Skip to content

Commit 7d13f09

Browse files
committed
Fix COIN code
1 parent 68be0ab commit 7d13f09

File tree

10 files changed

+44
-60
lines changed

10 files changed

+44
-60
lines changed

extern/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endif()
3030
FetchContent_Declare(
3131
mathoptsolverscmake
3232
GIT_REPOSITORY https://github.com/fontanf/mathoptsolverscmake.git
33-
GIT_TAG 80cd13a843e2c10684abbfe76cf9aae0d71ff79d
33+
GIT_TAG 2394715172d234b21515eae6cec7c545bafa65cb
3434
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/"
3535
EXCLUDE_FROM_ALL)
3636
FetchContent_MakeAvailable(mathoptsolverscmake)

include/generalizedassignmentsolver/algorithms/linrelax_clp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#if CLP_FOUND
3+
#if CBC_FOUND
44

55
#include "generalizedassignmentsolver/solution.hpp"
66

include/generalizedassignmentsolver/algorithms/milp_cbc.hpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#pragma once
22

3-
#if defined(CBC_FOUND) || defined(CLP_FOUND)
4-
53
#include "generalizedassignmentsolver/solution.hpp"
64

7-
#include <OsiCbcSolverInterface.hpp>
5+
#include <coin/OsiCbcSolverInterface.hpp>
86

97
namespace generalizedassignmentsolver
108
{
@@ -24,11 +22,7 @@ struct CoinLP
2422

2523
}
2624

27-
#endif
28-
29-
#if CBC_FOUND
30-
31-
#include <CbcModel.hpp>
25+
#include <coin/CbcModel.hpp>
3226

3327
namespace generalizedassignmentsolver
3428
{
@@ -104,5 +98,3 @@ const MilpCbcOutput milp_cbc(
10498
const MilpCbcParameters& parameters = {});
10599

106100
}
107-
108-
#endif

include/generalizedassignmentsolver/algorithms/repair.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace generalizedassignmentsolver
88
enum class RepairInitialSolution
99
{
1010
CombinatorialRelaxation,
11-
#if CLP_FOUND
11+
#if CBC_FOUND
1212
LinearRelaxationClp,
1313
#endif
1414
#if CPLEX_FOUND

src/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@ target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
2121
GeneralizedAssignmentSolver_local_search
2222
GeneralizedAssignmentSolver_column_generation
2323
Boost::program_options)
24-
if(COLORINGSOLVER_USE_CBC)
24+
if(GENERALIZEDASSIGNMENTSOLVER_USE_CBC)
2525
target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
2626
CBC_FOUND=1)
2727
target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
2828
GeneralizedAssignmentSolver_milp_cbc)
2929
endif()
30-
if(COLORINGSOLVER_USE_GUROBI)
30+
if(GENERALIZEDASSIGNMENTSOLVER_USE_GUROBI)
3131
target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
3232
GUROBI_FOUND=1)
3333
target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
3434
GeneralizedAssignmentSolver_milp_gurobi)
3535
endif()
36-
if(COLORINGSOLVER_USE_CPLEX)
36+
if(GENERALIZEDASSIGNMENTSOLVER_USE_CPLEX)
3737
target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
3838
CPLEX_FOUND=1)
3939
target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC
4040
GeneralizedAssignmentSolver_milp_cplex)
4141
endif()
42-
if(COLORINGSOLVER_USE_KNITRO)
42+
if(GENERALIZEDASSIGNMENTSOLVER_USE_KNITRO)
4343
target_compile_definitions(GeneralizedAssignmentSolver_main PUBLIC
4444
KNITRO_FOUND=1)
4545
target_link_libraries(GeneralizedAssignmentSolver_main PUBLIC

src/algorithms/linrelax_clp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if CLP_FOUND
1+
#if CBC_FOUND
22

33
#include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
44
#include "generalizedassignmentsolver/algorithms/milp_cbc.hpp"

src/algorithms/linrelax_clp_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if CLP_FOUND
1+
#if CBC_FOUND
22

33
#include "generalizedassignmentsolver/tester.hpp"
44
#include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"

src/algorithms/milp_cbc.cpp

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#if defined(CBC_FOUND) || defined(CLP_FOUND)
2-
31
#include "generalizedassignmentsolver/algorithms/milp_cbc.hpp"
42

53
#include "generalizedassignmentsolver/algorithm_formatter.hpp"
@@ -75,38 +73,34 @@ CoinLP::CoinLP(const Instance& instance)
7573
number_of_elements_in_rows.data());
7674
}
7775

