add Solution Components

- add basic solution Checker
- add random destroy Operator
- revised some parts of the code

.clang-format

+BasedOnStyle: LLVM
+Language: Cpp
+Standard: c++20
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: true
+  AfterStruct: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterUnion: true
+  BeforeCatch: false
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 120
+CompactNamespaces: false
+ContinuationIndentWidth: 8
+EmptyLineBeforeAccessModifier: LogicalBlock
+IncludeBlocks: Regroup
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
+PointerAlignment: Right
+ReferenceAlignment: Right
+QualifierAlignment: Right
+ReflowComments: false
+SeparateDefinitionBlocks: Always
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 0
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: Never

CMakeLists.txt

@@ -15,10 +15,6 @@ find_package(CLI11 REQUIRED)
 find_package(nlohmann_json REQUIRED)
 find_package(spdlog REQUIRED)
 
-
-
-
-
 add_executable(pdptw src/mains/main.cpp
                 src/mains/main_interface.cpp
                 src/input/data.cpp
@@ -37,6 +33,10 @@ add_executable(pdptw src/mains/main.cpp
                 src/lns/modification/route/insert_route_with_pair.cpp
                 src/lns/modification/route/insert_route.cpp
                 src/lns/modification/route/remove_route.cpp
+                src/output/solution_checker.cpp
+                src/lns/operators/destruction/random_destroy.cpp
+                src/lns/operators/selector/operator_selection.cpp
+                src/utils.cpp
                 )
 
 target_link_libraries(pdptw PRIVATE CLI11::CLI11 nlohmann_json::nlohmann_json spdlog::spdlog)

src/config.h

 
 
-const int EXCLUSION_PENALTY = 100;
+const int EXCLUSION_PENALTY = 100;
\ No newline at end of file
+
+const int RANDOM_SEED = 10;
\ No newline at end of file

src/input/pdptw_data.cpp

@@ -60,6 +60,18 @@ PDPTWData::PDPTWData(int size, int capacity, Location depot, std::vector<Locatio
     }
 }
 
+const Pair &PDPTWData::getPair(int id) const
+{
+    for (const Pair &pair : pairs)
+    {
+        if (id == pair.getID())
+        {
+            return pair;
+        }
+    }
+    spdlog::error("Pair not found for ID {}", id);
+    throw std::runtime_error("Pair not found");
+}
 
 void PDPTWData::print() const 
 {

src/input/pdptw_data.h

@@ -54,6 +54,8 @@ public:
     std::vector<Location> const &getLocations() const;
     std::vector<Pair> const &getPairs() const;
 
+    const Pair &getPair(int id) const;
+
     /** 
     *   0 return the depot.
     *   Other numbers return the associated location.

src/lns/constraints/time_window/time_window_constraint.cpp

@@ -134,21 +134,6 @@ void TimeWindowConstraint::ApplyModif(const PDPTWData& data, const Pair & pair,
         allRouteReachTimes[routeIndex][i] = std::max(allRouteReachTimes[routeIndex][i - 1], startTW) + serviceTime + travelTime;
     }
 }
-/*
-    // Adjust the size of reachTimes vector
-    reachTimes.resize(routeIDs.size(), 0);
-    // Time to the first location
-    reachTimes[0] = data.getDepot().getTimeWindow().getStart() + data::TravelTime(data, 0, routeIDs.at(0));
-    // Compute other reachTimes (max between arrival and start of the time window + previous service time + travel time)
-    for (int i = 1; i < routeIDs.size(); ++i) {
-        TimeInteger travelTime = data::TravelTime(data, routeIDs[i - 1], routeIDs[i]);
-        // locations are indexed from 0 to n-1,
-        TimeInteger serviceTime = data.getLocation(routeIDs[i - 1]).getServiceDuration();
-        TimeInteger startTW = data.getLocation(routeIDs[i - 1]).getTimeWindow().getStart();
-
-        reachTimes[i] = std::max(reachTimes[i - 1], startTW) + serviceTime + travelTime;
-    }
-*/
 
 bool TimeWindowConstraint::check(InsertPair const &op) const
 {

src/lns/modification/atomic_destruction.h

@@ -15,5 +15,5 @@ public:
     /**
      * @return the location ID removed from the solution.
      */
-    virtual std::vector<int> const &getDeletedRequests() const = 0;
+    virtual std::vector<int> const &getDeletedPairs() const = 0;
 };

src/lns/modification/atomic_modification.h

 #pragma once
 
-#include <vector>
-
 #include "lns/constraints/constraint.h"
+
+#include <vector>
 class Solution;
 
 /**
@@ -21,11 +21,15 @@ public:
      */
     virtual double evaluate(Solution const &solution) const = 0;
 
-     /**
+    /**
      * Apply of the modification to the solution.
      * @note does not check the validity of the modification, does not update solution cost nor constraints
      */
     virtual void modifySolution(Solution &solution) = 0;
-};
-
 
