rtc-tools 2.7.0a1__tar.gz → 2.7.0a2__tar.gz

{rtc-tools-2.7.0a1/src/rtc_tools.egg-info → rtc-tools-2.7.0a2}/PKG-INFO

@@ -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 → rtc-tools-2.7.0a2/src/rtc_tools.egg-info}/PKG-INFO

@@ -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 → rtc-tools-2.7.0a2}/src/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
 

{rtc-tools-2.7.0a1 → rtc-tools-2.7.0a2}/src/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)