Jd/multiple fixes

.github/workflows/cross-package-test.yml

@@ -0,0 +1,47 @@
+name: CrossPackageTest
+
+on:
+  push:
+    branches: [main]
+    tags: [v*]
+  pull_request:
+
+jobs:
+  test:
+    name: Julia v${{ matrix.julia-version }} - ${{ matrix.package_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        julia-version: [1]
+        os: [ubuntu-latest]
+        package_name: [HydroPowerSimulations, StorageSystemsSimulations]
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.julia-version }}
+          arch: x64
+      - uses: julia-actions/julia-buildpkg@latest
+      - name: Clone ${{matrix.package_name}}
+        uses: actions/checkout@v2
+        with:
+          repository: NREL-Sienna/${{matrix.package_name}}.jl
+          path: downstream
+      - name: Run the tests
+        shell: julia --project=downstream {0}
+        run: |
+          using Pkg
+          try
+            # Force it to use this PR's version of the package
+            Pkg.develop(PackageSpec(path="."))  # resolver may fail with main deps
+            Pkg.update()
+            Pkg.test()  # resolver may fail with test time deps
+          catch err
+            err isa Pkg.Resolve.ResolverError || rethrow()
+            # If we can't resolve that means this is incompatible by SemVer, and this is fine.
+            # It means we marked this as a breaking change, so we don't need to worry about
+            # mistakenly introducing a breaking change as we have intentionally made one.
+            @info "Not compatible with this release. No problem." exception=err
+            exit(0)  # Exit immediately, as a success
+          end

Project.toml

@@ -38,15 +38,14 @@ DocStringExtensions = "~v0.9"
 HDF5 = "~0.17"
 InfrastructureSystems = "2"
 InteractiveUtils = "1"
-JSON = "0.21"
 JSON3 = "1"
 JuMP = "1"
 LinearAlgebra = "1"
 Logging = "1"
 MathOptInterface = "1"
 PowerModels = "^0.21"
-PowerNetworkMatrices = "^0.11.1"
-PowerSystems = "4"
+PowerNetworkMatrices = "^0.11"
+PowerSystems = "^4.4"
 PrettyTables = "2"
 ProgressMeter = "^1.5"
 Serialization = "1"

docs/src/api/PowerSimulations.md

@@ -269,7 +269,6 @@ FlowLimitConstraint
 FlowRateConstraint
 FlowRateConstraintFromTo
 FlowRateConstraintToFrom
-HVDCLossesAbsoluteValue
 HVDCPowerBalance
 NetworkFlowConstraint
 RateLimitConstraint

src/PowerSimulations.jl

@@ -412,7 +412,6 @@ import TimeSeries
 
 # I/O Imports
 import DataFrames
-import JSON
 import CSV
 import HDF5
 import PrettyTables

src/core/constraints.jl

