rtc-tools-interface 0.7.3__tar.gz → 0.7.5__tar.gz

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtc-tools-interface
-Version: 0.7.3
+Version: 0.7.5
 Summary: Toolbox for user interfaces for RTC-Tools
 Home-page: UNKNOWN
 Author: Deltares

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/README.md

@@ -163,4 +163,4 @@ The table could thus look like:
 |  | Volume (\$m^3\$)  |                |                  | electricity_cost | "Goal for minimizing electricity cost, at priority 10" | python
 
 
-After running the model, in your output folder the folder `goal_figures` containing the figures is created.
+After running the model, in your output folder the folder `figures` containing the figures is created.

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/rtc_tools_interface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtc-tools-interface
-Version: 0.7.3
+Version: 0.7.5
 Summary: Toolbox for user interfaces for RTC-Tools
 Home-page: UNKNOWN
 Author: Deltares

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/rtctools_interface/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-03-05T11:26:05+0100",
+ "date": "2024-05-07T16:13:24+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "444bbd64198172e319ec16b7ee923ad775b0499d",
- "version": "0.7.3"
+ "full-revisionid": "af2a5c1b89eab1ec3446493bf214a9a157408bdb",
+ "version": "0.7.5"
 }
 '''  # END VERSION_JSON
 

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/rtctools_interface/plotting/plot_tools.py

@@ -40,7 +40,7 @@ def get_subplot_axis(i_plot, n_rows, n_cols, axs):
 
 def get_file_write_path(output_folder: Union[str, Path], file_name="figure"):
     """Get path to to file."""
-    new_output_folder = Path(output_folder) / "goal_figures"
+    new_output_folder = Path(output_folder) / "figures"
     os.makedirs(new_output_folder, exist_ok=True)
     return os.path.join(new_output_folder, file_name)
 

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/rtctools_interface/simulation/plot_mixin.py

@@ -1,6 +1,9 @@
 """Mixin to store all required data for plotting. Can also call the plot function."""
 
 import logging
+from typing import Dict, List
+
+import numpy as np
 
 from rtctools_interface.plotting.plot_tools import create_plot_final_results
 from rtctools_interface.utils.results_collection import PlottingBaseMixin
@@ -14,6 +17,23 @@ class PlotMixin(PlottingBaseMixin):
     """
 
     optimization_problem = False
+    _manual_extracted_states: Dict[str, list] = {}
+
+    def manual_extraction_from_state_vector(self):
+        for variable in self.custom_variables:
+            try:
+                self._manual_extracted_states[variable].append(self.get_var(variable))
+            except KeyError:
+                logger.debug("Variable {} not found in output of model.".format(variable))
+
+    def initialize(self):
+        super().initialize()
+        self._manual_extracted_states = {variable: [] for variable in self.custom_variables}
+        self.manual_extraction_from_state_vector()
+
+    def update(self, dt):
+        super().update(dt)
+        self.manual_extraction_from_state_vector()
 
     def post(self):
         """Tasks after optimizing."""
@@ -26,3 +46,6 @@ class PlotMixin(PlottingBaseMixin):
 
         if self.plot_final_results:
             create_plot_final_results(current_run, self._previous_run, plotting_library=self.plotting_library)
+
+    def collect_timeseries_data(self, all_variables_to_store: List[str]) -> Dict[str, np.ndarray]:
+        return {variable: np.array(self._manual_extracted_states[variable]) for variable in all_variables_to_store}

{rtc-tools-interface-0.7.3 → rtc-tools-interface-0.7.5}/rtctools_interface/utils/results_collection.py

@@ -152,7 +152,7 @@ class PlottingBaseMixin(ReadGoalsMixin):
                 timeseries_data[timeseries_name] = extracted_results[timeseries_name]
             except KeyError:
                 try:
-                    timeseries_data[timeseries_name] = self.get_timeseries(timeseries_name)
+                    timeseries_data[timeseries_name] = self.io.get_timeseries(timeseries_name)[1]
                 except KeyError as exc:
                     raise KeyError("Cannot find timeseries for %s" % timeseries_name) from exc
         return timeseries_data