Fix variable get structure

AntaresSimulatorTeam · Aug 21, 2024 · 27f8ad8 · 27f8ad8
1 parent 2c723cd
commit 27f8ad8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/andromede/expression/linear_expression_efficient.py b/src/andromede/expression/linear_expression_efficient.py
@@ -1079,6 +1079,7 @@ def _copy_expression(
 
 # TODO : Define shortcuts for "x", is_one etc ....
 def var(name: str) -> LinearExpressionEfficient:
+    # TODO: At term build time, no information on the variable structure is known, we use a default time, scenario varying, maybe discard structure as term attribute ?
     return LinearExpressionEfficient(
         [
             TermEfficient(

diff --git a/src/andromede/libs/standard.py b/src/andromede/libs/standard.py
@@ -343,7 +343,7 @@
             var("nb_stop").sum(
                 shift=ExpressionRange(-param("d_min_down") + 1, literal(0))
             )
-            <= param("nb_units_max").shift(-param("d_min_down")) - var("nb_on"),
+            <= param("nb_units_max").shift(-param("d_min_down")).sum() - var("nb_on"),
         ),
     ],
     objective_operational_contribution=(param("cost") * var("generation"))

diff --git a/src/andromede/simulation/linear_expression_resolver.py b/src/andromede/simulation/linear_expression_resolver.py
@@ -90,7 +90,10 @@ def resolve_variables(
                         scenario,
                         term.component_id,
                         term.variable_name,
-                        term.structure,
+                        # At term build time, no information on the variable structure is known, we use it now
+                        self.context.network.get_component(term.component_id)
+                        .model.variables[term.variable_name]
+                        .structure,
                     )
                 )
         return solver_vars