change implementation of parameters

.github/workflows/performance_comparison.yml

@@ -0,0 +1,72 @@
+name: 'Performance Comparison'
+
+on:
+  pull_request:
+
+jobs:
+  comparison:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: julia-actions/setup-julia@latest
+      - uses: actions/checkout@v1
+      - name: Run Perfomance Test Master
+        run: |
+          julia --project=test -e 'using Pkg; Pkg.add(PackageSpec(name="PowerSimulationsDynamics", rev="master")); Pkg.instantiate()'
+          julia -t 4 --project=test test/performance/performance_test.jl "Master"
+      - name: Run Perfomance Test Branch
+        run: |
+          julia --project=test -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
+          julia -t 4 --project=test test/performance/performance_test.jl "This Branch"
+      - name: Read precompile results
+        id: precompile_results
+        run: |
+          body="$(cat precompile_time.txt)"
+          body="${body//'%'/'%25'}"
+          body="${body//$'\n'/'%0A'}"
+          body="${body//$'\r'/'%0D'}"
+          echo "::set-output name=body::$body"
+      - name: Read build results
+        id: build_results
+        run: |
+          body="$(cat build_time.txt)"
+          body="${body//'%'/'%25'}"
+          body="${body//$'\n'/'%0A'}"
+          body="${body//$'\r'/'%0D'}"
+          echo "::set-output name=body::$body"
+      - name: Find Comment
+        uses: peter-evans/find-comment@v1
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Performance Results
+      - name: Create comment
+        if: steps.fc.outputs.comment-id == ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            Performance Results
+            | Version      | Precompile Time |
+            | :---        |    :----:   |
+            ${{ steps.precompile_results.outputs.body }}
+
+            | Version      | Build Time |
+            | :---        |    :----:   |
+            ${{ steps.build_results.outputs.body }}
+      - name: Update comment
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          body: |
+            Performance Results
+            | Version      | Precompile Time |
+            | :---        |    :----:   |
+            ${{ steps.precompile_results.outputs.body }}
+
+            | Version      | Build Time |
+            | :---        |    :----:   |
+            ${{ steps.build_results.outputs.body }}
+
+          edit-mode: replace

Project.toml

@@ -19,7 +19,6 @@ JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
-ParameterJuMP = "774612a8-9878-5177-865a-ca53ae2495f9"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PowerModels = "c36e90e8-916a-50a6-bd94-075b64ef4655"
 PowerSystems = "bcd98974-b02a-5e2f-9ee0-a103f5c450dd"
@@ -41,7 +40,6 @@ JSON = "0.21"
 JSON3 = "1"
 JuMP = "1"
 MathOptInterface = "1"
-ParameterJuMP = "~v0.4"
 PowerModels = "~0.19"
 PowerSystems = "^1.24"
 PrettyTables = "^1.3, 2"

README.md

@@ -21,24 +21,25 @@ The flexible modeling framework is enabled through a modular set of capabilities
 
 For example, an annual production cost modeling simulation can be created by formulating a unit commitment model against system data to assemble a set of 365 daily time-coupled scheduling problems.
 
-### _Simulations_ enabled by PowerSimulations
+## Simulations enabled by PowerSimulations
 
+- Integrated Resource Planning
 - Production Cost Modeling
 
