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

fix issue #44 (wrong url in comment)

Browse Source
This commit is contained in:
Laurent Perron
2015-10-21 15:12:26 +02:00
parent 9dd33ce40b
commit 00081fdb05
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/csharp/organize_day.cs
View File

@@ -46,7 +46,7 @@ public class OrganizeDay
*
* Problem formulation from ECLiPSe:
* Slides on (Finite Domain) Constraint Logic Programming, page 38f
* http://eclipse-clp.org/reports/eclipse.ppt
* http://eclipseclp.org/reports/eclipse.ppt
*
*
* Also see http://www.hakank.org/google_or_tools/organize_day.py

2
examples/csharp/organize_day_intervals.cs
View File

@@ -29,7 +29,7 @@ public class OrganizeDay
*
* Problem formulation from ECLiPSe:
* Slides on (Finite Domain) Constraint Logic Programming, page 38f
* http://eclipse-clp.org/reports/eclipse.ppt
* http://eclipseclp.org/reports/eclipse.ppt
*
*
* Also see http://www.hakank.org/google_or_tools/organize_day.py

9
src/flatzinc/search.cc
View File

@@ -539,6 +539,15 @@ DecisionBuilder* FzSolver::CreateDecisionBuilders(const FzSolverParameters& p,
// Add the objective decision builder.
if (obj_db != nullptr) {
builders.push_back(obj_db);
} else if (model_.objective() != nullptr) {
// The model contains an objective, but the obj_db was not built.
IntVar* const obj_var = Extract(model_.objective())->Var();
obj_db = solver()->MakePhase(obj_var, Solver::CHOOSE_FIRST_UNBOUND,
model_.maximize() ? Solver::ASSIGN_MAX_VALUE
: Solver::ASSIGN_MIN_VALUE);
builders.push_back(obj_db);
FZVLOG << " - adding objective decision builder = "
<< obj_db->DebugString() << FZENDL;
}
// Add completion decision builders to be more robust.
AddCompletionDecisionBuilders(defined_variables, active_variables, limit,