merge dt changes

src/PowerSimulations.jl

@@ -177,7 +177,6 @@ export list_recorder_events
 export show_recorder_events
 export list_simulation_events
 export show_simulation_events
-export write_results
 export write_to_CSV
 
 ## Enums
@@ -329,25 +328,12 @@ import LinearAlgebra
 import JSON3
 import PowerSystems
 import InfrastructureSystems
-# so that users have access to IS.Results interfaces
-import InfrastructureSystems:
-    get_variables,
-    get_parameters,
-    get_total_cost,
-    write_results,
-    get_timestamp,
-    get_resolution,
-    get_name,
-    @assert_op,
-    list_recorder_events
+import InfrastructureSystems: @assert_op, list_recorder_events, get_name
 export get_name
 export get_model_base_power
-export get_total_cost
 export get_optimizer_stats
-export get_timestamp
 export get_timestamps
 export get_resolution
-export write_results
 import PowerModels
 import TimerOutputs
 import ProgressMeter
@@ -433,9 +419,11 @@ include("core/initial_conditions.jl")
 include("core/settings.jl")
 include("core/cache_utils.jl")
 include("core/optimizer_stats.jl")
+include("core/extended_dataframe.jl")
 include("core/value_states.jl")
 
 include("core/optimization_container.jl")
+include("core/store_common.jl")
 
 # Order Required
 include("initial_conditions/initial_condition_chronologies.jl")
@@ -474,7 +462,6 @@ include("simulation/simulation_models.jl")
 include("simulation/simulation_state.jl")
 include("simulation/initial_condition_update_simulation.jl")
 include("simulation/simulation_store_params.jl")
-include("simulation/simulation_store_common.jl")
 include("simulation/hdf_simulation_store.jl")
 include("simulation/in_memory_simulation_store.jl")
 include("simulation/simulation_problem_results.jl")
@@ -489,15 +476,14 @@ include("devices_models/devices/common/range_constraint.jl")
 include("devices_models/devices/common/add_variable.jl")
 include("devices_models/devices/common/add_auxiliary_variable.jl")
 include("devices_models/devices/common/add_constraint_dual.jl")
-include("devices_models/devices/common/rating_constraints.jl")
 include("devices_models/devices/common/rateofchange_constraints.jl")
 include("devices_models/devices/common/duration_constraints.jl")
-include("devices_models/devices/common/commitment_constraint.jl")
 include("devices_models/devices/common/get_time_series.jl")
 
 # Device Modeling components
 include("devices_models/devices/interfaces.jl")
 include("devices_models/devices/common/add_to_expression.jl")
+include("devices_models/devices/common/set_expression.jl")
 include("devices_models/devices/renewable_generation.jl")
 include("devices_models/devices/thermal_generation.jl")
 include("devices_models/devices/electric_loads.jl")

src/core/abstract_simulation_store.jl

@@ -16,4 +16,9 @@ abstract type SimulationStore end
 # - write_result!
 # - read_result!
 # - write_optimizer_stats!
-# - read_problem_optimizer_stats
+# - read_optimizer_stats
+# - get_dm_data
+# - get_em_data
+
+get_dm_data(store::SimulationStore) = store.dm_data
+get_em_data(store::SimulationStore) = store.em_data

src/core/auxiliary_variables.jl

@@ -18,3 +18,5 @@ struct TimeDurationOff <: AuxVariableType end
 
 """ Auxiliary Variable for Thermal Generation Models that solve for power above min"""
 struct PowerOutput <: AuxVariableType end
+
+should_write_resulting_value(::Type{<:AuxVariableType}) = true

src/core/constraints.jl

@@ -103,3 +103,5 @@ function encode_key(key::ConstraintKey)
 end
 
 Base.convert(::Type{ConstraintKey}, name::Symbol) = ConstraintKey(decode_symbol(name)...)
+
+should_write_resulting_value(::Type{<:ConstraintType}) = true

src/core/expressions.jl

@@ -44,3 +44,7 @@ struct ReserveRangeExpressionUB <: RangeConstraintUBExpressions end
 struct ComponentActivePowerRangeExpressionUB <: RangeConstraintUBExpressions end
 struct ComponentReserveUpBalanceExpression <: ExpressionType end
 struct ComponentReserveDownBalanceExpression <: ExpressionType end
+
+should_write_resulting_value(::Type{<:ExpressionType}) = false
+should_write_resulting_value(::Type{<:CostExpressions}) = true
+should_write_resulting_value(::Type{RawACE}) = true