From aa4f6537fea8b509e3a53186d210a41b7ac227f4 Mon Sep 17 00:00:00 2001
From: Alinson S Xavier <axavier@anl.gov>
Date: Sun, 3 May 2020 10:48:05 -0500
Subject: [PATCH] Remove obsolete functions

---
 src/ReverseManufacturing.jl |  4 +-
 src/instance.jl             | 77 +------------------------------------
 2 files changed, 3 insertions(+), 78 deletions(-)

diff --git a/src/ReverseManufacturing.jl b/src/ReverseManufacturing.jl
index 4b98668..a84bdb2 100644
--- a/src/ReverseManufacturing.jl
+++ b/src/ReverseManufacturing.jl
@@ -2,7 +2,7 @@
 # Written by Alinson Santos Xavier <axavier@anl.gov>
 
 module ReverseManufacturing
-    include("dotdict.jl")
+    #include("dotdict.jl")
     include("instance.jl")
-    include("model.jl")
+    #include("model.jl")
 end
diff --git a/src/instance.jl b/src/instance.jl
index 634b0e7..ddc56d0 100644
--- a/src/instance.jl
+++ b/src/instance.jl
@@ -1,8 +1,7 @@
 # Copyright (C) 2020 Argonne National Laboratory
 # Written by Alinson Santos Xavier <axavier@anl.gov>
 
-using Printf, JSON, JSONSchema
-import Base.getindex, Base.time
+using JSON, JSONSchema
 
 
 struct Product
@@ -50,22 +49,6 @@ struct Instance
 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
     basedir = dirname(@__FILE__)
     json = JSON.parsefile(path)
@@ -160,61 +143,3 @@ function load(path::String)::Instance
     
     return Instance(products, collection_centers, plants)
 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