keeping up with attribute rename in grid-parity-exchange/Egret#275 (#3)

darrylmelander · Apr 18, 2022 · aa73bae · aa73bae
1 parent 047cf62
commit aa73bae
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/prescient/engine/egret/data_extractors.py b/prescient/engine/egret/data_extractors.py
@@ -155,16 +155,16 @@ def get_max_power_available(sced: OperationsModel, g: G) -> float:
         gdata = sced.data['elements']['generator'][g]
         val = gdata['headroom']['values'][0] \
                 + ScedDataExtractor.get_power_generated(sced, g)*int(ScedDataExtractor.is_generator_on(sced,g))
-        if 'rg' in gdata:
-            val += sced.data['elements']['generator'][g]['rg']['values'][0]
+        if 'reserve_supplied' in gdata:
+            val += gdata['reserve_supplied']['values'][0]
         return val
 
     @staticmethod
     def get_thermal_headroom(sced: OperationsModel, g: G) -> float:
         gdata = sced.data['elements']['generator'][g]
         val = gdata['headroom']['values'][0]
-        if 'rg' in gdata:
-            val += gdata['rg']['values'][0]
+        if 'reserve_supplied' in gdata:
+            val += gdata['reserve_supplied']['values'][0]
         return val
 
     @staticmethod