rtc-tools-interface 0.8.0b2__tar.gz → 0.8.0b4__tar.gz

{rtc-tools-interface-0.8.0b2 → rtc-tools-interface-0.8.0b4}/PKG-INFO

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

{rtc-tools-interface-0.8.0b2 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/PKG-INFO

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

{rtc-tools-interface-0.8.0b2 → rtc-tools-interface-0.8.0b4}/rtctools_interface/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-05-28T11:08:07+0200",
+ "date": "2024-06-11T11:21:50+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "706b384c4fcf2b2621e9370973ec8ecc78765fb8",
- "version": "0.8.0b2"
+ "full-revisionid": "6bc6e859ff0f928c2f4c1127a2aca08ce9720051",
+ "version": "0.8.0b4"
 }
 '''  # END VERSION_JSON
 

{rtc-tools-interface-0.8.0b2 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/runner.py

@@ -5,6 +5,7 @@ from pathlib import Path
 import shutil
 import sys
 from typing import List, Optional
+from rtctools.data.pi import DiagHandler
 from rtctools.optimization.pi_mixin import PIMixin
 from rtctools.optimization.csv_mixin import CSVMixin
 from rtctools.util import run_optimization_problem, _resolve_folder
@@ -80,6 +81,17 @@ def run_optimization_problem_closed_loop(
     original_output_folder = Path(_resolve_folder(kwargs, base_folder, "output_folder", "output"))
     original_output_folder.mkdir(exist_ok=True)
 
+    # Set logging handlers.
+    if not logger.hasHandlers():
+        handler = logging.StreamHandler()
+        formatter = logging.Formatter("%(asctime)s %(levelname)s %(message)s")
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+    if issubclass(optimization_problem_class, PIMixin):
+        if not any((isinstance(h, DiagHandler) for h in logger.handlers)):
+            diag_handler = DiagHandler(original_output_folder)
+            logger.addHandler(diag_handler)
+
     if issubclass(optimization_problem_class, PIMixin):
         original_import = XMLTimeSeriesFile(original_input_folder)
         original_import.set_reference_data(copy.deepcopy(original_import))

{rtc-tools-interface-0.8.0b2 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/base_goal.py

@@ -217,7 +217,7 @@ class BaseGoal(Goal):
             "goal_type": self.goal_type,
             "function_min": self.function_range[0] if np.any(np.isfinite(self.function_range[0])) else None,
             "function_max": self.function_range[1] if np.any(np.isfinite(self.function_range[1])) else None,
-            "function_nominal": self.function_nominal if np.isfinite(self.function_nominal) else None,
+            "function_nominal": self.function_nominal if np.any(np.isfinite(self.function_nominal)) else None,
             "target_min_series": None,
             "target_max_series": None,
             "target_min": self.target_min,

{rtc-tools-interface-0.8.0b2 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/results_collection.py

@@ -81,7 +81,7 @@ def get_plot_variables(plot_config: list[PlotTableRow]) -> List[str]:
     variables_with_previous_result = [
         var for subplot_config in plot_config for var in subplot_config.variables_with_previous_result
     ]
-    return variables_style_1 + variables_style_2 + variables_with_previous_result
+    return list(set(variables_style_1 + variables_style_2 + variables_with_previous_result))
 
 
 def filter_plot_config(plot_config: list[PlotTableRow], all_goal_generator_goals) -> list[PlotTableRow]: