[FZ] reorganize code; actually generate constant elements
This commit is contained in:
committed by
Corentin Le Molgat
parent
5d85f840b5
commit
2a352d1f3f
File diff suppressed because it is too large
Load Diff
@@ -6,8 +6,18 @@ predicate symmetry_breaking_constraint(var bool: b) = (b) :: symmetry_breaking;
|
||||
predicate redundant_constraint(var bool: b) = (b) :: redundant;
|
||||
|
||||
% array_var_bool_element_nonshifted.
|
||||
predicate ortools_array_bool_element(var int: idx,
|
||||
set of int: index_set_of_x,
|
||||
array [int] of bool: x,
|
||||
var bool: c);
|
||||
|
||||
predicate array_var_bool_element_nonshifted(var int: idx,
|
||||
array [int] of bool: x,
|
||||
var bool: c) =
|
||||
ortools_array_bool_element(idx, index_set(x), x, c);
|
||||
|
||||
predicate ortools_array_var_bool_element(var int: idx,
|
||||
set of int: domain_of_x,
|
||||
set of int: index_set_of_x,
|
||||
array [int] of var bool: x,
|
||||
var bool: c);
|
||||
|
||||
@@ -16,9 +26,21 @@ predicate array_var_bool_element_nonshifted(var int: idx,
|
||||
var bool: c) =
|
||||
ortools_array_var_bool_element(idx, index_set(x), x, c);
|
||||
|
||||
|
||||
|
||||
% array_var_int_element_nonshifted.
|
||||
predicate ortools_array_int_element(var int: idx,
|
||||
set of int: index_set_of_x,
|
||||
array [int] of int: x,
|
||||
var int: c);
|
||||
|
||||
predicate array_var_int_element_nonshifted(var int: idx,
|
||||
array [int] of int: x,
|
||||
var int: c) =
|
||||
ortools_array_int_element(idx, index_set(x), x, c);
|
||||
|
||||
predicate ortools_array_var_int_element(var int: idx,
|
||||
set of int: domain_of_x,
|
||||
set of int: index_set_of_x,
|
||||
array [int] of var int: x,
|
||||
var int: c);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user