From 1b43d12ef85523c7fbaa7a8aeb840bed8c7e6640 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?=
 <vladislav-a-k@mail.ru>
Date: Mon, 1 Apr 2019 07:28:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B,=20?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BB=D0=B8=D1=88?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constraints/conversion_2.mzn | 21 ---------------------
 tests/with_typing/v2.tipp        |  4 ++--
 tests/without_typing/Case2.ipp   | 20 ++------------------
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/src/constraints/conversion_2.mzn b/src/constraints/conversion_2.mzn
index d6be3a5..125f5df 100644
--- a/src/constraints/conversion_2.mzn
+++ b/src/constraints/conversion_2.mzn
@@ -162,27 +162,6 @@ array [1..n_operations] of 1..n_locations : operations_destination; % Локац
             )
         );
 
-/* TODO разобраться и удалить лишнее.
-        % { Если объект участвует как ресурс в операции перемещения (не швартовки), то это согласованно с current_moving_operation,
-        %   иначе (как ресурс в погрузке или швартове) - он должен стоять на месте. }
-        constraint forall (obj in 1..n_moving_obj, t in 1..n_intervals) (
-            (participation_as_resource[obj, t] != 0) -> (
-                (    (is_moving_operation[participation_as_resource[obj, t]] /\
-                      (not is_mooring_op[participation_as_resource[obj, t]])
-                     ) -> (
-                        (current_moving_operation[obj, t] != 0)
-                            /\
-                        (participation_as_resource[obj, t] = moving_op_of_obj[obj, current_moving_operation[obj, t]])
-                     )
-                )
-                     /\
-                (not (is_moving_operation[participation_as_resource[obj, t]] /\
-                     (not is_mooring_op[participation_as_resource[obj, t]])
-                     ) -> current_moving_operation[obj, t] = 0)
-            )
-        );
-*/
-
         % Если объект участвует как ресурс в операции перемещения, то это согласованно с current_moving_operation.
         constraint forall (obj in 1..n_moving_obj, t in 1..n_intervals) (
             (participation_as_resource[obj, t] != 0) -> (
diff --git a/tests/with_typing/v2.tipp b/tests/with_typing/v2.tipp
index 1b6ff24..8e0c354 100644
--- a/tests/with_typing/v2.tipp
+++ b/tests/with_typing/v2.tipp
@@ -39,9 +39,9 @@ Templates
 4009; mov; []; 1001; 18; 19; [1002]; 1.0
 15; mov; []; 1002; 18; 17; []; 1.0
 16; mov; []; 1002; 19; 17; []; 1.0
-18; mov; []; 1002; 19; 18; []; 0.1
+18; mov; []; 1002; 19; 18; []; 1.0
 14; mov; []; 1002; 17; 19; []; 1.0
-17; mov; []; 1002; 18; 19; []; 0.1
+17; mov; []; 1002; 18; 19; []; 1.0
 13; mov; []; 1002; 17; 18; []; 1.0
 3998; loa; []; 20; 22; 1001; 18; []; 200.0; U
 3996; loa; []; 1001; 22; 20; 18; []; 200.0; U
diff --git a/tests/without_typing/Case2.ipp b/tests/without_typing/Case2.ipp
index 0de804c..cc79156 100644
--- a/tests/without_typing/Case2.ipp
+++ b/tests/without_typing/Case2.ipp
@@ -65,21 +65,5 @@ Task Properties
 20.0;0
 
 Solution
-15.0
-15; R; 0.0; 1.0
-8; R; 1.0; 2.0
-12; R; 2.0; 1.0
-14; R; 3.0; 1.0
-2; R; 3.0; 2.0
-7; R; 3.0; 5.0
-4; R; 8.0; 1.0
-12; R; 9.0; 1.0
-2; R; 9.0; 1.0
-7; R; 9.0; 1.0
-11; R; 10.0; 1.0
-4; R; 10.0; 1.0
-13; R; 11.0; 1.0
-5; R; 11.0; 1.0
-14; R; 12.0; 1.0
-4; R; 12.0; 3.0
-11; R; 14.0; 1.0
+16.0
+
-- 
GitLab