Using demote_formulation on-demand during ModelView wrapping

PyPSA · Jun 19, 2019 · 888000f · 888000f
1 parent 1119c42
commit 888000f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/components/components.jl b/src/components/components.jl
@@ -19,6 +19,9 @@ function addto! end
 function addto!(jm::JuMP.AbstractModel, m::EnergyModel, c::Component)
     addto!(ModelView(jm, c), m, c)
 end
+function addto!(jm::JuMP.AbstractModel, m::EnergyModel, d::Device)
+    addto!(ModelView(jm, d), m, demote_formulation(m, d))
+end
 
 include("energymodel.jl")
 include("subnetwork.jl")

diff --git a/src/formulation.jl b/src/formulation.jl
@@ -30,13 +30,18 @@ struct UnitCommittmentModel <: DispatchModel end
 abstract type ExpansionModel <: ModelType end
 
 # If nothing else is said, let's say it's fine
-demote_formulation(::Type{ExpansionModel}, DF::Type{ExpansionForm}) = DF
-demote_formulation(::Type{DispatchModel},  DF::Type{DispatchForm}) = DF
+demote_formulation(::Type{ExpansionModel}, ::Type{DF}) where DF <: ExpansionForm = DF
+demote_formulation(::Type{DispatchModel},  ::Type{DF}) where DF <: DispatchForm = DF
 
 # An expansion form should demote to its respective DispatchForm
-demote_formulation(MT::Type{DispatchModel}, ::Type{ExpansionForm{DDF}}) where DDF <: DispatchForm = demote_formulation(MT, DDF)
+demote_formulation(::Type{MT}, ::Type{DF}) where {MT <: DispatchModel, DDF, DF <: ExpansionForm{DDF}} = demote_formulation(MT, DDF)
 
 # We demote UnitCommittment to LinearDispatch in a LinearDispatchModel
 demote_formulation(::Type{LinearDispatchModel}, ::Type{UnitCommittmentForm}) = LinearDispatchForm
 
+function demote_formulation(m::EnergyModel{MT}, d::Device{DF}) where {MT <: ModelType, DF <: DeviceFormulation}
+    # TODO test whether conditionally changing the type would be faster!
+    with_formulation(d, demote_formulation(MT, DF))
+end
+
 with_formulation(d::T, ::Type{DF}) where {T <: Device, DF <: DeviceFormulation} = T(d, DF)