+    /**
+     * Visitor pattern double dispatch.
+     * Only need to be implemented with `return *this;`, update ModificationApplyVariant typedef when adding new modification.
+     */
+    virtual ModificationApplyVariant asApplyVariant() const = 0;
+};

src/lns/modification/pair/insert_pair.cpp

@@ -95,4 +95,9 @@ const Pair &InsertPair::getPair() const
 Index InsertPair::getIndex() const 
 {
     return std::make_tuple(routeIndex, pickupInsertion, deliveryInsertion);
+}
+
+ModificationApplyVariant InsertPair::asApplyVariant() const
+{
+    return (*this);
 }
\ No newline at end of file

src/lns/modification/pair/insert_pair.h

@@ -51,6 +51,8 @@ public:
 
     ~InsertPair() override = default;
 
+    ModificationApplyVariant asApplyVariant() const override;
+    
     void modifySolution(Solution &solution) override;
     double evaluate(Solution const &solution) const override;
     Location const *getAddedLocation() const override;

src/lns/modification/pair/remove_pair.cpp

 #include "remove_pair.h"
-#include "input/data.h"
-
-
-RemovePair::RemovePair(int routeIndex, int pickupDeletion, int deliveryDeletion, Pair const &pair) :
-    routeIndex(routeIndex), 
-    pickupDeletion(pickupDeletion), 
-    deliveryDeletion(deliveryDeletion), 
-    pickupLocation(pair.getPickup()), 
-    deliveryLocation(pair.getDelivery()),
-    pair(pair) {}
 
+#include "input/data.h"
 
-RemovePair::RemovePair(Index position, Pair const &pair) :
-    routeIndex(std::get<0>(position)), 
-    pickupDeletion(std::get<1>(position)), 
-    deliveryDeletion(std::get<2>(position)), 
-    pickupLocation(pair.getPickup()), 
-    deliveryLocation(pair.getDelivery()),
-    pair(pair) {}
+RemovePair::RemovePair(int routeIndex, int pickupDeletion, int deliveryDeletion, Pair const &pair)
+    : routeIndex(routeIndex), pickupDeletion(pickupDeletion), deliveryDeletion(deliveryDeletion),
+      pickupLocation(pair.getPickup()), deliveryLocation(pair.getDelivery()), pair(pair)
+{}
 
+RemovePair::RemovePair(Index position, Pair const &pair)
+    : routeIndex(std::get<0>(position)), pickupDeletion(std::get<1>(position)), deliveryDeletion(std::get<2>(position)),
+      pickupLocation(pair.getPickup()), deliveryLocation(pair.getDelivery()), pair(pair)
+{}
 
 void RemovePair::modifySolution(Solution &solution)
 {
     Route &route = solution.getRoute(routeIndex);
 
-    // update removedLocationID
-    removedLocationID.push_back(route.getRoute()[pickupDeletion]);
-    removedLocationID.push_back(route.getRoute()[deliveryDeletion]);
+    // update removedPairID
+
+    removedPairID.push_back(route.getRoute()[pickupDeletion]);
 
     // remove the delivery before (to not have to update the index)
     route.deleteAt(deliveryDeletion);
     route.deleteAt(pickupDeletion);
-
-
 }
 
 double RemovePair::evaluate(Solution const &solution) const
 {
     Route const &route = solution.getRoute(routeIndex);
-    const std::vector<int> & routeIDs = route.getRoute();
-    const PDPTWData &data = solution.getData();
+    std::vector<int> const &routeIDs = route.getRoute();
+    PDPTWData const &data = solution.getData();
 
     int prevPickup = (pickupDeletion == 0) ? 0 : routeIDs[pickupDeletion - 1];
     // pickup location should not be at the end of a route anyway
@@ -47,9 +37,9 @@ double RemovePair::evaluate(Solution const &solution) const
 
     double pickupCost = data::removedCostForSuppression(data, prevPickup, pickupLocation.getId(), nextPickup);
 
-    int prevDelivery = (deliveryDeletion == 0) ? 0 : routeIDs[deliveryDeletion - 1]; 
+    int prevDelivery = (deliveryDeletion == 0) ? 0 : routeIDs[deliveryDeletion - 1];
     int nextDelivery = (deliveryDeletion >= routeIDs.size()) ? 0 : routeIDs[deliveryDeletion + 1];
-    if (deliveryDeletion == pickupDeletion+1)
+    if (deliveryDeletion == pickupDeletion + 1)
     {
         prevDelivery = prevPickup;
     }
@@ -62,7 +52,6 @@ double RemovePair::evaluate(Solution const &solution) const
 int RemovePair::getPickupDeletion() const
 {
     return pickupDeletion;
-
 }
 
 int RemovePair::getDeliveryDeletion() const
@@ -75,19 +64,19 @@ int RemovePair::getRouteIndex() const
     return routeIndex;
 }
 
