From 46ae75ddec75bb79a2a95c953d1392a10d7266f9 Mon Sep 17 00:00:00 2001 From: Ni Wang Date: Wed, 17 Jan 2024 13:57:08 +0100 Subject: [PATCH 1/4] Change display of EnergyProblem --- src/structures.jl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/structures.jl b/src/structures.jl index e02c61ec..cdb8f0fe 100644 --- a/src/structures.jl +++ b/src/structures.jl @@ -160,3 +160,8 @@ mutable struct EnergyProblem ) end end + +function Base.show(io::IO, ep::EnergyProblem) + println(io, "Solved = ", ep.solved, "") + print(io, "Objective_value = ", ep.objective_value, "") +end From 6c59763cbb46ea378f1409fb829140307e39e600 Mon Sep 17 00:00:00 2001 From: Ni Wang Date: Wed, 17 Jan 2024 14:48:49 +0100 Subject: [PATCH 2/4] Add test --- src/structures.jl | 7 +++++-- test/test-case-studies.jl | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/structures.jl b/src/structures.jl index cdb8f0fe..57113de9 100644 --- a/src/structures.jl +++ b/src/structures.jl @@ -161,7 +161,10 @@ mutable struct EnergyProblem end end +""" +Customize the display of EnergyProblem in the REPL. +""" function Base.show(io::IO, ep::EnergyProblem) - println(io, "Solved = ", ep.solved, "") - print(io, "Objective_value = ", ep.objective_value, "") + println(io, "Solved = ", ep.solved) + print(io, "Objective_value = ", ep.objective_value) end diff --git a/test/test-case-studies.jl b/test/test-case-studies.jl index a8935029..eb8c094d 100644 --- a/test/test-case-studies.jl +++ b/test/test-case-studies.jl @@ -29,6 +29,7 @@ end write_lp_file = true, log_file = "model.log", ) + println(energy_problem) @test energy_problem.objective_value ≈ 269238.43825 atol = 1e-5 end end From 99ed777c1370b2c7a109b27a95e9e9227faaf5bc Mon Sep 17 00:00:00 2001 From: Ni Wang Date: Wed, 17 Jan 2024 15:26:32 +0100 Subject: [PATCH 3/4] Reset EnergyProblem after creating model --- src/create-model.jl | 3 +++ src/structures.jl | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/create-model.jl b/src/create-model.jl index 92c5a3fc..a8a149ec 100644 --- a/src/create-model.jl +++ b/src/create-model.jl @@ -11,6 +11,9 @@ function create_model!(energy_problem; kwargs...) constraints_partitions = energy_problem.constraints_partitions energy_problem.model = create_model(graph, representative_periods, constraints_partitions; kwargs...) + energy_problem.termination_status = JuMP.OPTIMIZE_NOT_CALLED + energy_problem.solved = false + energy_problem.objective_value = NaN return energy_problem end diff --git a/src/structures.jl b/src/structures.jl index 57113de9..aa362e94 100644 --- a/src/structures.jl +++ b/src/structures.jl @@ -165,6 +165,7 @@ end Customize the display of EnergyProblem in the REPL. """ function Base.show(io::IO, ep::EnergyProblem) - println(io, "Solved = ", ep.solved) - print(io, "Objective_value = ", ep.objective_value) + println(io, "Terminal status: ", ep.termination_status) + println(io, "Solved: ", ep.solved) + print(io, "Objective_value: ", ep.objective_value) end From 98e13411723262b6f63083c411d7615fca5bf62c Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Wed, 17 Jan 2024 16:13:04 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- src/structures.jl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/structures.jl b/src/structures.jl index aa362e94..53ef990d 100644 --- a/src/structures.jl +++ b/src/structures.jl @@ -161,11 +161,10 @@ mutable struct EnergyProblem end end -""" -Customize the display of EnergyProblem in the REPL. -""" function Base.show(io::IO, ep::EnergyProblem) - println(io, "Terminal status: ", ep.termination_status) - println(io, "Solved: ", ep.solved) - print(io, "Objective_value: ", ep.objective_value) + println(io, "EnergyProblem:") + println(io, " - Model created: ", !isnothing(ep.model)) + println(io, " - Solved: ", ep.solved) + println(io, " - Termination status: ", ep.termination_status) + println(io, " - Objective_value: ", ep.objective_value) end