diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e8a99a..4a9b25d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ GasPowerModels.jl Change Log ### staged - nothing +### v0.6.0 +- Update to PowerModelsRestoration v0.8 (breaking) + ### v0.5.1 - Update normalized pressure zone values in matgas data - Add missing `report` flags to variables diff --git a/Project.toml b/Project.toml index 1af0f49..cdbd594 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "GasPowerModels" uuid = "1fcaf345-95e3-5b8b-91d6-2145eb844b9d" authors = ["Russell Bent"] repo = "https://github.com/lanl-ansi/GasPowerModels.jl" -version = "0.5.1" +version = "0.6.0" [deps] GasModels = "5e113713-6c35-5477-b766-e1109486666f" @@ -18,7 +18,7 @@ InfrastructureModels = "~0.6, ~0.7" JSON = "~0.21" JuMP = "~0.23, 1" Memento = "~1.0, ~1.1, ~1.2, ~1.3, ~1.4" -PowerModelsRestoration = "~0.6, ~0.7" +PowerModelsRestoration = "~0.8" julia = "1.6" [extras] diff --git a/src/core/objective.jl b/src/core/objective.jl index 8a1295d..3e1973a 100644 --- a/src/core/objective.jl +++ b/src/core/objective.jl @@ -72,8 +72,7 @@ function objective_expression_opf_cost(gpm::AbstractGasPowerModel; n::Int = nw_i gen_cost = Dict{Tuple{Int, Int}, Any}() for (i, gen) in _IM.ref(gpm, _PM.pm_it_sym, n, :gen) - conductor_ids = _PM.conductor_ids(_get_powermodel_from_gaspowermodel(gpm), n) - pg = sum(_IM.var(gpm, _PM.pm_it_sym, n, :pg, i)[c] for c in conductor_ids) + pg = _IM.var(gpm, _PM.pm_it_sym, n, :pg, i) if length(gen["cost"]) == 1 gen_cost[(n, i)] = gen["cost"][1]