diff --git a/src/constraints/conversion_2.mzn b/src/constraints/conversion_2.mzn index 97e86eea88c8a77ef810eb8f4a7fc89b955eb608..fcaf9eedfdd03238d56c39aaee639f228cc4f116 100644 --- a/src/constraints/conversion_2.mzn +++ b/src/constraints/conversion_2.mzn @@ -274,11 +274,9 @@ array [1..n_operations] of 1..n_locations : operations_destination; % Локац storage_used_volume[storage, 0, cargo] = initial_storage_vol[storage, cargo] ); - constraint forall (storage in 1..n_obj_with_storage, cargo in 1..n_cargo_types) ( % Final values. - if final_storage_vol[storage, cargo] >= 0 then - storage_used_volume[storage, n_intervals + 1, cargo] == final_storage_vol[storage, cargo] - else true - endif + constraint forall (storage in 1..n_obj_with_storage, cargo in 1..n_cargo_types % Final values. + where final_storage_vol[storage, cargo] >= 0) ( + storage_used_volume[storage, n_intervals + 1, cargo] = final_storage_vol[storage, cargo] ); % Изменение грузов в хранилищах.