-### _Model_ formulations contained in PowerSimulations
+## Opertation model formulations contained in PowerSimulations
 
 - [Unit Commitment](https://en.wikipedia.org/wiki/Unit_commitment_problem_in_electrical_power_production)
 - [Economic Dispatch](https://en.wikipedia.org/wiki/Economic_dispatch)
 
-### Installation
+## Installation
 
 ```julia
 julia> ]
-(v1.6) pkg> add PowerSystems
-(v1.6) pkg> add PowerSimulations
+(v1.8) pkg> add PowerSystems
+(v1.8) pkg> add PowerSimulations
 ```
 
-### Usage
+## Usage
 
 `PowerSimulations.jl` uses [PowerSystems.jl](https://github.com/NREL/PowerSystems.jl) to handle the data used in the simulations.
 

src/PowerSimulations.jl

@@ -367,7 +367,6 @@ import JuMP: optimizer_with_attributes
 import JuMP.Containers: DenseAxisArray, SparseAxisArray
 export optimizer_with_attributes
 import MathOptInterface
-import ParameterJuMP
 import LinearAlgebra
 import JSON3
 import PowerSystems
@@ -425,7 +424,6 @@ const PSI = PowerSimulations
 const IS = InfrastructureSystems
 const MOI = MathOptInterface
 const MOIU = MathOptInterface.Utilities
-const PJ = ParameterJuMP
 const MOPFM = MOI.FileFormats.Model
 const TS = TimeSeries
 

src/core/definitions.jl

@@ -10,15 +10,22 @@ const BUILD_PROBLEMS_TIMER = TimerOutputs.TimerOutput()
 const RUN_OPERATION_MODEL_TIMER = TimerOutputs.TimerOutput()
 const RUN_SIMULATION_TIMER = TimerOutputs.TimerOutput()
 
-# Type Alias for JuMP and PJ containers
-const PGAE = PJ.ParametrizedGenericAffExpr{Float64, JuMP.VariableRef}
+# Type Alias for JuMP containers
 const GAE = JuMP.GenericAffExpr{Float64, JuMP.VariableRef}
 const JuMPAffineExpressionArray = Matrix{GAE}
 const JuMPAffineExpressionVector = Vector{GAE}
 const JuMPConstraintArray = DenseAxisArray{JuMP.ConstraintRef}
-const JuMPVariableArray = DenseAxisArray{JuMP.VariableRef}
-const JuMPParamArray = DenseAxisArray{PJ.ParameterRef}
+const JuMPVariableMatrix = DenseAxisArray{
+    JuMP.VariableRef,
+    2,
+    Tuple{Vector{String}, UnitRange{Int64}},
+    Tuple{
+        JuMP.Containers._AxisLookup{Dict{String, Int64}},
+        JuMP.Containers._AxisLookup{Tuple{Int64, Int64}},
+    },
+}
 const JuMPFloatArray = DenseAxisArray{Float64}
+const JuMPVariableArray = DenseAxisArray{JuMP.VariableRef}
 
 # Settings constants
 const UNSET_HORIZON = 0

src/core/initial_conditions.jl

@@ -19,7 +19,7 @@ get_component_type(::ICKey{T, U}) where {T <: InitialConditionType, U <: PSY.Com
 """
 Container for the initial condition data
 """
-struct InitialCondition{T <: InitialConditionType, U <: Union{PJ.ParameterRef, Float64}}
+struct InitialCondition{T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64}}
     component::PSY.Component
     value::U
 end
@@ -28,7 +28,7 @@ function InitialCondition(
     ::Type{T},
     component::PSY.Component,
     value::U,
-) where {T <: InitialConditionType, U <: Union{PJ.ParameterRef, Float64}}
+) where {T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64}}
     return InitialCondition{T, U}(component, value)
 end
 
@@ -39,7 +39,7 @@ function InitialCondition(
 ) where {
     T <: InitialConditionType,
     U <: PSY.Component,
-    V <: Union{PJ.ParameterRef, Float64},
+    V <: Union{JuMP.VariableRef, Float64},
 }
     return InitialCondition{T, U}(component, value)
 end
@@ -49,7 +49,7 @@ function get_condition(p::InitialCondition{T, Float64}) where {T <: InitialCondi
 end
 
 function get_condition(
-    p::InitialCondition{T, PJ.ParameterRef},
+    p::InitialCondition{T, JuMP.VariableRef},
 ) where {T <: InitialConditionType}
     return jump_value(p.value)
 end
@@ -60,10 +60,10 @@ get_component_name(ic::InitialCondition) = PSY.get_name(ic.component)
 get_component_type(ic::InitialCondition) = typeof(ic.component)
 get_ic_type(
     ::Type{InitialCondition{T, U}},
-) where {T <: InitialConditionType, U <: Union{PJ.ParameterRef, Float64}} = T
+) where {T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64}} = T
 get_ic_type(
     ::InitialCondition{T, U},
-) where {T <: InitialConditionType, U <: Union{PJ.ParameterRef, Float64}} = T
+) where {T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64}} = T
 
 """
 Stores data to populate initial conditions before the build call