Skip to content

Move operation models to PowerOperationsModels #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
luke-kiernan wants to merge 2 commits into from
Closed

Move operation models to PowerOperationsModels #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d72d4
Move operation models to PowerOperationsModels
luke-kiernan May 13, 2026
e20fb02
Address CoPilot review of PR #100
luke-kiernan May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ JuMP = "^1.28"
LinearAlgebra = "1"
Logging = "1"
MathOptInterface = "1"
PowerNetworkMatrices = "^0.19"
PowerNetworkMatrices = "^0.20"
PrettyTables = "3.1"
Random = "^1.10"
Serialization = "1"
Expand Down
69 changes: 7 additions & 62 deletions src/InfrastructureOptimizationModels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ using DocStringExtensions
#################################################################################
# Exports

# Base Models
export DecisionModel
export EmulationModel
# Base Models — concrete DecisionModel/EmulationModel now defined and exported by POM.
export AbstractProblemTemplate
export ServicesModelContainer, DevicesModelContainer, BranchModelContainer
export InitialCondition
Expand Down Expand Up @@ -197,11 +195,9 @@ export EventParametersAttributes
export ValidDataParamEltypes

# Functions
export validate_time_series!
export init_optimization_container!
## Op Model Exports
export get_initial_conditions
export serialize_outputs
export serialize_optimization_model

export get_device_models
Expand Down Expand Up @@ -231,51 +227,17 @@ export add_pwl_normalization_constraint!
export add_pwl_sos2_constraint!
export get_pwl_cost_expression_delta

## Outputs interfaces
export get_variable_values
export get_dual_values
## Outputs interfaces — OptimizationProblemOutputs and its readers now live in POM.
export get_parameter_values
export get_aux_variable_values
export get_expression_values
export get_timestamps
export get_system
export list_variable_keys
export list_dual_keys
export list_parameter_keys
export list_aux_variable_keys
export list_expression_keys
export list_variable_names
export list_dual_names
export list_parameter_names
export list_aux_variable_names
export list_expression_names
export read_variable
export read_dual
export read_parameter
export read_aux_variable
export read_expression
export read_variables
export read_duals
export read_parameters
export read_aux_variables
export read_expressions
export get_realized_timestamps
export get_problem_base_power
export get_objective_value
export read_optimizer_stats

Comment thread
luke-kiernan marked this conversation as resolved.
## Utils Exports
export OptimizationProblemOutputs
export OptimizationProblemOutputsExport
export OptimizerStats
export get_all_constraint_index
export get_all_variable_index
export get_constraint_index
export get_variable_index
export list_recorder_events
export jump_value
export ConstraintBounds
export VariableBounds

# Internal accessors needed by downstream packages
export get_network_model
Expand All @@ -297,9 +259,6 @@ export get_service_name
export get_default_time_series_type
export add_expression_container!

# Initial condition infrastructure (extension points for POM)
export update_initial_conditions!

# Key Types (defined in IOM)
export OptimizationContainerKey
export VariableKey
Expand Down Expand Up @@ -370,15 +329,14 @@ export add_service_variables!, requires_initialization
# End bulk-added

# more extension points
export write_outputs!
export built_for_recurrent_solves
export get_incompatible_devices

# Bulk export: symbols POM needs that weren't previously exported
# Core types
export OptimizationContainer, OperationModel, AbstractPowerFlowEvaluationModel
export ArgumentConstructStage, ModelConstructStage
export EmulationModelStore, DeviceModelForBranches
export DeviceModelForBranches
export SOSStatusVariable
# Parameter types
export FuelCostParameter, VariableValueParameter, FixValueParameter
Expand Down Expand Up @@ -476,11 +434,12 @@ export ModelBuildStatus
export RunStatus
export SimulationBuildStatus

# Problem Types
# Problem Types — abstract types stay in IOM; default concrete subtypes
# (DefaultDecisionProblem, DefaultEmulationProblem, GenericOpProblem,
# GenericEmulationProblem) are exported by POM.
export OperationProblem
export DecisionProblem
export EmulationProblem
export DefaultDecisionProblem
export DefaultEmulationProblem

