From f59dbfe1409e6e824965498b6d8a23b30d315b27 Mon Sep 17 00:00:00 2001 From: Vlad_kv Date: Tue, 12 Nov 2019 11:59:56 +0300 Subject: [PATCH] =?UTF-8?q?op=5Fwith=5Fnominally=5Fmooring=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B8=D0=BD=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20?= =?UTF-8?q?=D1=81=200-=D0=BB=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constraints/conversion_2.mzn | 2 +- src/constraints/conversion_2_greedy.mzn | 2 +- src/constraints/conversion_2_greedy_v2.mzn | 2 +- src/constraints/conversion_2_with_partial_cargo_operations.mzn | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/constraints/conversion_2.mzn b/src/constraints/conversion_2.mzn index c686365..f3e324a 100644 --- a/src/constraints/conversion_2.mzn +++ b/src/constraints/conversion_2.mzn @@ -56,7 +56,7 @@ array [0..n_moving_obj, 0..n_operations] of bool : moving_op_of_obj; % Операции с условной швартовкой. int : op_with_nominally_mooring_max_size; array [0..n_locations, 0..n_moving_obj] of 0..op_with_nominally_mooring_max_size : op_with_nominally_mooring_sizes; - array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 1..n_operations : op_with_nominally_mooring; + array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 0..n_operations : op_with_nominally_mooring; % current_moored_obj соответствуе какому-либо реально пришвартованному объекту. constraint forall (loc in 1..n_locations, t in 1..n_intervals where loc mod 2 = 0) ( diff --git a/src/constraints/conversion_2_greedy.mzn b/src/constraints/conversion_2_greedy.mzn index 13da1ab..177d833 100644 --- a/src/constraints/conversion_2_greedy.mzn +++ b/src/constraints/conversion_2_greedy.mzn @@ -56,7 +56,7 @@ array [0..n_moving_obj, 0..n_operations] of bool : moving_op_of_obj; % Операции с условной швартовкой. int : op_with_nominally_mooring_max_size; array [0..n_locations, 0..n_moving_obj] of 0..op_with_nominally_mooring_max_size : op_with_nominally_mooring_sizes; - array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 1..n_operations : op_with_nominally_mooring; + array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 0..n_operations : op_with_nominally_mooring; % current_moored_obj соответствуе какому-либо реально пришвартованному объекту. constraint forall (loc in 1..n_locations, t in 1..n_intervals, obj = current_moored_obj[loc, t] diff --git a/src/constraints/conversion_2_greedy_v2.mzn b/src/constraints/conversion_2_greedy_v2.mzn index ae7b8ed..929f91c 100644 --- a/src/constraints/conversion_2_greedy_v2.mzn +++ b/src/constraints/conversion_2_greedy_v2.mzn @@ -56,7 +56,7 @@ array [0..n_moving_obj, 0..n_operations] of bool : moving_op_of_obj; % Операции с условной швартовкой. int : op_with_nominally_mooring_max_size; array [0..n_locations, 0..n_moving_obj] of 0..op_with_nominally_mooring_max_size : op_with_nominally_mooring_sizes; - array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 1..n_operations : op_with_nominally_mooring; + array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 0..n_operations : op_with_nominally_mooring; % current_moored_obj соответствуе какому-либо реально пришвартованному объекту. constraint forall (loc in 1..n_locations, t in 1..n_intervals where loc mod 2 = 0) ( diff --git a/src/constraints/conversion_2_with_partial_cargo_operations.mzn b/src/constraints/conversion_2_with_partial_cargo_operations.mzn index f110cee..14b227f 100644 --- a/src/constraints/conversion_2_with_partial_cargo_operations.mzn +++ b/src/constraints/conversion_2_with_partial_cargo_operations.mzn @@ -56,7 +56,7 @@ array [0..n_moving_obj, 0..n_operations] of bool : moving_op_of_obj; % Операции с условной швартовкой. int : op_with_nominally_mooring_max_size; array [0..n_locations, 0..n_moving_obj] of 0..op_with_nominally_mooring_max_size : op_with_nominally_mooring_sizes; - array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 1..n_operations : op_with_nominally_mooring; + array [0..n_locations, 0..n_moving_obj, 1..op_with_nominally_mooring_max_size] of 0..n_operations : op_with_nominally_mooring; % current_moored_obj соответствуе какому-либо реально пришвартованному объекту. constraint forall (loc in 1..n_locations, t in 1..n_intervals, obj = current_moored_obj[loc, t] -- GitLab