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

Remove obsolete functions

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-05-03 10:48:05 -05:00
parent 3c7214d419
commit aa4f6537fe
2 changed files with 3 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ReverseManufacturing.jl
View File

@@ -2,7 +2,7 @@
# Written by Alinson Santos Xavier <axavier@anl.gov> # Written by Alinson Santos Xavier <axavier@anl.gov>
module ReverseManufacturing module ReverseManufacturing
include("dotdict.jl") #include("dotdict.jl")
include("instance.jl") include("instance.jl")
include("model.jl") #include("model.jl")
end end

77
src/instance.jl
View File

@@ -1,8 +1,7 @@
# Copyright (C) 2020 Argonne National Laboratory # Copyright (C) 2020 Argonne National Laboratory
# Written by Alinson Santos Xavier <axavier@anl.gov> # Written by Alinson Santos Xavier <axavier@anl.gov>
using Printf, JSON, JSONSchema using JSON, JSONSchema
import Base.getindex, Base.time
struct Product struct Product
@@ -50,22 +49,6 @@ struct Instance
end end
mutable struct ReverseManufacturingInstance
json::Dict
products::Dict
plants::Dict
end
function Base.show(io::IO, instance::ReverseManufacturingInstance)
n_plants = length(instance["plants"])
n_products = length(instance["products"])
print(io, "ReverseManufacturingInstance with ")
print(io, "$n_plants plants, ")
print(io, "$n_products products")
end
function load(path::String)::Instance function load(path::String)::Instance
basedir = dirname(@__FILE__) basedir = dirname(@__FILE__)
json = JSON.parsefile(path) json = JSON.parsefile(path)
@@ -160,61 +143,3 @@ function load(path::String)::Instance
return Instance(products, collection_centers, plants) return Instance(products, collection_centers, plants)
end end
function readfile(path::String)::ReverseManufacturingInstance
basedir = dirname(@__FILE__)
json = JSON.parsefile(path)
schema = Schema(JSON.parsefile("$basedir/schemas/input.json"))
validation_results = JSONSchema.validate(json, schema)
if validation_results !== nothing
println(validation_results)
throw("Invalid input file")
end
for plant_name in keys(json["plants"])
"outputs" in keys(json["plants"][plant_name]) || continue
for output_name in keys(json["plants"][plant_name]["outputs"])
if json["plants"][plant_name]["outputs"][output_name] < 1e-5
delete!(json["plants"][plant_name]["outputs"], output_name)
end
end
end
products = Dict(key => json["products"][key]
for key in keys(json["products"]))
plants = Dict(key => json["plants"][key]
for key in keys(json["plants"]))
for product_name in keys(products)
product = products[product_name]
product["name"] = product_name
product["input plants"] = []
product["output plants"] = []
end
for plant_name in keys(plants)
plant = plants[plant_name]
plant["name"] = plant_name
# Input product
input_product = products[plant["input"]]
plant["input product"] = input_product
push!(input_product["input plants"], plant)
# Output products
if !haskey(plant, "outputs")
plant["outputs"] = Dict()
end
for product_name in keys(plant["outputs"])
product = products[product_name]
push!(product["output plants"], plant)
end
end
return ReverseManufacturingInstance(json, products, plants)
end
export ReverseManufacturingInstance