[CP-SAT] improve cp_model.h; improve examples with arithmetic operators

2021-12-11 12:24:04 +01:00
parent 018bf0b556
commit a7a4d84f42
9 changed files with 291 additions and 274 deletions
--- a/examples/cpp/variable_intervals_sat.cc
+++ b/examples/cpp/variable_intervals_sat.cc
@@ -24,7 +24,7 @@ void Solve() {
  const IntVar end_p2 = cp_model.NewIntVar(Domain(500, 1000));
  const IntervalVar p2 = cp_model.NewIntervalVar(start_p2, duration_p2, end_p2);

-  cp_model.AddEquality(LinearExpr::Sum({duration_p1, duration_p2}), 360);
+  cp_model.AddEquality(duration_p1 + duration_p2, 360);
  cp_model.AddLessOrEqual(end_p1, start_p2);

  cp_model.AddNoOverlap({ins, p1, p2});