Use faster set implementation in ruin&recreate

acco93 · Mar 13, 2024 · 2127972 · 2127972
1 parent 42276b7
commit 2127972
Show file tree

Hide file tree

Showing 27 changed files with 109 additions and 106 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,9 +47,9 @@ add_executable(filo2
     base/PrettyPrinter.hpp
     base/SmallFlatMap.hpp
     base/SmallFlatSet.hpp
+    base/SparseIntSet.hpp
     base/Timer.hpp
     base/VectorView.hpp
-    base/VertexSet.hpp
     base/Welford.hpp
 
     instance/Instance.cpp

diff --git a/base/SparseIntSet.hpp b/base/SparseIntSet.hpp
@@ -0,0 +1,64 @@
+#ifndef _FILO2_SPARSEINTSET_HPP_
+#define _FILO2_SPARSEINTSET_HPP_
+
+#include <bitset>
+#include <cmath>
+#include <vector>
+
+namespace cobra {
+
+    class SparseIntSet {
+
+    public:
+        explicit SparseIntSet(unsigned int entries_num) {
+            flags.resize(entries_num);
+        }
+
+        SparseIntSet(const SparseIntSet &other) {
+            flags = other.flags;
+        }
+
+        SparseIntSet &operator=(const SparseIntSet &other) {
+            flags = other.flags;
+            return *this;
+        }
+
+        inline void insert(int value) {
+            const auto already_here = contains(value);
+            if (!already_here) {
+                insert_without_checking_existance(value);
+            }
+        }
+
+        inline void insert_without_checking_existance(int value) {
+            flags[value] = true;
+            elements.push_back(value);
+        }
+
+        inline bool contains(int value) {
+            return flags[value];
+        }
+
+        void clear() {
+            for (auto value : elements) {
+                flags[value] = false;
+            }
+            elements.clear();
+        }
+
+        const std::vector<int> &get_elements() const {
+            return elements;
+        }
+
+        unsigned int size() const {
+            return elements.size();
+        }
+
+    private:
+        std::vector<bool> flags;
+        std::vector<int> elements;
+    };
+
+}  // namespace cobra
+
+#endif
diff --git a/base/VertexSet.hpp b/base/VertexSet.hpp
diff --git a/localsearch/AbstractOperator.hpp b/localsearch/AbstractOperator.hpp
@@ -40,7 +40,7 @@ namespace cobra {
 
         // Applies `move` to `solution` and populates `affected_vertices` with the vertices `i` for which at least one move generator `(i,
         // j)` or `(j, i)` require an update.
-        virtual void execute(Solution& solution, const MoveGenerator& move, VertexSet& affected_vertices) = 0;
+        virtual void execute(Solution& solution, const MoveGenerator& move, SparseIntSet& affected_vertices) = 0;
 
         // Performs some final cleanup at the end of the local search cycle, if necessary.
         virtual void post_processing(Solution& solution) = 0;
@@ -415,7 +415,7 @@ namespace cobra {
             };
 
             auto depot = false;
-            for (auto i : affected_vertices.get_vertices()) {
+            for (auto i : affected_vertices.get_elements()) {
 
                 if constexpr (handle_partial_solutions) {
                     if (!solution.is_vertex_in_solution(i)) {
@@ -524,7 +524,7 @@ namespace cobra {
             };
 
             auto depot = false;
-            for (auto i : affected_vertices.get_vertices()) {
+            for (auto i : affected_vertices.get_elements()) {
 
                 if constexpr (handle_partial_solutions) {
                     if (!solution.is_vertex_in_solution(i)) {
@@ -776,7 +776,7 @@ namespace cobra {
             }
 
             // Reset the update bits associated with affected vertices.
-            for (auto i : affected_vertices.get_vertices()) {
+            for (auto i : affected_vertices.get_elements()) {
                 T::update_bits.at(i, UPDATE_BITS_FIRST, false);
                 T::update_bits.at(i, UPDATE_BITS_SECOND, false);
             }
@@ -789,7 +789,7 @@ namespace cobra {
 
         // Set of vertices affected by a move application. This set together with `update_bits` define the move generators requiring an
         // update.
-        VertexSet affected_vertices;
+        SparseIntSet affected_vertices;
     };
 
 

diff --git a/localsearch/EjectionChain.hpp b/localsearch/EjectionChain.hpp
@@ -244,7 +244,7 @@ namespace cobra {
         }
 
         inline void execute(Solution &solution, __attribute__((unused)) const MoveGenerator &generating_move,
-                            VertexSet &affected_vertices) override {
+                            SparseIntSet &affected_vertices) override {
 
             for (auto i : forbidden_i.get_set_entries_possibly_with_duplicates(feasible_rni)) {
                 affected_vertices.insert(i);
@@ -254,7 +254,7 @@ namespace cobra {
             }
 
             // Reset some cached deltas associated with affected vertices.
-            for (const int i : affected_vertices.get_vertices()) {
+            for (const int i : affected_vertices.get_elements()) {
                 for (const int move_index : moves.get_move_generator_indices_involving(i)) {
                     moves.get(move_index).set_computed_for_ejch(false);
                     moves.get(move_index + 1).set_computed_for_ejch(false);

diff --git a/localsearch/LocalSearch.hpp b/localsearch/LocalSearch.hpp
@@ -5,7 +5,7 @@
 #include <map>
 #include <set>
 
-#include "../base/VertexSet.hpp"
+#include "../base/SparseIntSet.hpp"
 #include "../instance/Instance.hpp"
 #include "../movegen/MoveGenerators.hpp"
 #include "../solution/Solution.hpp"

diff --git a/localsearch/OneOneExchange.hpp b/localsearch/OneOneExchange.hpp
@@ -56,7 +56,7 @@ namespace cobra {
                    (i_route == j_route && i != j_prev && j_prev != solution.get_next_vertex(i_route, i));
         }
 
-        inline void execute(Solution& solution, const MoveGenerator& move, VertexSet& storage) override {
+        inline void execute(Solution& solution, const MoveGenerator& move, SparseIntSet& storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/OneZeroExchange.hpp b/localsearch/OneZeroExchange.hpp
@@ -46,7 +46,7 @@ namespace cobra {
                    (iRoute == jRoute && j != solution.get_next_vertex(iRoute, i));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/RevThreeOneExchange.hpp b/localsearch/RevThreeOneExchange.hpp
@@ -63,7 +63,7 @@ namespace cobra {
                     jNext != solution.get_prev_vertex(iRoute, iPrevPrev));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/RevThreeThreeExchange.hpp b/localsearch/RevThreeThreeExchange.hpp
@@ -78,7 +78,7 @@ namespace cobra {
                     jNextNextNext != iPrevPrev && jNextNextNext != solution.get_prev_vertex(iRoute, iPrevPrev));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/RevThreeTwoExchange.hpp b/localsearch/RevThreeTwoExchange.hpp
@@ -72,7 +72,7 @@ namespace cobra {
                     jNextNext != solution.get_prev_vertex(iRoute, iPrevPrev));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/RevThreeZeroExchange.hpp b/localsearch/RevThreeZeroExchange.hpp
@@ -55,7 +55,7 @@ namespace cobra {
                    (iRoute == jRoute && j != iPrev && j != iPrevPrev && j != solution.get_prev_vertex(iRoute, iPrevPrev));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();
 

diff --git a/localsearch/RevTwoOneExchange.hpp b/localsearch/RevTwoOneExchange.hpp
@@ -63,7 +63,7 @@ namespace cobra {
                    (iRoute == jRoute && j != iPrev && j != iPrevPrev && jNext != iPrevPrev);
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/RevTwoTwoExchange.hpp b/localsearch/RevTwoTwoExchange.hpp
@@ -72,7 +72,7 @@ namespace cobra {
                     jNextNext != solution.get_prev_vertex(iRoute, iPrev));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/RevTwoZeroExchange.hpp b/localsearch/RevTwoZeroExchange.hpp
@@ -48,7 +48,7 @@ namespace cobra {
                    (iRoute == jRoute && iPrev != j && j != solution.get_prev_vertex(iRoute, iPrev));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/SplitExchange.hpp b/localsearch/SplitExchange.hpp
@@ -43,7 +43,7 @@ namespace cobra {
                                             this->instance.get_vehicle_capacity());
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/TailsExchange.hpp b/localsearch/TailsExchange.hpp
@@ -47,7 +47,7 @@ namespace cobra {
                        this->instance.get_vehicle_capacity();
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/ThreeOneExchange.hpp b/localsearch/ThreeOneExchange.hpp
@@ -62,7 +62,7 @@ namespace cobra {
                    (iRoute == jRoute && i != jPrev && i != solution.get_prev_vertex(jRoute, jPrev) && j != iPrev && j != iPrevPrev);
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/ThreeThreeExchange.hpp b/localsearch/ThreeThreeExchange.hpp
@@ -72,7 +72,7 @@ namespace cobra {
                     solution.get_next_vertex(iRoute, i) != jPrevPrevPrev && j != iPrev && j != iPrevPrev);
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/ThreeTwoExchange.hpp b/localsearch/ThreeTwoExchange.hpp
@@ -67,7 +67,7 @@ namespace cobra {
                    (iRoute == jRoute && i != jPrev && i != jPrevPrev && i != jPrevPrevPrev && j != iPrev && j != iPrevPrev);
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/ThreeZeroExchange.hpp b/localsearch/ThreeZeroExchange.hpp
@@ -55,7 +55,7 @@ namespace cobra {
                    (iRoute == jRoute && j != iPrev && j != iPrevPrev && j != solution.get_next_vertex(iRoute, i));
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();
 

diff --git a/localsearch/TwoOneExchange.hpp b/localsearch/TwoOneExchange.hpp
@@ -59,7 +59,7 @@ namespace cobra {
                    (iRoute == jRoute && i != jPrev && solution.get_next_vertex(iRoute, i) != jPrev && iPrev != j);
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/TwoOptExchange.hpp b/localsearch/TwoOptExchange.hpp
@@ -38,7 +38,7 @@ namespace cobra {
             return iRoute == jRoute;
         }
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/TwoTwoExchange.hpp b/localsearch/TwoTwoExchange.hpp
@@ -64,7 +64,7 @@ namespace cobra {
         }
 
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();

diff --git a/localsearch/TwoZeroExchange.hpp b/localsearch/TwoZeroExchange.hpp
@@ -49,7 +49,7 @@ namespace cobra {
         }
 
 
-        inline void execute(Solution &solution, const MoveGenerator &move, VertexSet &storage) override {
+        inline void execute(Solution &solution, const MoveGenerator &move, SparseIntSet &storage) override {
 
             const auto i = move.get_first_vertex();
             const auto j = move.get_second_vertex();