Changement equation eteint et ajout spill reserve

tests/functional/data_reserve/thermal_reserves_one_cluster/components.yml

@@ -44,6 +44,30 @@ study:
       - name: tertiary2_reserve_down_not_supplied_cost
         type: constant
         value: 1000
+      - name: primary_reserve_up_oversupplied_cost
+        type: constant
+        value: 0
+      - name: primary_reserve_down_oversupplied_cost
+        type: constant
+        value: 0
+      - name: secondary_reserve_up_oversupplied_cost
+        type: constant
+        value: 0
+      - name: secondary_reserve_down_oversupplied_cost
+        type: constant
+        value: 0
+      - name: tertiary1_reserve_up_oversupplied_cost
+        type: constant
+        value: 0
+      - name: tertiary1_reserve_down_oversupplied_cost
+        type: constant
+        value: 0
+      - name: tertiary2_reserve_up_oversupplied_cost
+        type: constant
+        value: 0
+      - name: tertiary2_reserve_down_oversupplied_cost
+        type: constant
+        value: 0
 
   components:
     - id: D
@@ -107,6 +131,18 @@ study:
         - name: nb_units_max
           type: timeseries
           timeseries: nb_units_max-ts
+        - name: nb_units_max_invisible
+          type: timeseries
+          timeseries: nb_units_max-ts
+        - name: nb_units_off_invisible
+          type: timeseries
+          timeseries: nb_units_max-ts
+        - name: nb_units_off_min
+          type: constant
+          value: 0
+        - name: nb_units_off_max
+          type: timeseries
+          timeseries: nb_units_max-ts
         - name: max_failure
           type: constant
           value: 0
@@ -155,25 +191,37 @@ study:
         - name: participation_max_tertiary2_reserve_down
           type: constant
           value: 27
-        - name : cost_participation_primary_reserve_up
+        - name : cost_participation_primary_reserve_up_on
+          type : constant
+          value : 0
+        - name : cost_participation_primary_reserve_up_off
           type : constant
           value : 0
         - name : cost_participation_primary_reserve_down
           type : constant
           value : 0
-        - name : cost_participation_secondary_reserve_up
+        - name : cost_participation_secondary_reserve_up_on
+          type : constant
+          value : 0
+        - name : cost_participation_secondary_reserve_up_off
           type : constant
           value : 0
         - name : cost_participation_secondary_reserve_down
           type : constant
           value : 0
-        - name : cost_participation_tertiary1_reserve_up
+        - name : cost_participation_tertiary1_reserve_up_on
+          type : constant
+          value : 0
+        - name : cost_participation_tertiary1_reserve_up_off
           type : constant
           value : 0
         - name : cost_participation_tertiary1_reserve_down
           type : constant
           value : 0
-        - name : cost_participation_tertiary2_reserve_up
+        - name : cost_participation_tertiary2_reserve_up_on
+          type : constant
+          value : 0
+        - name : cost_participation_tertiary2_reserve_up_off
           type : constant
           value : 0
         - name : cost_participation_tertiary2_reserve_down

tests/functional/libs/heuristic_arrondi.py

