From 45c608e371d450a3dbace5462ed7e8cedea251ad Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Tue, 7 Jun 2022 07:41:36 +0200 Subject: [PATCH] fix warm_start redefinition --- ortools/flatzinc/mznlib/redefinitions-2.0.mzn | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ortools/flatzinc/mznlib/redefinitions-2.0.mzn b/ortools/flatzinc/mznlib/redefinitions-2.0.mzn index f65436344d..ea47763122 100644 --- a/ortools/flatzinc/mznlib/redefinitions-2.0.mzn +++ b/ortools/flatzinc/mznlib/redefinitions-2.0.mzn @@ -98,17 +98,5 @@ predicate int_lin_ne_imp(array [int] of int: as, array [int] of var int: bs, int: c, var bool: r); annotation warm_start_array( array[int] of ann: w ); -annotation warm_start( array[int] of var bool: x, array[int] of opt bool: v ) = - assert(index_sets_agree(x, v), "index sets of warm_start arguments don't agree", - let { - any: xx = [ x[i] | i in index_set(x) where occurs(v[i])]; - any: vv = [ deopt(v[i]) | i in index_set(x) where occurs(v[i])]; - } in warm_start(xx, vv)); -annotation warm_start( array[int] of var int: x, array[int] of opt int: v ) = - assert(index_sets_agree(x, v), "index sets of warm_start arguments don't agree", - let { - any: xx = [ x[i] | i in index_set(x) where occurs(v[i])]; - any: vv = [ deopt(v[i]) | i in index_set(x) where occurs(v[i])]; - } in warm_start(xx, vv));