78-
#endif
79-
80-
#if CBC_FOUND
81-
82-
//#include "CbcHeuristicDiveCoefficient.hpp"
83-
//#include "CbcHeuristicDiveFractional.hpp"
84-
//#include "CbcHeuristicDiveGuided.hpp"
85-
//#include "CbcHeuristicDiveVectorLength.hpp"
86-
//#include "CbcLinked.hpp"
87-
//#include "CbcHeuristicGreedy.hpp"
88-
//#include "CbcHeuristicLocal.hpp"
89-
#include "CbcHeuristic.hpp"
90-
//#include "CbcHeuristicRINS.hpp"
91-
//#include "CbcHeuristicRENS.hpp"
92-
93-
//#include "CglAllDifferent.hpp"
94-
//#include "CglClique.hpp"
95-
//#include "CglDuplicateRow.hpp"
96-
//#include "CglFlowCover.hpp"
97-
//#include "CglGomory.hpp"
98-
//#include "CglKnapsackCover.hpp"
99-
//#include "CglLandP.hpp"
100-
//#include "CglLiftAndProject.hpp"
101-
//#include "CglMixedIntegerRounding.hpp"
102-
//#include "CglMixedIntegerRounding2.hpp"
103-
//#include "CglOddHole.hpp"
104-
//#include "CglProbing.hpp"
105-
//#include "CglRedSplit.hpp"
106-
//#include "CglResidualCapacity.hpp"
107-
//#include "CglSimpleRounding.hpp"
108-
//#include "CglStored.hpp"
109-
//#include "CglTwomir.hpp"
76+
//#include "coin/CbcHeuristicDiveCoefficient.hpp"
77+
//#include "coin/CbcHeuristicDiveFractional.hpp"
78+
//#include "coin/CbcHeuristicDiveGuided.hpp"
79+
//#include "coin/CbcHeuristicDiveVectorLength.hpp"
80+
//#include "coin/CbcLinked.hpp"
81+
//#include "coin/CbcHeuristicGreedy.hpp"
82+
//#include "coin/CbcHeuristicLocal.hpp"
83+
#include "coin/CbcHeuristic.hpp"
84+
//#include "coin/CbcHeuristicRINS.hpp"
85+
//#include "coin/CbcHeuristicRENS.hpp"
86+
87+
//#include "coin/CglAllDifferent.hpp"
88+
//#include "coin/CglClique.hpp"
89+
//#include "coin/CglDuplicateRow.hpp"
90+
//#include "coin/CglFlowCover.hpp"
91+
//#include "coin/CglGomory.hpp"
92+
//#include "coin/CglKnapsackCover.hpp"
93+
//#include "coin/CglLandP.hpp"
94+
//#include "coin/CglLiftAndProject.hpp"
95+
//#include "coin/CglMixedIntegerRounding.hpp"
96+
//#include "coin/CglMixedIntegerRounding2.hpp"
97+
//#include "coin/CglOddHole.hpp"
98+
//#include "coin/CglProbing.hpp"
99+
//#include "coin/CglRedSplit.hpp"
100+
//#include "coin/CglResidualCapacity.hpp"
101+
//#include "coin/CglSimpleRounding.hpp"
102+
//#include "coin/CglStored.hpp"
103+
//#include "coin/CglTwomir.hpp"
110104

111105
/**
112106
* Useful links:
@@ -438,5 +432,3 @@ const MilpCbcOutput generalizedassignmentsolver::milp_cbc(
438432
algorithm_formatter.end();
439433
return output;
440434
}
441-
442-
#endif

src/algorithms/repair.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "generalizedassignmentsolver/algorithm_formatter.hpp"
44
#include "generalizedassignmentsolver/algorithms/lagrelax_lbfgs.hpp"
5-
#if CLP_FOUND
5+
#if CBC_FOUND
66
#include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
77
#endif
88
#if CPLEX_FOUND
@@ -22,7 +22,7 @@ std::istream& generalizedassignmentsolver::operator>>(std::istream& in, RepairIn
2222
in >> token;
2323
if (token == "combinatorial_relaxation") {
2424
initial_solution = RepairInitialSolution::CombinatorialRelaxation;
25-
#if CLP_FOUND
25+
#if CBC_FOUND
2626
} else if (token == "linrelax_clp") {
2727
initial_solution = RepairInitialSolution::LinearRelaxationClp;
2828
#endif
@@ -71,7 +71,7 @@ RepairOutput generalizedassignmentsolver::repair(
7171
}
7272
}
7373
break;
74-
#if CLP_FOUND
74+
#if CBC_FOUND
7575
} case RepairInitialSolution::LinearRelaxationClp: {
7676
LinRelaxClpOutput output_linrelax_clp = linrelax_clp(instance);
7777
for (ItemIdx item_id = 0; item_id < instance.number_of_items(); ++item_id) {

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "generalizedassignmentsolver/instance_builder.hpp"
22

3-
#if CLP_FOUND
3+
#if CBC_FOUND
44
//#include "generalizedassignmentsolver/algorithms/linrelax_clp.hpp"
55
#endif
66
#include "generalizedassignmentsolver/algorithms/column_generation.hpp"
@@ -103,7 +103,7 @@ Output run(
103103
read_args(parameters, vm);
104104
return random(instance, generator, parameters);
105105

106-
#if CLP_FOUND
106+
#if CBC_FOUND
107107
//} else if (algorithm == "linrelax-clp") {
108108
// Parameters parameters;
109109
// read_args(parameters, vm);

0 commit comments

Comments
 (0)