# Settings and Data Types
export Settings
Expand Down Expand Up @@ -517,9 +476,7 @@ export get_contributing_devices
export get_contributing_devices_map
export get_parameter_column_values
export update_container_parameter_values!
export export_outputs
export get_source_data
export set_source_data!

## Note: Concrete PowerModels types (ACPPowerModel, DCPPowerModel, etc.) are now
## defined and exported by PowerOperationsModels, not IOM.
Expand All @@ -538,8 +495,6 @@ include("core/parameter_container.jl") # Parameter container infr
include("core/abstract_model_store.jl") # Store depends on keys
include("core/optimizer_stats.jl") # Stats standalone
include("core/optimization_container_metadata.jl") # Metadata depends on keys
include("core/optimization_problem_outputs_export.jl") # Export config
include("core/optimization_problem_outputs.jl") # Outputs depends on all above
include("core/model_internal.jl") # Internal state (needs ModelBuildStatus)

include("core/time_series_parameter_types.jl")
Expand Down Expand Up @@ -625,16 +580,6 @@ include("bilinear_approximations/nmdt.jl")
include("common_models/add_param_container.jl")

include("operation/operation_model_interface.jl")
include("operation/decision_model_store.jl")
include("operation/emulation_model_store.jl")
include("operation/store_common.jl")
include("operation/initial_conditions_update_in_memory_store.jl")
include("operation/decision_model.jl")
include("operation/emulation_model.jl")
include("operation/problem_outputs.jl")
include("operation/time_series_interface.jl")
include("operation/optimization_debugging.jl")
include("operation/model_numerical_analysis_utils.jl")

include("initial_conditions/calculate_initial_condition.jl")

Expand Down
38 changes: 16 additions & 22 deletions src/core/operation_model_abstract_types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
"""
Abstract type for Decision Model and Emulation Model. OperationModel structs are parameterized with DecisionProblem or Emulation Problem structs
Common supertype for problems that an `OperationModel` can solve.
Both `DecisionProblem` and `EmulationProblem` are subtypes.
"""
abstract type OperationModel end
abstract type OperationProblem end

"""
Abstract type for Decision Model and Emulation Model. `OperationModel`
subtypes are parameterized by the problem they solve (`<: OperationProblem`).
"""
abstract type OperationModel{T <: OperationProblem} end

#TODO: Document the required interfaces for custom types
"""
Expand All @@ -13,7 +20,7 @@ import InfrastructureOptimizationModels
const POM = InfrastructureOptimizationModels
struct MyCustomProblem <: POM.DecisionProblem
"""
abstract type DecisionProblem end
abstract type DecisionProblem <: OperationProblem end

"""
Abstract type for Emulation Problems
Expand All @@ -24,7 +31,12 @@ import InfrastructureOptimizationModels
const POM = InfrastructureOptimizationModels
struct MyCustomEmulator <: POM.EmulationProblem
"""
abstract type EmulationProblem end
abstract type EmulationProblem <: OperationProblem end

"""
Return the concrete `OperationProblem` subtype that parameterizes a model.
"""
get_problem_type(::OperationModel{M}) where {M <: OperationProblem} = M

#################################################################################
# Simulation Models Container
Expand Down Expand Up @@ -55,21 +67,3 @@ end

# Placeholder accessor function for simulation sequence
get_step_resolution(::SimulationSequence) = Dates.Hour(1)

#################################################################################
# Simulation Type
# Abstract type for simulation objects
# Concrete implementation should be in PowerSimulations
abstract type Simulation end

#################################################################################
# Simulation Outputs Type
# Abstract type for simulation outputs
# Concrete implementation should be in PowerSimulations
abstract type SimulationOutputs end

#################################################################################
# Simulation Problem Outputs Type
# Abstract type for individual problem outputs within a simulation
# Concrete implementation should be in PowerSimulations
abstract type SimulationProblemOutputs end
Loading
Loading