rtc-tools 2.8.2__tar.gz → 2.8.3__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.
Files changed (451) hide show
  1. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/PKG-INFO +1 -1
  2. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/casadi_helpers.py +6 -6
  3. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/collocated_integrated_optimization_problem.py +37 -31
  4. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/homotopy_mixin.py +1 -1
  5. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/simulation/simulation_problem.py +2 -2
  6. rtc_tools-2.8.3/tests/optimization/data/ModelDelayConstantInput.mo +6 -0
  7. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/SingleShootingModel.mo +2 -0
  8. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_delay_expressions.py +52 -0
  9. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_integration.py +48 -0
  10. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_modelica_mixin.py +56 -0
  11. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_vector_constraints_variables.py +13 -0
  12. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/test_simulation.py +33 -0
  13. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.codecov.yml +0 -0
  14. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.coveragerc +0 -0
  15. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.git-blame-ignore-revs +0 -0
  16. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.github/actions/setup-python/action.yml +0 -0
  17. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.github/workflows/ci.yml +0 -0
  18. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.gitignore +0 -0
  19. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.pre-commit-config.yaml +0 -0
  20. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/.readthedocs.yaml +0 -0
  21. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/AUTHORS +0 -0
  22. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/CHARTER.md +0 -0
  23. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/CONTRIBUTING.md +0 -0
  24. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/COPYING +0 -0
  25. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/COPYING.LESSER +0 -0
  26. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/GOVERNANCE.md +0 -0
  27. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/README.md +0 -0
  28. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/.gitignore +0 -0
  29. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/Makefile +0 -0
  30. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/_static/external_links.js +0 -0
  31. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/_static/theme_overrides.css +0 -0
  32. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/conf.py +0 -0
  33. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/basic.rst +0 -0
  34. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/cascading_channels.rst +0 -0
  35. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/channel_pulse.rst +0 -0
  36. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/channel_wave_damping.rst +0 -0
  37. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/debugging.rst +0 -0
  38. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/ensemble.rst +0 -0
  39. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/fallback_options.rst +0 -0
  40. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/goal_programming.rst +0 -0
  41. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/integrator_delay.rst +0 -0
  42. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/lookup_table.rst +0 -0
  43. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/mixed_integer.rst +0 -0
  44. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/pumped_hydropower_system.rst +0 -0
  45. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization/step_response.rst +0 -0
  46. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/optimization.rst +0 -0
  47. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/basic_results.py +0 -0
  48. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/cascading_channels_results.py +0 -0
  49. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/channel_pulse_results.py +0 -0
  50. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/channel_wave_damping.py +0 -0
  51. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/ensemble_results.py +0 -0
  52. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/goal_programming_results.py +0 -0
  53. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/integrator_delay.py +0 -0
  54. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/lookup_table_results.py +0 -0
  55. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/mixed_integer_results.py +0 -0
  56. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/pumped_hydropower_system_results.py +0 -0
  57. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/pyplots/simulation_results.py +0 -0
  58. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/simulation/custom_equation.rst +0 -0
  59. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/simulation/setpoint.rst +0 -0
  60. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples/simulation.rst +0 -0
  61. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/examples.rst +0 -0
  62. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/getting-started.rst +0 -0
  63. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/Aggregation_01.png +0 -0
  64. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/Lake-Hartwell-24012016.jpg +0 -0
  65. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/PumpedStoragePlant_openmodelica.png +0 -0
  66. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/Woudagemaal.jpg +0 -0
  67. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/basic_example_console.png +0 -0
  68. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/cascading_channels_omedit.png +0 -0
  69. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/channel_impulse_xs.png +0 -0
  70. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/channel_wave_damping_omedit.png +0 -0
  71. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/graig-coch-2117306_640.jpg +0 -0
  72. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/integrator_delay_modelica.png +0 -0
  73. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/lavant-2976738_1280.jpg +0 -0
  74. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/orifice_vs_pump_openmodelica.png +0 -0
  75. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/pont-du-gard-1742029_1280.jpg +0 -0
  76. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/rtc-tools-horizontal-color.svg +0 -0
  77. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/rtc-tools-horizontal-white.svg +0 -0
  78. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/simple_storage_openmodelica.png +0 -0
  79. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/single_channel.png +0 -0
  80. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/single_channel_hec-ras.png +0 -0
  81. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/validation/Downstream_150.png +0 -0
  82. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/images/validation/Upstream_150.png +0 -0
  83. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/index.rst +0 -0
  84. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/literature.bib +0 -0
  85. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/make.bat +0 -0
  86. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/basics.rst +0 -0
  87. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/csv_io.rst +0 -0
  88. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/fews_io.rst +0 -0
  89. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/forecast_uncertainty.rst +0 -0
  90. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/goal_programming/converting_goals_to_constraints.rst +0 -0
  91. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/goal_programming/goals.rst +0 -0
  92. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/goal_programming/linearized_order.rst +0 -0
  93. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/goal_programming/main_idea.rst +0 -0
  94. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/goal_programming/minimize_absolute_value.rst +0 -0
  95. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/homotopy.rst +0 -0
  96. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/initial_state_estimation.rst +0 -0
  97. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/linearization.rst +0 -0
  98. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/lookup_tables.rst +0 -0
  99. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/modelica_models.rst +0 -0
  100. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/multi_objective.rst +0 -0
  101. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/solver_configuration.rst +0 -0
  102. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization/time_discretization.rst +0 -0
  103. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/optimization.rst +0 -0
  104. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/related-projects.rst +0 -0
  105. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/simulation/basics.rst +0 -0
  106. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/simulation/csv_io.rst +0 -0
  107. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/simulation/fews_io.rst +0 -0
  108. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/simulation.rst +0 -0
  109. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/doc/time-series.rst +0 -0
  110. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/basic/input/initial_state.csv +0 -0
  111. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/basic/input/timeseries_import.csv +0 -0
  112. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/basic/model/Example.mo +0 -0
  113. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/basic/output/.gitignore +0 -0
  114. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/basic/reference_output/timeseries_export.csv +0 -0
  115. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/basic/src/example.py +0 -0
  116. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/input/initial_state.csv +0 -0
  117. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/input/timeseries_import.csv +0 -0
  118. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/model/.gitignore +0 -0
  119. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/model/Example.mo +0 -0
  120. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/output/.gitignore +0 -0
  121. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/reference_output/timeseries_export.csv +0 -0
  122. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/cascading_channels/src/example.py +0 -0
  123. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/HEC-RAS.zip +0 -0
  124. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/input/timeseries_import.csv +0 -0
  125. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/model/Example.mo +0 -0
  126. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/output/.gitignore +0 -0
  127. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/reference_output/HEC-RAS_export.csv +0 -0
  128. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/reference_output/timeseries_export.csv +0 -0
  129. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/reference_output/timeseries_export_inertial_wave.csv +0 -0
  130. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/reference_output/timeseries_export_inertial_wave_semi_implicit.csv +0 -0
  131. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/reference_output/timeseries_export_saint_venant.csv +0 -0
  132. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/reference_output/timeseries_export_saint_venant_upwind.csv +0 -0
  133. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_pulse/src/example.py +0 -0
  134. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/input/timeseries_import.csv +0 -0
  135. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/model/Example.mo +0 -0
  136. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/model/ExampleLocalControl.mo +0 -0
  137. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/model/ExampleOptimization.mo +0 -0
  138. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/model/PIDController.mo +0 -0
  139. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/output/.gitignore +0 -0
  140. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/reference_output/timeseries_export.csv +0 -0
  141. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/reference_output/timeseries_export_local_control.csv +0 -0
  142. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/src/example_local_control.py +0 -0
  143. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/src/example_optimization.py +0 -0
  144. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/src/steady_state_initialization_mixin.py +0 -0
  145. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/channel_wave_damping/src/step_size_parameter_mixin.py +0 -0
  146. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/.gitignore +0 -0
  147. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/ensemble.csv +0 -0
  148. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/forecast1/.gitignore +0 -0
  149. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/forecast1/initial_state.csv +0 -0
  150. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/forecast1/timeseries_import.csv +0 -0
  151. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/forecast2/.gitignore +0 -0
  152. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/forecast2/initial_state.csv +0 -0
  153. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/forecast2/timeseries_import.csv +0 -0
  154. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/lookup_tables/.gitignore +0 -0
  155. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/lookup_tables/curvefit_options.ini +0 -0
  156. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/input/lookup_tables/storage_V.csv +0 -0
  157. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/model/Example.mo +0 -0
  158. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/output/forecast1/.gitignore +0 -0
  159. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/output/forecast2/.gitignore +0 -0
  160. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/reference_output/forecast1/timeseries_export.csv +0 -0
  161. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/reference_output/forecast2/timeseries_export.csv +0 -0
  162. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/ensemble/src/example.py +0 -0
  163. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/fallback_option/output/.gitignore +0 -0
  164. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/fallback_option/src/example.py +0 -0
  165. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/fallback_option/src/example_with_gp.py +0 -0
  166. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/goal_programming/input/initial_state.csv +0 -0
  167. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/goal_programming/input/timeseries_import.csv +0 -0
  168. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/goal_programming/model/Example.mo +0 -0
  169. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/goal_programming/output/.gitignore +0 -0
  170. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/goal_programming/reference_output/timeseries_export.csv +0 -0
  171. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/goal_programming/src/example.py +0 -0
  172. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/integrator_delay/input/initial_state.csv +0 -0
  173. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/integrator_delay/input/timeseries_import.csv +0 -0
  174. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/integrator_delay/input/timeseries_import_simulation.csv +0 -0
  175. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/integrator_delay/model/Example.mo +0 -0
  176. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/integrator_delay/src/example.py +0 -0
  177. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/input/.gitignore +0 -0
  178. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/input/initial_state.csv +0 -0
  179. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/input/lookup_tables/.gitignore +0 -0
  180. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/input/lookup_tables/curvefit_options.ini +0 -0
  181. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/input/lookup_tables/storage_V.csv +0 -0
  182. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/input/timeseries_import.csv +0 -0
  183. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/model/Example.mo +0 -0
  184. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/output/.gitignore +0 -0
  185. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/reference_output/timeseries_export.csv +0 -0
  186. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/lookup_table/src/example.py +0 -0
  187. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/mixed_integer/input/initial_state.csv +0 -0
  188. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/mixed_integer/input/timeseries_import.csv +0 -0
  189. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/mixed_integer/model/Example.mo +0 -0
  190. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/mixed_integer/output/.gitignore +0 -0
  191. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/mixed_integer/reference_output/timeseries_export.csv +0 -0
  192. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/mixed_integer/src/example.py +0 -0
  193. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/pumped_hydropower_system/input/initial_state.csv +0 -0
  194. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/pumped_hydropower_system/input/timeseries_import.csv +0 -0
  195. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/pumped_hydropower_system/model/PumpedStoragePlant.mo +0 -0
  196. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/pumped_hydropower_system/output/.gitignore +0 -0
  197. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/pumped_hydropower_system/reference_output/timeseries_export.csv +0 -0
  198. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/pumped_hydropower_system/src/example.py +0 -0
  199. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation/input/parameters.csv +0 -0
  200. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation/input/timeseries_import.csv +0 -0
  201. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation/model/Example.mo +0 -0
  202. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation/output/.gitignore +0 -0
  203. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation/reference_output/timeseries_export.csv +0 -0
  204. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation/src/example.py +0 -0
  205. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation_with_custom_equations/input/initial_state.csv +0 -0
  206. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation_with_custom_equations/input/timeseries_import.csv +0 -0
  207. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation_with_custom_equations/model/SimpleModel.mo +0 -0
  208. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation_with_custom_equations/output/.gitignore +0 -0
  209. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation_with_custom_equations/reference_output/timeseries_export.csv +0 -0
  210. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/simulation_with_custom_equations/src/simple_model.py +0 -0
  211. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/single_reservoir/input/initial_state.csv +0 -0
  212. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/single_reservoir/input/timeseries_import.csv +0 -0
  213. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/single_reservoir/model/single_reservoir.mo +0 -0
  214. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/single_reservoir/output/.gitignore +0 -0
  215. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/single_reservoir/reference_output/timeseries_export.csv +0 -0
  216. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/single_reservoir/src/single_reservoir.py +0 -0
  217. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/step_response/input/initial_state.csv +0 -0
  218. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/step_response/input/timeseries_import.csv +0 -0
  219. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/step_response/model/Example.mo +0 -0
  220. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/step_response/output/.gitignore +0 -0
  221. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/step_response/reference_output/timeseries_export_saint_venant.csv +0 -0
  222. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/examples/step_response/src/example.py +0 -0
  223. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/pyproject.toml +0 -0
  224. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/sonar-project.properties +0 -0
  225. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/__init__.py +0 -0
  226. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/__init__.py +0 -0
  227. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/alias_tools.py +0 -0
  228. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/caching.py +0 -0
  229. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/casadi_to_lp.py +0 -0
  230. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/debug_check_helpers.py +0 -0
  231. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/_internal/ensemble_bounds_decorator.py +0 -0
  232. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/__init__.py +0 -0
  233. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/csv.py +0 -0
  234. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/interpolation/__init__.py +0 -0
  235. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/interpolation/bspline.py +0 -0
  236. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/interpolation/bspline1d.py +0 -0
  237. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/interpolation/bspline2d.py +0 -0
  238. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/netcdf.py +0 -0
  239. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/pi.py +0 -0
  240. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/rtc.py +0 -0
  241. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/data/storage.py +0 -0
  242. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/__init__.py +0 -0
  243. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/control_tree_mixin.py +0 -0
  244. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/csv_lookup_table_mixin.py +0 -0
  245. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/csv_mixin.py +0 -0
  246. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/goal_programming_mixin.py +0 -0
  247. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/goal_programming_mixin_base.py +0 -0
  248. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/initial_state_estimation_mixin.py +0 -0
  249. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/io_mixin.py +0 -0
  250. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/linearization_mixin.py +0 -0
  251. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/linearized_order_goal_programming_mixin.py +0 -0
  252. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/min_abs_goal_programming_mixin.py +0 -0
  253. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/modelica_mixin.py +0 -0
  254. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/netcdf_mixin.py +0 -0
  255. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/optimization_problem.py +0 -0
  256. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/pi_mixin.py +0 -0
  257. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/planning_mixin.py +0 -0
  258. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/single_pass_goal_programming_mixin.py +0 -0
  259. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/optimization/timeseries.py +0 -0
  260. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/rtctoolsapp.py +0 -0
  261. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/simulation/__init__.py +0 -0
  262. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/simulation/csv_mixin.py +0 -0
  263. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/simulation/io_mixin.py +0 -0
  264. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/simulation/pi_mixin.py +0 -0
  265. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/util.py +0 -0
  266. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/src/rtctools/version.py +0 -0
  267. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/__init__.py +0 -0
  268. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/__init__.py +0 -0
  269. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/.gitignore +0 -0
  270. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/curve.dat +0 -0
  271. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/diag.xml +0 -0
  272. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/initial_state_0.csv +0 -0
  273. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/initial_state_1.csv +0 -0
  274. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/look_up_table_0.csv +0 -0
  275. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/look_up_table_1.csv +0 -0
  276. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/look_up_table_2.csv +0 -0
  277. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/pi_run.xml +0 -0
  278. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/rtcDataConfig.xml +0 -0
  279. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/rtcParameterConfig.xml +0 -0
  280. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/surface.dat +0 -0
  281. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_export.xml +0 -0
  282. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import.bin +0 -0
  283. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import.xml +0 -0
  284. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_0.csv +0 -0
  285. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_1.csv +0 -0
  286. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_2.csv +0 -0
  287. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_ensemble.nc +0 -0
  288. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_ensemble.xml +0 -0
  289. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_ensemblesize1_noRealization.nc +0 -0
  290. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_ensemblesize1_withRealization.nc +0 -0
  291. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data/timeseries_import_neq.xml +0 -0
  292. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/data_path.py +0 -0
  293. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/test_csv.py +0 -0
  294. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/test_data.py +0 -0
  295. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/test_diag.py +0 -0
  296. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/test_interpolate.py +0 -0
  297. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/test_netcdf.py +0 -0
  298. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data/test_storage.py +0 -0
  299. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/data_path.py +0 -0
  300. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/examples/__init__.py +0 -0
  301. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/examples/test_examples.py +0 -0
  302. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/internal/__init__.py +0 -0
  303. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/internal/test_alias_tools.py +0 -0
  304. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/__init__.py +0 -0
  305. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/.gitignore +0 -0
  306. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/EmptyModel.mo +0 -0
  307. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/Model.mo +0 -0
  308. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelAlgebraic.mo +0 -0
  309. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelDebugChecks.mo +0 -0
  310. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelDelay.mo +0 -0
  311. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelDelayLoop.mo +0 -0
  312. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelHomotopyParameter.mo +0 -0
  313. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelMixedInteger.mo +0 -0
  314. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelNestedDelay.mo +0 -0
  315. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelSIUnits.mo +0 -0
  316. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelSymbolicParameters.mo +0 -0
  317. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelWithInitial.mo +0 -0
  318. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelWithInitialLinear.mo +0 -0
  319. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ModelWithLookupTable.mo +0 -0
  320. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/ensemble.csv +0 -0
  321. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/initial_state.csv +0 -0
  322. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/lookup_tables/.gitignore +0 -0
  323. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/lookup_tables/curvefit_options.ini +0 -0
  324. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/lookup_tables/x_prime.csv +0 -0
  325. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member0/.gitignore +0 -0
  326. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member0/initial_state.csv +0 -0
  327. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member0/parameters.csv +0 -0
  328. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member0/timeseries_import.csv +0 -0
  329. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member1/.gitignore +0 -0
  330. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member1/initial_state.csv +0 -0
  331. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member1/parameters.csv +0 -0
  332. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/member1/timeseries_import.csv +0 -0
  333. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/.gitignore +0 -0
  334. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/Model.mo +0 -0
  335. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/ensemble.csv +0 -0
  336. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member0/timeseries_import.csv +0 -0
  337. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member1/timeseries_import.csv +0 -0
  338. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member2/timeseries_import.csv +0 -0
  339. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/member3/timeseries_import.csv +0 -0
  340. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/rtcDataConfig.xml +0 -0
  341. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/rtcParameterConfig.xml +0 -0
  342. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/timeseries_import.nc +0 -0
  343. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_ensemble_sizes/timeseries_import.xml +0 -0
  344. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/ensemble.csv +0 -0
  345. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/member0/timeseries_import.csv +0 -0
  346. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/member1/timeseries_import.csv +0 -0
  347. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/rtcDataConfig.xml +0 -0
  348. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/rtcParameterConfig.xml +0 -0
  349. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/timeseries_import.nc +0 -0
  350. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_initial_date/timeseries_import.xml +0 -0
  351. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/ensemble.csv +0 -0
  352. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/member0/timeseries_import.csv +0 -0
  353. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/member1/timeseries_import.csv +0 -0
  354. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/rtcDataConfig.xml +0 -0
  355. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/rtcParameterConfig.xml +0 -0
  356. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/timeseries_import.nc +0 -0
  357. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_timestep/timeseries_import.xml +0 -0
  358. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/ensemble.csv +0 -0
  359. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/member0/parameters.csv +0 -0
  360. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/member0/timeseries_import.csv +0 -0
  361. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/member1/parameters.csv +0 -0
  362. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/member1/timeseries_import.csv +0 -0
  363. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/rtcDataConfig.xml +0 -0
  364. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/rtcParameterConfig.xml +0 -0
  365. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/timeseries_import.nc +0 -0
  366. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/multiple_io_mixins/different_values/timeseries_import.xml +0 -0
  367. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/non_zero_indexed_ensembles/Model.mo +0 -0
  368. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/non_zero_indexed_ensembles/rtcDataConfig.xml +0 -0
  369. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/non_zero_indexed_ensembles/rtcParameterConfig.xml +0 -0
  370. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/non_zero_indexed_ensembles/rtcParameterConfig_extra.xml +0 -0
  371. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/non_zero_indexed_ensembles/timeseries_import.xml +0 -0
  372. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/one-member-ensemble/ensemble.csv +0 -0
  373. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/one-member-ensemble/member0/.gitignore +0 -0
  374. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/one-member-ensemble/member0/initial_state.csv +0 -0
  375. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/one-member-ensemble/member0/parameters.csv +0 -0
  376. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/one-member-ensemble/member0/timeseries_import.csv +0 -0
  377. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/parameters.csv +0 -0
  378. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/reference_linear_model.lp +0 -0
  379. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/rtcDataConfig.xml +0 -0
  380. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/rtcParameterConfig.xml +0 -0
  381. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/rtcParameterConfig_extra.xml +0 -0
  382. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/single_non_zero_ensemble_index/Model.mo +0 -0
  383. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/single_non_zero_ensemble_index/rtcDataConfig.xml +0 -0
  384. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/single_non_zero_ensemble_index/rtcParameterConfig.xml +0 -0
  385. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/single_non_zero_ensemble_index/rtcParameterConfig_extra.xml +0 -0
  386. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/single_non_zero_ensemble_index/timeseries_import.xml +0 -0
  387. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/timeseries_import.csv +0 -0
  388. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/timeseries_import.nc +0 -0
  389. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data/timeseries_import.xml +0 -0
  390. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/data_path.py +0 -0
  391. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/regenerate_lp_reference.py +0 -0
  392. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_control_tree_mixin.py +0 -0
  393. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_csv_lookuptable_mixin.py +0 -0
  394. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_csv_mixin.py +0 -0
  395. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_debug_checks.py +0 -0
  396. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_export_lp.py +0 -0
  397. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_extra_casadipath.py +0 -0
  398. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_goal_programming.py +0 -0
  399. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_homotopy_mixin.py +0 -0
  400. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_interpolation.py +0 -0
  401. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_io_mixin.py +0 -0
  402. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_linearized_order_goal_programming_mixin.py +0 -0
  403. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_min_abs_goal_programming.py +0 -0
  404. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_multiple_io_mixins.py +0 -0
  405. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_netcdf_mixin.py +0 -0
  406. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_optimization_problem.py +0 -0
  407. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_path_extra_variables.py +0 -0
  408. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_path_variable_assembly.py +0 -0
  409. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_pi_mixin.py +0 -0
  410. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_planning_and_control_tree_mixin.py +0 -0
  411. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_planning_mixin.py +0 -0
  412. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_problem_class_check.py +0 -0
  413. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_single_pass_goal_programming.py +0 -0
  414. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_solvers.py +0 -0
  415. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_timeseries.py +0 -0
  416. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/optimization/test_vector_goals.py +0 -0
  417. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/__init__.py +0 -0
  418. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/.gitignore +0 -0
  419. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/Model.mo +0 -0
  420. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/ModelCustomEquation.mo +0 -0
  421. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/Model_base.mo +0 -0
  422. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/Model_delay.mo +0 -0
  423. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/Model_nominal.mo +0 -0
  424. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/initial_state.csv +0 -0
  425. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_infeasible.mo +0 -0
  426. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_out_of_bounds.mo +0 -0
  427. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_out_of_sym_bounds.mo +0 -0
  428. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_with_bounds.mo +0 -0
  429. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_with_input_series.mo +0 -0
  430. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_with_sym_ystart.mo +0 -0
  431. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_with_xstart.mo +0 -0
  432. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/model_with_zero_xstart.mo +0 -0
  433. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/timeseries_import.csv +0 -0
  434. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/infeasible_initial_value/timeseries_import_with_x.csv +0 -0
  435. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/initial_state.csv +0 -0
  436. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/parameters.csv +0 -0
  437. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/rtcDataConfig.xml +0 -0
  438. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/rtcParameterConfig.xml +0 -0
  439. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/timeseries_import.csv +0 -0
  440. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data/timeseries_import.xml +0 -0
  441. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/data_path.py +0 -0
  442. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/test_csv_mixin.py +0 -0
  443. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/test_io_mixin.py +0 -0
  444. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/test_pi_mixin.py +0 -0
  445. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/simulation/test_problem_class_check.py +0 -0
  446. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/test_case.py +0 -0
  447. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tests/test_rtctoolsapp.py +0 -0
  448. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/tox.ini +0 -0
  449. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/uv.lock +0 -0
  450. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/xsd/rtcDataConfig.xsd +0 -0
  451. {rtc_tools-2.8.2 → rtc_tools-2.8.3}/xsd/rtcSharedTypes.xsd +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: rtc-tools
