rtc-tools-interface 0.8.0b3__tar.gz → 0.8.0b4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/PKG-INFO +1 -1
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/PKG-INFO +1 -1
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/_version.py +3 -3
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/runner.py +12 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/results_collection.py +1 -1
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/COPYING.LESSER +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/README.md +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/SOURCES.txt +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/dependency_links.txt +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/requires.txt +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/top_level.txt +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/closed_loop_dates.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/results_construction.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/time_series_handler.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/base_goal.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/base_optimization_problem.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/goal_generator_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/goal_performance_metrics.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/goal_table_schema.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/helpers/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/helpers/statistics_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/plot_goals_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/plot_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/optimization/read_goals.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/plotting/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/plotting/plot_tools.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/plotting/subplot_classes.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/simulation/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/simulation/base_simulation_problem.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/simulation/plot_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/plot_table_schema.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/read_goals_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/read_plot_table.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/serialization.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/type_definitions.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/setup.cfg +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/setup.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/closed_loop/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/closed_loop/test_read_xml.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/closed_loop/test_run_optization_problem_closed_loop.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/optimization/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/optimization/test_base_optimization_problem.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/optimization/test_passing_goals_directly.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/optimization/test_plot_goals_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/optimization/test_read_goals.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/simulation/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/simulation/test_base_simulation_problem.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/simulation/test_plot_mixin.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/utils/__init__.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/utils/get_test.py +0 -0
- {rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/versioneer.py +0 -0
|
@@ -8,11 +8,11 @@ import json
|
|
|
8
8
|
|
|
9
9
|
version_json = '''
|
|
10
10
|
{
|
|
11
|
-
"date": "2024-06-
|
|
11
|
+
"date": "2024-06-11T11:21:50+0200",
|
|
12
12
|
"dirty": false,
|
|
13
13
|
"error": null,
|
|
14
|
-
"full-revisionid": "
|
|
15
|
-
"version": "0.8.
|
|
14
|
+
"full-revisionid": "6bc6e859ff0f928c2f4c1127a2aca08ce9720051",
|
|
15
|
+
"version": "0.8.0b4"
|
|
16
16
|
}
|
|
17
17
|
''' # END VERSION_JSON
|
|
18
18
|
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/closed_loop/runner.py
RENAMED
|
@@ -5,6 +5,7 @@ from pathlib import Path
|
|
|
5
5
|
import shutil
|
|
6
6
|
import sys
|
|
7
7
|
from typing import List, Optional
|
|
8
|
+
from rtctools.data.pi import DiagHandler
|
|
8
9
|
from rtctools.optimization.pi_mixin import PIMixin
|
|
9
10
|
from rtctools.optimization.csv_mixin import CSVMixin
|
|
10
11
|
from rtctools.util import run_optimization_problem, _resolve_folder
|
|
@@ -80,6 +81,17 @@ def run_optimization_problem_closed_loop(
|
|
|
80
81
|
original_output_folder = Path(_resolve_folder(kwargs, base_folder, "output_folder", "output"))
|
|
81
82
|
original_output_folder.mkdir(exist_ok=True)
|
|
82
83
|
|
|
84
|
+
# Set logging handlers.
|
|
85
|
+
if not logger.hasHandlers():
|
|
86
|
+
handler = logging.StreamHandler()
|
|
87
|
+
formatter = logging.Formatter("%(asctime)s %(levelname)s %(message)s")
|
|
88
|
+
handler.setFormatter(formatter)
|
|
89
|
+
logger.addHandler(handler)
|
|
90
|
+
if issubclass(optimization_problem_class, PIMixin):
|
|
91
|
+
if not any((isinstance(h, DiagHandler) for h in logger.handlers)):
|
|
92
|
+
diag_handler = DiagHandler(original_output_folder)
|
|
93
|
+
logger.addHandler(diag_handler)
|
|
94
|
+
|
|
83
95
|
if issubclass(optimization_problem_class, PIMixin):
|
|
84
96
|
original_import = XMLTimeSeriesFile(original_input_folder)
|
|
85
97
|
original_import.set_reference_data(copy.deepcopy(original_import))
|
|
@@ -81,7 +81,7 @@ def get_plot_variables(plot_config: list[PlotTableRow]) -> List[str]:
|
|
|
81
81
|
variables_with_previous_result = [
|
|
82
82
|
var for subplot_config in plot_config for var in subplot_config.variables_with_previous_result
|
|
83
83
|
]
|
|
84
|
-
return variables_style_1 + variables_style_2 + variables_with_previous_result
|
|
84
|
+
return list(set(variables_style_1 + variables_style_2 + variables_with_previous_result))
|
|
85
85
|
|
|
86
86
|
|
|
87
87
|
def filter_plot_config(plot_config: list[PlotTableRow], all_goal_generator_goals) -> list[PlotTableRow]:
|
|
File without changes
|
|
File without changes
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtc_tools_interface.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/plotting/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/rtctools_interface/utils/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/closed_loop/test_read_xml.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/optimization/test_read_goals.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rtc-tools-interface-0.8.0b3 → rtc-tools-interface-0.8.0b4}/tests/simulation/test_plot_mixin.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|