From 043fe87acef393bbda2610acb73710c9acd431b0 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: Mon, 8 Jul 2019 11:23:13 +0300 Subject: [PATCH] cleanup --- src/constraints/conversion_2_greedy_v2.mzn | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/constraints/conversion_2_greedy_v2.mzn b/src/constraints/conversion_2_greedy_v2.mzn index 97af56a..23db4ca 100644 --- a/src/constraints/conversion_2_greedy_v2.mzn +++ b/src/constraints/conversion_2_greedy_v2.mzn @@ -523,23 +523,6 @@ array [0..n_operations] of 0..n_locations : operations_destination; % Локац ) ); - - constraint forall (storage in 1..n_all_storage_sections, t in 1..(n_intervals + 1)) ( - debug_storage_used_volume[storage, t] = ( - storage_used_volume[storage, t - 1] + - cargo_flows[storage, t] + - (sum (op in involved_operations_as_sec_stor[storage]) ( real_cargo_value[op, t])) + - (sum (op in involved_operations_as_main_stor[storage]) (-real_cargo_value[op, t])) - ) - ); - - array [0..n_all_storage_sections, 0..(n_intervals + 1)] of var int : debug_storage_used_volume; - constraint forall (t in 0..(n_intervals + 1)) (debug_storage_used_volume[0, t] = 0); % Фиктивный объект. - - constraint forall (storage in 1..n_all_storage_sections) ( % Initial values. - debug_storage_used_volume[storage, 0] = initial_storage_vol[storage] - ); - /* constraint forall (storage in 1..n_all_storage_sections, t in 1..(n_intervals + 1)) ( storage_used_volume[storage, t] = ( @@ -693,11 +676,6 @@ output [show(sum(is_not_terminated)), "\n", "real_cargo_value {", show(n_intervals + 2), "} = ", show(real_cargo_value), "\n\n", "current_partial_cargo_op {", show(n_intervals + 1), "} = ", show(current_partial_cargo_op), "\n\n", - % "debug_1 {", show(max_number_of_connected_sections + 1), " ", show(n_intervals + 1), "} = ", show(debug_1), "\n\n", - - "debug_storage_used_volume = ", show(debug_storage_used_volume), "\n\n", - - /* "is_op_possible {", show(n_intervals), "} = ", show(is_op_possible), "\n\n", "debug_1 {", show(n_intervals), "} = ", show(debug_1), "\n\n", -- GitLab