-Location const & RemovePair::getPickupLocation() const
+Location const &RemovePair::getPickupLocation() const
 {
     return pickupLocation;
 }
 
-Location const & RemovePair::getDeliveryLocation() const
+Location const &RemovePair::getDeliveryLocation() const
 {
     return deliveryLocation;
 }
 
-std::vector<int> const & RemovePair::getDeletedRequests() const
+std::vector<int> const &RemovePair::getDeletedPairs() const
 {
-    return removedLocationID;
+    return removedPairID;
 }
 
 Pair const &RemovePair::getPair() const
@@ -95,7 +84,12 @@ Pair const &RemovePair::getPair() const
     return pair;
 }
 
-Index RemovePair::getIndex() const 
+Index RemovePair::getIndex() const
 {
     return std::make_tuple(routeIndex, pickupDeletion, deliveryDeletion);
+}
+
+ModificationApplyVariant RemovePair::asApplyVariant() const
+{
+    return (*this);
 }
\ No newline at end of file

src/lns/modification/pair/remove_pair.h

@@ -41,9 +41,9 @@ class RemovePair : public AtomicDestruction
     Pair const & pair;
 
     /**
-     * Removed Location ID (empty before ModifySolution is called)
+     * Removed PairID (= pickupID) (empty before ModifySolution is called)
      */
-    std::vector<int> removedLocationID;
+    std::vector<int> removedPairID;
 
 public:
     
@@ -51,12 +51,14 @@ public:
     RemovePair(Index position, Pair const &pair);
     ~RemovePair() override = default;
 
+    ModificationApplyVariant asApplyVariant() const override;
+    
     void modifySolution(Solution &solution) override;
     double evaluate(Solution const &solution) const override;
     /**
      *  Return the location ID of location that has been deleted
      */
-    std::vector<int> const &getDeletedRequests() const override;
+    std::vector<int> const &getDeletedPairs() const override;
 
     int getPickupDeletion() const;
     int getDeliveryDeletion() const;

src/lns/modification/route/remove_route.cpp

 #include "remove_route.h"
 
+#include "input/location.h"
+
+#include <algorithm>
+#include <ranges>
 #include <utility>
+#include <vector>
+
+RemoveRoute::RemoveRoute() : routeIndex(-1), removedPairID({}) {}
 
+RemoveRoute::RemoveRoute(int routeIndex) : routeIndex(routeIndex), removedPairID({}) {}
 
-RemoveRoute::RemoveRoute() : routeIndex(-1), removedLocationID({}) {}
-RemoveRoute::RemoveRoute(int routeIndex) : routeIndex(routeIndex), removedLocationID({}) {}
-RemoveRoute::RemoveRoute(int routeIndex, std::vector<int> removedLocationID) : 
-    routeIndex(routeIndex), 
-    removedLocationID(std::move(removedLocationID)) {}
+RemoveRoute::RemoveRoute(int routeIndex, std::vector<int> &&removedPairID)
+    : routeIndex(routeIndex), removedPairID(std::move(removedPairID))
+{}
 
 void RemoveRoute::modifySolution(Solution &solution)
 {
     std::vector<Route> &routes = solution.getRoutes();
-
-    // update removedLocationID
-    removedLocationID.insert(removedLocationID.end(), 
-    std::make_move_iterator(routes[routeIndex].getRoute().begin()), 
-    std::make_move_iterator(routes[routeIndex].getRoute().end()));
-
+    std::vector<int> const &locationIDs = routes.at(routeIndex).getRoute();
+
+    // update removedPairID
+    removedPairID.reserve(routes.at(routeIndex).getSize());
+
+    for (int id : locationIDs)
+    {
+        if (solution.getData().getLocation(id).getLocType() == LocType::PICKUP)
+        {
+            removedPairID.push_back(id);
+        }
+    }
     routes.erase(routes.begin() + routeIndex);
 }
 
@@ -31,7 +43,7 @@ int RemoveRoute::getRouteIndex() const
     return routeIndex;
 }
 
-std::vector<int> const &RemoveRoute::getDeletedRequests() const
+std::vector<int> const &RemoveRoute::getDeletedPairs() const
 {
-    return removedLocationID;
+    return removedPairID;
 }
\ No newline at end of file