3
- Version: 2.8.2
3
+ Version: 2.8.3
4
4
  Summary: Toolbox for control and optimization of water systems.
5
5
  Project-URL: Homepage, https://oss.deltares.nl/web/rtc-tools/home
6
6
  Project-URL: Download, https://github.com/rtc-tools/rtc-tools/
@@ -31,15 +31,15 @@ def nullvertcat(*L):
31
31
  return ca.vertcat(*L)
32
32
 
33
33
 
34
- def reduce_matvec(e, v):
34
+ def reduce_affine(e, v):
35
35
  """
36
- Reduces the MX graph e of linear operations on p into a matrix-vector product.
36
+ Reduces the MX graph e of affine operations on v into a matrix-vector product plus a constant.
37
37
 
38
- This reduces the number of nodes required to represent the linear operations.
38
+ This reduces the number of nodes required to represent the affine operations.
39
39
  """
40
- Af = ca.Function("Af", [ca.MX()], [ca.jacobian(e, v)])
41
- A = Af(ca.DM())
42
- return ca.reshape(ca.mtimes(A, v), e.shape)
40
+ Af = ca.Function("Af", [v], [ca.jacobian(e, v), ca.vec(e)])
41
+ A, b = Af(0)
42
+ return ca.reshape(ca.mtimes(A, v) + b, e.shape)
43
43
 
