ANL-CEEESA/RELOG
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/RELOG.git synced 2025-12-05 23:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes to limits

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-04-03 14:14:53 -05:00
parent 021a657ba9
commit 7657f0375d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/model.jl
View File

@@ -189,13 +189,13 @@ function create_nodes_and_arcs(instance)
disposal_cost = 0.0
disposal_limit = 0.0
if "disposal" in keys(location) product_name in keys(location["disposal"])
if "disposal" in keys(location) && product_name in keys(location["disposal"])
dict = location["disposal"][product_name]
disposal_cost = dict["cost"]
if "limit" in keys(dict)
disposal_limit = dict["limit"]
else
disposal_limit = 1e30
disposal_limit = 1e10
end
end
@@ -260,7 +260,9 @@ function create_nodes_and_arcs(instance)
for dest_plant in product["input plants"]
for dest_location_name in keys(dest_plant["locations"])
dest_location = dest_plant["locations"][dest_location_name]
source = shipping_nodes[product_name, source_plant["name"], source_location_name]
source = shipping_nodes[product_name,
source_plant["name"],
source_location_name]
dest = process_nodes[product_name, dest_plant["name"], dest_location_name]
distance = calculate_distance(source_location["latitude"],
source_location["longitude"],
@@ -347,7 +349,7 @@ function get_solution(instance::ReverseManufacturingInstance,
# Inputs
for a in process_node.incoming_arcs
if vals[a] <= 0
if vals[a] <= 1e-3
continue
end
skip_plant = skip_location = false
@@ -395,7 +397,7 @@ function get_solution(instance::ReverseManufacturingInstance,
end
for a in shipping_node.outgoing_arcs
if vals[a] <= 0
if vals[a] <= 1e-3
continue
end
skip_plant = skip_location = false