@@ -132,13 +132,17 @@ def arrondi_opti_sans_start_up(
     cost : float,
     startup_cost : float,
     fixed_cost : float,
-    cost_participation_primary_reserve_up : float,
+    cost_participation_primary_reserve_up_on : float,
+    cost_participation_primary_reserve_up_off : float,
     cost_participation_primary_reserve_down : float,
-    cost_participation_secondary_reserve_up : float,
+    cost_participation_secondary_reserve_up_on : float,
+    cost_participation_secondary_reserve_up_off : float,
     cost_participation_secondary_reserve_down : float,
-    cost_participation_tertiary1_reserve_up : float,
+    cost_participation_tertiary1_reserve_up_on : float,
+    cost_participation_tertiary1_reserve_up_off : float,
     cost_participation_tertiary1_reserve_down : float,
-    cost_participation_tertiary2_reserve_up : float,        
+    cost_participation_tertiary2_reserve_up_on : float,   
+    cost_participation_tertiary2_reserve_up_off : float,        
     cost_participation_tertiary2_reserve_down : float,
     spillage_cost : float,
     ens_cost : float,
@@ -241,13 +245,17 @@ def nouvelle_arrondi(
     cost : float,
     startup_cost : float,
     fixed_cost : float,
-    cost_participation_primary_reserve_up : float,
+    cost_participation_primary_reserve_up_on : float,
+    cost_participation_primary_reserve_up_off : float,
     cost_participation_primary_reserve_down : float,
-    cost_participation_secondary_reserve_up : float,
+    cost_participation_secondary_reserve_up_on : float,
+    cost_participation_secondary_reserve_up_off : float,
     cost_participation_secondary_reserve_down : float,
-    cost_participation_tertiary1_reserve_up : float,
+    cost_participation_tertiary1_reserve_up_on : float,
+    cost_participation_tertiary1_reserve_up_off : float,
     cost_participation_tertiary1_reserve_down : float,
-    cost_participation_tertiary2_reserve_up : float,        
+    cost_participation_tertiary2_reserve_up_on : float,   
+    cost_participation_tertiary2_reserve_up_off : float,        
     cost_participation_tertiary2_reserve_down : float,
     spillage_cost : float,
     ens_cost : float,
@@ -313,13 +321,17 @@ def old_arrondi(
     cost : Optional[float] = 0,
     startup_cost : Optional[float] = 0,
     fixed_cost : Optional[float] = 0,
-    cost_participation_primary_reserve_up : Optional[float] = 0,
+    cost_participation_primary_reserve_up_on : Optional[float] = 0,
+    cost_participation_primary_reserve_up_off : Optional[float] = 0,
     cost_participation_primary_reserve_down : Optional[float] = 0,
-    cost_participation_secondary_reserve_up : Optional[float] = 0,
+    cost_participation_secondary_reserve_up_on : Optional[float] = 0,
+    cost_participation_secondary_reserve_up_off : Optional[float] = 0,
     cost_participation_secondary_reserve_down : Optional[float] = 0,
-    cost_participation_tertiary1_reserve_up : Optional[float] = 0,
+    cost_participation_tertiary1_reserve_up_on : Optional[float] = 0,
+    cost_participation_tertiary1_reserve_up_off : Optional[float] = 0,
     cost_participation_tertiary1_reserve_down : Optional[float] = 0,
-    cost_participation_tertiary2_reserve_up : Optional[float] = 0,       
+    cost_participation_tertiary2_reserve_up_on : Optional[float] = 0,   
+    cost_participation_tertiary2_reserve_up_off : Optional[float] = 0,       
     cost_participation_tertiary2_reserve_down : Optional[float] = 0,
     spillage_cost : Optional[float] = 0,
     ens_cost : Optional[float] = 0,
@@ -335,3 +347,25 @@ def old_arrondi(
 
     nbr_on = ceil(round(nbr_on_float,12))
     return(nbr_on)
+
+def old_arrondi_eteint_off(
+    nbr_on_float : float,
+    nbr_units_max : float,
+    nbr_off_float : float,
+) -> int:
+
+    nbr_on = ceil(round(nbr_on_float,12))
+    nbr_off = ceil(round(nbr_off_float,12))
+
+    if nbr_off + nbr_on > nbr_units_max:
+        nbr_off -= 1
+
+    return(nbr_off)
+
+def old_arrondi_eteint_on(
+    nbr_on_float : float,
+    nbr_units_max : float,
+) -> int:
+
+    nbr_on = ceil(round(nbr_on_float,12))
+    return(nbr_on)

tests/functional/libs/heuristique.py

@@ -55,3 +55,29 @@ def heuristique_mix(
             arrondi_final[t] = arrondi_opti_avec_start_up(*[s[t] for s in variable],*[p[t] for p in params])        
     return arrondi_final
 
+def old_heuristique_eteint_off(
+        horaire : List[str],
+        variable: List[List[str]],
+        params: Optional[List[List[str]]] = None,
+    ) -> List[str]:
+
+    arrondi_final = [ old_arrondi_eteint_off(*[s[t] for s in variable],*[p[t] for p in params]) for t in horaire]
+    return arrondi_final
+
+def old_heuristique_eteint_on(
+        horaire : List[str],
+        variable: List[List[str]],
+        params: Optional[List[List[str]]] = None,
+    ) -> List[str]:
+
+    arrondi_final = [ old_arrondi_eteint_on(*[s[t] for s in variable],*[p[t] for p in params]) for t in horaire]
+    return arrondi_final
+
+def changement_invisible(
+        horaire : List[str],
+        variable: List[List[str]],
+        params: Optional[List[List[str]]] = None,
+    ) -> List[str]:
+
+    a = [ variable[0][t] for t in horaire ]
+    return([ variable[0][t] for t in horaire ])