Merge branch 'main' into v3.6.0-rc

CHANGELOG.md

@@ -8,6 +8,10 @@
 
 - Added capability to evaluate the optimality of a given partition against a set of load scenarios to judge robustness
 
+## v3.5.1
+
+- Fixed bug in `constraint_mc_power_balance_shed_block` (`LPUBFDiagPowerModel` version) where `pd_zblock_zdemand` was used instead of `qd_zblock_zdemand`
+
 ## v3.5.0
 
 - Added support for individually shedable loads to block LinDistFlow formulation

Project.toml

@@ -35,15 +35,15 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 ArgParse = "1.1"
 Combinatorics = "1"
-EzXML = "1.1.0"
+EzXML = "1.2.0"
 Graphs = "1.4.1, 1.6, 1.7, 1.8, 1.9"
 HiGHS = "1.5.2"
 Hwloc = "2"
 InfrastructureModels = "0.7"
 Ipopt = "0.9, 1.0.2, 1.3"
 JSON = "0.21"
 JSONSchema = "0.3.3, 1"
-JuMP = "0.22, 0.23, 1"
+JuMP = "1 - 1.14"
 Juniper = "0.8, 0.9"
 LoggingExtras = "0.4.7, 0.4.9"
 PolyhedralRelaxations = "0.3.3, 0.3.4, 0.3.5"

README.md

@@ -69,7 +69,7 @@ If you find PowerModelsONM useful for your work, we kindly request that you cite
 
 ## License
 
-This code is provided under a BSD license as part of the Multi-Infrastructure Control and Optimization Toolkit (MICOT) project, LA-CC-13-108.
+This code is provided under a BSD license as part of the Multi-Infrastructure Control and Optimization Toolkit (MICOT) project, C15024.
 
 [docs-dev-img]: https://github.com/lanl-ansi/PowerModelsONM.jl/workflows/Documentation/badge.svg
 [docs-dev-url]: https://lanl-ansi.github.io/PowerModelsONM.jl/dev

src/core/constraint.jl

