Rename decision nodes to shipping nodes

This commit is contained in:
2020-03-18 10:37:06 -05:00
parent cc49268ce4
commit ba28c350e0
2 changed files with 34 additions and 31 deletions

View File

@@ -8,17 +8,17 @@ using ReverseManufacturing, Cbc, JuMP, Printf
model = ReverseManufacturing.build_model(instance, Cbc.Optimizer)
# Verify nodes
@test ("P1", "Origin", "C1") in keys(model.decision_nodes)
@test ("P1", "Origin", "C3") in keys(model.decision_nodes)
@test ("P1", "Origin", "C8") in keys(model.decision_nodes)
@test ("P2", "F1", "L1") in keys(model.decision_nodes)
@test ("P2", "F1", "L2") in keys(model.decision_nodes)
@test ("P3", "F1", "L1") in keys(model.decision_nodes)
@test ("P3", "F1", "L2") in keys(model.decision_nodes)
@test ("P3", "F2", "L3") in keys(model.decision_nodes)
@test ("P3", "F2", "L4") in keys(model.decision_nodes)
@test ("P4", "F2", "L3") in keys(model.decision_nodes)
@test ("P4", "F2", "L4") in keys(model.decision_nodes)
@test ("P1", "Origin", "C1") in keys(model.shipping_nodes)
@test ("P1", "Origin", "C3") in keys(model.shipping_nodes)
@test ("P1", "Origin", "C8") in keys(model.shipping_nodes)
@test ("P2", "F1", "L1") in keys(model.shipping_nodes)
@test ("P2", "F1", "L2") in keys(model.shipping_nodes)
@test ("P3", "F1", "L1") in keys(model.shipping_nodes)
@test ("P3", "F1", "L2") in keys(model.shipping_nodes)
@test ("P3", "F2", "L3") in keys(model.shipping_nodes)
@test ("P3", "F2", "L4") in keys(model.shipping_nodes)
@test ("P4", "F2", "L3") in keys(model.shipping_nodes)
@test ("P4", "F2", "L4") in keys(model.shipping_nodes)
@test ("P1", "F1", "L1") in keys(model.process_nodes)
@test ("P1", "F1", "L2") in keys(model.process_nodes)
@test ("P2", "F2", "L3") in keys(model.process_nodes)
@@ -27,7 +27,7 @@ using ReverseManufacturing, Cbc, JuMP, Printf
@test ("P4", "F3", "L5") in keys(model.process_nodes)
# Verify some arcs
p1_orig_c1 = model.decision_nodes["P1", "Origin", "C1"]
p1_orig_c1 = model.shipping_nodes["P1", "Origin", "C1"]
p1_f1_l1 = model.process_nodes["P1", "F1", "L1"]
@test length(p1_orig_c1.outgoing_arcs) == 2
@test length(p1_f1_l1.incoming_arcs) == 10
@@ -38,7 +38,7 @@ using ReverseManufacturing, Cbc, JuMP, Printf
@test round(arc.costs["transportation"], digits=2) == 1643.43
@test arc.costs["variable"] == 70.0
p2_f1_l1 = model.decision_nodes["P2", "F1", "L1"]
p2_f1_l1 = model.shipping_nodes["P2", "F1", "L1"]
p2_f2_l3 = model.process_nodes["P2", "F2", "L3"]
@test length(p2_f1_l1.incoming_arcs) == 1
@test length(p2_f1_l1.outgoing_arcs) == 2