Fix COIN code

fontanf · fontanf · commit 7d13f09301d5 · 2024-12-28T15:53:29.000+01:00
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 FetchContent_Declare(
     mathoptsolverscmake
     GIT_REPOSITORY https://github.com/fontanf/mathoptsolverscmake.git
-    GIT_TAG 80cd13a843e2c10684abbfe76cf9aae0d71ff79d
+    GIT_TAG 2394715172d234b21515eae6cec7c545bafa65cb
     #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/"
     EXCLUDE_FROM_ALL)
 FetchContent_MakeAvailable(mathoptsolverscmake)
diff --git a/include/generalizedassignmentsolver/algorithms/linrelax_clp.hpp b/include/generalizedassignmentsolver/algorithms/linrelax_clp.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#if CLP_FOUND
+#if CBC_FOUND
 
 #include "generalizedassignmentsolver/solution.hpp"
 
diff --git a/include/generalizedassignmentsolver/algorithms/milp_cbc.hpp b/include/generalizedassignmentsolver/algorithms/milp_cbc.hpp
@@ -1,10 +1,8 @@
 #pragma once
 
-#if defined(CBC_FOUND) || defined(CLP_FOUND)
-
 #include "generalizedassignmentsolver/solution.hpp"
 
-#include <OsiCbcSolverInterface.hpp>
+#include <coin/OsiCbcSolverInterface.hpp>
 
 namespace generalizedassignmentsolver
 {
@@ -24,11 +22,7 @@ struct CoinLP
 
 }
 
-#endif
-
-#if CBC_FOUND
-
-#include <CbcModel.hpp>
+#include <coin/CbcModel.hpp>
 
 namespace generalizedassignmentsolver
 {
@@ -104,5 +98,3 @@ const MilpCbcOutput milp_cbc(
         const MilpCbcParameters& parameters = {});
 
 }
-
-#endif
diff --git a/include/generalizedassignmentsolver/algorithms/repair.hpp b/include/generalizedassignmentsolver/algorithms/repair.hpp
@@ -8,7 +8,7 @@ namespace generalizedassignmentsolver
 enum class RepairInitialSolution
 {
     CombinatorialRelaxation,
-#if CLP_FOUND
+#if CBC_FOUND
     LinearRelaxationClp,
 #endif
 #if CPLEX_FOUND
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,25 +21,25 @@ target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
     GeneralizedAssignmentSolver_local_search
     GeneralizedAssignmentSolver_column_generation
     Boost::program_options)
-if(COLORINGSOLVER_USE_CBC)
+if(GENERALIZEDASSIGNMENTSOLVER_USE_CBC)
     target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
         CBC_FOUND=1)
     target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
         GeneralizedAssignmentSolver_milp_cbc)
 endif()
-if(COLORINGSOLVER_USE_GUROBI)
+if(GENERALIZEDASSIGNMENTSOLVER_USE_GUROBI)
     target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
         GUROBI_FOUND=1)
     target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
         GeneralizedAssignmentSolver_milp_gurobi)
 endif()
-if(COLORINGSOLVER_USE_CPLEX)
+if(GENERALIZEDASSIGNMENTSOLVER_USE_CPLEX)
     target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
         CPLEX_FOUND=1)
     target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
         GeneralizedAssignmentSolver_milp_cplex)
 endif()
-if(COLORINGSOLVER_USE_KNITRO)
+if(GENERALIZEDASSIGNMENTSOLVER_USE_KNITRO)
     target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
         KNITRO_FOUND=1)
     target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
diff --git a/src/algorithms/linrelax_clp.cpp b/src/algorithms/linrelax_clp.cpp
@@ -1,4 +1,4 @@
-#if CLP_FOUND
+#if CBC_FOUND
 
 #include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
 #include "generalizedassignmentsolver/algorithms/milp_cbc.hpp"
