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

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

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

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

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

{rtc-tools-2.5.2a1 → rtc-tools-2.5.2a2}/src/rtctools/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-03-21T11:14:45+0100",
+ "date": "2023-03-21T15:45:07+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "6b71d38281d28838cf6e739fc29d7d34dee036f0",
- "version": "2.5.2a1"
+ "full-revisionid": "51c2d6cf97df52e8a6790dc74aa9ec0866fc5a5c",
+ "version": "2.5.2a2"
 }
 '''  # END VERSION_JSON
 

{rtc-tools-2.5.2a1 → rtc-tools-2.5.2a2}/src/rtctools/optimization/csv_lookup_table_mixin.py

@@ -293,6 +293,11 @@ class CSVLookupTableMixin(OptimizationProblem):
                 curve_name, *curvefit_options))
             return tuple(curvefit_options)
 
+        def check_lookup_table(lookup_table):
+            if lookup_table in self.__lookup_tables:
+                raise Exception(
+                    "Cannot add lookup table {},"
+                    "since there is already one with this name.".format(lookup_table))
         # Read CSV files
         logger.info(
             "CSVLookupTableMixin: Generating Splines from lookup table data.")
@@ -365,6 +370,7 @@ class CSVLookupTableMixin(OptimizationProblem):
                 symbols = [ca.SX.sym(inputs[0])]
                 if not valid_cache:
                     function = ca.Function('f', symbols, [BSpline1D(*tck)(symbols[0])])
+                check_lookup_table(output)
                 self.__lookup_tables[output] = LookupTable(symbols, function, tck)
 
             elif len(csvinput.dtype.names) == 3:
@@ -400,6 +406,7 @@ class CSVLookupTableMixin(OptimizationProblem):
                 symbols = [ca.SX.sym(inputs[0]), ca.SX.sym(inputs[1])]
                 if not valid_cache:
                     function = ca.Function('f', symbols, [BSpline2D(*tck)(symbols[0], symbols[1])])
+                check_lookup_table(output)
                 self.__lookup_tables[output] = LookupTable(symbols, function, tck)
 
             else:

{rtc-tools-2.5.2a1 → rtc-tools-2.5.2a2}/src/rtctools/optimization/optimization_problem.py

@@ -180,7 +180,7 @@ class OptimizationProblem(DataStoreAccessor, metaclass=ABCMeta):
                         log_level = logging.INFO
                 logger.log(log_level, "Solver succeeded with status {} ({}).".format(
                         return_status, wall_clock_time))
-            except AttributeError:
+            except (AttributeError, ValueError):
                 logger.log(log_level, "Solver succeeded with status {} ({}).".format(
                     return_status, wall_clock_time))