From 5693ef2aa244f00aeeb394a0c3634528cd4290e1 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 26 Jul 2023 10:25:11 -0500 Subject: [PATCH] Reformat source code --- src/model/resolve.jl | 25 ++++++++----------------- src/reports/products.jl | 3 ++- src/reports/write.jl | 6 +++++- test/src/model/resolve_test.jl | 3 ++- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/model/resolve.jl b/src/model/resolve.jl index c821eb1..2b220af 100644 --- a/src/model/resolve.jl +++ b/src/model/resolve.jl @@ -21,7 +21,10 @@ function resolve(model_old, instance::Instance; optimizer = nothing)::OrderedDic selected_pairs = Set() for ((node_old, t), var_old) in model_old[:is_open] if JuMP.value(var_old) > 0.1 - push!(selected_pairs, (node_old.location.plant_name, node_old.location.location_name)) + push!( + selected_pairs, + (node_old.location.plant_name, node_old.location.location_name), + ) end end filtered_plants = [] @@ -63,10 +66,7 @@ function _fix_plants!(model_old, model_new)::Nothing # Fix open_plant variables for ((node_old, t), var_old) in model_old[:open_plant] value_old = JuMP.value(var_old) - key = ( - node_old.location.plant_name, - node_old.location.location_name, - ) + key = (node_old.location.plant_name, node_old.location.location_name) key ∈ keys(model_new[:graph].name_to_process_node_map) || continue node_new = model_new[:graph].name_to_process_node_map[key] var_new = model_new[:open_plant][node_new, t] @@ -78,10 +78,7 @@ function _fix_plants!(model_old, model_new)::Nothing for ((node_old, t), var_old) in model_old[:is_open] t > 0 || continue value_old = JuMP.value(var_old) - key = ( - node_old.location.plant_name, - node_old.location.location_name, - ) + key = (node_old.location.plant_name, node_old.location.location_name) key ∈ keys(model_new[:graph].name_to_process_node_map) || continue node_new = model_new[:graph].name_to_process_node_map[key] var_new = model_new[:is_open][node_new, t] @@ -92,10 +89,7 @@ function _fix_plants!(model_old, model_new)::Nothing # Fix plant capacities for ((node_old, t), var_old) in model_old[:capacity] value_old = JuMP.value(var_old) - key = ( - node_old.location.plant_name, - node_old.location.location_name, - ) + key = (node_old.location.plant_name, node_old.location.location_name) key ∈ keys(model_new[:graph].name_to_process_node_map) || continue node_new = model_new[:graph].name_to_process_node_map[key] var_new = model_new[:capacity][node_new, t] @@ -108,10 +102,7 @@ function _fix_plants!(model_old, model_new)::Nothing for ((node_old, t), var_old) in model_old[:expansion] t > 0 || continue value_old = JuMP.value(var_old) - key = ( - node_old.location.plant_name, - node_old.location.location_name, - ) + key = (node_old.location.plant_name, node_old.location.location_name) key ∈ keys(model_new[:graph].name_to_process_node_map) || continue node_new = model_new[:graph].name_to_process_node_map[key] var_new = model_new[:expansion][node_new, t] diff --git a/src/reports/products.jl b/src/reports/products.jl index a1a7799..d67b142 100644 --- a/src/reports/products.jl +++ b/src/reports/products.jl @@ -53,4 +53,5 @@ function products_report(solution; marginal_costs)::DataFrame return df end -write_products_report(solution, filename; marginal_costs = true) = CSV.write(filename, products_report(solution; marginal_costs)) +write_products_report(solution, filename; marginal_costs = true) = + CSV.write(filename, products_report(solution; marginal_costs)) diff --git a/src/reports/write.jl b/src/reports/write.jl index 898b8cf..2bd1ad7 100644 --- a/src/reports/write.jl +++ b/src/reports/write.jl @@ -13,7 +13,11 @@ function write(solution::AbstractDict, filename::AbstractString) end end -function write_reports(solution::AbstractDict, basename::AbstractString; marginal_costs = true) +function write_reports( + solution::AbstractDict, + basename::AbstractString; + marginal_costs = true, +) RELOG.write_products_report(solution, "$(basename)_products.csv"; marginal_costs) RELOG.write_plants_report(solution, "$(basename)_plants.csv") RELOG.write_plant_outputs_report(solution, "$(basename)_plant_outputs.csv") diff --git a/test/src/model/resolve_test.jl b/test/src/model/resolve_test.jl index 80bb8cd..04b0c5c 100644 --- a/test/src/model/resolve_test.jl +++ b/test/src/model/resolve_test.jl @@ -14,7 +14,8 @@ function model_resolve_test() @testset "Resolve (heuristic)" begin # Shoud not crash filename = fixture("s1.json") - solution_old, model_old = RELOG.solve(filename, return_model = true, heuristic = true) + solution_old, model_old = + RELOG.solve(filename, return_model = true, heuristic = true) solution_new = RELOG.resolve(model_old, filename) end end