From fd4b24218011cc54736c29ad9f476623109a7467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=81=D0=B5=D0=BB=D1=91=D0=B2=20=D0=92=D0=BB?= =?UTF-8?q?=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?= Date: Sun, 28 Apr 2019 20:30:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BF=D1=80=D0=BE=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constraints/conversion_2.mzn | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/constraints/conversion_2.mzn b/src/constraints/conversion_2.mzn index 97e86ee..fcaf9ee 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] ); % Изменение грузов в хранилищах. -- GitLab