src/lns/modification/route/remove_route.h

@@ -21,20 +21,20 @@ class RemoveRoute : public AtomicDestruction
     /**
      * Removed Location ID (empty before ModifySolution is called)
      */
-    std::vector<int> removedLocationID;
+    std::vector<int> removedPairID;
 
 public:
 
     RemoveRoute();
     explicit RemoveRoute(int routeIndex);
-    RemoveRoute(int routeIndex, std::vector<int> removedLocationID);
+    RemoveRoute(int routeIndex, std::vector<int> &&removedPairID);
 
     void modifySolution(Solution &solution) override;
     double evaluate(Solution const &solution) const override;
     /**
     *  Return the location ID of location that has been deleted
     */
-    std::vector<int> const &getDeletedRequests() const override;
+    std::vector<int> const &getDeletedPairs() const override;
 
     int getRouteIndex() const;
 };
\ No newline at end of file

src/lns/operators/abstract_operator.h

+#pragma once
+
+class Solution;
+
+class DestructionOperator
+{
+public:
+    virtual void destroySolution(Solution &solution) const = 0;
+    virtual ~DestructionOperator() = default;
+};
+
+class ReconstructionOperator
+{
+public:
+    virtual void reconstructSolution(Solution &solution, double blinkRate) const = 0;
+    virtual ~ReconstructionOperator() = default;
+};

src/lns/operators/destruction/random_destroy.cpp

+#include "random_destroy.h"
+#include "lns/solution/solution.h"
+#include "utils.h"
+#include "types.h"
+
+#include "lns/modification/pair/remove_pair.h"
+
+#include <algorithm> 
+
+void RandomDestroy::destroySolution(Solution &solution) const
+{
+
+    int nbRequests = solution.requestsFulFilledCount();
+    int actualNumberOfPairsToDestroy = std::min(nbRequests, numberOfPairsToDestroy);
+    int remainingPairToDelete = actualNumberOfPairsToDestroy;
+
+    while (remainingPairToDelete < 0)
+    {
+        // too complicated
+        // Other (simpler) option -> choose random route then choose random pair ?
+     
+        // choose a random pair
+        int pairNumber = util::getRandomInt(0, remainingPairToDelete * 2 - 1);
+        
+        int pairID = 0;
+        int routeID = 0;
+        int count = 0;
+        Index index = std::make_tuple(0,0,0);
+        
+        // retrieve index (route and position)
+        for (const Route &route : solution.getRoutes())
+        {
+            count +=  route.getSize();
+            if (pairNumber < count)
+            {
+                count = count - pairNumber;
+
+                std::get<0>(index) = routeID;
+                std::get<1>(index) = count;
+                std::get<2>(index) = route.getPairLocationPosition(count, solution.getData());
+
+                // retrieve pickupID (= PairID)
+                if (solution.getData().getLocation(route.getRoute().at(count)).getLocType() == LocType::PICKUP )
+                {
+                    pairID = route.getRoute().at(count);
+                }
+                else
+                {
+                    pairID = route.getRoute().at(std::get<2>(index));
+                }
+                break;
+            }
+            ++routeID;
+        }
+
+        RemovePair remPair = RemovePair(index, solution.getData().getPair(pairID));
+
+        // appliquer la modif (via solution method -> update correctement la solution)
+        solution.applyDestructSolution(remPair);
+
+        // update les compteurs
+        --remainingPairToDelete;
+    }
+}
\ No newline at end of file

src/lns/operators/destruction/random_destroy.h

+#pragma once
+
+#include "lns/operators/abstract_operator.h"
+
+class RandomDestroy : public DestructionOperator
+{
+public:
+    explicit RandomDestroy(int numberOfPairsToDestroy)
+        : numberOfPairsToDestroy(numberOfPairsToDestroy)
+    {}
+
+    /**
+     * This operator removes numberOfPairsToDestroy pairs randomly in the solution.
+     */
+    void destroySolution(Solution &solution) const override;
+
+private:
+    int numberOfPairsToDestroy;
+};

src/lns/solution/route.cpp

@@ -59,4 +59,22 @@ int Route::getLocation(int index) const
 int Route::getSize() const 
 {
     return route.size();
+}
+
+
+int Route::getPairLocationPosition(int position, const PDPTWData &data) const
+{
+    int firstID = getRoute().at(position);
+    int secondID = data.getLocation(firstID).getPair();
+
+    for (int i=0; i < getSize(); i++)
+    {
+        if (getRoute().at(i) == secondID)
+        {
+            return i;
+        }
+    }
+    
+    spdlog::error("Paired location not found for ID {}", firstID);
+    throw std::runtime_error("Paired location not found in the route");
 }
\ No newline at end of file