rtc-tools-interface 0.7.4__tar.gz → 0.7.6__tar.gz

{rtc-tools-interface-0.7.4 → rtc-tools-interface-0.7.6}/PKG-INFO

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

{rtc-tools-interface-0.7.4 → rtc-tools-interface-0.7.6}/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.4 → rtc-tools-interface-0.7.6}/rtc_tools_interface.egg-info/PKG-INFO

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

{rtc-tools-interface-0.7.4 → rtc-tools-interface-0.7.6}/rtctools_interface/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-04-25T09:38:32+0200",
+ "date": "2024-05-07T17:02:33+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "6a173e1225c206b2767e60622278e201b16cb21e",
- "version": "0.7.4"
+ "full-revisionid": "0a20a376b41a3ca0e27f8d19c46f6b6d91536766",
+ "version": "0.7.6"
 }
 '''  # END VERSION_JSON
 

{rtc-tools-interface-0.7.4 → rtc-tools-interface-0.7.6}/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.6/rtctools_interface/simulation/plot_mixin.py

@@ -0,0 +1,51 @@
+"""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
+
+logger = logging.getLogger("rtctools")
+
+
+class PlotMixin(PlottingBaseMixin):
+    """
+    Class for plotting results based on the plot_table.
+    """
+
+    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, *args, **kwargs):
+        super().initialize(*args, **kwargs)
+        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."""
+        super().post()
+
+        timeseries_data = self.collect_timeseries_data(self.custom_variables)
+        self._intermediate_results.append({"timeseries_data": timeseries_data, "priority": 0})
+        current_run = self.create_plot_data_and_config([])
+        self._store_current_results(self._cache_folder, current_run)
+
+        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.4/rtctools_interface/simulation/plot_mixin.py

@@ -1,28 +0,0 @@
-"""Mixin to store all required data for plotting. Can also call the plot function."""
-
-import logging
-
-from rtctools_interface.plotting.plot_tools import create_plot_final_results
-from rtctools_interface.utils.results_collection import PlottingBaseMixin
-
-logger = logging.getLogger("rtctools")
-
-
-class PlotMixin(PlottingBaseMixin):
-    """
-    Class for plotting results based on the plot_table.
-    """
-
-    optimization_problem = False
-
-    def post(self):
-        """Tasks after optimizing."""
-        super().post()
-
-        timeseries_data = self.collect_timeseries_data(self.custom_variables)
-        self._intermediate_results.append({"timeseries_data": timeseries_data, "priority": 0})
-        current_run = self.create_plot_data_and_config([])
-        self._store_current_results(self._cache_folder, current_run)
-
-        if self.plot_final_results:
-            create_plot_final_results(current_run, self._previous_run, plotting_library=self.plotting_library)