Merge pull request #5 from fontanf/dev

Clean code
fontanf · Apr 20, 2024 · 1086eea · 1086eea
2 parents 1410140 + 09acfad
commit 1086eea
Show file tree

Hide file tree

Showing 28 changed files with 113 additions and 149 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ python3 scripts/download_data.py --data gecco2020
 Run:
 
 ```shell
-./bazel-bin/setcoveringsolver/setcovering/main -v 1 -i data/wedelin1995/sasd9imp2.dat -f wedelin1995 -a milp-cbc
+./bazel-bin/setcoveringsolver/main -v 1 -i data/wedelin1995/sasd9imp2.dat -f wedelin1995 -a milp-cbc
 ```
 ```
 =====================================
@@ -130,7 +130,7 @@ Cost:                          5262040
 ```
 
 ```shell
-./bazel-bin/setcoveringsolver/setcovering/main -v 1 -i data/beasley1990/scpnrh5.txt -f orlibrary -a large-neighborhood-search -t 0.3
+./bazel-bin/setcoveringsolver/main -v 1 -i data/beasley1990/scpnrh5.txt -f orlibrary -a large-neighborhood-search -t 0.3
 ```
 ```
 =====================================
@@ -212,7 +212,7 @@ Cost:                          55
 ```
 
 ```shell
-./bazel-bin/setcoveringsolver/setcovering/main -v 1 -i data/faster1994/rail582.txt -f faster --unicost -a local-search-row-weighting-1 -c solution.txt -t 2
+./bazel-bin/setcoveringsolver/main -v 1 -i data/faster1994/rail582.txt -f faster --unicost -a local-search-row-weighting-1 -c solution.txt -t 2
 ```
 ```
 =====================================
@@ -312,7 +312,7 @@ Cost:                          130
 ```
 
 ```shell
-./bazel-bin/setcoveringsolver/setcovering/main -v 1 -i data/gecco2020/AC_15_cover.txt -f gecco2020 --unicost -a local-search-row-weighting-2 -t 10 -c solution.txt
+./bazel-bin/setcoveringsolver/main -v 1 -i data/gecco2020/AC_15_cover.txt -f gecco2020 --unicost -a local-search-row-weighting-2 -t 10 -c solution.txt
 ```
 ```
 =====================================

diff --git a/scripts/run_tests.py b/scripts/run_tests.py
@@ -16,7 +16,6 @@
 main = os.path.join(
         "bazel-bin",
         "setcoveringsolver",
-        "setcovering",
         "main")
 
 

diff --git a/setcoveringsolver/BUILD b/setcoveringsolver/BUILD
@@ -27,3 +27,53 @@ config_setting(
     values = {"define": "gurobi=true"},
     visibility = ["//visibility:public"],
 )
+
+load("//setcoveringsolver:variables.bzl", "STDCPP",
+         "CBC_COPTS", "CBC_DEP",
+         "CPLEX_COPTS", "CPLEX_DEP",
+         "GUROBI_COPTS", "GUROBI_DEP")
+
+cc_library(
+        name = "data",
+        hdrs = [
+                "instance.hpp",
+                "instance_builder.hpp",
+                "solution.hpp",
+                "reduction.hpp",
+                "algorithm.hpp",
+                "algorithm_formatter.hpp",
+        ],
+        srcs = [
+                "instance.cpp",
+                "instance_builder.cpp",
+                "solution.cpp",
+                "reduction.cpp",
+                "algorithm.cpp",
+                "algorithm_formatter.cpp",
+        ],
+        deps = [
+                "@optimizationtools//optimizationtools/utils:utils",
+                "@optimizationtools//optimizationtools/containers:containers",
+        ],
+        copts = STDCPP,
+        visibility = ["//visibility:public"],
+)
+
+cc_binary(
+        name = "main",
+        srcs = ["main.cpp"],
+        deps = [
+                "//setcoveringsolver/algorithms:greedy",
+                "//setcoveringsolver/algorithms:milp_cbc",
+                "//setcoveringsolver/algorithms:milp_gurobi",
+                "//setcoveringsolver/algorithms:local_search_row_weighting",
+                "//setcoveringsolver/algorithms:large_neighborhood_search",
+                "@boost//:program_options",
+        ] + CBC_DEP + GUROBI_DEP,
+        copts = CBC_COPTS + GUROBI_COPTS,
+        linkopts = select({
+                    "@bazel_tools//src/conditions:windows": [],
+                    "//conditions:default": ["-lpthread"],
+        }),
+)
+
diff --git a/setcoveringsolver/setcovering/algorithm.cpp → setcoveringsolver/algorithm.cpp b/setcoveringsolver/setcovering/algorithm.cpp → setcoveringsolver/algorithm.cpp
diff --git a/setcoveringsolver/setcovering/algorithm.hpp → setcoveringsolver/algorithm.hpp b/setcoveringsolver/setcovering/algorithm.hpp → setcoveringsolver/algorithm.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "setcoveringsolver/setcovering/reduction.hpp"
+#include "setcoveringsolver/reduction.hpp"
 
 #include "optimizationtools/utils/output.hpp"
 #include "optimizationtools/utils/utils.hpp"
@@ -9,8 +9,6 @@
 
 namespace setcoveringsolver
 {
-namespace setcovering
-{
 
 inline optimizationtools::ObjectiveDirection objective_direction()
 {
@@ -127,4 +125,3 @@ struct Parameters: optimizationtools::Parameters
 };
 
 }
-}
diff --git a/...olver/setcovering/algorithm_formatter.cpp → setcoveringsolver/algorithm_formatter.cpp b/...olver/setcovering/algorithm_formatter.cpp → setcoveringsolver/algorithm_formatter.cpp
@@ -1,10 +1,10 @@
-#include "setcoveringsolver/setcovering/algorithm_formatter.hpp"
+#include "setcoveringsolver/algorithm_formatter.hpp"
 
 #include "optimizationtools/utils/utils.hpp"
 
 #include <iomanip>
 
-using namespace setcoveringsolver::setcovering;
+using namespace setcoveringsolver;
 
 void AlgorithmFormatter::start(
         const std::string& algorithm_name)

diff --git a/...olver/setcovering/algorithm_formatter.hpp → setcoveringsolver/algorithm_formatter.hpp b/...olver/setcovering/algorithm_formatter.hpp → setcoveringsolver/algorithm_formatter.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include "setcoveringsolver/setcovering/algorithm.hpp"
+#include "setcoveringsolver/algorithm.hpp"
 
 namespace setcoveringsolver
 {
-namespace setcovering
-{
 
 class AlgorithmFormatter
 {
@@ -108,4 +106,3 @@ inline const AlgorithmOutput solve_reduced_instance(
 }
 
 }
-}
diff --git a/...veringsolver/setcovering/algorithms/BUILD → setcoveringsolver/algorithms/BUILD b/...veringsolver/setcovering/algorithms/BUILD → setcoveringsolver/algorithms/BUILD
@@ -7,7 +7,7 @@ cc_library(
         name = "greedy",
         hdrs = ["greedy.hpp"],
         srcs = ["greedy.cpp"],
-        deps = ["//setcoveringsolver/setcovering:data"],
+        deps = ["//setcoveringsolver:data"],
         visibility = ["//visibility:public"],
 )
 
@@ -16,7 +16,7 @@ cc_library(
         hdrs = ["milp_cbc.hpp"],
         srcs = ["milp_cbc.cpp"],
         deps = [
-                "//setcoveringsolver/setcovering:data",
+                "//setcoveringsolver:data",
         ] + CBC_DEP,
         copts = CBC_COPTS,
         visibility = ["//visibility:public"],
@@ -27,7 +27,7 @@ cc_library(
         hdrs = ["milp_gurobi.hpp"],
         srcs = ["milp_gurobi.cpp"],
         deps = [
-                "//setcoveringsolver/setcovering:data",
+                "//setcoveringsolver:data",
         ] + GUROBI_DEP,
         copts = GUROBI_COPTS,
         visibility = ["//visibility:public"],
@@ -39,7 +39,7 @@ cc_library(
         srcs = ["local_search_row_weighting.cpp"],
         deps = [
                 ":greedy",
-                "//setcoveringsolver/setcovering:data",
+                "//setcoveringsolver:data",
         ],
         visibility = ["//visibility:public"],
 )
@@ -50,7 +50,7 @@ cc_library(
         srcs = ["large_neighborhood_search.cpp"],
         deps = [
                 ":greedy",
-                "//setcoveringsolver/setcovering:data",
+                "//setcoveringsolver:data",
         ],
         visibility = ["//visibility:public"],
 )
diff --git a/...gsolver/setcovering/algorithms/greedy.cpp → setcoveringsolver/algorithms/greedy.cpp b/...gsolver/setcovering/algorithms/greedy.cpp → setcoveringsolver/algorithms/greedy.cpp
@@ -1,12 +1,12 @@
-#include "setcoveringsolver/setcovering/algorithms/greedy.hpp"
+#include "setcoveringsolver/algorithms/greedy.hpp"
 
-#include "setcoveringsolver/setcovering/algorithm_formatter.hpp"
+#include "setcoveringsolver/algorithm_formatter.hpp"
 
 #include "optimizationtools/containers/indexed_binary_heap.hpp"
 
-using namespace setcoveringsolver::setcovering;
+using namespace setcoveringsolver;
 
-const Output setcoveringsolver::setcovering::greedy(
+const Output setcoveringsolver::greedy(
         const Instance& instance,
         const Parameters& parameters)
 {
@@ -67,7 +67,7 @@ const Output setcoveringsolver::setcovering::greedy(
     return output;
 }
 
-const Output setcoveringsolver::setcovering::greedy_lin(
+const Output setcoveringsolver::greedy_lin(
         const Instance& instance,
         const Parameters& parameters)
 {
@@ -126,7 +126,7 @@ const Output setcoveringsolver::setcovering::greedy_lin(
     return output;
 }
 
-const Output setcoveringsolver::setcovering::greedy_dual(
+const Output setcoveringsolver::greedy_dual(
         const Instance& instance,
         const Parameters& parameters)
 {

diff --git a/...gsolver/setcovering/algorithms/greedy.hpp → setcoveringsolver/algorithms/greedy.hpp b/...gsolver/setcovering/algorithms/greedy.hpp → setcoveringsolver/algorithms/greedy.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include "setcoveringsolver/setcovering/algorithm.hpp"
+#include "setcoveringsolver/algorithm.hpp"
 
 namespace setcoveringsolver
 {
-namespace setcovering
-{
 
 const Output greedy(
         const Instance& instance,
@@ -20,5 +18,3 @@ const Output greedy_dual(
         const Parameters& parameters = {});
 
 }
-}
-
diff --git a/.../algorithms/large_neighborhood_search.cpp → .../algorithms/large_neighborhood_search.cpp b/.../algorithms/large_neighborhood_search.cpp → .../algorithms/large_neighborhood_search.cpp
@@ -1,12 +1,12 @@
-#include "setcoveringsolver/setcovering/algorithms/large_neighborhood_search.hpp"
+#include "setcoveringsolver/algorithms/large_neighborhood_search.hpp"
 
-#include "setcoveringsolver/setcovering/algorithm_formatter.hpp"
-#include "setcoveringsolver/setcovering/algorithms/greedy.hpp"
+#include "setcoveringsolver/algorithm_formatter.hpp"
+#include "setcoveringsolver/algorithms/greedy.hpp"
 
 #include "optimizationtools/containers/indexed_set.hpp"
 #include "optimizationtools/containers/indexed_binary_heap.hpp"
 
-using namespace setcoveringsolver::setcovering;
+using namespace setcoveringsolver;
 
 struct LargeNeighborhoodSearchSet
 {
@@ -17,7 +17,7 @@ struct LargeNeighborhoodSearchSet
     Cost score = 0;
 };
 
-const LargeNeighborhoodSearchOutput setcoveringsolver::setcovering::large_neighborhood_search(
+const LargeNeighborhoodSearchOutput setcoveringsolver::large_neighborhood_search(
         const Instance& instance,
         const LargeNeighborhoodSearchParameters& parameters)
 {

diff --git a/.../algorithms/large_neighborhood_search.hpp → .../algorithms/large_neighborhood_search.hpp b/.../algorithms/large_neighborhood_search.hpp → .../algorithms/large_neighborhood_search.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include "setcoveringsolver/setcovering/algorithm.hpp"
+#include "setcoveringsolver/algorithm.hpp"
 
 namespace setcoveringsolver
 {
-namespace setcovering
-{
 
 struct LargeNeighborhoodSearchParameters: Parameters
 {
@@ -77,5 +75,3 @@ const LargeNeighborhoodSearchOutput large_neighborhood_search(
         const LargeNeighborhoodSearchParameters& parameters = {});
 
 }
-}
-
diff --git a/...algorithms/local_search_row_weighting.cpp → ...algorithms/local_search_row_weighting.cpp b/...algorithms/local_search_row_weighting.cpp → ...algorithms/local_search_row_weighting.cpp
@@ -1,11 +1,11 @@
-#include "setcoveringsolver/setcovering/algorithms/local_search_row_weighting.hpp"
+#include "setcoveringsolver/algorithms/local_search_row_weighting.hpp"
 
-#include "setcoveringsolver/setcovering/algorithm_formatter.hpp"
-#include "setcoveringsolver/setcovering/algorithms/greedy.hpp"
+#include "setcoveringsolver/algorithm_formatter.hpp"
+#include "setcoveringsolver/algorithms/greedy.hpp"
 
 #include "optimizationtools/containers/indexed_set.hpp"
 
-using namespace setcoveringsolver::setcovering;
+using namespace setcoveringsolver;
 
 struct LocalSearchRowWeightingComponent
 {
@@ -45,7 +45,7 @@ struct LocalSearchRowWeightingSet
     Cost score = 0;
 };
 
-const LocalSearchRowWeighting2Output setcoveringsolver::setcovering::local_search_row_weighting_2(
+const LocalSearchRowWeighting2Output setcoveringsolver::local_search_row_weighting_2(
         const Instance& instance,
         std::mt19937_64& generator,
         const LocalSearchRowWeighting2Parameters& parameters)
@@ -566,7 +566,7 @@ struct LocalSearchRowWeighting1Set
     Cost score = 0;
 };
 
-const LocalSearchRowWeighting1Output setcoveringsolver::setcovering::local_search_row_weighting_1(
+const LocalSearchRowWeighting1Output setcoveringsolver::local_search_row_weighting_1(
         const Instance& instance,
         std::mt19937_64& generator,
         const LocalSearchRowWeighting1Parameters& parameters)

diff --git a/...algorithms/local_search_row_weighting.hpp → ...algorithms/local_search_row_weighting.hpp b/...algorithms/local_search_row_weighting.hpp → ...algorithms/local_search_row_weighting.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include "setcoveringsolver/setcovering/algorithm.hpp"
+#include "setcoveringsolver/algorithm.hpp"
 
 namespace setcoveringsolver
 {
-namespace setcovering
-{
 
 struct LocalSearchRowWeighting1Parameters: Parameters
 {
@@ -207,5 +205,3 @@ const LocalSearchRowWeighting2Output local_search_row_weighting_2(
         const LocalSearchRowWeighting2Parameters& parameters = {});
 
 }
-}
-
diff --git a/...olver/setcovering/algorithms/milp_cbc.cpp → setcoveringsolver/algorithms/milp_cbc.cpp b/...olver/setcovering/algorithms/milp_cbc.cpp → setcoveringsolver/algorithms/milp_cbc.cpp
@@ -1,10 +1,10 @@
 #if CBC_FOUND
 
-#include "setcoveringsolver/setcovering/algorithms/milp_cbc.hpp"
+#include "setcoveringsolver/algorithms/milp_cbc.hpp"
 
-#include "setcoveringsolver/setcovering/algorithm_formatter.hpp"
+#include "setcoveringsolver/algorithm_formatter.hpp"
 
-using namespace setcoveringsolver::setcovering;
+using namespace setcoveringsolver;
 
 ////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////// Callback ///////////////////////////////////
@@ -164,7 +164,7 @@ CoinLP::CoinLP(const Instance& instance)
             number_of_elements_in_rows.data());
 }
 
-const Output setcoveringsolver::setcovering::milp_cbc(
+const Output setcoveringsolver::milp_cbc(
         const Instance& instance,
         const MilpCbcParameters& parameters)
 {

diff --git a/...olver/setcovering/algorithms/milp_cbc.hpp → setcoveringsolver/algorithms/milp_cbc.hpp b/...olver/setcovering/algorithms/milp_cbc.hpp → setcoveringsolver/algorithms/milp_cbc.hpp
@@ -2,15 +2,13 @@
 
 #if CBC_FOUND
 
-#include "setcoveringsolver/setcovering/algorithm.hpp"
+#include "setcoveringsolver/algorithm.hpp"
 
 #include <CbcModel.hpp>
 #include <OsiCbcSolverInterface.hpp>
 
 namespace setcoveringsolver
 {
-namespace setcovering
-{
 
 struct MilpCbcParameters: Parameters
 {
@@ -23,7 +21,6 @@ const Output milp_cbc(
         const MilpCbcParameters& parameters = {});
 
 }
-}
 
 #endif