diff --git a/src/instance/read.jl b/src/instance/read.jl index 7a7e947..ee4de2c 100644 --- a/src/instance/read.jl +++ b/src/instance/read.jl @@ -58,17 +58,19 @@ instance = UnitCommitment.read("/path/to/input.json.gz") function _repair_scenario_name_and_probability( scenarios::Vector{UnitCommitmentScenario}, - path::Vector{String} + path::Vector{String}, )::Vector{UnitCommitmentScenario} number_of_scenarios = length(scenarios) probs = [sc.probability for sc in scenarios] total_weight = number_of_scenarios if Float64 in typeof.(probs) - try + try total_weight = sum(probs) catch e if isa(e, MethodError) - error("If any of the scenarios is assigned a weight, then all scenarios must be assigned weights.") + error( + "If any of the scenarios is assigned a weight, then all scenarios must be assigned weights.", + ) end end else @@ -76,7 +78,8 @@ function _repair_scenario_name_and_probability( end for (sc_path, sc) in zip(path, scenarios) - sc.name !== "" || (sc.name = first(split(last(split(sc_path, "/")), "."))) + sc.name !== "" || + (sc.name = first(split(last(split(sc_path, "/")), "."))) sc.probability = (sc.probability / total_weight) end return scenarios @@ -86,7 +89,7 @@ function read(path::String)::UnitCommitmentInstance scenarios = Vector{UnitCommitmentScenario}() scenario = _read_scenario(path) scenario.name = "s1" - scenario.probability = 1.0 + scenario.probability = 1.0 scenarios = [scenario] instance = UnitCommitmentInstance(time = scenario.time, scenarios = scenarios) diff --git a/src/instance/structs.jl b/src/instance/structs.jl index 1760114..9d565af 100644 --- a/src/instance/structs.jl +++ b/src/instance/structs.jl @@ -30,9 +30,9 @@ end mutable struct Unit name::String - bus::Bus + bus::Bus max_power::Vector{Float64} - min_power::Vector{Float64} + min_power::Vector{Float64} must_run::Vector{Bool} min_power_cost::Vector{Float64} cost_segments::Vector{CostSegment} diff --git a/test/transform/randomize/XavQiuAhm2021_test.jl b/test/transform/randomize/XavQiuAhm2021_test.jl index 1322b19..85b52e0 100644 --- a/test/transform/randomize/XavQiuAhm2021_test.jl +++ b/test/transform/randomize/XavQiuAhm2021_test.jl @@ -30,9 +30,7 @@ test_approx(x, y) = @test isapprox(x, y, atol = 1e-3) randomize!( sc, - XavQiuAhm2021.Randomization( - randomize_load_profile = false, - ), + XavQiuAhm2021.Randomization(randomize_load_profile = false), rng = MersenneTwister(42), )