From 43c00033a8b69fe9103fa7b47a3f0fd83f842cde Mon Sep 17 00:00:00 2001 From: "lperron@google.com" Date: Mon, 15 Nov 2010 15:07:46 +0000 Subject: [PATCH] fix assert in timetabling --- constraint_solver/timetabling.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/constraint_solver/timetabling.cc b/constraint_solver/timetabling.cc index f5ac34c7cf..3709dcae59 100644 --- a/constraint_solver/timetabling.cc +++ b/constraint_solver/timetabling.cc @@ -1037,7 +1037,9 @@ void LambdaThetaTree::ReComputeAux(int pos) { n.ect_opt = ect3; n.responsible_ect = responsible_ect(left(pos)); } - DCHECK_NE(-1, n.responsible_processing); + DCHECK_GE(n.processing_opt, n.processing); + DCHECK((n.responsible_processing != -1) || + (n.processing_opt == n.processing)); } } @@ -1423,8 +1425,9 @@ class DecomposedSequenceConstraint : public Constraint { do { do { do { + // OverloadChecking is symmetrical. It has the same effect on the + // straight and the mirrored version. straight_.OverloadChecking(); - mirror_.OverloadChecking(); } while (straight_.DetectablePrecedences() || mirror_.DetectablePrecedences()); } while (straight_not_last_.Propagate() ||