From 02688907b0ef86bfc96b5a5f56fd7e2d542452e3 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:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D1=82=D0=B5=D0=BF=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B0=D1=89=D1=91=D0=BD=20=D0=BA=20=D0=B6=D0=B8=D0=B7=D0=BD?=
 =?UTF-8?q?=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constraints/conversion_1.mzn |  2 +-
 src/inport/ConversionUtil.java   | 16 ++++++++++------
 src/inport/Main.java             |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/constraints/conversion_1.mzn b/src/constraints/conversion_1.mzn
index 6fb0e7b..64f2f6c 100644
--- a/src/constraints/conversion_1.mzn
+++ b/src/constraints/conversion_1.mzn
@@ -279,7 +279,7 @@ constraint forall (obj in 1..n_moving_obj, t in 1..n_intervals) ( % Само о
 solve minimize sum(is_not_terminated);
 
 output [show(sum(is_not_terminated)), "\n",
-        show(op_status), "\n\n",
+        "op_status = ", show(op_status), "\n\n",
         "m_obj_loc = ", show(m_obj_loc), "\n\n",
         "op_fin = ", show(op_fin), "\n\n",
         "op_start = ", show(op_start), "\n\n",
diff --git a/src/inport/ConversionUtil.java b/src/inport/ConversionUtil.java
index bcb9a93..de26307 100644
--- a/src/inport/ConversionUtil.java
+++ b/src/inport/ConversionUtil.java
@@ -875,10 +875,14 @@ public class ConversionUtil {
             }
         }
 
-        private void movingObjectLocationDefinition() throws IOException {
-            writeArray(writer, "is_mooring_op", isMooringOp);
-            writeArray(writer, "main_obj_of_operation", mainObjOfOperation, (Integer val) -> val + 1);
-            writeArrayOfSetAs2DArray(writer, "moving_op_of_obj", movingOpOfObj, true, true);
+        private void movingObjectLocationDefinition(boolean isV1) throws IOException {
+            if (! isV1) {
+                writeArray(writer, "is_mooring_op", isMooringOp);
+                writeArray(writer, "main_obj_of_operation", mainObjOfOperation, (Integer val) -> val + 1);
+                writeArrayOfSetAs2DArray(writer, "moving_op_of_obj", movingOpOfObj, true, true);
+            } else {
+                writeArrayOfSetAs2DArray(writer, "moving_op_of_obj", movingOpOfObj, true, false);
+            }
             writeArray(writer, "operations_destination", operationsDestination, (Integer val) -> val + 1);
             writer.write("\n");
         }
@@ -935,7 +939,7 @@ public class ConversionUtil {
                 writer.write("n_moving_obj = " + movingObjects.size() + ";\n");
                 writer.write("\n");
 
-                movingObjectLocationDefinition();
+                movingObjectLocationDefinition(true);
                 initialLocations();
                 weatherWindows();
                 operationsContinuity();
@@ -1150,7 +1154,7 @@ public class ConversionUtil {
                 writer.write("n_moving_obj = " + movingObjects.size() + ";\n");
                 writer.write("\n");
 
-                movingObjectLocationDefinition();
+                movingObjectLocationDefinition(false);
                 initialLocations();
                 finalLocations();
                 weatherWindowsNewFormat();
diff --git a/src/inport/Main.java b/src/inport/Main.java
index f66a02f..1259478 100644
--- a/src/inport/Main.java
+++ b/src/inport/Main.java
@@ -116,6 +116,7 @@ public class Main {
             }
             case "testing" :
                 test_2();
+                test_1();
                 break;
             case "testing_2":
                 test_2_0();
-- 
GitLab