Merge pull request #140 from RAMP-project/review/paper-figure-code

Code to reproduce JOSS figure
RAMP-project · May 15, 2024 · fbf77bd · fbf77bd
2 parents ef010ae + 2e868f9
commit fbf77bd
Show file tree

Hide file tree

Showing 3 changed files with 161 additions and 6 deletions.
diff --git a/docs/notebooks/example_figure_joss.ipynb b/docs/notebooks/example_figure_joss.ipynb
diff --git a/docs/notebooks/plot_class.ipynb b/docs/notebooks/plot_class.ipynb
diff --git a/ramp/core/core.py b/ramp/core/core.py
@@ -312,8 +312,8 @@ def initialize(
             # format datetimeindex in minutes
             self.__datetimeindex = pd.date_range(
                 start=self.days[0],
-                end=self.days[-1] + pd.Timedelta(1, "d") - pd.Timedelta(1, "T"),
-                freq="T",
+                end=self.days[-1] + pd.Timedelta(1, "d") - pd.Timedelta(1, "min"),
+                freq="min",
             )
 
     @property
@@ -1399,10 +1399,14 @@ def windows(
         )  # same as above for window3
 
         self.random_var_1 = int(
-            random_var_w * np.diff(self.window_1)
+            random_var_w * np.diff(self.window_1)[0]
         )  # calculate the random variability of window1, i.e. the maximum range of time they can be enlarged or shortened
-        self.random_var_2 = int(random_var_w * np.diff(self.window_2))  # same as above
-        self.random_var_3 = int(random_var_w * np.diff(self.window_3))  # same as above
+        self.random_var_2 = int(
+            random_var_w * np.diff(self.window_2)[0]
+        )  # same as above
+        self.random_var_3 = int(
+            random_var_w * np.diff(self.window_3)[0]
+        )  # same as above
 
         # automatically appends the appliance to the user's appliance list
         self.user._add_appliance_instance(self)