rtc-tools 2.7.0a1__py3-none-any.whl → 2.7.0a2__py3-none-any.whl

{rtc_tools-2.7.0a1.dist-info → rtc_tools-2.7.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtc-tools
-Version: 2.7.0a1
+Version: 2.7.0a2
 Summary: Toolbox for control and optimization of water systems.
 Home-page: https://oss.deltares.nl/web/rtc-tools/home
 Author: Deltares

{rtc_tools-2.7.0a1.dist-info → rtc_tools-2.7.0a2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rtctools/__init__.py,sha256=91hvS2-ryd2Pvw0COpsUzTwJwSnTZ035REiej-1hNI4,107
-rtctools/_version.py,sha256=My52FWqz9UB3_PwxQjfVCPUkHjej_S48gNc1rsNpaKc,499
+rtctools/_version.py,sha256=khi7aLWt95iU8AN9lfjGJYvYFy3VrtunF5V_MRtL7tI,499
 rtctools/rtctoolsapp.py,sha256=UnkuiJhv0crEEVs8H6PYvMuc2y_q6V_xLuyKEgXj9GM,4200
 rtctools/util.py,sha256=PaeKfDUA174ODZbY5fZjCTf-F-TdhW7yEuP189Ro190,9075
 rtctools/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,10 +41,10 @@ rtctools/simulation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 rtctools/simulation/csv_mixin.py,sha256=rGDUFPsqGHmF0_dWdXeWzWzMpkPmwCNweTBVrwSh31g,6704
 rtctools/simulation/io_mixin.py,sha256=SJasNGI--OQ9Y-Z61oeeaGCxSrNddYz4AOVfJYbmf74,6209
 rtctools/simulation/pi_mixin.py,sha256=vcizArZsOn7tGlSFCsUmkjmRFA1A1kMNqUllLlkVc9Y,9831
-rtctools/simulation/simulation_problem.py,sha256=wGRIOm4AHAy75R7cbqeA13-Qy1ED3RY3Yc5Hvtmv6PY,48541
-rtc_tools-2.7.0a1.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-rtc_tools-2.7.0a1.dist-info/METADATA,sha256=p33wEk1F8t8jCHyV1bUe5R4JcedANOtp-9NsTH1mWBc,1494
-rtc_tools-2.7.0a1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-rtc_tools-2.7.0a1.dist-info/entry_points.txt,sha256=-x622IB_l1duw2M6t6syfQ4yzOiQTp0IZxKGcYRgWgk,151
-rtc_tools-2.7.0a1.dist-info/top_level.txt,sha256=pnBrb58PFPd1kp1dqa-JHU7R55h3alDNJIJnF3Jf9Dw,9
-rtc_tools-2.7.0a1.dist-info/RECORD,,
+rtctools/simulation/simulation_problem.py,sha256=TAG8J8td-23UgRz_I0Nz7yp9v_HT8ayblyYPtqbLyZo,48647
+rtc_tools-2.7.0a2.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+rtc_tools-2.7.0a2.dist-info/METADATA,sha256=OISYetGzEVCx1AWcMEcqOZpd-HT-0p6CftZd3uicWx4,1494
+rtc_tools-2.7.0a2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+rtc_tools-2.7.0a2.dist-info/entry_points.txt,sha256=-x622IB_l1duw2M6t6syfQ4yzOiQTp0IZxKGcYRgWgk,151
+rtc_tools-2.7.0a2.dist-info/top_level.txt,sha256=pnBrb58PFPd1kp1dqa-JHU7R55h3alDNJIJnF3Jf9Dw,9
+rtc_tools-2.7.0a2.dist-info/RECORD,,

rtctools/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-04-25T06:42:12+0000",
+ "date": "2024-05-14T15:15:45+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "e3d59506cabe8df7e05acd089ccf574e106a577f",
- "version": "2.7.0a1"
+ "full-revisionid": "6d06af067e4be71ea3b47593feb9be8ee7c37adc",
+ "version": "2.7.0a2"
 }
 '''  # END VERSION_JSON
 

rtctools/simulation/simulation_problem.py

@@ -419,7 +419,6 @@ class SimulationProblem(DataStoreAccessor):
             start_values = {}
 
             # Attempt to cast var.start to python type
-            start_value_is_symbolic = False
             mx_start = ca.MX(var.start)
             if mx_start.is_constant():
                 # cast var.start to python type
@@ -427,7 +426,6 @@ class SimulationProblem(DataStoreAccessor):
                 if start_value_pymoca is not None and start_value_pymoca != 0:
                     start_values["modelica"] = start_value_pymoca
             else:
-                start_value_is_symbolic = True
                 start_values["modelica"] = mx_start
 
             if not var.fixed:
@@ -479,8 +477,8 @@ class SimulationProblem(DataStoreAccessor):
                 input_source = "modelica"
                 source_description = "modelica file or default value"
             start_val = start_values.get(input_source, None)
-            is_numeric = start_val is not None and not start_value_is_symbolic
-            numeric_start_val = start_val if is_numeric else 0.0
+            start_is_numeric = start_val is not None and not isinstance(start_val, ca.MX)
+            numeric_start_val = start_val if start_is_numeric else 0.0
             if len(start_values) > 1:
                 logger.warning(
                     "Initialize: Multiple initial values for {} are provided: {}.".format(
@@ -500,10 +498,12 @@ class SimulationProblem(DataStoreAccessor):
 
             # Add a residual for the difference between the state and its starting expression
             start_expr = start_val
+            min_is_symbolic = isinstance(var.min, ca.MX)
+            max_is_symbolic = isinstance(var.max, ca.MX)
             if var.fixed:
                 # Set bounds to be equal to each other, such that IPOPT can
                 # turn the decision variable into a parameter.
-                if var.min != -np.inf or var.max != np.inf:
+                if min_is_symbolic or max_is_symbolic or var.min != -np.inf or var.max != np.inf:
                     logger.info(
                         "Initialize: bounds of {} will be overwritten".format(var_name)
                         + " by the start value given by {}.".format(source_description)
@@ -515,7 +515,7 @@ class SimulationProblem(DataStoreAccessor):
                 minimized_residuals.append((var.symbol - start_expr) / var_nominal)
 
             # Check that the start_value is in between the variable bounds.
-            if start_val is not None and is_numeric:
+            if start_is_numeric and not min_is_symbolic and not max_is_symbolic:
                 if not (var.min <= start_val and start_val <= var.max):
                     logger.warning(
                         "Initialize: start value {} = {}".format(var_name, start_val)