update dependencies for psy4 (#36)

* update dependencies for psy4

* update tests for psy4 syntax

* increase the project.toml version

Project.toml

@@ -1,7 +1,7 @@
 name = "PowerFlows"
 uuid = "94fada2c-fd9a-4e89-8d82-81405f5cb4f6"
 authors = ["Jose Daniel Lara <jdlara@berkeley.edu>"]
-version = "0.6.2"
+version = "0.7.0"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -14,10 +14,10 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
 DataFrames = "1"
-InfrastructureSystems = "1"
+InfrastructureSystems = "2"
 LinearAlgebra = "1"
 NLsolve = "4"
-PowerNetworkMatrices = "^0.9, ^0.10"
-PowerSystems = "^3"
+PowerNetworkMatrices = "^0.9, ^0.10, ^0.11"
+PowerSystems = "^4"
 SparseArrays = "1"
 julia = "^1.6"

test/test_nlsolve_powerflow.jl

@@ -208,7 +208,7 @@ end
         r = 1e-3,
         x = 1e-3,
         b = (from = 0.0, to = 0.0),
-        rate = 0.0,
+        rating = 0.0,
         angle_limits = (min = -pi / 2, max = pi / 2),
     )
     add_component!(sys, l)
@@ -289,15 +289,14 @@ end
         active_power_limits = (min = 0.0, max = 0.0),
         reactive_power_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost(nothing),
+        operation_cost = ThermalGenerationCost(nothing),
         base_power = 100.0,
         time_limits = nothing,
         prime_mover_type = PrimeMovers.OT,
         fuel = ThermalFuels.OTHER,
         services = Device[],
         dynamic_injector = nothing,
         ext = Dict{String, Any}(),
-        time_series_container = InfrastructureSystems.TimeSeriesContainer(),
     )
     add_component!(sys, g1)
 
@@ -347,7 +346,7 @@ end
         r = 1e-3,
         x = 1e-3,
         b = (from = 0.0, to = 0.0),
-        rate = 0.0,
+        rating = 0.0,
         angle_limits = (min = -pi / 2, max = pi / 2),
     )
     add_component!(sys, l)
@@ -384,15 +383,14 @@ end
         active_power_limits = (min = 0.0, max = 0.0),
         reactive_power_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost(nothing),
+        operation_cost = ThermalGenerationCost(nothing),
         base_power = 100.0,
         time_limits = nothing,
         prime_mover_type = PrimeMovers.OT,
         fuel = ThermalFuels.OTHER,
         services = Device[],
         dynamic_injector = nothing,
         ext = Dict{String, Any}(),
-        time_series_container = InfrastructureSystems.TimeSeriesContainer(),
     )
     add_component!(sys, g1)