@@ -219,7 +219,7 @@ function constraint_radial_topology(pm::AbstractUnbalancedPowerModel, nw::Int; r
     var(pm, nw)[:f] = Dict{Tuple{Int,Int,Int},JuMP.VariableRef}()
     var(pm, nw)[:lambda] = Dict{Tuple{Int,Int},JuMP.VariableRef}()
     var(pm, nw)[:beta] = Dict{Tuple{Int,Int},JuMP.VariableRef}()
-    var(pm, nw)[:alpha] = Dict{Tuple{Int,Int},Union{JuMP.VariableRef,Int}}()
+    var(pm, nw)[:alpha] = Dict{Tuple{Int,Int},Union{JuMP.VariableRef,JuMP.AffExpr,Int}}()
 
     # "real" node and branch sets
     N₀ = ids(pm, nw, :blocks)
@@ -250,9 +250,10 @@ function constraint_radial_topology(pm::AbstractUnbalancedPowerModel, nw::Int; r
     end
 
     # create an aux varible α that maps to the switch states
-    for (s,sw) in ref(pm, nw, :switch)
-        (i,j) = (ref(pm, nw, :bus_block_map, sw["f_bus"]), ref(pm, nw, :bus_block_map, sw["t_bus"]))
-        var(pm, nw, :alpha)[(i,j)] = var(pm, nw, :switch_state, s)
+    switch_lookup = Dict{Tuple{Int,Int},Vector{Int}}((ref(pm, nw, :bus_block_map, sw["f_bus"]), ref(pm, nw, :bus_block_map, sw["t_bus"])) => Int[ss for (ss,ssw) in ref(pm, nw, :switch) if (ref(pm, nw, :bus_block_map, sw["f_bus"])==ref(pm, nw, :bus_block_map, ssw["f_bus"]) && ref(pm, nw, :bus_block_map, sw["t_bus"])==ref(pm, nw, :bus_block_map, ssw["t_bus"])) || (ref(pm, nw, :bus_block_map, sw["f_bus"])==ref(pm, nw, :bus_block_map, ssw["t_bus"]) && ref(pm, nw, :bus_block_map, sw["t_bus"])==ref(pm, nw, :bus_block_map, ssw["f_bus"]))] for (s,sw) in ref(pm, nw, :switch))
+    for ((i,j), switches) in switch_lookup
+        var(pm, nw, :alpha)[(i,j)] = JuMP.@expression(pm.model, sum(var(pm, nw, :switch_state, s) for s in switches))
+        JuMP.@constraint(pm.model, var(pm, nw, :alpha, (i,j)) <= 1)
     end
 
     f = var(pm, nw, :f)

src/form/lindistflow.jl

@@ -152,7 +152,7 @@ function constraint_mc_power_balance_shed_block(pm::PMD.LPUBFDiagModel, nw::Int,
             ==
             sum(qg[g][t] for (g, conns) in bus_gens if t in conns)
             - sum(qs[s][t] for (s, conns) in bus_storage if t in conns)
-            - sum(pd_zblock_zdemand[l][t] for (l, conns) in bus_loads if t in conns)
+            - sum(qd_zblock_zdemand[l][t] for (l, conns) in bus_loads if t in conns)
             - sum((-w[t] * LinearAlgebra.diag(Bt')[idx]) for (sh, conns) in uncontrolled_shunts if t in conns)
             - sum(-var(pm, nw, :capacitor_reactive_power, sh)[t] for (sh, conns) in controlled_shunts if t in conns)
         )

test/data/network.ieee13mod.dss

@@ -0,0 +1,181 @@
+Clear
+Set DefaultBaseFrequency=60
+
+!
+! This script is based on a script developed by Tennessee Tech Univ students
+! Tyler Patton, Jon Wood, and David Woods, April 2009
+!
+
+new circuit.IEEE13Nodeckt
+~ basekv=115 pu=1.0001 phases=3 bus1=SourceBus
+~ Angle=30                                                         ! advance angle 30 deg so result agree with published angle
+~ MVAsc3=20000 MVASC1=21000    ! stiffen the source to approximate inf source
+~ baseMVA=1
+
+
+!SUB TRANSFORMER DEFINITION
+! Although this data was given, it does not appear to be used in the test case results
+! The published test case starts at 1.0 per unit at Bus 650. To make this happen, we will change the impedance
+! on the transformer to something tiny by dividing by 1000 using the DSS in-line RPN math
+New Transformer.Sub Phases=3 Windings=2   XHL=(8 1000 /)
+~ wdg=1 bus=SourceBus   conn=delta  kv=115  kva=5000   %r=(.5 1000 /)
+~ wdg=2 bus=650             conn=wye    kv=4.16  kva=5000   %r=(.5 1000 /)
+
+! FEEDER 1-PHASE VOLTAGE REGULATORS
+! Define low-impedance 2-wdg transformer
+
+New Transformer.Reg1 phases=1 bank=reg1 XHL=0.01 kVAs=[1666 1666]
+~ Buses=[650.1 RG60.1] kVs=[2.4  2.4] %LoadLoss=0.01
+~ %rs=[0 0] ! correct default here
+
+New Transformer.Reg2 phases=1 bank=reg1 XHL=0.01 kVAs=[1666 1666]
+~ Buses=[650.2 RG60.2] kVs=[2.4  2.4] %LoadLoss=0.01
+~ %rs=[0 0] ! correct default here
+
+New Transformer.Reg3 phases=1 bank=reg1 XHL=0.01 kVAs=[1666 1666]
+~ Buses=[650.3 RG60.3] kVs=[2.4  2.4] %LoadLoss=0.01
+~ %rs=[0 0] ! correct default here
+
+
+!TRANSFORMER DEFINITION
+New Transformer.XFM1  Phases=3   Windings=2  XHL=2
+~ wdg=1 bus=633       conn=Wye kv=4.16    kva=500    %r=.55     XHT=1
+~ wdg=2 bus=634       conn=Wye kv=0.480    kva=500    %r=.55   XLT=1
+
+!ADD A SWITCH AT THE SUBSTATION
+New Line.cb_101    Phases=3 Bus1=RG60   Bus2=600  Switch=y  r1=0 r0=0 x1=0.000 x0=0.000 c1=0.000 c0=0.000 normamps=800 emergamps=1000
+
+!LINE CODES
+
+// these are local matrix line codes
+// corrected 9-14-2011
+New linecode.mtx601 nphases=3 BaseFreq=60
+~ rmatrix = (0.3465 | 0.1560 0.3375 | 0.1580 0.1535 0.3414 )
+~ xmatrix = (1.0179 | 0.5017 1.0478 | 0.4236 0.3849 1.0348 )
+~ units=mi
+New linecode.mtx602 nphases=3 BaseFreq=60
+~ rmatrix = (0.7526 | 0.1580 0.7475 | 0.1560 0.1535 0.7436 )
+~ xmatrix = (1.1814 | 0.4236 1.1983 | 0.5017 0.3849 1.2112 )
+~ units=mi
+New linecode.mtx603 nphases=2 BaseFreq=60
+~ rmatrix = (1.3238 | 0.2066 1.3294 )
+~ xmatrix = (1.3569 | 0.4591 1.3471 )
+~ units=mi
+New linecode.mtx604 nphases=2 BaseFreq=60
+~ rmatrix = (1.3238 | 0.2066 1.3294 )
+~ xmatrix = (1.3569 | 0.4591 1.3471 )
+~ units=mi
+New linecode.mtx605 nphases=1 BaseFreq=60
+~ rmatrix = (1.3292 )
+~ xmatrix = (1.3475 )
+~ units=mi
+New Linecode.mtx606 nphases=3  Units=mi
+~ Rmatrix=[0.791721  |0.318476  0.781649  |0.28345  0.318476  0.791721  ]
+~ Xmatrix=[0.438352  |0.0276838  0.396697  |-0.0184204  0.0276838  0.438352  ]
+~ Cmatrix=[383.948  |0  383.948  |0  0  383.948  ]
+New linecode.mtx607 nphases=1 BaseFreq=60
+~ rmatrix = (1.3425 )
+~ xmatrix = (0.5124 )
+~ cmatrix = [236]
+~ units=mi
+
+!LOADSHAPE DEFINITION
+New LoadShape.microgrid1a interval=1 npts=8 useactual=no mult=(0.25, 0.4, 0.8, 1.0, 1.0, 0.8, 0.6, 0.5)
+New LoadShape.microgrid1b interval=1 npts=8 useactual=no mult=(1.0, 1.0, 0.8, 0.5, 0.4, 0.4, 0.4, 0.8)
+New LoadShape.microgrid1c interval=1 npts=8 useactual=no mult=(0.25, 0.4, 0.8, 1.0, 1.4, 2.0, 1.0, 0.8)
+New LoadShape.microgrid1d interval=1 npts=8 useactual=no mult=(0.4, 0.4, 0.4, 1.0, 1.0, 0.8, 0.8, 0.6)
+New LoadShape.pvdaily interval=1 npts=8 useactual=no mult=(0, 0, 0.4, 1.0, 0.8, 0.3, 0, 0)
+
+!LOAD DEFINITIONS
+New Load.671 Bus1=671.1.2.3  Phases=3 Conn=Delta Model=1 kV=4.16   kW=1155 kvar=660 vminpu=0.6 vmaxpu=1.4
+New Load.634a Bus1=634.1     Phases=1 Conn=Wye  Model=1 kV=0.277  kW=160   kvar=110 vminpu=0.6 vmaxpu=1.4
+New Load.634b Bus1=634.2     Phases=1 Conn=Wye  Model=1 kV=0.277  kW=120   kvar=90 vminpu=0.6 vmaxpu=1.4
+New Load.634c Bus1=634.3     Phases=1 Conn=Wye  Model=1 kV=0.277  kW=120   kvar=90 vminpu=0.6 vmaxpu=1.4
+New Load.645 Bus1=645.2       Phases=1 Conn=Wye  Model=1 kV=2.4      kW=170   kvar=125 vminpu=0.6 vmaxpu=1.4
+New Load.646 Bus1=646.2.3    Phases=1 Conn=Delta Model=2 kV=4.16    kW=230   kvar=132 vminpu=0.6 vmaxpu=1.4
+New Load.692 Bus1=692.3.1    Phases=1 Conn=Delta Model=5 kV=4.16    kW=170   kvar=151 vminpu=0.6 vmaxpu=1.4 daily=microgrid1d
+New Load.675a Bus1=675.1    Phases=1 Conn=Wye  Model=1 kV=2.4  kW=485   kvar=190 vminpu=0.6 vmaxpu=1.4 daily=microgrid1d
+New Load.675b Bus1=675.2    Phases=1 Conn=Wye  Model=1 kV=2.4  kW=68   kvar=60 vminpu=0.6 vmaxpu=1.4 daily=microgrid1d
+New Load.675c Bus1=675.3    Phases=1 Conn=Wye  Model=1 kV=2.4  kW=290   kvar=212 vminpu=0.6 vmaxpu=1.4 daily=microgrid1d
+New Load.611 Bus1=611.3      Phases=1 Conn=Wye  Model=5 kV=2.4  kW=170   kvar=80 vminpu=0.6 vmaxpu=1.4
+New Load.652 Bus1=652.1      Phases=1 Conn=Wye  Model=2 kV=2.4  kW=128   kvar=86 vminpu=0.6 vmaxpu=1.4
+New Load.670a Bus1=670.1    Phases=1 Conn=Wye  Model=1 kV=2.4  kW=17    kvar=10 vminpu=0.6 vmaxpu=1.4
+New Load.670b Bus1=670.2    Phases=1 Conn=Wye  Model=1 kV=2.4  kW=66    kvar=38 vminpu=0.6 vmaxpu=1.4
+New Load.670c Bus1=670.3    Phases=1 Conn=Wye  Model=1 kV=2.4  kW=117  kvar=68 vminpu=0.6 vmaxpu=1.4
+
+!CAPACITOR DEFINITIONS
+New Capacitor.Cap1 Bus1=675 phases=3 kVAR=600 kV=4.16
+New Capacitor.Cap2 Bus1=611.3 phases=1 kVAR=100 kV=2.4
+
+!Bus 670 is the concentrated point load of the distributed load on line 632 to 671 located at 1/3 the distance from node 632
+
+!LINE DEFINITIONS
+New Line.650632    Phases=3 Bus1=600.1.2.3    Bus2=632.1.2.3  LineCode=mtx601 Length=2000 units=ft  normamps=800 emergamps=800
+New Line.632670    Phases=3 Bus1=632.1.2.3    Bus2=670.1.2.3  LineCode=mtx601 Length=667  units=ft  normamps=800 emergamps=800
+New Line.670671    Phases=3 Bus1=670.1.2.3    Bus2=671.1.2.3  LineCode=mtx601 Length=1333 units=ft  normamps=800 emergamps=800
+New Line.671680    Phases=3 Bus1=671.1.2.3    Bus2=680.1.2.3  LineCode=mtx601 Length=1000 units=ft  normamps=800 emergamps=800
+New Line.632633    Phases=3 Bus1=632.1.2.3    Bus2=633.1.2.3  LineCode=mtx602 Length=500  units=ft
+New Line.632645    Phases=2 Bus1=632.3.2      Bus2=645.3.2    LineCode=mtx603 Length=500  units=ft
+New Line.645646    Phases=2 Bus1=645.3.2      Bus2=646.3.2    LineCode=mtx603 Length=300  units=ft
+New Line.692675    Phases=3 Bus1=692.1.2.3    Bus2=675.1.2.3  LineCode=mtx606 Length=500  units=ft  normamps=800 emergamps=800
+New Line.671684    Phases=2 Bus1=671.1.3      Bus2=684.1.3    LineCode=mtx604 Length=300  units=ft
+New Line.684611    Phases=1 Bus1=684.3        Bus2=611.3      LineCode=mtx605 Length=300  units=ft
+New Line.684652    Phases=1 Bus1=684.1        Bus2=652.1      LineCode=mtx607 Length=800  units=ft
+
+!SWITCH DEFINITIONS
+New Line.671692    Phases=3 Bus1=671   Bus2=692  Switch=y  r1=0 r0=0 x1=0.000 x0=0.000 c1=0.000 c0=0.000 normamps=800 emergamps=1000
+New Line.680675    Phases=3 Bus1=680   Bus2=675  Switch=y  r1=0 r0=0 x1=0.000 x0=0.000 c1=0.000 c0=0.000 normamps=800 emergamps=1000 enabled=n
+
+!MICROGRID DEFINITIONS
+New Line.670700 Phases=3 Bus1=670       Bus2=700 Switch=y  r1=0 r0=0 x1=0.000 x0=0.000 c1=0.000 c0=0.000 enabled=y
+New Line.700701 Phases=3 Bus1=700.1.2.3 Bus2=701.1.2.3 LineCode=mtx601 Length=800  units=ft
+New Load.700    Phases=3 Bus1=700.1.2.3 Conn=Wye Model=1 kv=4.16 kw=10 kvar=3 daily=microgrid1b
+New Load.701    Phases=3 Bus1=701.1.2.3 Conn=Wye Model=1 kv=4.16 kw=15 kvar=5 daily=microgrid1b
+
+New PVSystem.PV_mg1b  Phases=3 Bus1=700.1.2.3 kv=4.16 conn=wye irradiance=1 Pmpp=25 kva=35 pf=0.74 daily=pvdaily
+New Storage.Battery_mg1b Phases=3 Bus1=700 kwhstored=5 kwhrated=50 kwrated=10 %idlingkw=0 %idlingkvar=0 %effcharge=100 %effdischarge=100 %charge=100 %discharge=100 %r=0 %x=0 enabled=y
+
+New Line.701702 Phases=3 Bus1=701       Bus2=702 Switch=y  r1=0 r0=0 x1=0.000 x0=0.000 c1=0.000 c0=0.000 enabled=y
+New Line.702703 Phases=3 Bus1=702.1.2.3 Bus2=703.1.2.3 LineCode=mtx601 Length=900 units=ft
+New Load.702    Phases=3 Bus1=702.1.2.3 conn=wye model=1 kv=4.16 kw=50 kvar=20 daily=microgrid1a
+New Load.703    Phases=3 Bus1=703.1.2.3 conn=wye model=1 kv=4.16 kw=135 kvar=100 daily=microgrid1a
+
+New PVSystem.PV_mg1a  Phases=3 Bus1=703.1.2.3 kv=4.16 conn=wye irradiance=1 Pmpp=25 kva=210 pf=0.74 daily=pvdaily
+New Storage.Battery_mg1a Phases=3 Bus1=700 kwhstored=25 kwhrated=200 kwrated=50 %idlingkw=0 %idlingkvar=0 %effcharge=100 %effdischarge=100 %charge=100 %discharge=100 %r=0 %x=0 enabled=y
+
+New Line.703800 Phases=3 Bus1=703 Bus2=800aux Switch=y r1=0 r0=0 x1=0 x0=0 c1=0 c0=0 enabled=y  normamps=600 emergamps=600
+New Line.800800aux Phases=3 Bus1=800aux Bus2=800 LineCode=mtx601 Length=1000 units=ft
+New Line.800801 Phases=3 Bus1=800 Bus2=801 Switch=y r1=0 r0=0 x1=0 x0=0 c1=0 c0=0 enabled=y  normamps=50 emergamps=50
+
+New Load.801 Phases=3 Bus1=801 conn=wye model=1 kv=4.16 kw=200.0 kvar=120.0 daily=microgrid1c
+
+New Storage.Battery_mg1c Phases=3 Bus1=801 kwhstored=500 kwhrated=1000 kwrated=250 %idlingkw=0 %idlingkvar=0 %effcharge=100 %effdischarge=100 %charge=100 %discharge=100 %r=0 %x=0 enabled=y
+
+New Line.801675 Phases=3 Bus1=801 Bus2=675aux Switch=y r1=0 r0=0 x1=0 x0=0 c1=0.0 c0=0.0 normamps=50 emergamps=50 enabled=n  ! tie switch
+New Line.675675aux Phases=3 Bus1=675 Bus2=675aux LineCode=mtx601 Length=15 units=mi normamps=800 emergamps=800
+
+New Generator.675 Phases=3 Bus1=675 kv=2.4 kva=2000 kw=1500 kvar=1200
+
+New Relay.801675 monitoredobj=line.801675
+New Recloser.671700 monitoredobj=line.671700 phasetrip=140
+New Relay.632645 MonitoredObj=line.632645
+
+!New CapControl.cap1 Capacitor=Cap1 element=Line.692675  ptphase=3 terminal=2 type=voltage ptratio=1 ctratio=1 ONsetting=2500 OFFsetting=2540 VoltOverride=N
+!New CapControl.cap2 Capacitor=Cap2 element=Line.684611  terminal=3 ptphase=3 type=kvar ptratio=1 ctratio=1 ONsetting=0 OFFsetting=0 VoltOverride=Y Vmin=0 Vmax=10000
+
+Set Voltagebases=[115, 4.16, .48]
+calcv
+
+! POINT REGULATOR CONTROLS TO REGULATOR TRANSFORMER AND SET PARAMETERS
+new regcontrol.Reg1  transformer=Reg1 winding=2  vreg=122  band=2  ptratio=20 ctprim=700  R=3   X=9
+new regcontrol.Reg2  transformer=Reg2 winding=2  vreg=122  band=2  ptratio=20 ctprim=700  R=3   X=9
+new regcontrol.Reg3  transformer=Reg3 winding=2  vreg=122  band=2  ptratio=20 ctprim=700  R=3   X=9
+
+Transformer.Reg1.Taps=[1.0 1.0625]
+Transformer.Reg2.Taps=[1.0 1.0500]
+Transformer.Reg3.Taps=[1.0 1.06875]
+
+Set Controlmode=OFF
+Set tolerance=0.001
+
+Solve

test/graphml.jl

@@ -7,9 +7,7 @@
        @test length(graph.edge) == 6
 
        save_graphml("../test/data/ieee13_nested.graphml", eng; type="nested")
-       open("../test/data/ieee13_nested.graphml", "r") do io
-            @test length(readlines(io)) == 1509
-       end
+       @test length(EzXML.nodes(EzXML.nodes(EzXML.readxml("../test/data/ieee13_nested.graphml").node)[1])) == 185
        rm("../test/data/ieee13_nested.graphml")
     end
 
@@ -19,9 +17,7 @@
         @test length(graph.edge) == 57
 
         save_graphml("../test/data/ieee13_unnested.graphml", eng; type="unnested")
-        open("../test/data/ieee13_unnested.graphml", "r") do io
-             @test length(readlines(io)) == 1479
-        end
+        @test length(EzXML.nodes(EzXML.nodes(EzXML.readxml("../test/data/ieee13_unnested.graphml").node)[1])) == 185
         rm("../test/data/ieee13_unnested.graphml")
     end
 end

test/mld.jl

@@ -35,7 +35,7 @@
             r = optimize_switches!(args)
 
             @test all(_r["termination_status"] == OPTIMAL for (n,_r) in r)
-            @test isapprox(sum(Float64[_r["objective"] for _r in values(r)]), 119.89; atol=1)
+            @test isapprox(sum(Float64[_r["objective"] for _r in values(r)]), 176.86; atol=1)
         end
 
         @testset "test rolling-horizon optimal switching - lindistflow - traditional" begin
@@ -53,7 +53,7 @@
             r = optimize_switches!(args)
 
             @test all(_r["termination_status"] == OPTIMAL for (n,_r) in r)
-            @test isapprox(sum(Float64[_r["objective"] for _r in values(r)]), 119.89; atol=1)
+            @test isapprox(sum(Float64[_r["objective"] for _r in values(r)]), 176.86; atol=1)
         end
 
         @testset "test rolling-horizon optimal switching - nfa - block" begin
@@ -138,7 +138,7 @@
             r = optimize_switches!(args)
 
             @test first(r).second["termination_status"] == OPTIMAL
-            @test isapprox(r["1"]["objective"], 80.65; atol=1)
+            @test isapprox(r["1"]["objective"], 80.64; atol=1)
         end
 
         @testset "test full-lookahead optimal switching - lindistflow - traditional - radial-disabled - inverter-disabled" begin
@@ -203,3 +203,76 @@
         end
     end
 end
+
+
+@testset "test radiality " begin
+    solver = build_solver_instances(;solver_options=Dict{String,Any}("HiGHS"=>Dict{String,Any}("output_flag"=>false, "presolve"=>"off")))["mip_solver"]
+    eng_s = parse_file("../test/data/network.ieee13mod.dss")
+
+    eng_s["time_elapsed"] = 1.0
+    eng_s["switch_close_actions_ub"] = Inf
+
+    PMD.apply_voltage_bounds!(eng_s; vm_lb=0.9, vm_ub=1.1)
+    PMD.apply_voltage_angle_difference_bounds!(eng_s, 10.0)
+    PMD.adjust_line_limits!(eng_s, Inf)
+    PMD.adjust_transformer_limits!(eng_s, Inf)
+
+    for switch in values(eng_s["switch"])
+        switch["dispatchable"] = YES
+        switch["state"] = CLOSED
+        switch["status"] = ENABLED
+    end
+
+    for t in ["storage", "solar", "generator"]
+        for obj in values(eng_s[t])
+            obj["inverter"] = GRID_FOLLOWING
+        end
+    end
+
+    set_option!(eng_s, ("options", "objective", "disable-load-block-weight-cost"), true)
+    set_option!(eng_s, ("options", "objective", "disable-storage-discharge-cost"), true)
+    set_option!(eng_s, ("options", "objective", "disable-generation-dispatch-cost"), true)
+
+    r = solve_block_mld(eng_s, LPUBFDiagPowerModel, solver)
+
+    @test r["solution"]["switch"]["680675"]["state"] != r["solution"]["switch"]["671692"]["state"]
+    @test length(filter(x->x.second["state"]==OPEN, r["solution"]["switch"])) == 2
+    @test r["objective"] < 1.0
+
+    eng_s["switch"]["680675"]["state"] = OPEN
+
+    r = solve_block_mld(eng_s, LPUBFDiagPowerModel, solver)
+
+    @test r["solution"]["switch"]["680675"]["state"] == OPEN
+    @test r["solution"]["switch"]["671692"]["state"] == OPEN
+    @test length(filter(x->x.second["state"]==OPEN, r["solution"]["switch"])) == 2
+    @test r["objective"] < 1.0
+
+    eng_s["switch"]["680675"]["state"] = CLOSED
+    eng_s["switch"]["671692"]["state"] = OPEN
+
+    r = solve_block_mld(eng_s, LPUBFDiagPowerModel, solver)
+
+    @test r["solution"]["switch"]["680675"]["state"] == OPEN
+    @test r["solution"]["switch"]["671692"]["state"] == OPEN
+    @test length(filter(x->x.second["state"]==OPEN, r["solution"]["switch"])) == 2
+    @test r["objective"] < 1.0
+
+    eng_s["switch"]["680675"]["state"] = OPEN
+    eng_s["switch"]["671692"]["state"] = OPEN
+
+    r = solve_block_mld(eng_s, LPUBFDiagPowerModel, solver)
+
+    @test (r["solution"]["switch"]["680675"]["state"] != r["solution"]["switch"]["671692"]["state"]) || (r["solution"]["switch"]["680675"]["state"] == OPEN)
+    @test length(filter(x->x.second["state"]==OPEN, r["solution"]["switch"])) == 2
+    @test r["objective"] < 1.0
+
+    eng_s["switch"]["680675"]["dispatchable"] = NO
+    eng_s["switch"]["671692"]["dispatchable"] = NO
+
+    r = solve_block_mld(eng_s, LPUBFDiagPowerModel, solver)
+
+    @test r["solution"]["switch"]["680675"]["state"] == r["solution"]["switch"]["671692"]["state"]
+    @test length(filter(x->x.second["state"]==OPEN, r["solution"]["switch"])) == 2
+    @test r["objective"] < 1.0
+end

test/runtests.jl

@@ -8,6 +8,7 @@ Distributed.addprocs(3)
 # cd("test"); import Gurobi; using PowerModelsONM
 
 import JSON
+import EzXML
 import PowerModelsDistribution as PMD
 
 import Juniper