diff --git a/instances/s1.json b/instances/s1.json index 8f40f3c..840f179 100644 --- a/instances/s1.json +++ b/instances/s1.json @@ -121,7 +121,12 @@ "capacity": 1000, "opening cost": [3000, 3000], "fixed operating cost": [50.0, 50.0], - "variable operating cost": [50.0, 50.0] + "variable operating cost": [50.0, 50.0], + "disposal": { + "P3": { + "cost": [100.0, 100.0] + } + } }, "L4": { "latitude": 0.75, diff --git a/src/RELOG.jl b/src/RELOG.jl index f460478..dd677ca 100644 --- a/src/RELOG.jl +++ b/src/RELOG.jl @@ -1,7 +1,7 @@ # Copyright (C) 2020 Argonne National Laboratory # Written by Alinson Santos Xavier -module ReverseManufacturing +module RELOG include("dotdict.jl") include("instance.jl") include("graph.jl") diff --git a/src/model.jl b/src/model.jl index 8f55968..64c1139 100644 --- a/src/model.jl +++ b/src/model.jl @@ -155,13 +155,13 @@ end function solve(filename::String; optimizer=Cbc.Optimizer) println("Reading $filename...") - instance = ReverseManufacturing.load(filename) + instance = RELOG.load(filename) println("Building graph...") - graph = ReverseManufacturing.build_graph(instance) + graph = RELOG.build_graph(instance) println("Building optimization model...") - model = ReverseManufacturing.build_model(instance, graph, optimizer) + model = RELOG.build_model(instance, graph, optimizer) println("Optimizing...") JuMP.optimize!(model.mip)