@@ -332,23 +332,8 @@ The specified constraint is formulated as:
 ```
 """
 struct PhaseAngleControlLimit <: ConstraintType end
-"""
-Struct to create the constraints that set the losses through a lossy HVDC two-terminal line.
-
-For more information check [Branch Formulations](@ref PowerSystems.Branch-Formulations).
-
-The specified constraints are formulated as:
-
-```math
-\\begin{align*}
-& f_t^\\text{to-from} - f_t^\\text{from-to} \\le \\ell_t,\\quad \\forall t \\in \\{1,\\dots, T\\} \\\\
-& f_t^\\text{from-to} - f_t^\\text{to-from} \\le \\ell_t,\\quad \\forall t \\in \\{1,\\dots, T\\}
-\\end{align*}
-```
-"""
-struct HVDCLossesAbsoluteValue <: ConstraintType end
-struct HVDCDirection <: ConstraintType end
 struct InterfaceFlowLimit <: ConstraintType end
+struct HVDCFlowCalculationConstraint <: ConstraintType end
 
 abstract type PowerVariableLimitsConstraint <: ConstraintType end
 """

src/core/formulations.jl

@@ -134,6 +134,11 @@ struct HVDCTwoTerminalLossless <: AbstractTwoTerminalDCLineFormulation end
 Branch type to represent lossy power flow on DC lines
 """
 struct HVDCTwoTerminalDispatch <: AbstractTwoTerminalDCLineFormulation end
+"""
+Branch type to represent piecewise lossy power flow on two terminal DC lines
+"""
+struct HVDCTwoTerminalPiecewiseLoss <: AbstractTwoTerminalDCLineFormulation end
+
 # Not Implemented
 # struct VoltageSourceDC <: AbstractTwoTerminalDCLineFormulation end
 

src/core/initial_conditions.jl

@@ -3,7 +3,7 @@ Container for the initial condition data
 """
 mutable struct InitialCondition{
     T <: InitialConditionType,
-    U <: Union{JuMP.VariableRef, Float64},
+    U <: Union{JuMP.VariableRef, Float64, Nothing},
 }
     component::PSY.Component
     value::U
@@ -39,16 +39,22 @@ function get_condition(
     return jump_value(p.value)
 end
 
+function get_condition(
+    ::InitialCondition{T, Nothing},
+) where {T <: InitialConditionType}
+    return nothing
+end
+
 get_component(ic::InitialCondition) = ic.component
 get_value(ic::InitialCondition) = ic.value
 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{JuMP.VariableRef, Float64}} = T
+) where {T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64, Nothing}} = T
 get_ic_type(
     ::InitialCondition{T, U},
-) where {T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64}} = T
+) where {T <: InitialConditionType, U <: Union{JuMP.VariableRef, Float64, Nothing}} = T
 
 """
 Stores data to populate initial conditions before the build call

src/core/optimization_container.jl

@@ -33,7 +33,12 @@ function get_objective_expression(v::ObjectiveFunction)
     if iszero(v.variant_terms)
         return v.invariant_terms
     else
-        return JuMP.add_to_expression!(v.variant_terms, v.invariant_terms)
+        # JuMP doesn't support expression conversion from Affn to QuadExpressions
+        if isa(v.invariant_terms, JuMP.GenericQuadExpr)
+            return JuMP.add_to_expression!(v.invariant_terms, v.variant_terms)
+        else
+            return JuMP.add_to_expression!(v.variant_terms, v.invariant_terms)
+        end
     end
 end
 get_sense(v::ObjectiveFunction) = v.sense
@@ -1503,7 +1508,8 @@ function _add_initial_condition_container!(
     else
         param_type = Float64
     end
-    ini_conds = Vector{InitialCondition{T, param_type}}(undef, length_devices)
+    ini_type = Union{InitialCondition{T, param_type}, InitialCondition{T, Nothing}}
+    ini_conds = Vector{ini_type}(undef, length_devices)
     _assign_container!(container.initial_conditions, ic_key, ini_conds)
     return ini_conds
 end
@@ -1716,6 +1722,9 @@ function _process_duals(container::OptimizationContainer, lp_optimizer)
             if JuMP.has_upper_bound(first(variable))
                 cache[key][:ub] = JuMP.upper_bound.(variable)
             end
+            if JuMP.is_fixed(first(variable)) && is_integer_flag
+                cache[key][:fixed_int_value] = jump_value.(v)
+            end
             cache[key][:integer] = is_integer_flag
             JuMP.fix.(variable, var_cache[key]; force = true)
         end
@@ -1756,6 +1765,9 @@ function _process_duals(container::OptimizationContainer, lp_optimizer)
         else
             JuMP.unfix.(variable)
             JuMP.set_binary.(variable)
+            if haskey(cache[key], :fixed_int_value)
+                JuMP.fix.(variable, cache[key][:fixed_int_value])
+            end
             #= Needed if a model has integer variables
             if haskey(cache[key], :lb) && JuMP.has_lower_bound(first(variable))
                 JuMP.set_lower_bound.(variable, cache[key][:lb])

src/core/variables.jl

@@ -228,8 +228,36 @@ Docs abbreviation: ``u^\\text{dir}``
 """
 struct HVDCFlowDirectionVariable <: VariableType end
 
+"""
+Struct to dispatch the creation of HVDC Received Flow at From Bus Variables for PWL formulations
+
+Docs abbreviation: ``x``
+"""
+struct HVDCActivePowerReceivedFromVariable <: VariableType end
+
+"""
+Struct to dispatch the creation of HVDC Received Flow at To Bus Variables for PWL formulations
+
+Docs abbreviation: ``y``
+"""
+struct HVDCActivePowerReceivedToVariable <: VariableType end
+
 abstract type SparseVariableType <: VariableType end
 
+"""
+Struct to dispatch the creation of HVDC Piecewise Loss Variables
+
+Docs abbreviation: ``h`` or ``w``
+"""
+struct HVDCPiecewiseLossVariable <: SparseVariableType end
+
+"""
+Struct to dispatch the creation of HVDC Piecewise Binary Loss Variables
+
+Docs abbreviation: ``z``
+"""
+struct HVDCPiecewiseBinaryLossVariable <: SparseVariableType end
+
 """
 Struct to dispatch the creation of piecewise linear cost variables for objective function
 
@@ -274,6 +302,8 @@ const START_VARIABLES = (HotStartVariable, WarmStartVariable, ColdStartVariable)
 
 should_write_resulting_value(::Type{PieceWiseLinearCostVariable}) = false
 should_write_resulting_value(::Type{PieceWiseLinearBlockOffer}) = false
+should_write_resulting_value(::Type{HVDCPiecewiseLossVariable}) = false
+should_write_resulting_value(::Type{HVDCPiecewiseBinaryLossVariable}) = false
 convert_result_to_natural_units(::Type{ActivePowerVariable}) = true
 convert_result_to_natural_units(::Type{PowerAboveMinimumVariable}) = true
 convert_result_to_natural_units(::Type{ActivePowerInVariable}) = true