diff --git a/src/algorithms/linrelax_clp_test.cpp b/src/algorithms/linrelax_clp_test.cpp
@@ -1,4 +1,4 @@
-#if CLP_FOUND
+#if CBC_FOUND
 
 #include "generalizedassignmentsolver/tester.hpp"
 #include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
diff --git a/src/algorithms/milp_cbc.cpp b/src/algorithms/milp_cbc.cpp
@@ -1,5 +1,3 @@
-#if defined(CBC_FOUND) || defined(CLP_FOUND)
-
 #include "generalizedassignmentsolver/algorithms/milp_cbc.hpp"
 
 #include "generalizedassignmentsolver/algorithm_formatter.hpp"
@@ -75,38 +73,34 @@ CoinLP::CoinLP(const Instance& instance)
             number_of_elements_in_rows.data());
 }
 
-#endif
-
-#if CBC_FOUND
-
-//#include "CbcHeuristicDiveCoefficient.hpp"
-//#include "CbcHeuristicDiveFractional.hpp"
-//#include "CbcHeuristicDiveGuided.hpp"
-//#include "CbcHeuristicDiveVectorLength.hpp"
-//#include "CbcLinked.hpp"
-//#include "CbcHeuristicGreedy.hpp"
-//#include "CbcHeuristicLocal.hpp"
-#include "CbcHeuristic.hpp"
-//#include "CbcHeuristicRINS.hpp"
-//#include "CbcHeuristicRENS.hpp"
-
-//#include "CglAllDifferent.hpp"
-//#include "CglClique.hpp"
-//#include "CglDuplicateRow.hpp"
-//#include "CglFlowCover.hpp"
-//#include "CglGomory.hpp"
-//#include "CglKnapsackCover.hpp"
-//#include "CglLandP.hpp"
-//#include "CglLiftAndProject.hpp"
-//#include "CglMixedIntegerRounding.hpp"
-//#include "CglMixedIntegerRounding2.hpp"
-//#include "CglOddHole.hpp"
-//#include "CglProbing.hpp"
-//#include "CglRedSplit.hpp"
-//#include "CglResidualCapacity.hpp"
-//#include "CglSimpleRounding.hpp"
-//#include "CglStored.hpp"
-//#include "CglTwomir.hpp"
+//#include "coin/CbcHeuristicDiveCoefficient.hpp"
+//#include "coin/CbcHeuristicDiveFractional.hpp"
+//#include "coin/CbcHeuristicDiveGuided.hpp"
+//#include "coin/CbcHeuristicDiveVectorLength.hpp"
+//#include "coin/CbcLinked.hpp"
+//#include "coin/CbcHeuristicGreedy.hpp"
+//#include "coin/CbcHeuristicLocal.hpp"
+#include "coin/CbcHeuristic.hpp"
+//#include "coin/CbcHeuristicRINS.hpp"
+//#include "coin/CbcHeuristicRENS.hpp"
+
+//#include "coin/CglAllDifferent.hpp"
+//#include "coin/CglClique.hpp"
+//#include "coin/CglDuplicateRow.hpp"
+//#include "coin/CglFlowCover.hpp"
+//#include "coin/CglGomory.hpp"
+//#include "coin/CglKnapsackCover.hpp"
+//#include "coin/CglLandP.hpp"
+//#include "coin/CglLiftAndProject.hpp"
+//#include "coin/CglMixedIntegerRounding.hpp"
+//#include "coin/CglMixedIntegerRounding2.hpp"
+//#include "coin/CglOddHole.hpp"
+//#include "coin/CglProbing.hpp"
+//#include "coin/CglRedSplit.hpp"
+//#include "coin/CglResidualCapacity.hpp"
+//#include "coin/CglSimpleRounding.hpp"
+//#include "coin/CglStored.hpp"
+//#include "coin/CglTwomir.hpp"
 
 /**
  * Useful links:
@@ -438,5 +432,3 @@ const MilpCbcOutput generalizedassignmentsolver::milp_cbc(
     algorithm_formatter.end();
     return output;
 }
-
-#endif
diff --git a/src/algorithms/repair.cpp b/src/algorithms/repair.cpp
@@ -2,7 +2,7 @@
 
 #include "generalizedassignmentsolver/algorithm_formatter.hpp"
 #include "generalizedassignmentsolver/algorithms/lagrelax_lbfgs.hpp"
-#if CLP_FOUND
+#if CBC_FOUND
 #include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
 #endif
 #if CPLEX_FOUND
@@ -22,7 +22,7 @@ std::istream& generalizedassignmentsolver::operator>>(std::istream& in, RepairIn
     in >> token;
     if (token == "combinatorial_relaxation") {
         initial_solution = RepairInitialSolution::CombinatorialRelaxation;
-#if CLP_FOUND
+#if CBC_FOUND
     } else if (token == "linrelax_clp") {
         initial_solution = RepairInitialSolution::LinearRelaxationClp;
 #endif
@@ -71,7 +71,7 @@ RepairOutput generalizedassignmentsolver::repair(
             }
         }
         break;
-#if CLP_FOUND
+#if CBC_FOUND
     } case RepairInitialSolution::LinearRelaxationClp: {
         LinRelaxClpOutput output_linrelax_clp = linrelax_clp(instance);
         for (ItemIdx item_id = 0; item_id < instance.number_of_items(); ++item_id) {
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,6 @@
 #include "generalizedassignmentsolver/instance_builder.hpp"
 
-#if CLP_FOUND
+#if CBC_FOUND
 //#include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
 #endif
 #include "generalizedassignmentsolver/algorithms/column_generation.hpp"
@@ -103,7 +103,7 @@ Output run(
         read_args(parameters, vm);
         return random(instance, generator, parameters);
 
-#if CLP_FOUND
+#if CBC_FOUND
     //} else if (algorithm == "linrelax-clp") {
     //    Parameters parameters;
     //    read_args(parameters, vm);

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#if defined(CBC_FOUND) \|\| defined(CLP_FOUND)`
`4`		`-`
`5`	`3`	`#include "generalizedassignmentsolver/solution.hpp"`
`6`	`4`
`7`		`-#include <OsiCbcSolverInterface.hpp>`
	`5`	`+#include <coin/OsiCbcSolverInterface.hpp>`
`8`	`6`
`9`	`7`	`namespace generalizedassignmentsolver`
`10`	`8`	`{`
`@@ -24,11 +22,7 @@ struct CoinLP`
`24`	`22`
`25`	`23`	`}`
`26`	`24`
`27`		`-#endif`
`28`		`-`
`29`		`-#if CBC_FOUND`
`30`		`-`
`31`		`-#include <CbcModel.hpp>`
	`25`	`+#include <coin/CbcModel.hpp>`
`32`	`26`
`33`	`27`	`namespace generalizedassignmentsolver`
`34`	`28`	`{`
`@@ -104,5 +98,3 @@ const MilpCbcOutput milp_cbc(`
`104`	`98`	`const MilpCbcParameters& parameters = {});`
`105`	`99`
`106`	`100`	`}`
`107`		`-`
`108`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace generalizedassignmentsolver`
`8`	`8`	`enum class RepairInitialSolution`
`9`	`9`	`{`
`10`	`10`	`CombinatorialRelaxation,`
`11`		`-#if CLP_FOUND`
	`11`	`+#if CBC_FOUND`
`12`	`12`	`LinearRelaxationClp,`
`13`	`13`	`#endif`
`14`	`14`	`#if CPLEX_FOUND`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if CLP_FOUND`
	`1`	`+#if CBC_FOUND`
`2`	`2`
`3`	`3`	`#include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"`
`4`	`4`	`#include "generalizedassignmentsolver/algorithms/milp_cbc.hpp"`