Fixed when using investment models (#40)

* Moved test of checks to separate file * Use default function from EMB 0.8.3 * Added error in EMRP checks and extended tests * Fixed problems when using investment model - Extension functions where not working - Tests included to check that everything is fine
EnergyModelsX · Nov 29, 2024 · 040e6d1 · 040e6d1 · JulStraus · Nov 29, 2024
1 parent 02dba0e
commit 040e6d1
Show file tree

Hide file tree

Showing 11 changed files with 814 additions and 379 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,11 @@
 # Release notes
 
+## Version 0.6.4 (2024-11-29)
+
+* Fixed errors overseen from the inclusion of batteries and detailed hydropower.
+* Extended on tests to avoid errors like these in the future.
+* Provided a comprehensive testset for checks.
+
 ## Version 0.6.3 (2024-11-27)
 
 ### Battery modelling

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "EnergyModelsRenewableProducers"
 uuid = "b007c34f-ba52-4995-ba37-fffe79fbde35"
 authors = ["Sigmund Eggen Holm, Julian Straus, Per Aaslid, Linn Emelie Schäffer"]
-version = "0.6.3"
+version = "0.6.4"
 
 [deps]
 EnergyModelsBase = "5d7e687e-f956-46f3-9045-6f5a5fd49f50"
@@ -15,7 +15,7 @@ EnergyModelsInvestments = "fca3f8eb-b383-437d-8e7b-aac76bb2004f"
 EMIExt = "EnergyModelsInvestments"
 
 [compat]
-EnergyModelsBase = "0.8.1"
+EnergyModelsBase = "0.8.3"
 EnergyModelsInvestments = "0.8"
 JuMP = "1.5"
 TimeStruct = "0.9"

diff --git a/ext/EMIExt/checks.jl b/ext/EMIExt/checks.jl
@@ -8,7 +8,7 @@ utilize investments at the time being, a separate function is required
 - No investment data is allowed
 """
 function EMB.check_node_data(
-    n::Union{HydroReservoir,HydroUnit,HydroGate},
+    n::Union{HydroReservoir,EMRP.HydroUnit,HydroGate},
     data::InvestmentData,
     𝒯,
     modeltype::AbstractInvestmentModel,

diff --git a/ext/EMIExt/utils.jl b/ext/EMIExt/utils.jl
@@ -25,17 +25,17 @@ function EMRP.multiplication_variables(
     else
         # Calculation of the multiplication with the installed capacity of the node
         prod = @expression(m, [t_inv ∈ 𝒯ᴵⁿᵛ],
-            capacity(level(n), t_inv) * [:bat_stack_replace_b][n, t_inv]
+            capacity(level(n), t_inv) * m[:bat_stack_replace_b][n, t_inv]
         )
     end
     return prod
 end
 
-function capacity_max(n::AbstractBattery, t_inv, modeltype::AbstractInvestmentModel)
+function EMRP.capacity_max(n::AbstractBattery, t_inv, modeltype::AbstractInvestmentModel)
     if EMI.has_investment(n, :level)
-        max_installed = capacity(level(n), t_inv) * cycles(n)
+        max_installed = EMI.max_installed(EMI.investment_data(n, :level), t_inv) * EMRP.cycles(n)
     else
-        max_installed = EMI.max_installed(EMI.investment_data(n, :level)) * cycles(n)
+        max_installed = capacity(level(n), t_inv) * EMRP.cycles(n)
     end
     return max_installed
 end