Commit 02688907 authored by Vladislav Kiselev's avatar Vladislav Kiselev

Нетепизированный формат возвращён к жизни.

parent 0e9f1054
...@@ -279,7 +279,7 @@ constraint forall (obj in 1..n_moving_obj, t in 1..n_intervals) ( % Само о ...@@ -279,7 +279,7 @@ constraint forall (obj in 1..n_moving_obj, t in 1..n_intervals) ( % Само о
solve minimize sum(is_not_terminated); solve minimize sum(is_not_terminated);
output [show(sum(is_not_terminated)), "\n", 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", "m_obj_loc = ", show(m_obj_loc), "\n\n",
"op_fin = ", show(op_fin), "\n\n", "op_fin = ", show(op_fin), "\n\n",
"op_start = ", show(op_start), "\n\n", "op_start = ", show(op_start), "\n\n",
......
...@@ -875,10 +875,14 @@ public class ConversionUtil { ...@@ -875,10 +875,14 @@ public class ConversionUtil {
} }
} }
private void movingObjectLocationDefinition() throws IOException { private void movingObjectLocationDefinition(boolean isV1) throws IOException {
writeArray(writer, "is_mooring_op", isMooringOp); if (! isV1) {
writeArray(writer, "main_obj_of_operation", mainObjOfOperation, (Integer val) -> val + 1); writeArray(writer, "is_mooring_op", isMooringOp);
writeArrayOfSetAs2DArray(writer, "moving_op_of_obj", movingOpOfObj, true, true); 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); writeArray(writer, "operations_destination", operationsDestination, (Integer val) -> val + 1);
writer.write("\n"); writer.write("\n");
} }
...@@ -935,7 +939,7 @@ public class ConversionUtil { ...@@ -935,7 +939,7 @@ public class ConversionUtil {
writer.write("n_moving_obj = " + movingObjects.size() + ";\n"); writer.write("n_moving_obj = " + movingObjects.size() + ";\n");
writer.write("\n"); writer.write("\n");
movingObjectLocationDefinition(); movingObjectLocationDefinition(true);
initialLocations(); initialLocations();
weatherWindows(); weatherWindows();
operationsContinuity(); operationsContinuity();
...@@ -1150,7 +1154,7 @@ public class ConversionUtil { ...@@ -1150,7 +1154,7 @@ public class ConversionUtil {
writer.write("n_moving_obj = " + movingObjects.size() + ";\n"); writer.write("n_moving_obj = " + movingObjects.size() + ";\n");
writer.write("\n"); writer.write("\n");
movingObjectLocationDefinition(); movingObjectLocationDefinition(false);
initialLocations(); initialLocations();
finalLocations(); finalLocations();
weatherWindowsNewFormat(); weatherWindowsNewFormat();
......
...@@ -116,6 +116,7 @@ public class Main { ...@@ -116,6 +116,7 @@ public class Main {
} }
case "testing" : case "testing" :
test_2(); test_2();
test_1();
break; break;
case "testing_2": case "testing_2":
test_2_0(); test_2_0();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment