short-term-storage model parsing test added

AntaresSimulatorTeam · Mar 8, 2024 · 24f3793 · 24f3793
1 parent ea4360d
commit 24f3793
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 14 deletions.
diff --git a/src/andromede/expression/parsing/parse_expression.py b/src/andromede/expression/parsing/parse_expression.py
@@ -142,8 +142,8 @@ def visitTimeShiftRange(
         self, ctx: ExprParser.TimeShiftRangeContext
     ) -> ExpressionNode:
         shifted_expr = self._convert_identifier(ctx.IDENTIFIER().getText())  # type: ignore
-        shift1 = ctx.shift1.accept(self)
-        shift2 = ctx.shift2.accept(self)
+        shift1 = ctx.shift1.accept(self)  # type: ignore
+        shift2 = ctx.shift2.accept(self)  # type: ignore
         return shifted_expr.shift(ExpressionRange(shift1, shift2))
 
     # Visit a parse tree produced by ExprParser#function.
@@ -156,11 +156,11 @@ def visitFunction(self, ctx: ExprParser.FunctionContext) -> ExpressionNode:
         return fn(operand)
 
     # Visit a parse tree produced by ExprParser#shift.
-    def visitShift(self, ctx: ExprParser.ShiftContext):
-        if ctx.expr() is None:
+    def visitShift(self, ctx: ExprParser.ShiftContext) -> ExpressionNode:
+        if ctx.expr() is None:  # type: ignore
             return literal(0)
-        shift = ctx.expr().accept(self)
-        if ctx.op.text == "-":
+        shift = ctx.expr().accept(self)  # type: ignore
+        if ctx.op.text == "-":  # type: ignore
             return -shift
         return shift
 

diff --git a/tests/andromede/model/test_model_parsing.py b/tests/andromede/model/test_model_parsing.py
@@ -12,14 +12,15 @@
 import io
 
 from andromede.expression import literal, param, var
-from andromede.libs.standard import CONSTANT
+from andromede.libs.standard import CONSTANT, TIME_AND_SCENARIO_FREE
 from andromede.model import (
     ModelPort,
     PortField,
     PortType,
     float_parameter,
     float_variable,
     model,
+    Constraint,
 )
 from andromede.model.model import PortFieldDefinition, PortFieldId
 from andromede.model.parsing import parse_yaml_library
@@ -96,14 +97,14 @@ def test_library_parsing():
         - name: inflows
       variables:
         - name: injection
-          lower_bound: 0
-          upper_bound: p_max_injection
+          lower-bound: 0
+          upper-bound: p_max_injection
         - name: withdrawal
-          lower_bound: 0
-          upper_bound: p_max_withdrawal
+          lower-bound: 0
+          upper-bound: p_max_withdrawal
         - name: level
-          lower_bound: level_min
-          upper_bound: level_max
+          lower-bound: level_min
+          upper-bound: level_max
       ports:
         - name: injection_port
           type: flow
@@ -113,7 +114,7 @@ def test_library_parsing():
           definition: "injection - withdrawal"
       constraints:
         - name: Level equation
-          expression: "level - level[-1] - efficiency * injection + withdrawal = inflows"
+          expression: "level[t] - level[t-1] - efficiency * injection + withdrawal = inflows"
           
     - id: thermal-cluster-dhd
       description: DHD model for thermal cluster
@@ -201,3 +202,49 @@ def test_library_parsing():
         ],
         objective_contribution=(param("cost") * var("generation")).sum().expec(),
     )
+    short_term_storage = lib.models["short-term-storage"]
+    assert short_term_storage == model(
+        id="short-term-storage",
+        parameters=[
+            float_parameter("efficiency", structure=CONSTANT),
+            float_parameter("level_min", structure=CONSTANT),
+            float_parameter("level_max", structure=CONSTANT),
+            float_parameter("p_max_withdrawal", structure=CONSTANT),
+            float_parameter("p_max_injection", structure=CONSTANT),
+            float_parameter("inflows", structure=CONSTANT),
+        ],
+        variables=[
+            float_variable(
+                "injection",
+                lower_bound=literal(0),
+                upper_bound=param("p_max_injection"),
+            ),
+            float_variable(
+                "withdrawal",
+                lower_bound=literal(0),
+                upper_bound=param("p_max_withdrawal"),
+            ),
+            float_variable(
+                "level",
+                lower_bound=param("level_min"),
+                upper_bound=param("level_max"),
+            ),
+        ],
+        ports=[ModelPort(port_type=port_type, port_name="injection_port")],
+        port_fields_definitions=[
+            PortFieldDefinition(
+                port_field=PortFieldId(port_name="injection_port", field_name="flow"),
+                definition=var("injection") - var("withdrawal"),
+            )
+        ],
+        constraints=[
+            Constraint(
+                name="Level equation",
+                expression=var("level")
+                - var("level").shift(-literal(1))
+                - param("efficiency") * var("injection")
+                + var("withdrawal")
+                == param("inflows"),
+            )
+        ],
+    )