Rename episode_analytics into episode

vinault · Feb 24, 2020 · 555e82f · 555e82f
1 parent 52b8084
commit 555e82f
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 8 deletions.
diff --git a/grid2kpi/__init__.py b/grid2kpi/__init__.py
@@ -0,0 +1 @@
+from .episode import EpisodeAnalytics
diff --git a/...kpi/episode_analytics/EpisodeAnalytics.py → grid2kpi/episode/EpisodeAnalytics.py b/...kpi/episode_analytics/EpisodeAnalytics.py → grid2kpi/episode/EpisodeAnalytics.py
@@ -63,7 +63,7 @@ def _make_df_from_data(self):
         -------
         res: :class:`tuple`
          generated dataframes
-    """
+        """
         size = len(self.actions)
         timesteps = list(range(size))
         load_size = size * len(self.observations[0].load_p)
@@ -133,10 +133,17 @@ def _make_df_from_data(self):
 
             pos = time_step
             # TODO : change with benjamin's count of actions
-            action_line = np.sum(act._switch_line_status)
+            action_line = np.sum(act._switch_line_status) + np.sum(act._set_line_status)
+            if action_line > 0:
+                line_action = "reconnect " + line_action
+            if action_line < 0:
+                line_action = "disconnect " + line_action
+                action_line = - action_line
 
             # TODO: change with benjamin's count of actions
-            action_subs = int(np.any(act._change_bus_vect))
+            action_subs = int(np.any(act._change_bus_vect)) + int(np.any(act._set_topo_vect))
+            if action_line:
+                action_subs = 0
 
             object_changed_set = self.get_object_changed(
                 act._set_topo_vect, topo_list)

diff --git a/grid2kpi/episode_analytics/EpisodeTrace.py → grid2kpi/episode/EpisodeTrace.py b/grid2kpi/episode_analytics/EpisodeTrace.py → grid2kpi/episode/EpisodeTrace.py
diff --git a/grid2kpi/episode/__init__.py b/grid2kpi/episode/__init__.py
@@ -0,0 +1 @@
+from .EpisodeAnalytics import *
diff --git a/grid2kpi/episode_analytics/actions_model.py → grid2kpi/episode/actions_model.py b/grid2kpi/episode_analytics/actions_model.py → grid2kpi/episode/actions_model.py
diff --git a/...episode_analytics/consumption_profiles.py → grid2kpi/episode/consumption_profiles.py b/...episode_analytics/consumption_profiles.py → grid2kpi/episode/consumption_profiles.py
diff --git a/grid2kpi/episode_analytics/env_actions.py → grid2kpi/episode/env_actions.py b/grid2kpi/episode_analytics/env_actions.py → grid2kpi/episode/env_actions.py
diff --git a/grid2kpi/episode_analytics/maintenances.py → grid2kpi/episode/maintenances.py b/grid2kpi/episode_analytics/maintenances.py → grid2kpi/episode/maintenances.py
diff --git a/...pi/episode_analytics/observation_model.py → grid2kpi/episode/observation_model.py b/...pi/episode_analytics/observation_model.py → grid2kpi/episode/observation_model.py
diff --git a/grid2kpi/episode_analytics/__init__.py b/grid2kpi/episode_analytics/__init__.py
diff --git a/setup.py b/setup.py
@@ -1,10 +1,10 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 setup(name='Grid2Kpi',
-      version='0.1.0',
-      description='Toto',
-      long_description='Tata',
+      version='0.1.0-rc3',
+      description='Grid2Kpi',
+      long_description='Grid2Kpi',
       classifiers=[
           'Development Status :: 4 - Beta',
           'Programming Language :: Python :: 3.6',
@@ -16,7 +16,7 @@
           "Natural Language :: English"
       ],
       license='MPL',
-      packages=['grid2kpi'],
+      packages=['grid2kpi', 'grid2kpi.episode'],
       include_package_data=True,
       install_requires=["numpy", "pandas", "pandapower", "Grid2Op", "plotly"],
       zip_safe=False)