diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 393cff545b66c7ba1a9a7302d838eea50c4c1bc2..7e6b6f2a30b38a2f86d75bfef51e4676b09c5787 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -198,7 +198,7 @@ contains (DEFINES, DISABLE_AIRMAP) { # GeograpicLib (TODO: add Windows support!) LinuxBuild { - LIBS += -L/usr/local/lib -lGeographic # libGeograpic.so + LIBS += -L$$BASEDIR/libs/libGeographic/lib -lGeographic # libGeograpic.so.17 } # google or-tools (TODO: add Windows support!) diff --git a/deploy/QGroundControl.AppImage b/deploy/QGroundControl.AppImage index bbc863beeb7d347d39a6641b183a96421027b63a..e8a0e86ac1355c2075717dc3d50e059359774749 100755 Binary files a/deploy/QGroundControl.AppImage and b/deploy/QGroundControl.AppImage differ diff --git a/deploy/create_linux_appimage.sh b/deploy/create_linux_appimage.sh index 4d1e7a9bd3b8c534b8a6dbf035d8cced027e62d7..bdf050672ba4c3640ea0bac69c3e8dabc6c3ae23 100755 --- a/deploy/create_linux_appimage.sh +++ b/deploy/create_linux_appimage.sh @@ -69,7 +69,7 @@ cp -L libts/usr/lib/x86_64-linux-gnu/libts-0.0.so.0 ${APPDIR}/usr/lib/x86_64-lin cp -L ${QGC_SRC}/libs/or-tools-src-ubuntu/lib/* ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libortools.so not found"; exit 1; } # copy libGeographic.so.17 -cp -L /usr/lib/x86_64-linux-gnu/libGeographic.so.17 ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libGeographic.so.17 not found"; exit 1; } +cp -L ${QGC_SRC}/libs/libGeographic/libGeographic.so.17 ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libGeographic.so.17 not found"; exit 1; } # copy boost cp -L /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 ${APPDIR}/usr/lib/x86_64-linux-gnu/ || { echo "libboost_system.so.1.65.1 not found"; exit 1; } diff --git a/libs/or-tools-src-ubuntu/Makefile b/libs/or-tools-src-ubuntu/Makefile index 38e1c0c61590ea8d8986b45da022332f1a970a14..2602bf37eca21d9a0c28437613a3f1942e57419d 100644 --- a/libs/or-tools-src-ubuntu/Makefile +++ b/libs/or-tools-src-ubuntu/Makefile @@ -269,6 +269,8 @@ test_cc: detect_cc $(MAKE) run SOURCE=examples/cpp/vrp.cc $(MAKE) run SOURCE=examples/cpp/nurses_cp.cc $(MAKE) run SOURCE=examples/cpp/minimal_jobshop_cp.cc + $(MAKE) run SOURCE=examples/cpp/linear_programming.cc + $(MAKE) run SOURCE=examples/cpp/integer_programming.cc ################## ## C++ SOURCE ## diff --git a/libs/or-tools-src-ubuntu/bin/clp b/libs/or-tools-src-ubuntu/bin/clp index c9274cd47c3b39a96ecce102963d45264eab466e..cdebebd773224068bb9182b03df9de794cb95148 100755 Binary files a/libs/or-tools-src-ubuntu/bin/clp and b/libs/or-tools-src-ubuntu/bin/clp differ diff --git a/libs/or-tools-src-ubuntu/examples/cpp/assignment_mip.cc b/libs/or-tools-src-ubuntu/examples/cpp/assignment_mip.cc index 76340f9c76902fd02b84a087d8e9c17a8af8d7f5..f48bf9a567bdd8b50d1d46fde79ae514464206cc 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/assignment_mip.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/assignment_mip.cc @@ -20,7 +20,7 @@ // [END import] namespace operations_research { -void IntegerProgrammingExample() { +void AssignmentMip() { // Data // [START data_model] const std::vector> costs{ @@ -34,7 +34,7 @@ void IntegerProgrammingExample() { // Solver // [START solver] // Create the mip solver with the CBC backend. - MPSolver solver("simple_mip_program", + MPSolver solver("AssignmentMip", MPSolver::CBC_MIXED_INTEGER_PROGRAMMING); // [END solver] @@ -112,7 +112,7 @@ void IntegerProgrammingExample() { } // namespace operations_research int main(int argc, char** argv) { - operations_research::IntegerProgrammingExample(); + operations_research::AssignmentMip(); return EXIT_SUCCESS; } // [END program] diff --git a/libs/or-tools-src-ubuntu/examples/cpp/constraint_programming_cp.cc b/libs/or-tools-src-ubuntu/examples/cpp/constraint_programming_cp.cc index 5f1d4d4b8d6c800a84de5681a9257de874361750..ce47960c1c8852cc9d7e5fc32a08ee62750725bd 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/constraint_programming_cp.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/constraint_programming_cp.cc @@ -41,7 +41,7 @@ void RunConstraintProgrammingExample() { solver.NewSearch(db); while (solver.NextSolution()) { LOG(INFO) << "Solution" - << ": x = " << x->Value() << "; y = " << x->Value() + << ": x = " << x->Value() << "; y = " << y->Value() << "; z = " << z->Value(); } solver.EndSearch(); diff --git a/libs/or-tools-src-ubuntu/examples/cpp/integer_programming.cc b/libs/or-tools-src-ubuntu/examples/cpp/integer_programming.cc index 406a3cfb9b4103918512c34f11bdd6c4e93f1875..cc433326ead52c4cd991dde01418a8305215a017 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/integer_programming.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/integer_programming.cc @@ -13,13 +13,25 @@ // Integer programming example that shows how to use the API. +#include "ortools/base/commandlineflags.h" #include "ortools/base/logging.h" #include "ortools/linear_solver/linear_solver.h" namespace operations_research { void RunIntegerProgrammingExample( - MPSolver::OptimizationProblemType optimization_problem_type) { - MPSolver solver("IntegerProgrammingExample", optimization_problem_type); + const std::string& optimization_problem_type) { + LOG(INFO) << "---- Integer programming example with " + << optimization_problem_type << " ----"; + + if (!MPSolver::ParseAndCheckSupportForProblemType( + optimization_problem_type)) { + LOG(INFO) << " support for solver not linked in."; + return; + } + + MPSolver solver("IntegerProgrammingExample", + MPSolver::ParseSolverTypeOrDie(optimization_problem_type)); + const double infinity = solver.infinity(); // x and y are integer non-negative variables. MPVariable* const x = solver.MakeIntVar(0.0, infinity, "x"); @@ -44,9 +56,6 @@ void RunIntegerProgrammingExample( LOG(INFO) << "Number of variables = " << solver.NumVariables(); LOG(INFO) << "Number of constraints = " << solver.NumConstraints(); - solver.SetNumThreads(8); - solver.EnableOutput(); - const MPSolver::ResultStatus result_status = solver.Solve(); // Check that the problem has an optimal solution. if (result_status != MPSolver::OPTIMAL) { @@ -65,32 +74,21 @@ void RunIntegerProgrammingExample( } void RunAllExamples() { -#if defined(USE_CBC) - LOG(INFO) << "---- Integer programming example with CBC ----"; - RunIntegerProgrammingExample(MPSolver::CBC_MIXED_INTEGER_PROGRAMMING); -#endif -#if defined(USE_GLPK) - LOG(INFO) << "---- Integer programming example with GLPK ----"; - RunIntegerProgrammingExample(MPSolver::GLPK_MIXED_INTEGER_PROGRAMMING); -#endif -#if defined(USE_SCIP) - LOG(INFO) << "---- Integer programming example with SCIP ----"; - RunIntegerProgrammingExample(MPSolver::SCIP_MIXED_INTEGER_PROGRAMMING); -#endif -#if defined(USE_GUROBI) - LOG(INFO) << "---- Integer programming example with Gurobi ----"; - RunIntegerProgrammingExample(MPSolver::GUROBI_MIXED_INTEGER_PROGRAMMING); -#endif // USE_GUROBI -#if defined(USE_CPLEX) - LOG(INFO) << "---- Integer programming example with CPLEX ----"; - RunIntegerProgrammingExample(MPSolver::CPLEX_MIXED_INTEGER_PROGRAMMING); -#endif // USE_CPLEX + RunIntegerProgrammingExample("CBC"); + RunIntegerProgrammingExample("SAT"); + RunIntegerProgrammingExample("SCIP"); + RunIntegerProgrammingExample("GUROBI"); + RunIntegerProgrammingExample("GLPK"); + RunIntegerProgrammingExample("CPLEX"); + RunIntegerProgrammingExample("XPRESS"); } } // namespace operations_research int main(int argc, char** argv) { google::InitGoogleLogging(argv[0]); - FLAGS_logtostderr = 1; + absl::SetFlag(&FLAGS_logtostderr, true); + absl::SetFlag(&FLAGS_log_prefix, false); + gflags::ParseCommandLineFlags(&argc, &argv, true); operations_research::RunAllExamples(); - return EXIT_SUCCESS; + return 0; } diff --git a/libs/or-tools-src-ubuntu/examples/cpp/integer_programming_example.cc b/libs/or-tools-src-ubuntu/examples/cpp/integer_programming_example.cc index ef7e38e7185eedff84b4a51ddf437e016aa67f9d..4e4deab999df441cc462e780424cf6bef2064112 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/integer_programming_example.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/integer_programming_example.cc @@ -21,7 +21,7 @@ namespace operations_research { void IntegerProgrammingExample() { // [START solver] // Create the mip solver with the CBC backend. - MPSolver solver("IntegerExample", + MPSolver solver("integer_programming_example", MPSolver::CBC_MIXED_INTEGER_PROGRAMMING); // [END solver] diff --git a/libs/or-tools-src-ubuntu/examples/cpp/linear_programming.cc b/libs/or-tools-src-ubuntu/examples/cpp/linear_programming.cc index e37d6f0aa159f7c152f52f9b8253aeb020d6157c..54ea2ee4ed13b3b5a8d417315c24343a49073c09 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/linear_programming.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/linear_programming.cc @@ -13,58 +13,82 @@ // Linear programming example that shows how to use the API. +#include "ortools/base/commandlineflags.h" #include "ortools/base/logging.h" #include "ortools/linear_solver/linear_solver.h" #include "ortools/linear_solver/linear_solver.pb.h" namespace operations_research { -void RunLinearProgrammingExample() { - MPSolver solver("LinearProgrammingExample", - MPSolver::GLOP_LINEAR_PROGRAMMING); +void RunLinearProgrammingExample(const std::string& optimization_problem_type) { + LOG(INFO) << "---- Linear programming example with " + << optimization_problem_type << " ----"; + if (!MPSolver::ParseAndCheckSupportForProblemType( + optimization_problem_type)) { + LOG(INFO) << " support for solver not linked in."; + return; + } + + MPSolver solver("IntegerProgrammingExample", + MPSolver::ParseSolverTypeOrDie(optimization_problem_type)); + const double infinity = solver.infinity(); - // x and y are continuous non-negative variables. - MPVariable* const x = solver.MakeNumVar(0.0, infinity, "x"); - MPVariable* const y = solver.MakeNumVar(0.0, infinity, "y"); + // x1, x2 and x3 are continuous non-negative variables. + MPVariable* const x1 = solver.MakeNumVar(0.0, infinity, "x1"); + MPVariable* const x2 = solver.MakeNumVar(0.0, infinity, "x2"); + MPVariable* const x3 = solver.MakeNumVar(0.0, infinity, "x3"); - // Objectif function: Maximize 3x + 4y. + // Maximize 10 * x1 + 6 * x2 + 4 * x3. MPObjective* const objective = solver.MutableObjective(); - objective->SetCoefficient(x, 3); - objective->SetCoefficient(y, 4); + objective->SetCoefficient(x1, 10); + objective->SetCoefficient(x2, 6); + objective->SetCoefficient(x3, 4); objective->SetMaximization(); - // x + 2y <= 14. - MPConstraint* const c0 = solver.MakeRowConstraint(-infinity, 14.0); - c0->SetCoefficient(x, 1); - c0->SetCoefficient(y, 2); + // x1 + x2 + x3 <= 100. + MPConstraint* const c0 = solver.MakeRowConstraint(-infinity, 100.0); + c0->SetCoefficient(x1, 1); + c0->SetCoefficient(x2, 1); + c0->SetCoefficient(x3, 1); + + // 10 * x1 + 4 * x2 + 5 * x3 <= 600. + MPConstraint* const c1 = solver.MakeRowConstraint(-infinity, 600.0); + c1->SetCoefficient(x1, 10); + c1->SetCoefficient(x2, 4); + c1->SetCoefficient(x3, 5); - // 3x - y >= 0. - MPConstraint* const c1 = solver.MakeRowConstraint(0.0, infinity); - c1->SetCoefficient(x, 3); - c1->SetCoefficient(y, -1); + // 2 * x1 + 2 * x2 + 6 * x3 <= 300. + MPConstraint* const c2 = solver.MakeRowConstraint(-infinity, 300.0); + c2->SetCoefficient(x1, 2); + c2->SetCoefficient(x2, 2); + c2->SetCoefficient(x3, 6); - // x - y <= 2. - MPConstraint* const c2 = solver.MakeRowConstraint(-infinity, 2.0); - c2->SetCoefficient(x, 1); - c2->SetCoefficient(y, -1); + // TODO(user): Change example to show = and >= constraints. LOG(INFO) << "Number of variables = " << solver.NumVariables(); LOG(INFO) << "Number of constraints = " << solver.NumConstraints(); const MPSolver::ResultStatus result_status = solver.Solve(); + // Check that the problem has an optimal solution. if (result_status != MPSolver::OPTIMAL) { LOG(FATAL) << "The problem does not have an optimal solution!"; } - LOG(INFO) << "Solution:"; - LOG(INFO) << "x = " << x->solution_value(); - LOG(INFO) << "y = " << y->solution_value(); + + LOG(INFO) << "Problem solved in " << solver.wall_time() << " milliseconds"; + + // The objective value of the solution. LOG(INFO) << "Optimal objective value = " << objective->Value(); - LOG(INFO) << ""; + + // The value of each variable in the solution. + LOG(INFO) << "x1 = " << x1->solution_value(); + LOG(INFO) << "x2 = " << x2->solution_value(); + LOG(INFO) << "x3 = " << x3->solution_value(); + LOG(INFO) << "Advanced usage:"; - LOG(INFO) << "Problem solved in " << solver.wall_time() << " milliseconds"; LOG(INFO) << "Problem solved in " << solver.iterations() << " iterations"; - LOG(INFO) << "x: reduced cost = " << x->reduced_cost(); - LOG(INFO) << "y: reduced cost = " << y->reduced_cost(); + LOG(INFO) << "x1: reduced cost = " << x1->reduced_cost(); + LOG(INFO) << "x2: reduced cost = " << x2->reduced_cost(); + LOG(INFO) << "x3: reduced cost = " << x3->reduced_cost(); const std::vector activities = solver.ComputeConstraintActivities(); LOG(INFO) << "c0: dual value = " << c0->dual_value() << " activity = " << activities[c0->index()]; @@ -73,11 +97,22 @@ void RunLinearProgrammingExample() { LOG(INFO) << "c2: dual value = " << c2->dual_value() << " activity = " << activities[c2->index()]; } + +void RunAllExamples() { + RunLinearProgrammingExample("GLOP"); + RunLinearProgrammingExample("CLP"); + RunLinearProgrammingExample("GUROBI_LP"); + RunLinearProgrammingExample("CPLEX_LP"); + RunLinearProgrammingExample("GLPK_LP"); + RunLinearProgrammingExample("XPRESS_LP"); +} } // namespace operations_research int main(int argc, char** argv) { google::InitGoogleLogging(argv[0]); - FLAGS_logtostderr = 1; - operations_research::RunLinearProgrammingExample(); + absl::SetFlag(&FLAGS_logtostderr, true); + absl::SetFlag(&FLAGS_log_prefix, false); + gflags::ParseCommandLineFlags(&argc, &argv, true); + operations_research::RunAllExamples(); return EXIT_SUCCESS; } diff --git a/libs/or-tools-src-ubuntu/examples/cpp/linear_programming_example.cc b/libs/or-tools-src-ubuntu/examples/cpp/linear_programming_example.cc index 688eb77375a3ae62e6982397186dddbbb0061b97..e0f6d230df8e1c2cdf102f221f216cd9a04f9dda 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/linear_programming_example.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/linear_programming_example.cc @@ -20,7 +20,8 @@ namespace operations_research { void LinearProgrammingExample() { // [START solver] - MPSolver solver("LinearExample", MPSolver::GLOP_LINEAR_PROGRAMMING); + MPSolver solver("linear_programming_examples", + MPSolver::GLOP_LINEAR_PROGRAMMING); // [END solver] // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/cpp/mip_var_array.cc b/libs/or-tools-src-ubuntu/examples/cpp/mip_var_array.cc index 1b329d17d5e55eec0b7b116cf4007fcc56f0619e..05fdad057eb1822edb453b6dfaa258a64fa965d5 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/mip_var_array.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/mip_var_array.cc @@ -33,7 +33,7 @@ struct DataModel { }; // [END data_model] -void IntegerProgrammingExample() { +void MipVarArray() { // [START data] DataModel data; // [END data] @@ -41,8 +41,7 @@ void IntegerProgrammingExample() { // [START solver] // Create the mip solver with the CBC backend. - MPSolver solver("simple_mip_program", - MPSolver::CBC_MIXED_INTEGER_PROGRAMMING); + MPSolver solver("mip_var_array", MPSolver::CBC_MIXED_INTEGER_PROGRAMMING); // [END solver] // [START program_part2] @@ -96,7 +95,7 @@ void IntegerProgrammingExample() { } // namespace operations_research int main(int argc, char** argv) { - operations_research::IntegerProgrammingExample(); + operations_research::MipVarArray(); return EXIT_SUCCESS; } // [END program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/cpp/simple_lp_program.cc b/libs/or-tools-src-ubuntu/examples/cpp/simple_lp_program.cc index 24bd67898dffeefe46c683d6489170c974f2e1cf..b3ccc032a993d9b7e9c02c5ca8098dee824c095b 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/simple_lp_program.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/simple_lp_program.cc @@ -18,7 +18,7 @@ // [END import] namespace operations_research { -void run() { +void SimpleLpProgram() { // [START solver] // Create the linear solver with the GLOP backend. MPSolver solver("simple_lp_program", MPSolver::GLOP_LINEAR_PROGRAMMING); @@ -63,7 +63,7 @@ void run() { } // namespace operations_research int main() { - operations_research::run(); + operations_research::SimpleLpProgram(); return EXIT_SUCCESS; } // [END program] diff --git a/libs/or-tools-src-ubuntu/examples/cpp/simple_mip_program.cc b/libs/or-tools-src-ubuntu/examples/cpp/simple_mip_program.cc index 8b22617aeb32cf1bd0c7af7b1e381d27d67d2186..52e730ae0093d9dfdc4c7fc4f7895920b7f09e8b 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/simple_mip_program.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/simple_mip_program.cc @@ -18,7 +18,7 @@ // [END import] namespace operations_research { -void simple_mip_program() { +void SimpleMipProgram() { // [START solver] // Create the mip solver with the CBC backend. MPSolver solver("simple_mip_program", @@ -82,7 +82,7 @@ void simple_mip_program() { } // namespace operations_research int main(int argc, char** argv) { - operations_research::simple_mip_program(); + operations_research::SimpleMipProgram(); return EXIT_SUCCESS; } // [END program] diff --git a/libs/or-tools-src-ubuntu/examples/cpp/uncapacitated_facility_location.cc b/libs/or-tools-src-ubuntu/examples/cpp/uncapacitated_facility_location.cc index 10899376a98b5ad0de0e599a4c143d4c7dd19548..7bb3dbe09c36219a86eb5b470a0a78a67dc81156 100644 --- a/libs/or-tools-src-ubuntu/examples/cpp/uncapacitated_facility_location.cc +++ b/libs/or-tools-src-ubuntu/examples/cpp/uncapacitated_facility_location.cc @@ -139,7 +139,8 @@ static void UncapacitatedFacilityLocation(int32 facilities, std::cout << "LP-Model:\n" << lp_string << std::endl; } // Set options and solve - solver.SetNumThreads(8); + if (optimization_problem_type != MPSolver::SCIP_MIXED_INTEGER_PROGRAMMING) + solver.SetNumThreads(8); solver.EnableOutput(); const MPSolver::ResultStatus result_status = solver.Solve(); // Check that the problem has an optimal solution. diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/3_jugs_regular.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/3_jugs_regular.csproj index 3dbdfdbdd75a68c6fa8660dfb2adaac3042a3327..3a02ce22bbad20028d84e701db895002396c8004 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/3_jugs_regular.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/3_jugs_regular.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.cs b/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.cs index e2c7e71fa5d8a1ffd635a40a4c365bbd6d94b225..52606a1e067fab8e59e61e9f9254ce60f8cb33cf 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.cs @@ -36,7 +36,7 @@ public class AssignmentMip // Model. // [START model] - Solver solver = Solver.CreateSolver("AssignmentMip", "CBC_MIXED_INTEGER_PROGRAMMING"); + Solver solver = Solver.CreateSolver("AssignmentMip", "CBC"); // [END model] // Variables. diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.csproj index 9fe1d81e3a18634f230427672f0444bffeee222b..6c8bd64e71fd58dba63fece777eb1c61047b6dd1 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentMip.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentSat.csproj index ba529b8cdd9ed03454c3bd91a914b3190726e72f..72a0451a975637a46b467aef0bad8a52c0f563dd 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/AssignmentSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/BalanceGroupSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/BalanceGroupSat.csproj index 83d4ef3d15f26b236189c222fd024fa638746ffb..285a12af77f993538a43289e455a619adfbbabd2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/BalanceGroupSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/BalanceGroupSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.cs b/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.cs index b07fca8f224f7c45944fc31357bd3fb5d29c3a41..3eaee73fe522bc4e4e6ff808ff1a73e98078d6ca 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.cs @@ -38,7 +38,7 @@ public class BinPackingMip // [START solver] // Create the linear solver with the CBC backend. - Solver solver = Solver.CreateSolver("BinPackingMip", "CBC_MIXED_INTEGER_PROGRAMMING"); + Solver solver = Solver.CreateSolver("BinPackingMip", "CBC"); // [END solver] // [START program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.csproj index 65097081149bce89a2e6cbf95778bde47d0efb5e..334c1f5e2fbba2001fefd7608458043c51174354 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingMip.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingProblemSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingProblemSat.csproj index a34949c4c4a3f1b354a75682be504576b666c5c8..701eab6fa251ce06db6d952ba492a6ca0a406f10 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingProblemSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/BinPackingProblemSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/BoolOrSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/BoolOrSampleSat.csproj index 0bd4b082effe657d15d93e4858583567ebbd2aa9..07072dc7a71122945bf78921e1b141890524897a 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/BoolOrSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/BoolOrSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/ChannelingSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/ChannelingSampleSat.csproj index f47291d9ad40c5ef59d69cf60ae1bdf499bf3a92..0ca4d99fc61b2c20783a3a7399abdd2c8c15575e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/ChannelingSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/ChannelingSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/CpIsFunSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/CpIsFunSat.csproj index 575b467bfd205ba787c58fb1a1bd10ab8b5b2665..2686f1beb557505c43b54d6d37ec4c6b3dc6866e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/CpIsFunSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/CpIsFunSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/EarlinessTardinessCostSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/EarlinessTardinessCostSampleSat.csproj index 11b1252ca9a9ef6110e5c153ac762ed9c5e3e7b8..2782fdfc7632bb14cefdebbc98a2cc210d6640de 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/EarlinessTardinessCostSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/EarlinessTardinessCostSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/GateSchedulingSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/GateSchedulingSat.csproj index fe4adfd7ed71f3bbecfd9d5cc6d715a0683c0205..902d390b6e769a47fb1c5b41f0656a3db145cda3 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/GateSchedulingSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/GateSchedulingSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/IntervalSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/IntervalSampleSat.csproj index 3e5e09b1cb8d33e1a0d43732d78c1be1c16f803f..0765d214de80ff2281ea1f6d76076dc990f52205 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/IntervalSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/IntervalSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/JobshopFt06Sat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/JobshopFt06Sat.csproj index b8b448e0435cd7c579a1036755ce94b658a7f703..c55a8f596652a5e851ad066d181067b4fe0360db 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/JobshopFt06Sat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/JobshopFt06Sat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/JobshopSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/JobshopSat.csproj index 2b480bcc3b453db52bd25f168a5f059f3d65e756..296844fec886e75efbff827dd962954f53402977 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/JobshopSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/JobshopSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/Knapsack.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/Knapsack.csproj index 231d2349f42ae702c24954b95681b4124e0f2610..106bc39e4c928a633f2a6e1971e0a5e00d3808ae 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/Knapsack.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/Knapsack.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.cs b/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.cs index babdbba0a75e7af1273454d08a8b5b4c7af5154f..dee9d58e802ff0c11ec23bbcda1a23c1910a098f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.cs @@ -20,7 +20,7 @@ public class LinearProgrammingExample static void Main() { // [START solver] - Solver solver = Solver.CreateSolver("LinearProgrammingExample", "GLOP_LINEAR_PROGRAMMING"); + Solver solver = Solver.CreateSolver("LinearProgrammingExample", "GLOP"); // [END solver] // x and y are continuous non-negative variables. // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.csproj index f637000637f6337cbf40e4c94c63e63348dc6746..8e3401359daffcdde672d56c83d878c773e47a9e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/LinearProgrammingExample.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/LiteralSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/LiteralSampleSat.csproj index c13573fec43c563aa8e5accb79cc8672f440d71c..dd674ff980aea60f5771e5829eca109fac3fdbd4 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/LiteralSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/LiteralSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.cs b/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.cs index d24da6727d9c83f8c9d6f6be93a184a575feddb4..2518a968874a0de5a3185c6b6095822ce6f03872 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.cs @@ -44,7 +44,7 @@ public class MipVarArray // [START solver] // Create the linear solver with the CBC backend. - Solver solver = Solver.CreateSolver("SimpleMipProgram", "CBC_MIXED_INTEGER_PROGRAMMING"); + Solver solver = Solver.CreateSolver("MipVarArray", "CBC"); // [END solver] // [START program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.csproj index 7f02378572232855a4bbb2bd58164be12a9be74c..942357d7c69c84c940ad3d3b03438d9e2c0f1b2f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/MipVarArray.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.cs b/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.cs index cfa98bb607af45dda8f1a2a443fcdfd7a2c3d7da..509bf66b5fff045dc7b08cd3b9252a8f36d71f6a 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.cs @@ -41,7 +41,7 @@ public class MultipleKnapsackMip // [START solver] // Create the linear solver with the CBC backend. - Solver solver = Solver.CreateSolver("MultipleKnapsackMip", "CBC_MIXED_INTEGER_PROGRAMMING"); + Solver solver = Solver.CreateSolver("MultipleKnapsackMip", "CBC"); // [END solver] // [START program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.csproj index e7bbbad62579ac6234764d97d4b5a9c4f8e8b8e7..27c5d1c62cad559504cede72fd9b7d0fdf8e649f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/MultipleKnapsackMip.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/NetworkRoutingSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/NetworkRoutingSat.csproj index a1519781234459d4e0b538d832ed743589029e0f..5a309c672ee1091f401a0a546cf06766f6b3f0b7 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/NetworkRoutingSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/NetworkRoutingSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/NoOverlapSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/NoOverlapSampleSat.csproj index 7f92897f5da1cf9ef281b8cc5846bb5d3187f5d2..0d8743d6d64b203fce25aae1107b39e31dd9b92f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/NoOverlapSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/NoOverlapSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/NursesSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/NursesSat.csproj index 26d5ac5ee5f5cac41df97c873765e6810119eb35..c434412a1383fba60d9bc31ee07bbe2f79c6a8ef 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/NursesSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/NursesSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/OptionalIntervalSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/OptionalIntervalSampleSat.csproj index addd907f6d0bc0388e4ee1bf6987bfea66f33e7c..9c3c626880c58e1a3fbfd1bcb756784c50f1a5e5 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/OptionalIntervalSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/OptionalIntervalSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/RabbitsAndPheasantsSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/RabbitsAndPheasantsSat.csproj index f96c95bb9a5b5a02233a1c8067508bac6fe80167..caba542f73a0ef42d5f9613e6c99be9a4e5b368c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/RabbitsAndPheasantsSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/RabbitsAndPheasantsSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/RankingSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/RankingSampleSat.csproj index 5dd3ef36b508a09ced26db8102a675ebbd7d59e5..2e725679101aa80e161dec77de34f145ded53de3 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/RankingSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/RankingSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/ReifiedSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/ReifiedSampleSat.csproj index 0c1a018f8b096fa1da52ec969cf8152e4e6efd3d..4d8adebcc578b908849ab3d12fe0d6e764ad9729 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/ReifiedSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/ReifiedSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SearchForAllSolutionsSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SearchForAllSolutionsSampleSat.csproj index 5cf7485da4ac5153638f2088158c92aa9a67a498..88f3d9641fcb7719d05d53b7c42e337ebb74c960 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SearchForAllSolutionsSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SearchForAllSolutionsSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/ShiftSchedulingSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/ShiftSchedulingSat.csproj index 41d289580609558404f0d5f61ff2e477ed4f1afe..3108caff013cb2195c70cd7cfda8297d2eb65217 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/ShiftSchedulingSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/ShiftSchedulingSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleCpProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleCpProgram.csproj index d0781259ce52fc5c2811b8189b5788cf4a6d01d7..1c788826f657c5ec144d1ef4658b3cf51cae9d81 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleCpProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleCpProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.cs b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.cs index 4882a22e60e7b5d537b52b25cb4a6efee1a1f0c6..80ab61ffd1d0d9ffd28b77c98232b536cbc6893c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.cs @@ -22,7 +22,7 @@ public class SimpleLpProgram { // [START solver] // Create the linear solver with the GLOP backend. - Solver solver = Solver.CreateSolver("SimpleLpProgram", "GLOP_LINEAR_PROGRAMMING"); + Solver solver = Solver.CreateSolver("SimpleLpProgram", "GLOP"); // [END solver] // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.csproj index bb4a2d8d0dd0057e2af2e2ed56bfb793632cf14d..0c4a2107ce5644b5f340f4038d1f8c54187816b1 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleLpProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMaxFlowProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMaxFlowProgram.csproj index c788f23434253d2cb383cfb1df5517e345694cde..a74a99b667f498c5d7bb098f057e8009500f9ba5 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMaxFlowProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMaxFlowProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMinCostFlowProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMinCostFlowProgram.csproj index d59e8638ff177f58f0cc90faa15823afcd24ce81..6c55efa927ac74bc1e2b18bad83f15f2e51720ad 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMinCostFlowProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMinCostFlowProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.cs b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.cs index 895b31f34e6edf3e4902a790d4e8f11dfa569286..b39e9d08af9d8ac643e3252cef16d4fb3f722ebc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.cs @@ -23,7 +23,7 @@ public class SimpleMipProgram { // [START solver] // Create the linear solver with the CBC backend. - Solver solver = Solver.CreateSolver("SimpleMipProgram", "CBC_MIXED_INTEGER_PROGRAMMING"); + Solver solver = Solver.CreateSolver("SimpleMipProgram", "CBC"); // [END solver] // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.csproj index 3dc454956a19535a9856d8a3349a7703a37dda3c..d5169432ef07e2a8022fd2c348447572df245b75 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleMipProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleProgramFSharp.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleProgramFSharp.fsproj index c7b6bfbf21b3149cecab6793d60b971b0f562040..a660208ff86e33eaf8debe302ecd0576d49ae5bd 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleProgramFSharp.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleProgramFSharp.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleRoutingProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleRoutingProgram.csproj index efe2475f606acafe7a623d555e6b180645993ba8..5475e855e9f6994c11a9e8d314c1ce396c92802f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleRoutingProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleRoutingProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleSatProgram.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleSatProgram.csproj index 347d5d3a9ed8d233bbc411b45f5730c625a317c5..ecc2c8c028ca34d5c975a85877da0a437bb2fc04 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SimpleSatProgram.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SimpleSatProgram.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SolutionHintingSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SolutionHintingSampleSat.csproj index 4046c3a332be0ba9665d974da5215597f008e688..e040d0c2b47d85f12bcffc0a3f5776edfecef765 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SolutionHintingSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SolutionHintingSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SolveAndPrintIntermediateSolutionsSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SolveAndPrintIntermediateSolutionsSampleSat.csproj index cb9f638293295eb9f7ea9ba2d1ab72b372a8839a..eeee89496c7c0cff6557f492b453e45e75d9bcad 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SolveAndPrintIntermediateSolutionsSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SolveAndPrintIntermediateSolutionsSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SolveWithTimeLimitSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SolveWithTimeLimitSampleSat.csproj index f43aec4adb3a9776d884bfda35b65875a47cdac5..15b18b4a01aa4f6bba3ed6a3685a8a788f9b0271 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SolveWithTimeLimitSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SolveWithTimeLimitSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/SpeakerSchedulingSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/SpeakerSchedulingSat.csproj index 79bb4e953a87a78dc7592ee958b1d424f34d0fee..bb2c9b883a613dc2ddba54fff6123e41fb4f721e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/SpeakerSchedulingSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/SpeakerSchedulingSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/StepFunctionSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/StepFunctionSampleSat.csproj index bd5ae5264bf67bfac25bd99a528f0bb63ffcf5e7..10516ccc75bced19bcf122db73181dad784ed904 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/StepFunctionSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/StepFunctionSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/StopAfterNSolutionsSampleSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/StopAfterNSolutionsSampleSat.csproj index baca3119acebd6db0168ffc857e8ab438386e9d0..0e7de7b2a36bef4214e6dc40c53687b04272cdd3 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/StopAfterNSolutionsSampleSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/StopAfterNSolutionsSampleSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/TaskSchedulingSat.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/TaskSchedulingSat.csproj index ec6b74a09d813323963b013c7200b0aa96e98b74..6a7e49e5d7887d31404eeccea817d2d70e98d054 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/TaskSchedulingSat.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/TaskSchedulingSat.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/Tsp.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/Tsp.csproj index f7292ad45cf816b524ba5830c0beb8c541549868..db0e117e52c6822548c44246578c0fe40f81ef2c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/Tsp.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/Tsp.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/TspCircuitBoard.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/TspCircuitBoard.csproj index 4e2d06d4868c84844f6e2909a77e65bd47ecae6e..3976ccad899cc1c4932b5a287354d4ed52ee4f5c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/TspCircuitBoard.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/TspCircuitBoard.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/TspCities.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/TspCities.csproj index b38abf1aa0627b682963d39ed13d660a0226a4b3..06ab12e17e641aecb2f8a36c334c2601b22f8f3e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/TspCities.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/TspCities.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/TspDistanceMatrix.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/TspDistanceMatrix.csproj index d5695fe433d4a143c95cb4a22d0a7922b554b1a7..90e29083ba345b22efa2d2c5871ee4b7cf9753b6 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/TspDistanceMatrix.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/TspDistanceMatrix.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/Vrp.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/Vrp.csproj index eb8399e37811bf9d7b4dd51be81c48abc0635954..c5089f9e49b5ffd55d0a54872f4fa2c32fccef16 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/Vrp.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/Vrp.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpCapacity.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpCapacity.csproj index bb1af2706bd241ff4fddc96014778e96cccf6b32..9154c6b94c613cc3dbd6c8a4c56434a1f6176d55 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpCapacity.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpCapacity.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpDropNodes.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpDropNodes.csproj index ac8a631790e59724294b40c729a6ea78843b2e6f..bcfcfdee1ee4bdd5d7c7c3987aa6ac5bf63d123e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpDropNodes.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpDropNodes.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpGlobalSpan.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpGlobalSpan.csproj index 8765673d285f02647b417e13917e252299977fc6..adea5f49f0c762f5e0480183318311d8a52685b4 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpGlobalSpan.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpGlobalSpan.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpInitialRoutes.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpInitialRoutes.csproj index 6ff18f08854fff99a743f4887c58746e92896c12..dad042189276c78412080236290edd08c4c2c5ee 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpInitialRoutes.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpInitialRoutes.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDelivery.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDelivery.csproj index 3fe4f47c580a51cebf64a8e264e3835b5ee63061..56d8531b72ec470604326dff3e110b2aa4542525 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDelivery.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDelivery.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryFifo.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryFifo.csproj index 83baf9047f3aad4e946aa5f4977636b10a3d04ec..32b56d9f53f97b184bc7c8ab42d9bd1cfc091fba 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryFifo.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryFifo.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryLifo.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryLifo.csproj index f928f4084371511f82ed915dc753369ae3192de1..847e7625200e26949895e69504671365f3772184 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryLifo.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpPickupDeliveryLifo.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpResources.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpResources.csproj index ea5bf3ad6783b4a62aed3ce5ffd12ba28d4a31ba..d42cae1caf5974f0296708f2912727d6895c7c22 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpResources.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpResources.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpStartsEnds.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpStartsEnds.csproj index eb1ac087669c37d4bd1935711f7bcbf713c0d8ce..833f8014d51f55eb8a7d590a5df1687807d71c9f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpStartsEnds.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpStartsEnds.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpTimeWindows.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpTimeWindows.csproj index 23ae3f277619b462f86cea41487e84d88a72b449..f65aadd5c24d2a82c233179d9daeab6020693f5a 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpTimeWindows.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpTimeWindows.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/VrpWithTimeLimit.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/VrpWithTimeLimit.csproj index 69c956255c070eb7bad34097086f463f78d37f3b..e6927fa51916722c8c490d1a2105b17f7e21140b 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/VrpWithTimeLimit.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/VrpWithTimeLimit.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/a_puzzle.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/a_puzzle.csproj index ec327cad3a180488a5bfa1cc7269069c52308f9c..445ac7e4191d7ba104ff52be412687b9e405d889 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/a_puzzle.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/a_puzzle.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/a_round_of_golf.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/a_round_of_golf.csproj index 2bedf5c5ae9b8a43f8b035ec58af8e1a7fdc6d02..f3128ad196307de6a803e0b17c9ef70e59a9e6e4 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/a_round_of_golf.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/a_round_of_golf.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/all_interval.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/all_interval.csproj index b0f360b7c52e69e070f87305d6bdbb3c597e565f..52e27485779ad10b45e17cecbc74f99632d84672 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/all_interval.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/all_interval.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/alldifferent_except_0.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/alldifferent_except_0.csproj index 0c30c6523d3962ea1fb1b1cc631c2e99568dcf80..ea265813e453e41028659cf362191cd45acb2008 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/alldifferent_except_0.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/alldifferent_except_0.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/assignment.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/assignment.csproj index 0b3d6ed00006dc0b698fa9a9c30df71a982465b3..a97021bdfa59e0b30ed148fbb12b967c4f7cd00a 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/assignment.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/assignment.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/broken_weights.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/broken_weights.csproj index 926299ac0f21931118df1236f752119ddf7b5e7a..7d029d83ce7e89261d2b21fc2a62105deb3106c5 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/broken_weights.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/broken_weights.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/bus_schedule.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/bus_schedule.csproj index 048ec76c16abab7fd9495cee66677f1ae0794336..2b82a544c1be8341c3e92bd95475e61692eb3741 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/bus_schedule.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/bus_schedule.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/circuit.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/circuit.csproj index fce025f0ff69a91c1fdb63b0e49549ff52c4cde7..6ac25640cffe66cad908564fe68afabc3464bde0 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/circuit.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/circuit.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/circuit2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/circuit2.csproj index aad72c7f888c57dd9321f9ef68e966ed6ab23f9f..6f6205ac7fe293bd7150eb040e5e349a299d7490 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/circuit2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/circuit2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/coins3.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/coins3.csproj index 5aad15ae1beea1b2c3b03c8ee8ea6cf5e55ff898..9e700adfeb0a86842930169a73800f29029f7ac3 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/coins3.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/coins3.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/coins_grid.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/coins_grid.csproj index 86e5f76ff85c9385745222a427d24e6c56342d66..7500b78def266dfd1638d3d00cdba5ca46efab65 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/coins_grid.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/coins_grid.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/combinatorial_auction2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/combinatorial_auction2.csproj index 9d146a28a78059cbf2da6a365d1eba15ff37b7a1..44bf0614a1acb77c68f73194bd12a2b69c773bb5 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/combinatorial_auction2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/combinatorial_auction2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_regular.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_regular.csproj index 1e6f4a00c6634160a94e1bb637e89b1e9f5a6516..fd467708c362c295c896fd04328fa1b4c832205e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_regular.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_regular.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_transition.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_transition.csproj index d8d3e1037566fc598628f42e80308b64bbaf4fad..b0af164fb19eedc8cc7b4c805a58b9c160018984 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_transition.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/contiguity_transition.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/costas_array.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/costas_array.csproj index 04b9ff0690499beb1aa289931e642ddb6fdaf4dc..377d10a74d38edf0cfc99d0425cdcdcb6d89b628 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/costas_array.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/costas_array.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/covering_opl.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/covering_opl.csproj index be1db6c94f1d0054d8e39f5c01fe85f0bde6d704..5d496e9a573498fdddc9ae2b744485368371e9dc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/covering_opl.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/covering_opl.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/crew.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/crew.csproj index e36b4996629305ddd684a141e25c874dd223406a..edabdfe3e641034cec37de5c039111f358a943fe 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/crew.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/crew.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/crossword.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/crossword.csproj index 31c6215088aa99d0ac1651b70ce620a5c565b941..4adcd0611825d1621dbc310323aada24ea07fa37 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/crossword.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/crossword.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/crypta.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/crypta.csproj index 0975b585d8970c5c593cb9f837053013a6efd562..d87d4a5ac53fb9f7815884f852128e3aa12a60d0 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/crypta.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/crypta.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/crypto.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/crypto.csproj index f421c92125aa857da0e7b69c64e1fc8893f82874..7fcfa802ccbb6f221aaf6ea3aa8ec24c454693e4 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/crypto.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/crypto.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/cscvrptw.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/cscvrptw.csproj index 042ed4dd631e9dc6e2d2cac4791040e544dd1543..80ace40d4fb47c60953669b7b10523a5abe540f4 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/cscvrptw.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/cscvrptw.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csdiet.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/csdiet.csproj index 37103bd24afb150682648cc4e68d1f46fc8e2ba9..b430cc3c5ffdb7089b3c107c88a3df0c5b32ac8c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csdiet.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csdiet.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csflow.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/csflow.csproj index 93cc5fd30bbcc618969f4f4097fd743301c6b35a..949b70559f5a6c24613e64bfdf8a9ec404be74f8 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csflow.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csflow.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.cs b/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.cs index c8e2181f39bd76409f674f37ea4d5a38c503464c..9db0b328d4f847ed9c3edf737f76180f9375309d 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.cs @@ -106,19 +106,24 @@ public class CsIntegerProgramming static void Main() { Console.WriteLine("---- Integer programming example with GLPK ----"); - RunIntegerProgrammingExample("GLPK_MIXED_INTEGER_PROGRAMMING"); + RunIntegerProgrammingExample("GLPK"); Console.WriteLine("---- Linear programming example with CBC ----"); - RunIntegerProgrammingExample("CBC_MIXED_INTEGER_PROGRAMMING"); + RunIntegerProgrammingExample("CBC"); Console.WriteLine("---- Linear programming example with SCIP ----"); - RunIntegerProgrammingExample("SCIP_MIXED_INTEGER_PROGRAMMING"); + RunIntegerProgrammingExample("SCIP"); + Console.WriteLine("---- Linear programming example with SAT ----"); + RunIntegerProgrammingExample("SAT"); Console.WriteLine( "---- Integer programming example (Natural API) with GLPK ----"); - RunIntegerProgrammingExampleNaturalApi("GLPK_MIXED_INTEGER_PROGRAMMING"); + RunIntegerProgrammingExampleNaturalApi("GLPK"); Console.WriteLine( "---- Linear programming example (Natural API) with CBC ----"); - RunIntegerProgrammingExampleNaturalApi("CBC_MIXED_INTEGER_PROGRAMMING"); + RunIntegerProgrammingExampleNaturalApi("CBC"); Console.WriteLine( "---- Linear programming example (Natural API) with SCIP ----"); - RunIntegerProgrammingExampleNaturalApi("SCIP_MIXED_INTEGER_PROGRAMMING"); + RunIntegerProgrammingExampleNaturalApi("SCIP"); + Console.WriteLine( + "---- Linear programming example (Natural API) with SAT ----"); + RunIntegerProgrammingExampleNaturalApi("SAT"); } } diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.csproj index dbdee8b718fb688ae4e13f0d47faa853a1be69cc..40e2b7d5285266081dfa23c6cd70fd223bf30e36 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csintegerprogramming.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csknapsack.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/csknapsack.csproj index 6b858776937254216892eb98908d897219046afb..ce1aec95560626a8dbbd1e939d31130765afe751 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csknapsack.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csknapsack.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.cs b/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.cs index 28b2128d6840425c7c7f6056420777fb452d6e24..b58611f1bcc8a371fb95f3c493a0d1576bfa813f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.cs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.cs @@ -18,6 +18,8 @@ public class CsLinearProgramming { private static void RunLinearProgrammingExample(String solverType) { + Console.WriteLine($"---- Linear programming example with {solverType} ----"); + Solver solver = Solver.CreateSolver("IntegerProgramming", solverType); if (solver == null) { @@ -96,6 +98,9 @@ public class CsLinearProgramming private static void RunLinearProgrammingExampleNaturalApi( String solverType, bool printModel) { + Console.WriteLine( + $"---- Linear programming example (Natural API) with {solverType} ----"); + Solver solver = Solver.CreateSolver("IntegerProgramming", solverType); if (solver == null) { @@ -157,20 +162,12 @@ public class CsLinearProgramming static void Main() { - Console.WriteLine("---- Linear programming example with GLOP ----"); - RunLinearProgrammingExample("GLOP_LINEAR_PROGRAMMING"); - Console.WriteLine("---- Linear programming example with GLPK ----"); - RunLinearProgrammingExample("GLPK_LINEAR_PROGRAMMING"); - Console.WriteLine("---- Linear programming example with CLP ----"); - RunLinearProgrammingExample("CLP_LINEAR_PROGRAMMING"); - Console.WriteLine( - "---- Linear programming example (Natural API) with GLOP ----"); - RunLinearProgrammingExampleNaturalApi("GLOP_LINEAR_PROGRAMMING", true); - Console.WriteLine( - "---- Linear programming example (Natural API) with GLPK ----"); - RunLinearProgrammingExampleNaturalApi("GLPK_LINEAR_PROGRAMMING", false); - Console.WriteLine( - "---- Linear programming example (Natural API) with CLP ----"); - RunLinearProgrammingExampleNaturalApi("CLP_LINEAR_PROGRAMMING", false); + RunLinearProgrammingExample("GLOP"); + RunLinearProgrammingExample("GLPK_LP"); + RunLinearProgrammingExample("CLP"); + + RunLinearProgrammingExampleNaturalApi("GLOP", true); + RunLinearProgrammingExampleNaturalApi("GLPK_LP", false); + RunLinearProgrammingExampleNaturalApi("CLP", false); } } diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.csproj index 485c4e50456828c348a8fba9ca02489a66774503..dc8f948ac05ec0ad97abe6a21d35ef911ee96296 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/cslinearprogramming.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csls_api.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/csls_api.csproj index ab7d81b78dabf66874d26e6ae235c6638b14ecb6..e199e18f9fde90cd419072511d276beb47a13445 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csls_api.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csls_api.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/csrabbitspheasants.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/csrabbitspheasants.csproj index 1a71c42961cc552786b37373180bfe334b4ab763..3deaae68ae7e321fc2805a4787bb368a50c2a1cc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/csrabbitspheasants.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/csrabbitspheasants.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/cstsp.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/cstsp.csproj index d17dd40fd21b6b752e3cf84b6025b521339a6d0c..3c3f955a7d4f51668c6714399085b57c15ad9f5e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/cstsp.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/cstsp.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/curious_set_of_integers.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/curious_set_of_integers.csproj index 95ced2ada5f6c8a8210e3d2b22efcaf900810ba2..731e6fc9460e16f9b6b212d9d51dd498c8757acf 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/curious_set_of_integers.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/curious_set_of_integers.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/debruijn.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/debruijn.csproj index 8779efdcea822fb199f7611c228d2f209e8b6a6a..3dbe5843e43693dc644f74f8ca66ffad54e32ea1 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/debruijn.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/debruijn.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/discrete_tomography.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/discrete_tomography.csproj index 5a3a9bd8a524954aabfcb2f489e29648df90a1c8..0998bc044b68ce5ecd34fc95b595d43e735ceacc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/discrete_tomography.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/discrete_tomography.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/divisible_by_9_through_1.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/divisible_by_9_through_1.csproj index a523fea7999319902dad24282cdd09da0648a944..85008fbafe26e346443d2df521689506a3ddf633 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/divisible_by_9_through_1.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/divisible_by_9_through_1.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/dudeney.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/dudeney.csproj index 4c5301bedb4ca79f936f86712461612d9404e8e7..55c12582fa2a942530e065a40d7ea2197ba28715 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/dudeney.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/dudeney.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/einav_puzzle2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/einav_puzzle2.csproj index c32e7e3f187db1e9a09ce947864952966d4ecd3b..8ce88b7ad1d7b853a608ba107a8b5264bcef48ec 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/einav_puzzle2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/einav_puzzle2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/eq10.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/eq10.csproj index 0a343ab4137a1722b478961b97b5499a0af737dd..135134ec54af27d67cb59115796f86af9892cd90 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/eq10.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/eq10.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/eq20.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/eq20.csproj index 786cf07cba6b0b9c4a127343ae9c5e99a31c543a..e3b944ec8dcac17b5c483a2c060b7dd3e6cb192c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/eq20.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/eq20.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fill_a_pix.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/fill_a_pix.csproj index 173f8f192b1e3612237f97b6e85b4b07a7e17685..935b854b40f04b53563fec93727772b4d3e7c233 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fill_a_pix.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fill_a_pix.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsProgram.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsProgram.fsproj index ef30e5a0177c543a9910ad7ee6d5826be9c0dafc..bf9b7aa462da6640d0ad543aa765306d6ef7fed3 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsProgram.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsProgram.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fs b/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fs index 7f8b94978738683528d32e421029fda13d9c392e..d19e692c53660478af7e03797b343bde39b1a7ca 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fs +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fs @@ -38,7 +38,7 @@ solver.Add( x.ScalProd(chocolate).solver().MakeGreaterOrEqual(x.ScalProd(chocola solver.Add( x.ScalProd(sugar).solver().MakeGreaterOrEqual(x.ScalProd(sugar), limits.[2])) solver.Add( x.ScalProd(fat).solver().MakeGreaterOrEqual(x.ScalProd(fat), limits.[3])) -let obj = cost.Minimize(1L) +let obj = cost.Minimize(int64(1)) let db = solver.MakePhase(new IntVarVector(x), Solver.CHOOSE_PATH, Solver.ASSIGN_MIN_VALUE) solver.NewSearch(db, obj) diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fsproj index a1571c2882dfa61531218c0be7accfca686681a3..bc60a83f29bcccd9bdd22dca7e70c08744e77bf9 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsdiet.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsequality-inequality.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsequality-inequality.fsproj index 8598a396c81a43bc7c9e1ccdb4f01e914a063ed2..5a105125eb5018eb504acdd45bca29e6d6c338f2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsequality-inequality.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsequality-inequality.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsequality.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsequality.fsproj index 4b63aed3ed860571f5e95e03393f87c0148b841e..9a1ff33da48b03b04366d3db661f293625585018 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsequality.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsequality.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsinteger-linear-program.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsinteger-linear-program.fsproj index 2dcc947e67401c9b4d8df71c0e958c002ffb30c2..da7716ed78b662ca54d95fd6d37f99cbc0ec48af 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsinteger-linear-program.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsinteger-linear-program.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsintegerprogramming.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsintegerprogramming.fsproj index 5233ea8f053933d907989c3d1cda10125f67d680..07de25deb26990968a89c14ed3c18975cf8c3f7d 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsintegerprogramming.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsintegerprogramming.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsknapsack.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsknapsack.fsproj index d59fff5263c475066b2e1a7348b0a879e8178ce3..2deaaab9bedd8ac51c0184c7bfc34f70155ac254 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsknapsack.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsknapsack.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fslinearprogramming.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fslinearprogramming.fsproj index 67885489a3d0dbb7c7967187fcf10fa479a0cd30..8129a9fb1055b520864add251a05346b9bc8750d 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fslinearprogramming.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fslinearprogramming.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow-lpSolve.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow-lpSolve.fsproj index 346e04b025caecd5e18012237f39fd178cf3f3b9..9e4719224739a10841679a991023e06c7c4bc25a 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow-lpSolve.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow-lpSolve.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow.fsproj index 98024c948ff0a3c87dce37b2f5976baba3286406..c709f2ba6c6615cc536f92728d51183898d40676 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-max-flow.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-min-cost-flow.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-min-cost-flow.fsproj index 0cefb2a3796157e7069482ae14e7914ea5268a92..4fc444be5084356362ed88f20baf8857f21f64a7 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-min-cost-flow.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsnetwork-min-cost-flow.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsrabbit-pheasant.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsrabbit-pheasant.fsproj index 6fc00a1bdded63b844418e0f4391f23b097193af..739de2de77e3284bba97d0ed53187aa1a0638497 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsrabbit-pheasant.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsrabbit-pheasant.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay.fsproj index f2b69bf1ea4ca39a3b7be304b985d9a8ed220c12..5a5eb948c52f3f54468753e15f5d6fe296dd6e13 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3-lpSolve.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3-lpSolve.fsproj index 18f66fba30cbabc8e464c12ca85f1c92535bf74a..57d64da421f678a9b2f2f276246bbd918dafd16b 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3-lpSolve.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3-lpSolve.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3.fsproj b/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3.fsproj index 04416ffb02f21d4f310b3d30405c5d39f0cd817a..42b79d0d87dc62f738e621444f5d000fa73e1a55 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3.fsproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/fsvolsay3.fsproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving.csproj index bbf04e8f37ce6526765e47b3fedbf363f7cd7e3e..e1e32e7563e32a73f425fc5bf4970501074a97c9 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving_intervals.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving_intervals.csproj index cadd5cc5e40ca9339aa6a620398eeafc292aa580..52bf11477d2b93aa2d9c180ebcc1704ffa72e5ec 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving_intervals.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/furniture_moving_intervals.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/futoshiki.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/futoshiki.csproj index 487ba70ba3b4b14f81b8068c16eb910b7384a3e8..efc5f2863128246a53bd0f65662602ddcdec2fe5 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/futoshiki.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/futoshiki.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/golomb_ruler.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/golomb_ruler.csproj index dd36e32eb489bb5a512dcaa7c77b9d486874df45..e050ba4dfd0b09406e529a2da4f46e8642569709 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/golomb_ruler.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/golomb_ruler.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/grocery.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/grocery.csproj index a276f396b388d622bdb06d751ee20ea023e7ba0e..a1d0ac307e46ea584e71889479469ef37f0a3608 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/grocery.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/grocery.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/hidato_table.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/hidato_table.csproj index 5f1a4c9c141639bef76e9cc7f33434bcf7501249..792d8809e540ab510b85cfafcd6de4e210b98bcf 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/hidato_table.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/hidato_table.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/just_forgotten.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/just_forgotten.csproj index 8e9537664178716ddc7cbb782204bf3c99d50dec..67e6ee78cc645a2f59af4aec4f240285f3aeeede 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/just_forgotten.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/just_forgotten.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/kakuro.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/kakuro.csproj index 4cc6d6b6b31ea54b9a5e458eb63c5aa59c70c639..ca68e42cac02ec744a1ccab0e3b8b65008f3a692 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/kakuro.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/kakuro.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/kenken2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/kenken2.csproj index d2738af26e458b1a6c07944fe71cab1a932df913..b7669b505fba5efdf687a2d842f3bba753f61c46 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/kenken2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/kenken2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/killer_sudoku.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/killer_sudoku.csproj index fb6fca9a18bcb4a0736f907d86297ce2cc560ef6..19e4afe8410bf9a102af139f2a5a2a14a4dbb7fc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/killer_sudoku.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/killer_sudoku.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/labeled_dice.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/labeled_dice.csproj index e2a6d6d3b3ca158f272abff8cfb8e0e5f2cfb1e1..dc0e31788ef10abd0cf8e6cbe541e5666d0d3c43 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/labeled_dice.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/labeled_dice.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/langford.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/langford.csproj index 51246d9aef7d1c2b38a686054d1e0f33663e827a..d53eec1051e0aeed4919c421734109d791b7e4b7 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/langford.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/langford.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/least_diff.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/least_diff.csproj index 32e344a3b4890e30113bec3e4b4eaabdf5195cec..4b9154ae965a198f4156f92157aa993de0ad0f9f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/least_diff.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/least_diff.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/lectures.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/lectures.csproj index 819961a859f0c351c03d1a1fc63f57bae43058b3..9dbb4eb7cca1c3a515e2b45076bb3123bbe1e969 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/lectures.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/lectures.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/magic_sequence.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/magic_sequence.csproj index 5a77f90745e7bf172f57b4389bd2435164c273fb..d3b6c674e26b6ce4237c992e6db10e68ae1ea501 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/magic_sequence.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/magic_sequence.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/magic_square.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/magic_square.csproj index 0df2d162e5258a2b32a33b0a3d6278cac851b891..9f6ec8d494e544926aba7694d34e70293de6e613 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/magic_square.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/magic_square.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/magic_square_and_cards.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/magic_square_and_cards.csproj index 22079bf72d73b3f1aaf86dce453eba365b692774..05868e66505616b75b3acddfaf0a1f8396034578 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/magic_square_and_cards.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/magic_square_and_cards.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/map.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/map.csproj index f1edd7b41c22defbfc63b2835a58cc15f51a050f..585f42f7f5fd9111035486e6fc30e1d633c46d00 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/map.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/map.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/map2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/map2.csproj index dbd7433c5ba7bff80fa24760ba6e88fbba314398..e71883fea7213dc14e52bf2d7ddae65b33333510 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/map2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/map2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/marathon2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/marathon2.csproj index 94442779abffe31d7e975b50a0f2fc6459f5eeab..eeff12b3bd858ab759adefe830c88c8bf858f569 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/marathon2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/marathon2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_taha.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_taha.csproj index 87d5174e1f6f669d936dba9dc639f8bca0d2fcee..523c67beeeb90b7296a8f4134b5102c9f34f3eb2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_taha.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_taha.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_winston1.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_winston1.csproj index 47bf1585ed78a581fa881746382ab656c2e1d608..60622ee5c7ae4de58b19366026cef2ac38690c86 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_winston1.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/max_flow_winston1.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/minesweeper.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/minesweeper.csproj index 92951e71cec8a755e2d0cfcd0f5911ee7d24ec8c..e1edceafef2345f00f0c336dba657a7b12f7dbaa 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/minesweeper.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/minesweeper.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/mr_smith.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/mr_smith.csproj index f090a6ba31029fda4992d91959c4e21175fab1fa..d37f6b35f81da017a6b10ded9eba98423a2d8c2c 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/mr_smith.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/mr_smith.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/nontransitive_dice.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/nontransitive_dice.csproj index b7c12eac0ea50b33d17d464cee521e3351449cf8..00efffc454262c040102e22a2439017381d42d21 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/nontransitive_dice.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/nontransitive_dice.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/nqueens.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/nqueens.csproj index 40d3aeb219f50f6cd45809458b61a24354a19509..09912c8bbdc5fec8316fe791074605328fd12c49 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/nqueens.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/nqueens.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_regular.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_regular.csproj index 5009023f87a4aa167aadb2ca9d88b73da6e8c6f2..4cba6e51ea67d5ae25041be64e7c1049f0477592 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_regular.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_regular.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_transition.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_transition.csproj index 8e7078381243f66241ad1c76d6732f6b8823bbdf..87d4279bc59171ae10264bbbd7a1ca33b9a29114 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_transition.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/nurse_rostering_transition.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/olympic.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/olympic.csproj index 48ef61342194acad552b26098773f823be59bdde..3fc76894a3876098dc3443e378efc343df7bbba6 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/olympic.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/olympic.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/organize_day.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/organize_day.csproj index 9a0f2dfc86027ee742b4a87f0f2667151ff0fdf8..cb43fb67f9a5db1995e779078bb244819541ff69 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/organize_day.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/organize_day.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/organize_day_intervals.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/organize_day_intervals.csproj index 1eee36d71ed9772f449a6fb2945b0f67718cb327..5aee353bae54e64fc86beb0543715cee78a13868 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/organize_day_intervals.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/organize_day_intervals.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/p_median.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/p_median.csproj index c125074cd7f52d80f8ed2afdba8788774263b9e1..44d0d5b6a4ffc1b6eef6cebdd87d57980aa158f8 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/p_median.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/p_median.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/pandigital_numbers.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/pandigital_numbers.csproj index 0743ab6df7176fbc6be81f594f1e9b6cd84de182..693dcedf6973b151cb5ee6bb412c8f53adbfff64 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/pandigital_numbers.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/pandigital_numbers.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/partition.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/partition.csproj index 29bed33313aa63c1092c3fc2fab33808860a2ea4..5987cfe28e273c6d90a52c8d39a326b4440e7fa2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/partition.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/partition.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/perfect_square_sequence.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/perfect_square_sequence.csproj index e97f26b53b69cbb24edd0f95b46d5c25d39fe65e..b81cccd0c7aacc31e3de68e08b1cb0f6b8375b5e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/perfect_square_sequence.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/perfect_square_sequence.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/photo_problem.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/photo_problem.csproj index e75c91cf198a664300f55f1492d22d4db0f96f43..c2040ed31810aa538cbb3d34b97fba8c3f9a119f 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/photo_problem.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/photo_problem.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/place_number_puzzle.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/place_number_puzzle.csproj index 2983649ae38b6c9e1b2631d663fdf26e19071335..e2d74d4b1ea4d7589c9ac84468bdcd83e081c1dc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/place_number_puzzle.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/place_number_puzzle.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/post_office_problem2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/post_office_problem2.csproj index f0aa10ec56fb80467496a2bf4302f774628e9b68..d526e1eeaa399b4c9a5dc311b05e45865dccbf42 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/post_office_problem2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/post_office_problem2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/quasigroup_completion.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/quasigroup_completion.csproj index 7b83d318284ca0cf656cdcaf37cf692aac237a21..3328fc72b1f136ec8fbb6680a0337504f3748751 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/quasigroup_completion.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/quasigroup_completion.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/regex.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/regex.csproj index 00d5738fa8a8076b6d7c795082a4eea4b98cb7d0..e9506b1995cea1fff75a176fad02bf62975316ef 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/regex.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/regex.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/rogo2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/rogo2.csproj index fffea5be545ba1fcbe837006459492bdf918b576..7ef7fedea06131e2e625b0b5d74271cc90703a20 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/rogo2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/rogo2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/scheduling_speakers.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/scheduling_speakers.csproj index dddfd9d5cda8917be796de9fc5413e58ff06dd52..6c96be63f3dd3bdc7cacd85989655d2373f3f98a 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/scheduling_speakers.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/scheduling_speakers.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa.csproj index fcc3c41ad0852272b76515013da090118ec2066d..82a816f263310acff8e15577c3f3c28da4732b4b 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa2.csproj index 3db5a4c987c6857e29c2fc953c29dd4c217c1fad..ee03c827ac0b99637a0c655cbba42aa8c99267a4 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/secret_santa2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money.csproj index 4880ff75c8b357d4d940a739cd3adb2b8e3cb015..77ae85e9fc1de4ee81b54fdfccd0c724beaf5dd2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money2.csproj index 9b79cef444caad93805f649a34337e54d4ea665f..ff7d77ae875455eb934718557a0b288d97b733a0 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/send_more_money2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/send_most_money.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/send_most_money.csproj index 0d46a45ec0e5740ca5d7b9d4c057ca9c6f877807..08d6dc7a851b35f72539f6ca517e2ce047487ca6 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/send_most_money.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/send_most_money.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/seseman.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/seseman.csproj index 67325134208cb235dba38e8ef1df98166ee63df9..a20a19014fbb8a63737d3da7af279843bb06a11e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/seseman.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/seseman.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering.csproj index 244e668be8aadf48c41a27f0754709757a0cc1ed..02164c3fab7930c2f36212877bdc003c3b072dd1 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering2.csproj index e808d9d7759221d746cdd5064f6ec124b0ae4e2a..6abbb9283ff890a204809310bfbc98cc1945b5bf 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering3.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering3.csproj index 973bacc65c4c53030692a930757389bc5511cc27..75da21613e02ec044b286b7785c42164be55c8bb 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering3.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering3.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering4.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering4.csproj index 9f6d68a4b54737a881e6bf7978c6eee44976d185..56d78b73d744f176e26b1b0e2ed704dfeb38dad7 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering4.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering4.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_deployment.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_deployment.csproj index a2b727369b3cdf7c2ba9281bd2c47ead6cd9975a..d3cfbeb784b5f95d1b3a337dd56abd4943e84356 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_deployment.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_deployment.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_skiena.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_skiena.csproj index 7064328eda61d936064e57956ddf0d50bcc51a89..b23341fbc7cfc8434dcdb59a4179b2ddbdc49d58 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_skiena.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_covering_skiena.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/set_partition.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/set_partition.csproj index b23e773bafa6cecd613025ad48ac470f46af68c2..2f066f4f90cb000dc985ffd37213ee327c4d1e33 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/set_partition.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/set_partition.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/sicherman_dice.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/sicherman_dice.csproj index 2cadabc35990275aa01155d54fd9d7cef29af3fb..90e1398c4e766340e6447c2a37b7003ea9d0cd90 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/sicherman_dice.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/sicherman_dice.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/ski_assignment.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/ski_assignment.csproj index fb178f6155a08865eb46e31c7c8abe4ce22ff0ec..2b65f3bf22631da4395b110955c187ed725eadc9 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/ski_assignment.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/ski_assignment.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/stable_marriage.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/stable_marriage.csproj index 0d329b91877dab92ecd84c6f7b11cae0e24da41b..5fab20899ef215db386d2de1fd8b5db74525e2a5 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/stable_marriage.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/stable_marriage.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/strimko2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/strimko2.csproj index fc74f9a98597bb1ae1bb7ec7f2078233a62f31f0..e2b93f6222ea3e3119752cd5ae73f34ca8d5270b 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/strimko2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/strimko2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/subset_sum.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/subset_sum.csproj index 86775d22eb0fd09eee8366516e7e4ef714920e76..f91d6df5e0de0e946483ee517357b858994d2abd 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/subset_sum.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/subset_sum.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/sudoku.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/sudoku.csproj index a519a71f8177f494903199c25d57a770d4073396..057aba4178883747e417e03ea4bc4ec7d6aafddf 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/sudoku.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/sudoku.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/survo_puzzle.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/survo_puzzle.csproj index 1ae49385b95a5c18659a262572631798b55f4571..d2aafb58d152ac2c8dcff710a7e7d8216ac539f2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/survo_puzzle.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/survo_puzzle.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/to_num.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/to_num.csproj index 22f6c38ba7418ae8d4d05e6f3c634edc4e1d6b6d..853c8f42abff3db238b9f8cf33f6d3a080fcb0e9 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/to_num.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/to_num.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/traffic_lights.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/traffic_lights.csproj index 48d50c096096ff61deb9fad09516b2c99fbad53d..07c869824c19f4f66d631b15c64e6ea96e116e47 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/traffic_lights.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/traffic_lights.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/volsay.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/volsay.csproj index 8bc4ce89152c3649b2a11c90670325f2ff4826b9..88efdb7ed56cf05821eef90f69e5fdb38582cd9e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/volsay.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/volsay.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/volsay2.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/volsay2.csproj index 363e11255fa5ea3dff702b349dad1986a082eb9d..74c2991db44bb2decbca7f1d54910581f1152626 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/volsay2.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/volsay2.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/volsay3.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/volsay3.csproj index 5d73ce5d70ccda9eb675f590ab464fdc68210107..1f72634fff66b64136594e7d202f018d48c4a9cf 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/volsay3.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/volsay3.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/wedding_optimal_chart.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/wedding_optimal_chart.csproj index 07d1875e3c55530c9e7096190b380210bd0b3017..6b08412b190c32b69ecbb4fc91fa4878cefe8df2 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/wedding_optimal_chart.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/wedding_optimal_chart.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/who_killed_agatha.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/who_killed_agatha.csproj index 1fd0fe2d74630367b33c4800c0c7692644c30375..421a5ee2f82f29ca2fb3a1e33a468b9f49966329 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/who_killed_agatha.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/who_killed_agatha.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/word_square.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/word_square.csproj index 9cb28bf10a7e65d9e910f9f62634aef3c4f71306..df0b43c96818e4d5f2525614a838fe3c2712dfbc 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/word_square.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/word_square.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/xkcd.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/xkcd.csproj index 1e1608c1b86a23e3ec71f845c1ac450cc9e54fd8..6368eb2d22f29dce13b02af6dca7f8f27a83b88e 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/xkcd.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/xkcd.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/young_tableaux.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/young_tableaux.csproj index b5fd198de7279672f9440909ed86f84d5ce152e6..14db48fdd2535abe68e13dc7a7c7f2aa53ddae0b 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/young_tableaux.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/young_tableaux.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/dotnet/zebra.csproj b/libs/or-tools-src-ubuntu/examples/dotnet/zebra.csproj index 6e68c96c6db280cb934891691086f4aaadb35f3c..1235f11e2366929094ced814bfdd94fc0cf6e3ce 100644 --- a/libs/or-tools-src-ubuntu/examples/dotnet/zebra.csproj +++ b/libs/or-tools-src-ubuntu/examples/dotnet/zebra.csproj @@ -19,6 +19,6 @@ - + diff --git a/libs/or-tools-src-ubuntu/examples/java/AssignmentMip.java b/libs/or-tools-src-ubuntu/examples/java/AssignmentMip.java index fb93e658e514635ac23f9e4639ced61858a3a390..e8f9f006288c5696c936964304ce3aa7e7ef3985 100644 --- a/libs/or-tools-src-ubuntu/examples/java/AssignmentMip.java +++ b/libs/or-tools-src-ubuntu/examples/java/AssignmentMip.java @@ -43,8 +43,7 @@ public class AssignmentMip { // Solver // [START solver] // Create the linear solver with the CBC backend. - MPSolver solver = new MPSolver( - "AssignmentMip", MPSolver.OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("AssignmentMip", "CBC"); // [END solver] // Variables diff --git a/libs/or-tools-src-ubuntu/examples/java/BinPackingMip.java b/libs/or-tools-src-ubuntu/examples/java/BinPackingMip.java index c40c1ab5879e8d7d4db5a5088c0e8fab01d56bf2..b5f558cae645773d645e8e73ccb5348b9c8e3ad9 100644 --- a/libs/or-tools-src-ubuntu/examples/java/BinPackingMip.java +++ b/libs/or-tools-src-ubuntu/examples/java/BinPackingMip.java @@ -45,8 +45,7 @@ public class BinPackingMip { // [START solver] // Create the linear solver with the CBC backend. - MPSolver solver = new MPSolver( - "BinPackingMip", MPSolver.OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("BinPackingMip", "CBC"); // [END solver] // [START program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/java/CoinsGridMIP.java b/libs/or-tools-src-ubuntu/examples/java/CoinsGridMIP.java index 03fb70cefc25154c4235c755e2aa7314a7332bdf..9e03bde8be1f0df92846622161f25bbe23885700 100755 --- a/libs/or-tools-src-ubuntu/examples/java/CoinsGridMIP.java +++ b/libs/or-tools-src-ubuntu/examples/java/CoinsGridMIP.java @@ -50,12 +50,11 @@ public class CoinsGridMIP { System.loadLibrary("jniortools"); } - private static MPSolver createSolver(String solverType) { - return new MPSolver("MIPDiet", MPSolver.OptimizationProblemType.valueOf(solverType)); - } - private static void solve(String solverType) { - MPSolver solver = createSolver(solverType); + System.out.println("---- CoinsGridMIP with " + solverType); + + MPSolver solver = MPSolver.createSolver("CoinsGridMIP", solverType); + if (solver == null) return; /** invariants */ int n = 31; @@ -85,6 +84,8 @@ public class CoinsGridMIP { solver.solve(); + System.out.println("Problem solved in " + solver.wallTime() + "ms"); + for (int i = 0; i < n; i++) { for (int j = 0; j < n; j++) { System.out.print((int) x[i][j].solutionValue() + " "); @@ -94,23 +95,9 @@ public class CoinsGridMIP { } public static void main(String[] args) { - try { - System.out.println("---- Integer programming example with SCIP (recommended) ----"); - solve("SCIP_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } - try { - System.out.println("---- Integer programming example with CBC ----"); - solve("CBC_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } - try { - System.out.println("---- Integer programming example with GLPK ----"); - solve("GLPK_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } + solve("SCIP"); + solve("CBC"); + solve("GLPK"); + solve("SAT"); } } diff --git a/libs/or-tools-src-ubuntu/examples/java/ColoringMIP.java b/libs/or-tools-src-ubuntu/examples/java/ColoringMIP.java index 7804cfbbe24bbc9e0b28979f36b98bbbc6f2242c..381f4d1fd3223c97d66b7a639898e86cdb81e3c7 100755 --- a/libs/or-tools-src-ubuntu/examples/java/ColoringMIP.java +++ b/libs/or-tools-src-ubuntu/examples/java/ColoringMIP.java @@ -39,12 +39,12 @@ public class ColoringMIP { System.loadLibrary("jniortools"); } - private static MPSolver createSolver(String solverType) { - return new MPSolver("MIPDiet", MPSolver.OptimizationProblemType.valueOf(solverType)); - } - private static void solve(String solverType) { - MPSolver solver = createSolver(solverType); + System.out.println("---- CoinsGridMIP with " + solverType); + + MPSolver solver = MPSolver.createSolver("CoinsGridMIP", solverType); + if (solver == null) return; + double infinity = MPSolver.infinity(); /** invariants */ @@ -115,6 +115,8 @@ public class ColoringMIP { System.err.println("The problem does not have an optimal solution!"); return; } else { + System.out.println("Problem solved in " + solver.wallTime() + "ms"); + System.out.print("Colors used: "); for (MPVariable var : colUsed) { System.out.print((int) var.solutionValue() + " "); @@ -133,23 +135,9 @@ public class ColoringMIP { } public static void main(String[] args) { - try { - System.out.println("---- Integer programming example with SCIP (recommended) ----"); - solve("SCIP_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } - try { - System.out.println("---- Integer programming example with CBC ----"); - solve("CBC_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } - try { - System.out.println("---- Integer programming example with GLPK ----"); - solve("GLPK_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } + solve("SCIP"); + solve("CBC"); + solve("GLPK"); + solve("SAT"); } } diff --git a/libs/or-tools-src-ubuntu/examples/java/IntegerProgramming.java b/libs/or-tools-src-ubuntu/examples/java/IntegerProgramming.java index 935a5db6995a179d2a94988c683653f99e5774ee..353cd50ee194b45e725b9635845314c168ed2a97 100644 --- a/libs/or-tools-src-ubuntu/examples/java/IntegerProgramming.java +++ b/libs/or-tools-src-ubuntu/examples/java/IntegerProgramming.java @@ -10,6 +10,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. + package com.google.ortools.examples; import com.google.ortools.linearsolver.MPConstraint; @@ -27,17 +28,8 @@ public class IntegerProgramming { System.loadLibrary("jniortools"); } - private static MPSolver createSolver(String solverType) { - try { - return new MPSolver( - "IntegerProgrammingExample", MPSolver.OptimizationProblemType.valueOf(solverType)); - } catch (java.lang.IllegalArgumentException e) { - return null; - } - } - private static void runIntegerProgrammingExample(String solverType) { - MPSolver solver = createSolver(solverType); + MPSolver solver = MPSolver.createSolver("IntegerProgramming", solverType); if (solver == null) { System.out.println("Could not create solver " + solverType); return; @@ -88,10 +80,10 @@ public class IntegerProgramming { public static void main(String[] args) throws Exception { System.out.println("---- Integer programming example with SCIP (recommended) ----"); - runIntegerProgrammingExample("SCIP_MIXED_INTEGER_PROGRAMMING"); + runIntegerProgrammingExample("SCIP"); System.out.println("---- Integer programming example with CBC ----"); - runIntegerProgrammingExample("CBC_MIXED_INTEGER_PROGRAMMING"); - System.out.println("---- Integer programming example with GLPK ----"); - runIntegerProgrammingExample("GLPK_MIXED_INTEGER_PROGRAMMING"); + runIntegerProgrammingExample("CBC"); + System.out.println("---- Integer programming example with CP-SAT ----"); + runIntegerProgrammingExample("SAT"); } } diff --git a/libs/or-tools-src-ubuntu/examples/java/LinearProgramming.java b/libs/or-tools-src-ubuntu/examples/java/LinearProgramming.java index 05710a76fb83d8589bcbeb64952b71b637a0b3d0..271674d75e918db24c2747db503ddd6e8b5d8019 100644 --- a/libs/or-tools-src-ubuntu/examples/java/LinearProgramming.java +++ b/libs/or-tools-src-ubuntu/examples/java/LinearProgramming.java @@ -10,6 +10,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. + package com.google.ortools.examples; import com.google.ortools.linearsolver.MPConstraint; @@ -27,17 +28,8 @@ public class LinearProgramming { System.loadLibrary("jniortools"); } - private static MPSolver createSolver(String solverType) { - try { - return new MPSolver( - "LinearProgrammingExample", MPSolver.OptimizationProblemType.valueOf(solverType)); - } catch (java.lang.IllegalArgumentException e) { - return null; - } - } - private static void runLinearProgrammingExample(String solverType, boolean printModel) { - MPSolver solver = createSolver(solverType); + MPSolver solver = MPSolver.createSolver("IntegerProgramming", solverType); if (solver == null) { System.out.println("Could not create solver " + solverType); return; @@ -124,10 +116,8 @@ public class LinearProgramming { public static void main(String[] args) throws Exception { System.out.println("---- Linear programming example with GLOP (recommended) ----"); - runLinearProgrammingExample("GLOP_LINEAR_PROGRAMMING", true); + runLinearProgrammingExample("GLOP", true); System.out.println("---- Linear programming example with CLP ----"); - runLinearProgrammingExample("CLP_LINEAR_PROGRAMMING", false); - System.out.println("---- Linear programming example with GLPK ----"); - runLinearProgrammingExample("GLPK_LINEAR_PROGRAMMING", false); + runLinearProgrammingExample("CLP", false); } } diff --git a/libs/or-tools-src-ubuntu/examples/java/LinearProgrammingExample.java b/libs/or-tools-src-ubuntu/examples/java/LinearProgrammingExample.java index 8f8d5d7e225993c8aa5ba520968413b2251721af..0fdb7201672d5a48a858a6e8cdd87f89cdeefb79 100644 --- a/libs/or-tools-src-ubuntu/examples/java/LinearProgrammingExample.java +++ b/libs/or-tools-src-ubuntu/examples/java/LinearProgrammingExample.java @@ -27,8 +27,7 @@ public class LinearProgrammingExample { public static void main(String[] args) throws Exception { // [START solver] - MPSolver solver = new MPSolver( - "LinearProgrammingExample", MPSolver.OptimizationProblemType.GLOP_LINEAR_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("LinearProgrammingExample", "GLOP"); // [END solver] // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/java/MipVarArray.java b/libs/or-tools-src-ubuntu/examples/java/MipVarArray.java index bc0706e1256dcd1a92550628086f346054d1cf69..bd49769d16b30b2e6cf5c9dbac1bbac049fc886d 100644 --- a/libs/or-tools-src-ubuntu/examples/java/MipVarArray.java +++ b/libs/or-tools-src-ubuntu/examples/java/MipVarArray.java @@ -50,8 +50,7 @@ public class MipVarArray { // [START solver] // Create the linear solver with the CBC backend. - MPSolver solver = new MPSolver( - "SimpleMipProgram", MPSolver.OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("MipVarArray", "CBC"); // [END solver] // [START program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/java/MultipleKnapsackMip.java b/libs/or-tools-src-ubuntu/examples/java/MultipleKnapsackMip.java index 09fb730039e6ad775a23829684464881acd9c470..69ece026f880933bb33482eea84acca03e5d2569 100644 --- a/libs/or-tools-src-ubuntu/examples/java/MultipleKnapsackMip.java +++ b/libs/or-tools-src-ubuntu/examples/java/MultipleKnapsackMip.java @@ -46,8 +46,7 @@ public class MultipleKnapsackMip { // [START solver] // Create the linear solver with the CBC backend. - MPSolver solver = new MPSolver( - "MultipleKnapsackMip", MPSolver.OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("MultipleKnapsackMip", "CBC"); // [END solver] // [START program_part2] diff --git a/libs/or-tools-src-ubuntu/examples/java/SimpleLpProgram.java b/libs/or-tools-src-ubuntu/examples/java/SimpleLpProgram.java index 937a45debb50606e5638d35903aa76de681e44a6..40cb9298a1109abac3aee565eb9d7c8fbdc26e24 100644 --- a/libs/or-tools-src-ubuntu/examples/java/SimpleLpProgram.java +++ b/libs/or-tools-src-ubuntu/examples/java/SimpleLpProgram.java @@ -30,8 +30,7 @@ public class SimpleLpProgram { public static void main(String[] args) throws Exception { // [START solver] // Create the linear solver with the GLOP backend. - MPSolver solver = - new MPSolver("SimpleLpProgram", MPSolver.OptimizationProblemType.GLOP_LINEAR_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("SimpleLpProgram", "GLOP"); // [END solver] // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/java/SimpleMipProgram.java b/libs/or-tools-src-ubuntu/examples/java/SimpleMipProgram.java index a6435093397a8119e78a233315f2e6ce0945fb92..555a9815cc7f2069d560a58acdb6732687c2e492 100644 --- a/libs/or-tools-src-ubuntu/examples/java/SimpleMipProgram.java +++ b/libs/or-tools-src-ubuntu/examples/java/SimpleMipProgram.java @@ -30,8 +30,7 @@ public class SimpleMipProgram { public static void main(String[] args) throws Exception { // [START solver] // Create the linear solver with the CBC backend. - MPSolver solver = new MPSolver( - "SimpleMipProgram", MPSolver.OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING); + MPSolver solver = MPSolver.createSolver("SimpleMipProgram", "CBC"); // [END solver] // [START variables] diff --git a/libs/or-tools-src-ubuntu/examples/java/StiglerMIP.java b/libs/or-tools-src-ubuntu/examples/java/StiglerMIP.java index 63f4580d56e0c0a2a64a77d2b2ba774f087829fa..6b2b74f82c52d3dbcfa6de776edff0746ec44c81 100755 --- a/libs/or-tools-src-ubuntu/examples/java/StiglerMIP.java +++ b/libs/or-tools-src-ubuntu/examples/java/StiglerMIP.java @@ -32,12 +32,12 @@ public class StiglerMIP { System.loadLibrary("jniortools"); } - private static MPSolver createSolver(String solverType) { - return new MPSolver("MIPDiet", MPSolver.OptimizationProblemType.valueOf(solverType)); - } - private static void solve(String solverType) { - MPSolver solver = createSolver(solverType); + System.out.println("---- StiglerMIP with " + solverType); + + MPSolver solver = MPSolver.createSolver("CoinsGridMIP", solverType); + if (solver == null) return; + double infinity = MPSolver.infinity(); /** invariants */ @@ -282,23 +282,8 @@ public class StiglerMIP { } public static void main(String[] args) { - try { - System.out.println("---- Integer programming example with SCIP (recommended) ----"); - solve("SCIP_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } - try { - System.out.println("---- Integer programming example with CBC ----"); - solve("CBC_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } - try { - System.out.println("---- Integer programming example with GLPK ----"); - solve("GLPK_MIXED_INTEGER_PROGRAMMING"); - } catch (java.lang.IllegalArgumentException e) { - System.err.println("Bad solver type: " + e); - } + solve("SCIP"); + solve("CBC"); + solve("GLPK"); } } diff --git a/libs/or-tools-src-ubuntu/include/ortools/base/cleanup.h b/libs/or-tools-src-ubuntu/include/ortools/base/cleanup.h index f7919b05714b18ae561100864bf7fbf1c55422a9..41f3b6f39a04d81e0d16e22ed50e5d6a60ad2b8c 100644 --- a/libs/or-tools-src-ubuntu/include/ortools/base/cleanup.h +++ b/libs/or-tools-src-ubuntu/include/ortools/base/cleanup.h @@ -16,22 +16,110 @@ #include +#include "absl/base/macros.h" +#include "ortools/base/logging.h" + namespace absl { -template -class Cleanup { +namespace cleanup_internal { + +template +class Storage { + using InvokeT = absl::base_internal::InvokeT; + static_assert(std::is_same::value, ""); + static_assert(!std::is_reference::value, ""); + + public: + Storage() : contains_callback_(false), callback_() {} + + Storage(Storage&& other_storage) + : contains_callback_(other_storage.ContainsCallback()), + callback_(other_storage.ReleaseCallback()) {} + + template + explicit Storage(TheCallback&& the_callback) + : contains_callback_(true), + callback_(std::forward(the_callback)) {} + + template + Storage(Storage&& other_storage) // NOLINT + : contains_callback_(other_storage.ContainsCallback()), + callback_(other_storage.ReleaseCallback()) {} + + Storage& operator=(Storage&& other_storage) { + if (ContainsCallback()) std::move(callback_)(); + contains_callback_ = other_storage.ContainsCallback(); + callback_ = other_storage.ReleaseCallback(); + return *this; + } + + bool ContainsCallback() const { return contains_callback_; } + + Callback ReleaseCallback() { + contains_callback_ = false; + return std::move(callback_); + } + + void CancelCallback() { contains_callback_ = false; } + + void InvokeCallback() { + CancelCallback(); + + std::move(callback_)(); + } + + private: + bool contains_callback_; + Callback callback_; +}; + +struct AccessStorage { + template