rtc-tools 2.7.0b1__tar.gz → 2.7.0b3__tar.gz

{rtc_tools-2.7.0b1/src/rtc_tools.egg-info → rtc_tools-2.7.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtc-tools
-Version: 2.7.0b1
+Version: 2.7.0b3
 Summary: Toolbox for control and optimization of water systems.
 Home-page: https://oss.deltares.nl/web/rtc-tools/home
 Download-URL: http://github.com/deltares/rtc-tools/
@@ -25,7 +25,7 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 License-File: COPYING.LESSER
-Requires-Dist: casadi!=3.6.6,==3.6.*,>=3.6.3
+Requires-Dist: casadi!=3.6.6,<=3.7,>=3.6.3
 Requires-Dist: numpy>=1.16.0
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: pymoca==0.9.*,>=0.9.1

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/README.md

@@ -3,9 +3,9 @@
 [![Pipeline](https://github.com/deltares/rtc-tools/actions/workflows/rtc-tools.yml/badge.svg)](
     https://github.com/deltares/rtc-tools/actions/workflows/rtc-tools.yml
 )
-[![Coverage](https://codecov.io/gl/deltares/rtc-tools/branch/master/graph/badge.svg)](
-    https://codecov.io/gl/deltares/rtc-tools
-)
+[![Coverage](
+    https://sonarcloud.io/api/project_badges/measure?project=Deltares_rtc-tools&metric=coverage
+)](https://sonarcloud.io/summary/new_code?id=Deltares_rtc-tools)
 
 > **NOTE** The rtc-tools repository has been migrated from gitlab to here;
 see [migration from gitlab](#migration-from-gitlab).

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/setup.py

@@ -45,7 +45,7 @@ setup(
     packages=find_packages("src"),
     package_dir={"": "src"},
     install_requires=[
-        "casadi >= 3.6.3, == 3.6.*, !=3.6.6",
+        "casadi >= 3.6.3, <= 3.7, !=3.6.6",
         "numpy >= 1.16.0",
         "scipy >= 1.0.0",
         "pymoca >= 0.9.1, == 0.9.*",

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3/src/rtc_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtc-tools
-Version: 2.7.0b1
+Version: 2.7.0b3
 Summary: Toolbox for control and optimization of water systems.
 Home-page: https://oss.deltares.nl/web/rtc-tools/home
 Download-URL: http://github.com/deltares/rtc-tools/
@@ -25,7 +25,7 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 License-File: COPYING.LESSER
-Requires-Dist: casadi!=3.6.6,==3.6.*,>=3.6.3
+Requires-Dist: casadi!=3.6.6,<=3.7,>=3.6.3
 Requires-Dist: numpy>=1.16.0
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: pymoca==0.9.*,>=0.9.1

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtc_tools.egg-info/requires.txt

@@ -1,4 +1,4 @@
-casadi!=3.6.6,==3.6.*,>=3.6.3
+casadi!=3.6.6,<=3.7,>=3.6.3
 numpy>=1.16.0
 scipy>=1.0.0
 pymoca==0.9.*,>=0.9.1

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-04-15T16:04:52+0200",
+ "date": "2025-05-23T14:56:50+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "941763cc3e1c0ee1b9644aaa5dee37d25fd3b02c",
- "version": "2.7.0b1"
+ "full-revisionid": "16ab781cd81009655c779d5cc5b7c4aa3e73fa85",
+ "version": "2.7.0b3"
 }
 '''  # END VERSION_JSON
 

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/optimization/collocated_integrated_optimization_problem.py

@@ -2043,9 +2043,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
     def controls(self):
         return self.__controls
 
-    def _collint_get_lbx_ubx(self, count, indices):
-        bounds = self.bounds()
-
+    def _collint_get_lbx_ubx(self, bounds, count, indices):
         lbx = np.full(count, -np.inf, dtype=np.float64)
         ubx = np.full(count, np.inf, dtype=np.float64)
 
@@ -2210,7 +2208,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
                 count = max(count, control_indices_stop)
 
         discrete = self._collint_get_discrete(count, indices)
-        lbx, ubx = self._collint_get_lbx_ubx(count, indices)
+        lbx, ubx = self._collint_get_lbx_ubx(bounds, count, indices)
         x0 = self._collint_get_x0(count, indices)
 
         # Return number of control variables
@@ -2326,7 +2324,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
                 offset += 1
 
         discrete = self._collint_get_discrete(count, indices)
-        lbx, ubx = self._collint_get_lbx_ubx(count, indices)
+        lbx, ubx = self._collint_get_lbx_ubx(bounds, count, indices)
         x0 = self._collint_get_x0(count, indices)
 
         # Return number of state variables
@@ -3112,7 +3110,7 @@ class CollocatedIntegratedOptimizationProblem(OptimizationProblem, metaclass=ABC
         variable_to_all_indices = {k: set(v) for k, v in indices[0].items()}
         for ensemble_indices in indices[1:]:
             for k, v in ensemble_indices.items():
-                variable_to_all_indices[k] |= v
+                variable_to_all_indices[k] |= set(v)
 
         if len(inds_up) > 0:
             exceedences = []

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/optimization/control_tree_mixin.py

@@ -86,6 +86,11 @@ class ControlTreeMixin(OptimizationProblem):
         logger.debug("ControlTreeMixin: Branching times:")
         logger.debug(self.__branching_times)
 
+        # Avoid calling constant_inputs() many times
+        constant_inputs = [
+            self.constant_inputs(ensemble_member=i) for i in range(self.ensemble_size)
+        ]
+
         # Branches start at branching times, so that the tree looks like the following:
         #
         #         *-----
@@ -122,18 +127,16 @@ class ControlTreeMixin(OptimizationProblem):
             for forecast_variable in options["forecast_variables"]:
                 # We assume the time stamps of the forecasts in all ensemble
                 # members to be identical
-                timeseries = self.constant_inputs(ensemble_member=0)[forecast_variable]
+                timeseries = constant_inputs[0][forecast_variable]
                 els = np.logical_and(
                     timeseries.times >= branching_time_0, timeseries.times < branching_time_1
                 )
 
                 # Compute distance between ensemble members
                 for i, member_i in enumerate(branches[current_branch]):
-                    timeseries_i = self.constant_inputs(ensemble_member=member_i)[forecast_variable]
+                    timeseries_i = constant_inputs[member_i][forecast_variable]
                     for j, member_j in enumerate(branches[current_branch]):
-                        timeseries_j = self.constant_inputs(ensemble_member=member_j)[
-                            forecast_variable
-                        ]
+                        timeseries_j = constant_inputs[member_j][forecast_variable]
                         distances[i, j] += np.linalg.norm(
                             timeseries_i.values[els] - timeseries_j.values[els]
                         )

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/optimization/csv_lookup_table_mixin.py

@@ -359,6 +359,7 @@ class CSVLookupTableMixin(OptimizationProblem):
                             k=k,
                             monotonicity=mono,
                             curvature=curv,
+                            ipopt_options={"nlp_scaling_method": "none"},
                         )
                     else:
                         raise Exception(

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/optimization/optimization_problem.py

@@ -314,6 +314,24 @@ class OptimizationProblem(DataStoreAccessor, metaclass=ABCMeta):
         if log_level == logging.ERROR and not log_solver_failure_as_error:
             log_level = logging.INFO
 
+        if self.solver_options()["solver"].lower() == "knitro":
+            list_feas_flags = [
+                "KN_RC_OPTIMAL_OR_SATISFACTORY",
+                "KN_RC_ITER_LIMIT_FEAS",
+                "KN_RC_NEAR_OPT",
+                "KN_RC_FEAS_XTOL",
+                "KN_RC_FEAS_NO_IMPROVE",
+                "KN_RC_FEAS_FTOL",
+                "KN_RC_TIME_LIMIT_FEAS",
+                "KN_RC_FEVAL_LIMIT_FEAS",
+                "KN_RC_MIP_EXH_FEAS",
+                "KN_RC_MIP_TERM_FEAS",
+                "KN_RC_MIP_SOLVE_LIMIT_FEAS",
+                "KN_RC_MIP_NODE_LIMIT_FEAS",
+            ]
+            if solver_stats["return_status"] in list_feas_flags:
+                success = True
+
         return success, log_level
 
     @abstractproperty

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/rtctoolsapp.py

@@ -64,7 +64,7 @@ def copy_libraries(*args):
 
     for ep in importlib_metadata.entry_points(group="rtctools.libraries.modelica"):
         if ep.name == "library_folder":
-            library_folders.append(str(importlib.resources.files(ep.module).joinpath(ep.attr)))
+            library_folders.append(Path(importlib.resources.files(ep.module).joinpath(ep.attr)))
 
     tlds = {}
     for lf in library_folders:
@@ -104,7 +104,6 @@ def download_examples(*args):
     from zipfile import ZipFile
 
     version = rtctools.__version__
-    rtc_full_name = "rtc-tools-{}".format(version)
     try:
         url = "https://github.com/deltares/rtc-tools/zipball/{}".format(version)
 
@@ -117,11 +116,12 @@ def download_examples(*args):
 
     with ZipFile(local_filename, "r") as z:
         target = path / "rtc-tools-examples"
-        prefix = "{}/examples/".format(rtc_full_name)
+        zip_folder_name = next(x for x in z.namelist() if x.startswith("Deltares-rtc-tools-"))
+        prefix = "{}/examples/".format(zip_folder_name.rstrip("/"))
         members = [x for x in z.namelist() if x.startswith(prefix)]
         z.extractall(members=members)
         shutil.move(prefix, target)
-        shutil.rmtree(rtc_full_name)
+        shutil.rmtree(zip_folder_name)
 
         sys.exit("Succesfully downloaded the RTC-Tools examples to '{}'".format(target.resolve()))
 

{rtc_tools-2.7.0b1 → rtc_tools-2.7.0b3}/src/rtctools/util.py

@@ -110,6 +110,7 @@ def run_optimization_problem(
             "GoalProgrammingMixin",
             "PIMixin",
             "CSVMixin",
+            "IOMixin",
             "ModelicaMixin",
             "PlanningMixin",
             "ControlTreeMixin",