Updates for PowerModels v0.14 (#194)

* update build_model to instantiate_model * add optimizer kwarg to optimize_model * update powermodels version in project * update post_ methods to build_ * remove manifest from docs * update powermodels version in docs project.toml * UPD: Changelog and bump version to v0.7 Co-authored-by: David M Fobes <[email protected]>
lanl-ansi · Jan 24, 2020 · 5eddee6 · 5eddee6 · pseudocubic · Jan 24, 2020
1 parent cc5b09f
commit 5eddee6
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 300 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ PowerModelsDistribution.jl Change Log
 ### staged
 - none
 
+### v0.7.0
+- Updates function names for PowerModels v0.14 compatibility (breaking) (#194)
+
 ### v0.6.1
 - Fixed bug with new default SCS settings causing tests to fail (#190)
 - Changed unit test '5-bus independent radial different sdpubf opf_bf', testing vm instead of qg

diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "PowerModelsDistribution"
 uuid = "d7431456-977f-11e9-2de3-97ff7677985e"
 authors = ["David M Fobes <[email protected]>", "Carleton Coffrin"]
 repo = "https://github.com/lanl-ansi/PowerModelsDistribution.jl.git"
-version = "0.6.1"
+version = "0.7.0"
 
 [deps]
 InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0"
@@ -21,7 +21,7 @@ JuMP = "~0.19.2, ~0.20"
 Juniper = ">= 0.4"
 MathOptInterface = "~0.8, ~0.9"
 Memento = "~0.10, ~0.11, ~0.12"
-PowerModels = "~0.13"
+PowerModels = "~0.14"
 SCS = ">= 0.4"
 julia = "^1"
 

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -5,4 +5,4 @@ PowerModels = "c36e90e8-916a-50a6-bd94-075b64ef4655"
 
 [compat]
 InfrastructureModels = "~0.3"
-PowerModels = "~0.13"
+PowerModels = "~0.14"
diff --git a/docs/src/quickguide.md b/docs/src/quickguide.md
@@ -41,7 +41,7 @@ The following example demonstrates how to break a `run_mc_opf` call into seperat
 
 ```julia
 data = PowerModelsDistribution.parse_file("case3_unbalanced.dss")
-pm = PowerModels.build_model(data, ACPPowerModel, PowerModelsDistribution.post_mc_opf; multiconductor=true)
+pm = PowerModels.instantiate_model(data, ACPPowerModel, PowerModelsDistribution.build_mc_opf; multiconductor=true, ref_extensions=[ref_add_arcs_trans!])
 print(pm.model)
-optimize_model!(pm, with_optimizer(Ipopt.Optimizer))
+optimize_model!(pm, optimizer=with_optimizer(Ipopt.Optimizer))
 ```
diff --git a/src/prob/debug.jl b/src/prob/debug.jl
@@ -2,7 +2,7 @@
 # that do not converge using the standard formulations
 "OPF problem with slack power at every bus"
 function run_mc_opf_pbs(data::Dict{String,Any}, model_type, solver; kwargs...)
-    return _PMs.run_model(data, model_type, solver, post_mc_opf_pbs; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_pbs!, kwargs...)
+    return _PMs.run_model(data, model_type, solver, build_mc_opf_pbs; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_pbs!, kwargs...)
 end
 
 
@@ -14,7 +14,7 @@ end
 
 "PF problem with slack power at every bus"
 function run_mc_pf_pbs(data::Dict{String,Any}, model_type, solver; kwargs...)
-    return _PMs.run_model(data, model_type, solver, post_mc_pf_pbs; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_pbs!, kwargs...)
+    return _PMs.run_model(data, model_type, solver, build_mc_pf_pbs; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_pbs!, kwargs...)
 end
 
 
@@ -25,7 +25,7 @@ end
 
 
 "OPF problem with slack power at every bus"
-function post_mc_opf_pbs(pm::_PMs.AbstractPowerModel)
+function build_mc_opf_pbs(pm::_PMs.AbstractPowerModel)
     variable_mc_voltage(pm)
 
     variable_mc_branch_flow(pm)
@@ -60,7 +60,7 @@ end
 
 
 "PF problem with slack power at every bus"
-function post_mc_pf_pbs(pm::_PMs.AbstractPowerModel)
+function build_mc_pf_pbs(pm::_PMs.AbstractPowerModel)
     variable_mc_voltage(pm; bounded=false)
 
     variable_mc_branch_flow(pm; bounded=false)

diff --git a/src/prob/mld.jl b/src/prob/mld.jl
@@ -1,6 +1,6 @@
 "Run load shedding problem with storage"
 function run_mc_mld(data::Dict{String,Any}, model_type, solver; kwargs...)
-    return _PMs.run_model(data, model_type, solver, post_mc_mld; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_mld!, kwargs...)
+    return _PMs.run_model(data, model_type, solver, build_mc_mld; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_mld!, kwargs...)
 end
 
 
@@ -15,7 +15,7 @@ function run_mc_mld_bf(data::Dict{String,Any}, model_type, solver; kwargs...)
     if model_type != LPLinUBFPowerModel
         Memento.error(_LOGGER, "The problem type mc_mld_bf only supports a limited set of formulations at the moment")
     end
-    return _PMs.run_model(data, model_type, solver, post_mc_mld_bf; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_mld_bf!, kwargs...)
+    return _PMs.run_model(data, model_type, solver, build_mc_mld_bf; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_mld_bf!, kwargs...)
 end
 
 
@@ -27,7 +27,7 @@ end
 
 "Run unit commitment load shedding problem (!relaxed)"
 function run_mc_mld_uc(data::Dict{String,Any}, model_type, solver; kwargs...)
-    return _PMs.run_model(data, model_type, solver, post_mc_mld_uc; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_mld!, kwargs...)
+    return _PMs.run_model(data, model_type, solver, build_mc_mld_uc; multiconductor=true, ref_extensions=[ref_add_arcs_trans!], solution_builder=solution_mld!, kwargs...)
 end
 
 
@@ -38,7 +38,7 @@ end
 
 
 "Load shedding problem including storage"
-function post_mc_mld(pm::_PMs.AbstractPowerModel)
+function build_mc_mld(pm::_PMs.AbstractPowerModel)
     variable_mc_indicator_bus_voltage(pm; relax=true)
     variable_mc_bus_voltage_on_off(pm)
 
@@ -97,7 +97,7 @@ end
 
 
 "Load shedding problem for Branch Flow model"
-function post_mc_mld_bf(pm::_PMs.AbstractPowerModel)
+function build_mc_mld_bf(pm::_PMs.AbstractPowerModel)
     variable_mc_indicator_bus_voltage(pm; relax=true)
     variable_mc_bus_voltage_on_off(pm)
 
@@ -146,7 +146,7 @@ end
 
 
 "Standard unit commitment (!relaxed) load shedding problem"
-function post_mc_mld_uc(pm::_PMs.AbstractPowerModel)
+function build_mc_mld_uc(pm::_PMs.AbstractPowerModel)
     variable_mc_indicator_bus_voltage(pm; relax=false)
     variable_mc_bus_voltage_on_off(pm)