always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update examples

Browse Source
This commit is contained in:
Laurent Perron
2019-08-06 15:57:08 -07:00
parent 6c8cedcf22
commit 24e21cb7cf
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cpp/sat_runner.cc
View File

@@ -277,8 +277,8 @@ int Run() {
}
}
auto strtoint64 = [](const std::string& word) {
int64 value;
CHECK(absl::SimpleAtoi(word, &value));
int64 value = 0;
if (!word.empty()) CHECK(absl::SimpleAtoi(word, &value));
return value;
};
if (!AddObjectiveConstraint(problem, !FLAGS_lower_bound.empty(),

10
examples/tests/TestConstraintSolver.java
View File

@@ -115,7 +115,7 @@ public class TestConstraintSolver {
DecisionBuilder db =
solver.makePhase(vars, Solver.CHOOSE_FIRST_UNBOUND, Solver.ASSIGN_MAX_VALUE);
MoveOneVar moveOneVar = new MoveOneVar(vars);
LocalSearchPhaseParameters lsParams = solver.makeLocalSearchPhaseParameters(moveOneVar, db);
LocalSearchPhaseParameters lsParams = solver.makeLocalSearchPhaseParameters(sumVar, moveOneVar, db);
DecisionBuilder ls = solver.makeLocalSearchPhase(vars, db, lsParams);
SolutionCollector collector = solver.makeLastSolutionCollector();
collector.addObjective(sumVar);
@@ -139,7 +139,8 @@ public class TestConstraintSolver {
}
@Override
public boolean accept(Assignment delta, Assignment unusedDeltadelta) {
public boolean accept(Assignment delta, Assignment unusedDeltadelta, long unusedObjectiveMin,
long unusedObjectiveMax) {
AssignmentIntContainer solutionDelta = delta.intVarContainer();
int solutionDeltaSize = solutionDelta.size();
@@ -173,7 +174,7 @@ public class TestConstraintSolver {
IntVarLocalSearchFilter[] filters = new IntVarLocalSearchFilter[1];
filters[0] = filter;
LocalSearchPhaseParameters lsParams =
solver.makeLocalSearchPhaseParameters(moveOneVar, db, null, filters);
solver.makeLocalSearchPhaseParameters(sumVar, moveOneVar, db, null, filters);
DecisionBuilder ls = solver.makeLocalSearchPhase(vars, db, lsParams);
SolutionCollector collector = solver.makeLastSolutionCollector();
collector.addObjective(sumVar);
@@ -215,7 +216,8 @@ public class TestConstraintSolver {
DecisionBuilder db =
solver.makePhase(vars, Solver.CHOOSE_FIRST_UNBOUND, Solver.ASSIGN_MAX_VALUE);
OneVarLns oneVarLns = new OneVarLns(vars);
LocalSearchPhaseParameters lsParams = solver.makeLocalSearchPhaseParameters(oneVarLns, db);
LocalSearchPhaseParameters lsParams =
solver.makeLocalSearchPhaseParameters(sumVar, oneVarLns, db);
DecisionBuilder ls = solver.makeLocalSearchPhase(vars, db, lsParams);
SolutionCollector collector = solver.makeLastSolutionCollector();
collector.addObjective(sumVar);