44
44
 
45
45
  def substitute_in_external(
@@ -14,7 +14,7 @@ from rtctools._internal.casadi_helpers import (
14
14
  interpolate,
15
15
  is_affine,
16
16
  nullvertcat,
17
- reduce_matvec,
17
+ reduce_affine,
18
18
  substitute_in_external,
19
19
  )
20
20
  from rtctools._internal.casadi_to_lp import (
@@ -606,13 +606,13 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
606
606
  initial_state_indices = [None] * n
607
607
 
608
608
  # Derivatives take a bit more effort to vectorize, as we can have
609
- # both constant values and elements in the state vector
609
+ # both slopes from history and elements in the state vector
610
610
  initial_derivatives = ca.MX.zeros((n, 1))
611
611
  init_der_variable = []
612
612
  init_der_variable_indices = []
613
613
  init_der_variable_nominals = []
614
- init_der_constant = []
615
- init_der_constant_values = []
614
+ init_der_history = []
615
+ init_der_history_values = []
616
616
 
617
617
  history = self.history(ensemble_member)
618
618
 
@@ -633,26 +633,29 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
633
633
  # We do interpolation here instead of relying on der_at. This is faster because:
634
634
  # 1. We can reuse the history variable.
635
635
  # 2. We know that "variable" is a canonical state
636
- # 3. We know that we are only dealing with history (numeric values, not
637
- # symbolics)
638
636
  try:
639
637
  h = history[variable]
640
- if h.times[0] == t0 or len(h.values) == 1:
638
+ if h.times[0] == t0 or len(h.values) == 1 or np.isnan(h.values[-2]):
641
639
  init_der = 0.0
642
640
  else:
643
641
  assert h.times[-1] == t0
644
- init_der = (h.values[-1] - h.values[-2]) / (h.times[-1] - h.times[-2])
642
+ value_t0 = h.values[-1]
643
+ if np.isnan(value_t0):
644
+ value_t0 = X[initial_state_indices[j]] * self.variable_nominal(
645
+ variable
646
+ )
647
+ init_der = (value_t0 - h.values[-2]) / (h.times[-1] - h.times[-2])
645
648
  except KeyError:
646
649
  init_der = 0.0
647
650
 
648
- init_der_constant_values.append(init_der)
649
- init_der_constant.append(j)
651
+ init_der_history_values.append(init_der)
652
+ init_der_history.append(j)
650
653
 
651
654
  initial_derivatives[init_der_variable] = X[init_der_variable_indices] * np.array(
652
655
  init_der_variable_nominals
653
656
  )
654
- if len(init_der_constant_values) > 0:
655
- initial_derivatives[init_der_constant] = init_der_constant_values
657
+ if len(init_der_history_values) > 0:
658
+ initial_derivatives[init_der_history] = ca.vertcat(*init_der_history_values)
656
659
 
657
660
  ensemble_data["initial_state"] = X[initial_state_indices] * np.concatenate(
658
661
  (integrated_variable_nominals, collocated_variable_nominals)
@@ -755,19 +758,19 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
755
758
  ensemble_aggregate["initial_state"] = ca.horzcat(
756
759
  *[d["initial_state"] for d in ensemble_store]
757
760
  )
758
- ensemble_aggregate["initial_state"] = reduce_matvec(
761
+ ensemble_aggregate["initial_state"] = reduce_affine(
759
762
  ensemble_aggregate["initial_state"], self.solver_input
760
763
  )
761
764
  ensemble_aggregate["initial_derivatives"] = ca.horzcat(
762
765
  *[d["initial_derivatives"] for d in ensemble_store]
763
766
  )
764
- ensemble_aggregate["initial_derivatives"] = reduce_matvec(
767
+ ensemble_aggregate["initial_derivatives"] = reduce_affine(
765
768
  ensemble_aggregate["initial_derivatives"], self.solver_input
766
769
  )
767
770
  ensemble_aggregate["initial_path_variables"] = ca.horzcat(
768
771
  *[d["initial_path_variables"] for d in ensemble_store]
769
772
  )
770
- ensemble_aggregate["initial_path_variables"] = reduce_matvec(
773
+ ensemble_aggregate["initial_path_variables"] = reduce_affine(
771
774
  ensemble_aggregate["initial_path_variables"], self.solver_input
772
775
  )
773
776
 
@@ -1467,7 +1470,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
1467
1470
  # Jacobians for each set separately and for each ensemble member separately, but in
1468
1471
  # this case the increased complexity may well offset the performance gained by
1469
1472
  # caching.
1470
- interpolated_states = reduce_matvec(interpolated_states, self.solver_input)
1473
+ interpolated_states = reduce_affine(interpolated_states, self.solver_input)
1471
1474
 
1472
1475
  accumulation_U[0] = interpolated_states
1473
1476
 
@@ -1504,7 +1507,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
1504
1507
 
1505
1508
  path_variables[j] = values.reshape((n_collocation_times, variable_size))[1:, :]
1506
1509
 
1507
- path_variables = reduce_matvec(ca.horzcat(*path_variables), self.solver_input)
1510
+ path_variables = reduce_affine(ca.horzcat(*path_variables), self.solver_input)
1508
1511
 
1509
1512
  accumulation_U[1 + 2 * len(self.dae_variables["constant_inputs"]) + 2] = path_variables
1510
1513
 
@@ -1617,8 +1620,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
1617
1620
  # Inputs
1618
1621
  states_and_algebraics_and_controls = ca.vertcat(
1619
1622
  *[
1620
- self.variable_nominal(variable)
1621
- * self.__integrators[ensemble_member][variable]
1623
+ self.__integrators[ensemble_member][variable]
1622
1624
  for variable in integrated_variable_names
1623
1625
  ],
1624
1626
  interpolated_states[
@@ -1722,6 +1724,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
1722
1724
  (history_times.shape[0], len(self.dae_variables["constant_inputs"]))
1723
1725
  )
1724
1726
  if history_times.shape[0] > 0:
1727
+ raw_constant_inputs = self.constant_inputs(ensemble_member)
1725
1728
  for j, var in enumerate(self.dae_variables["constant_inputs"]):
1726
1729
  var_name = var.name()
1727
1730
  try:
@@ -2554,8 +2557,11 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
2554
2557
  inds = indices[variable]
2555
2558
  initial_value = X[inds]
2556
2559
  n = self.__integrators[ensemble_member][variable].size1()
2557
- results[variable] = self.variable_nominal(variable) * np.concatenate(
2558
- [[initial_value], np.array(integrators_output[j : j + n, :]).ravel()]
2560
+ results[variable] = np.concatenate(
2561
+ [
2562
+ [self.variable_nominal(variable) * initial_value],
2563
+ np.array(integrators_output[j : j + n, :]).ravel(),
2564
+ ]
2559
2565
  )
2560
2566
  j += n
2561
2567
 
@@ -2614,9 +2620,6 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
2614
2620
  if isinstance(variable, ca.MX):
2615
2621
  variable = variable.name()
2616
2622
 
2617
- if self.__variable_sizes.get(variable, 1) > 1:
2618
- raise NotImplementedError("state_at() not supported for vector states")
2619
-
2620
2623
  name = "{}[{},{}]{}".format(
2621
2624
  variable, ensemble_member, t - self.initial_time, "S" if scaled else ""
2622
2625
  )
@@ -2631,6 +2634,8 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
2631
2634
 
2632
2635
  # Fetch appropriate symbol, or value.
2633
2636
  canonical, sign = self.alias_relation.canonical_signed(variable)
2637
+ if self.__variable_sizes.get(canonical, 1) > 1:
2638
+ raise NotImplementedError("state_at() not supported for vector states")
2634
2639
  found = False
2635
2640
 
2636
2641
  # Check if it is in the state vector
@@ -2640,18 +2645,19 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
2640
2645
  pass
2641
2646
  else:
2642
2647
  times = self.times(canonical)
2648
+ nominal = self.variable_nominal(canonical)
2643
2649
 
2644
2650
  if self.integrate_states:
2645
- nominal = 1
2646
2651
  if t == self.initial_time:
2647
2652
  sym = sign * X[inds]
2653
+ if not scaled and nominal != 1:
2654
+ sym *= nominal
2648
2655
  found = True
2649
2656
  else:
2650
2657
  variable_values = ca.horzcat(
2651
- sign * X[inds], self.__integrators[ensemble_member][canonical]
2658
+ X[inds], self.__integrators[ensemble_member][canonical] / nominal
2652
2659
  ).T
2653
2660
  else:
2654
- nominal = self.variable_nominal(canonical)
2655
2661
  variable_values = X[inds]
2656
2662
 
2657
2663
  if not found:
@@ -2662,7 +2668,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
2662
2668
  history_timeseries = history[canonical]
2663
2669
  except KeyError:
2664
2670
  if extrapolate:
2665
- sym = variable_values[0]
2671
+ sym = variable_values[0] * nominal
2666
2672
  else:
2667
2673
  sym = np.nan
2668
2674
  else:
@@ -2757,11 +2763,11 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
2757
2763
 
2758
2764
  # Find canonical variable
2759
2765
  canonical, sign = self.alias_relation.canonical_signed(variable)
2760
- nominal = self.variable_nominal(canonical)
2761
- state = self.state_vector(canonical, ensemble_member)
2766
+ if self.__variable_sizes.get(canonical, 1) > 1:
2767
+ raise NotImplementedError("states_in() and integral() not supported for vector states")
2768
+ state = self.variable_nominal(canonical) * self.state_vector(canonical, ensemble_member)
2762
2769
  if self.integrate_states and canonical in self.__integrators[ensemble_member]:
2763
2770
  state = ca.vertcat(state, ca.transpose(self.__integrators[ensemble_member][canonical]))
2764
- state *= nominal
2765
2771
  if sign < 0:
2766
2772
  state *= -1
2767
2773
 
@@ -154,7 +154,7 @@ class HomotopyMixin(OptimizationProblem):
154
154
  # Recompute the sparsity structure for the nonlinear model family.
155
155
  self.clear_transcription_cache()
156
156
 
157
- if self.__theta == 1.0:
157
+ if self.__theta == 1.0: # NOSONAR
158
158
  break
159
159
  theta_converged = self.__theta
160
160
 
@@ -88,8 +88,8 @@ class SimulationProblem(DataStoreAccessor):
88
88
  self.__pymoca_model = pymoca.backends.casadi.api.transfer_model(
89
89
  kwargs["model_folder"], model_name, compiler_options
90
90
  )
91
- except RuntimeError as error:
92
- if compiler_options.get("cache", False):
91
+ except (RuntimeError, ModuleNotFoundError) as error:
92
+ if not compiler_options.get("cache", False):
93
93
  raise error
94
94
  compiler_options["cache"] = False
95
95
  logger.warning(f"Loading model {model_name} using a cache file failed: {error}.")
@@ -0,0 +1,6 @@
1
+ model ModelDelayConstantInput
2
+ input Real u(fixed=true);
3
+ output Real y;
4
+ equation
5
+ y = 2 * delay(u, 0.1);
6
+ end ModelDelayConstantInput;
@@ -2,6 +2,7 @@ model SingleShootingModel
2
2
  Real x(start=1.1);
3
3
  Real w(start=0.0);
4
4
  Real a;
5
+ Real negative_x;
5
6
 
6
7
  parameter Real k = 1.0;
7
8
 
@@ -13,5 +14,6 @@ equation
13
14
  der(x) = k * x + u;
14
15
  der(w) = x;
15
16
  a = x + w + constant_input;
17
+ negative_x = -x;
16
18
 
17
19
  end SingleShootingModel;
@@ -213,3 +213,55 @@ class TestDelayLoop(TestCase, unittest.TestCase):
213
213
  problem = ModelDelayLoopNoHistory(inline_delay_expressions=True)
214
214
  with self.assertRaisesRegex(Exception, "Circular dependency"):
215
215
  problem.optimize()
216
+
217
+
218
+ class ModelDelayConstantInputEnsemble(ModelicaMixin, CollocatedIntegratedOptimizationProblem):
219
+ def __init__(self, inline_delay_expressions):
220
+ super().__init__(
221
+ input_folder=data_path(),
222
+ output_folder=data_path(),
223
+ model_name="ModelDelayConstantInput",
224
+ model_folder=data_path(),
225
+ )
226
+ self.inline_delay_expressions = inline_delay_expressions
227
+
228
+ @property
229
+ def ensemble_size(self):
230
+ return 2
231
+
232
+ def times(self, variable=None):
233
+ return np.linspace(0.0, 1.0, 21)
234
+
235
+ def constant_inputs(self, ensemble_member):
236
+ constant_inputs = super().constant_inputs(ensemble_member)
237
+ times = np.linspace(-0.1, 1.0, 23)
238
+ constant_inputs["u"] = Timeseries(times, (ensemble_member + 1) * (1.0 + times))
239
+ return constant_inputs
240
+
241
+ def history(self, ensemble_member):
242
+ history = super().history(ensemble_member)
243
+ u = self.constant_inputs(ensemble_member)["u"]
244
+ history["u"] = Timeseries(u.times[:3], u.values[:3])
245
+ return history
246
+
247
+ def compiler_options(self):
248
+ compiler_options = super().compiler_options()
249
+ compiler_options["cache"] = False
250
+ compiler_options["library_folders"] = []
251
+ return compiler_options
252
+
253
+
254
+ class TestDelayConstantInputEnsemble(TestCase, unittest.TestCase):
255
+ def test_history_per_member(self):
256
+ times = np.linspace(0.0, 1.0, 21)
257
+ for inline_delay_expressions in (False, True):
258
+ problem = ModelDelayConstantInputEnsemble(inline_delay_expressions)
259
+ self.assertTrue(problem.optimize())
260
+ for ensemble_member in range(2):
261
+ with self.subTest(
262
+ inline_delay_expressions=inline_delay_expressions,
263
+ ensemble_member=ensemble_member,
264
+ ):
265
+ expected = 2 * (ensemble_member + 1) * (1.0 + times - 0.1)
266
+ results = problem.extract_results(ensemble_member)
267
+ np.testing.assert_allclose(results["y"], expected, atol=1e-6)
@@ -1,5 +1,6 @@
1
1
  import logging
2
2
 
3
+ import casadi as ca
3
4
  import numpy as np
4
5
 
5
6
  from rtctools.optimization.collocated_integrated_optimization_problem import (
@@ -102,6 +103,53 @@ class TestSingleShooting(TestCase):
102
103
  self.tolerance = 1e-6
103
104
 
104
105
 
106
+ class SingleShootingNominalModel(SingleShootingBaseModel):
107
+ def bounds(self):
108
+ return {"u": (0.5, 0.5)}
109
+
110
+ def variable_nominal(self, variable):
111
+ if variable == "x":
112
+ return 10.0
113
+ return super().variable_nominal(variable)
114
+
115
+ def objective(self, ensemble_member):
116
+ return (self.state_at("x", 1.0, ensemble_member=ensemble_member) - 1.0) ** 2
117
+
118
+
119
+ class TestIntegratedStateNominal(TestCase):
120
+ def setUp(self):
121
+ self.problem = SingleShootingNominalModel()
122
+ self.problem.optimize()
123
+ self.results = self.problem.extract_results()
124
+
125
+ def evaluate(self, expression):
126
+ f = ca.Function("f", [self.problem.solver_input], [expression])
127
+ return np.array(f(self.problem.solver_output)).ravel()
128
+
129
+ def test_results(self):
130
+ # Implicit Euler with k = 1, dt = 0.05: x[i] = x[i - 1] + dt * (x[i] + u)
131
+ x = self.results["x"]
132
+ np.testing.assert_allclose(x[1:], (x[:-1] + 0.05 * 0.5) / (1 - 0.05), rtol=1e-6)
133
+ np.testing.assert_allclose(x[-1], 1.0, atol=1e-6)
134
+
135
+ def test_state_at(self):
136
+ times = self.problem.times()
137
+ # 0.025 lies between the initial state and the first integrated state
138
+ for variable in ["x", "negative_x"]:
139
+ for t in [0.0, 0.025]:
140
+ np.testing.assert_allclose(
141
+ self.evaluate(self.problem.state_at(variable, t)),
142
+ np.interp(t, times, self.results[variable]),
143
+ atol=1e-6,
144
+ )
145
+
146
+ def test_states_in_and_path_expressions(self):
147
+ x = self.results["x"]
148
+ np.testing.assert_allclose(self.evaluate(self.problem.states_in("x")), x, rtol=1e-6)
149
+ path_x = self.problem.map_path_expression(self.problem.state("x"), 0)
150
+ np.testing.assert_allclose(self.evaluate(path_x), x, rtol=1e-6)
151
+
152
+
105
153
  class SingleShootingGoalProgrammingModel(GoalProgrammingMixin, SingleShootingBaseModel):
106
154
  def goals(self):
107
155
  return [Goal1(), Goal2(), Goal3()]
@@ -263,6 +263,7 @@ class ModelHistory(Model):
263
263
  # NOTE: We deliberately add histories of different lengths
264
264
  h["x"] = Timeseries(np.array([-0.2, -0.1, 0.0]), np.array([0.7, 0.9, 1.1]))
265
265
  h["w"] = Timeseries(np.array([-0.1, 0.0]), np.array([0.9, np.nan]))
266
+ h["u"] = Timeseries(np.array([-0.1, 0.0]), np.array([0.6, 0.9]))
266
267
  return h
267
268
 
268
269
  def variable_nominal(self, variable):
@@ -272,6 +273,23 @@ class ModelHistory(Model):
272
273
  return super().variable_nominal(variable)
273
274
 
274
275
 
276
+ class ModelHistoryControlNaN(ModelHistory):
277
+ def __init__(self, u_history):
278
+ self.__u_history = u_history
279
+ super().__init__()
280
+
281
+ def history(self, ensemble_member):
282
+ h = super().history(ensemble_member)
283
+ h["u"] = Timeseries(np.array([-0.1, 0.0]), np.array(self.__u_history))
284
+ return h
285
+
286
+ def variable_nominal(self, variable):
287
+ if variable == "u":
288
+ return 3.0
289
+ else:
290
+ return super().variable_nominal(variable)
291
+
292
+
275
293
  class ModelSymbolicParameters(ModelicaMixin, CollocatedIntegratedOptimizationProblem):
276
294
  def __init__(self, resolve_parameters=True, override_u_min=True):
277
295
  self.__resolve_parameters = resolve_parameters
@@ -482,6 +500,19 @@ class TestModelicaMixinScaled(TestModelicaMixin):
482
500
  self.results = self.problem.extract_results()
483
501
  self.tolerance = 1e-6
484
502
 
503
+ def test_state_at_before_t0_without_history(self):
504
+ x0 = self.results["x"][0]
505
+ for scaled, expected in [(False, x0), (True, x0 / 0.5)]:
506
+ state_at = ca.Function(
507
+ "state_at",
508
+ [self.problem.solver_input],
509
+ [self.problem.state_at("x", -0.1, scaled=scaled)],
510
+ )
511
+ # Not assertAlmostEqual, which passes NaN
512
+ np.testing.assert_allclose(
513
+ float(state_at(self.problem.solver_output)), expected, atol=self.tolerance
514
+ )
515
+
485
516
 
486
517
  class TestModelicaMixinNonConvex(TestCase):
487
518
  def setUp(self):
@@ -633,6 +664,14 @@ class TestModelicaMixinHistory(TestCase, unittest.TestCase):
633
664
  self.results["initial_der(w)"], (self.results["w"][0] - 0.9) / 0.1, self.tolerance
634
665
  )
635
666
 
667
+ def test_initial_der_u(self):
668
+ der_u = self.problem.map_path_expression(self.problem.der("u"), 0)
669
+ f = ca.Function("f", [self.problem.solver_input], [der_u])
670
+ # Not assertAlmostEqual, which passes NaN
671
+ np.testing.assert_allclose(
672
+ float(f(self.problem.solver_output)[0]), (0.9 - 0.6) / 0.1, atol=self.tolerance
673
+ )
674
+
636
675
  def test_delayed_feedback(self):
637
676
  np.testing.assert_allclose(
638
677
  self.results["x_delayed"],
@@ -648,6 +687,23 @@ class TestModelicaMixinHistory(TestCase, unittest.TestCase):
648
687
  )
649
688
 
650
689
 
690
+ class TestModelicaMixinHistoryControlNaN(TestCase, unittest.TestCase):
691
+ def initial_der_u(self, u_history):
692
+ problem = ModelHistoryControlNaN(u_history)
693
+ problem.optimize()
694
+ der_u = problem.map_path_expression(problem.der("u"), 0)
695
+ f = ca.Function("f", [problem.solver_input], [der_u])
696
+ return float(f(problem.solver_output)[0]), problem.extract_results()["u"][0]
697
+
698
+ def test_missing_t0(self):
699
+ der_u, u0 = self.initial_der_u([0.6, np.nan])
700
+ np.testing.assert_allclose(der_u, (u0 - 0.6) / 0.1, atol=1e-6)
701
+
702
+ def test_missing_before_t0(self):
703
+ der_u, _ = self.initial_der_u([np.nan, 0.9])
704
+ np.testing.assert_allclose(der_u, 0.0, atol=1e-6)
705
+
706
+
651
707
  class TestModelicaMixinSymbolicParameters(TestCase, unittest.TestCase):
652
708
  def setUp(self):
653
709
  self.problem = ModelSymbolicParameters()
@@ -598,6 +598,19 @@ class TestVectorConstraints(TestCase):
598
598
  with self.assertRaises(NotImplementedError):
599
599
  self.problem.optimize()
600
600
 
601
+ def test_additional_path_variables_vector_accessors_notimplemented(self):
602
+ problem = ModelAdditionalPathVariablesVector()
603
+ problem.optimize()
604
+
605
+ v = problem._additional_path_var.name()
606
+ for name in (v, "-" + v):
607
+ with self.assertRaises(NotImplementedError):
608
+ problem.states_in(name)
609
+ with self.assertRaises(NotImplementedError):
610
+ problem.integral(name)
611
+ with self.assertRaises(NotImplementedError):
612
+ problem.state_at(name, problem.times()[0] - 0.1)
613
+
601
614
  @unittest.skip("state_at() not implemented yet for vector variables")
602
615
  def test_additional_path_variables_state_at(self):
603
616
  self.problem1 = ModelAdditionalPathVariables()
@@ -1,8 +1,10 @@
1
1
  import os
2
2
  import re
3
+ from unittest import mock
3
4
 
4
5
  import casadi as ca
5
6
  import numpy as np
7
+ import pymoca.backends.casadi.api
6
8
 
7
9
  from rtctools._internal.alias_tools import AliasDict
8
10
  from rtctools.simulation.csv_mixin import CSVMixin
@@ -174,6 +176,37 @@ class SimulationModelBase(SimulationProblem):
174
176
  )
175
177
 
176
178
 
179
+ class SimulationModelCache(SimulationModelBase):
180
+ def compiler_options(self):
181
+ compiler_options = super().compiler_options()
182
+ compiler_options["cache"] = True
183
+ return compiler_options
184
+
185
+
186
+ class TestSimulationCacheRetry(TestCase):
187
+ def check_compiles_without_cache_after(self, error):
188
+ transfer_model = pymoca.backends.casadi.api.transfer_model
189
+ calls = []
190
+
191
+ def failing_cache(model_folder, model_name, compiler_options):
192
+ calls.append(compiler_options["cache"])
193
+ if compiler_options["cache"]:
194
+ raise error
195
+ return transfer_model(model_folder, model_name, compiler_options)
196
+
197
+ with mock.patch.object(pymoca.backends.casadi.api, "transfer_model", failing_cache):
198
+ problem = SimulationModelCache()
199
+
200
+ self.assertEqual(calls, [True, False])
201
+ self.assertIn("y", problem.get_state_variables())
202
+
203
+ def test_runtime_error(self):
204
+ self.check_compiles_without_cache_after(RuntimeError("incompatible cache file"))
205
+
206
+ def test_module_not_found_error(self):
207
+ self.check_compiles_without_cache_after(ModuleNotFoundError("no module in cache file"))
208
+
209
+
177
210
  class SimulationModelNominal(SimulationProblem):
178
211
  _force_zero_delay = True
179
212
 
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