Commit 043fe87a authored by Vladislav Kiselev's avatar Vladislav Kiselev

cleanup

parent 40b87b9c
...@@ -523,23 +523,6 @@ array [0..n_operations] of 0..n_locations : operations_destination; % Локац ...@@ -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)) ( constraint forall (storage in 1..n_all_storage_sections, t in 1..(n_intervals + 1)) (
storage_used_volume[storage, t] = ( storage_used_volume[storage, t] = (
...@@ -693,11 +676,6 @@ output [show(sum(is_not_terminated)), "\n", ...@@ -693,11 +676,6 @@ output [show(sum(is_not_terminated)), "\n",
"real_cargo_value {", show(n_intervals + 2), "} = ", show(real_cargo_value), "\n\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", "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", "is_op_possible {", show(n_intervals), "} = ", show(is_op_possible), "\n\n",
"debug_1 {", show(n_intervals), "} = ", show(debug_1), "\n\n", "debug_1 {", show(n_intervals), "} = ", show(debug_1), "\n\n",
......
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