Merge pull request #93 from intelligent-environments-lab/citylearn-ch…

…allenge-2023-power-outage-env Citylearn challenge 2023 power outage env
intelligent-environments-lab · Oct 20, 2023 · 448e3e4 · 448e3e4
2 parents 7b81a10 + dc04e34
commit 448e3e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/citylearn/__init__.py b/citylearn/__init__.py
@@ -1 +1 @@
-__version__ = '2.1b11'
+__version__ = '2.1b12'
diff --git a/citylearn/cost_function.py b/citylearn/cost_function.py
@@ -333,8 +333,9 @@ def normalized_unserved_energy(expected_energy: List[float], served_energy: List
             'power_outage': [1]*len(served_energy) if power_outage is None else power_outage,
         })
         data['unserved_energy'] = data['expected_energy'] - data['served_energy']
-        data.loc[data['power_outage']==0, 'unserved_energy'] = 0.0
+        data.loc[data['power_outage']==0, ('unserved_energy', 'expected_energy')] = (0.0, 0.0)
         data['unserved_energy'] = data['unserved_energy'].rolling(window=data.shape[0], min_periods=1).sum()
-        data['unserved_energy'] = data['unserved_energy']/data['expected_energy'].sum()
+        expected_energy = data['expected_energy'].sum()
+        data['unserved_energy'] = data['unserved_energy']/expected_energy
 
         return data['unserved_energy'].tolist()