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

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: rtc-tools-interface
-Version: 0.7.1
+Version: 0.7.3
 Summary: Toolbox for user interfaces for RTC-Tools
 Home-page: UNKNOWN
 Author: Deltares
 Maintainer: Deltares
 License: UNKNOWN
 Platform: UNKNOWN
-Requires-Python: >=3.5
+Requires-Python: >=3.9
 License-File: COPYING.LESSER
 
 UNKNOWN

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: rtc-tools-interface
-Version: 0.7.1
+Version: 0.7.3
 Summary: Toolbox for user interfaces for RTC-Tools
 Home-page: UNKNOWN
 Author: Deltares
 Maintainer: Deltares
 License: UNKNOWN
 Platform: UNKNOWN
-Requires-Python: >=3.5
+Requires-Python: >=3.9
 License-File: COPYING.LESSER
 
 UNKNOWN

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-12-22T13:22:49+0000",
+ "date": "2024-03-05T11:26:05+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "5d3d1b69fbc76a7bf4fd384003bfa601bb820486",
- "version": "0.7.1"
+ "full-revisionid": "444bbd64198172e319ec16b7ee923ad775b0499d",
+ "version": "0.7.3"
 }
 '''  # END VERSION_JSON
 

{rtc-tools-interface-0.7.1 → rtc-tools-interface-0.7.3}/rtctools_interface/optimization/base_goal.py

@@ -150,7 +150,7 @@ class BaseGoal(Goal):
                     self.function_nominal = abs(self.function_range[0]) + abs(self.function_range[1]) / 2
                     return
             self.function_nominal = 1.0
-            logger.warning("Function nominal not specified, nominal is set to 1.0")
+            logger.warning("Function nominal for goal with id '%s' not specified, nominal is set to 1.0", self.goal_id)
 
     def _set_target_bounds(
         self,

{rtc-tools-interface-0.7.1 → rtc-tools-interface-0.7.3}/rtctools_interface/optimization/plot_mixin.py

@@ -1,4 +1,5 @@
 """Mixin to store all required data for plotting. Can also call the plot function."""
+
 import logging
 
 from rtctools_interface.optimization.helpers.statistics_mixin import StatisticsMixin
@@ -20,7 +21,7 @@ class PlotMixin(PlottingBaseMixin, StatisticsMixin):
         """Store priority-dependent results required for plotting."""
         timeseries_data = self.collect_timeseries_data(list(set(self.custom_variables + self.state_variables)))
         to_store = {"timeseries_data": timeseries_data, "priority": priority}
-        self.intermediate_results.append(to_store)
+        self._intermediate_results.append(to_store)
         super().priority_completed(priority)
 
     def post(self):

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

@@ -1,4 +1,5 @@
 """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
@@ -19,7 +20,7 @@ class PlotMixin(PlottingBaseMixin):
         super().post()
 
         timeseries_data = self.collect_timeseries_data(self.custom_variables)
-        self.intermediate_results.append({"timeseries_data": timeseries_data, "priority": 0})
+        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)
 

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

@@ -141,7 +141,7 @@ class PlottingBaseMixin(ReadGoalsMixin):
     def pre(self):
         """Tasks before optimizing."""
         super().pre()
-        self.intermediate_results = []
+        self._intermediate_results = []
 
     def collect_timeseries_data(self, all_variables_to_store: List[str]) -> Dict[str, np.ndarray]:
         """Collect the timeseries data for a list of variables."""
@@ -171,7 +171,7 @@ class PlottingBaseMixin(ReadGoalsMixin):
             "save_plot_to": self.save_plot_to,
         }
         plot_data_and_config: PlotDataAndConfig = {
-            "intermediate_results": self.intermediate_results,
+            "intermediate_results": self._intermediate_results,
             "plot_options": plot_options,
             "prio_independent_data": prio_independent_data,
             "config_version": CONFIG_VERSION,

{rtc-tools-interface-0.7.1 → rtc-tools-interface-0.7.3}/setup.py

@@ -12,6 +12,6 @@ setup(
     description="Toolbox for user interfaces for RTC-Tools",
     install_requires=["pandas", "rtc-tools >= 2.5.0", "matplotlib", "plotly", "numpy", "pydantic"],
     tests_require=["pytest", "pytest-runner"],
-    python_requires=">=3.5",
+    python_requires=">=3.9",
     cmdclass=versioneer.get_cmdclass(),
 )