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

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

@@ -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.dist-info → rtc_tools-2.5.2a2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rtctools/__init__.py,sha256=GzuYmrfvai2LnOnLGZUweYWn4SJQH9txwzwVO-ykvN4,106
-rtctools/_version.py,sha256=cH3LMXkE6XmdAHo9nsq9U6bID5c4EGGwmn59ZZPyCXk,499
+rtctools/_version.py,sha256=0K1yImT9X9wdqhZb9KmjXsI77YhAB2XLta4BABO1ADg,499
 rtctools/rtctoolsapp.py,sha256=tK8hLfozegtH9kY5bmAox8lCE427uhxBWEp5pBqhiSA,4193
 rtctools/util.py,sha256=SkYvRJPZVuWXlWk3NMO9Xdx_Vy7vhO_qPMN0nJ96Vdc,7371
 rtctools/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,7 +20,7 @@ rtctools/data/interpolation/bspline2d.py,sha256=RJO9XbjrNFNgkYjS88l-c4miu9xW1yro
 rtctools/optimization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rtctools/optimization/collocated_integrated_optimization_problem.py,sha256=G2goCNLx8qARaR0JawJum0Fr4jxtiQAAQAXxaqS4m00,116465
 rtctools/optimization/control_tree_mixin.py,sha256=mYHJUaskdeChCrqSTIPpFXwBU1JcwlwLtUTjwvR7CQ8,9030
-rtctools/optimization/csv_lookup_table_mixin.py,sha256=GJXXTXHGcM_GOeRNhfOiqF7EILeve4Jnu_gc_FcBQio,16296
+rtctools/optimization/csv_lookup_table_mixin.py,sha256=mEZdl1ca69K9ptJdKxCGIle4MrAwBTB4AJiVYQctyZg,16651
 rtctools/optimization/csv_mixin.py,sha256=FvMcuLlKu-YJo2NNudwMUUYKNb6HN4cevndWjlo5nis,11624
 rtctools/optimization/goal_programming_mixin.py,sha256=itns49Wq8MSUQWG4XhmlTG4OFkrV_0KeU53Y2vXUXOQ,31616
 rtctools/optimization/goal_programming_mixin_base.py,sha256=MOXNAlDBOvsPgWMY-D2DUQX2HcOGfFw-bvOmZSiwepk,39951
@@ -32,7 +32,7 @@ rtctools/optimization/linearized_order_goal_programming_mixin.py,sha256=Aws3b0rn
 rtctools/optimization/min_abs_goal_programming_mixin.py,sha256=kom9pV7Th5N31Adoc9RZRlQTcfqIzwui0PDe5AQnYuU,13293
 rtctools/optimization/modelica_mixin.py,sha256=f8bdeQB5jvlAggfwU4G7WSaT-ityy8D8Ckhi1mpJekA,16202
 rtctools/optimization/netcdf_mixin.py,sha256=fqhQSiSARQ4l6lwqp6ZDQ-SuIAeMPkQ69NcFnvk97C4,7259
-rtctools/optimization/optimization_problem.py,sha256=04f4HICTGtbWLPXyIlnc1L3_Xp9cF8DqFxXBKjgq170,43064
+rtctools/optimization/optimization_problem.py,sha256=p0Tq2gj9sX9tOmMz9n3igXvrI822-lHeu1Tl31n3tg8,43078
 rtctools/optimization/pi_mixin.py,sha256=0sp0y_GT0BB5Mrv6WSDNIgNUz63mbfVxNPW3LDU7zw4,10785
 rtctools/optimization/single_pass_goal_programming_mixin.py,sha256=LxLquZYAnhR5wV39S3cgL3jKKQi4C3n6i0K55DETSdc,25126
 rtctools/optimization/timeseries.py,sha256=W2xYBZRZxKgOQ0aW_le5NDbXOBbokCeK-mjSUUa_EVs,1753
@@ -41,9 +41,9 @@ rtctools/simulation/csv_mixin.py,sha256=SIggsf7lfml3iWyhFSzCSCdxLt86ElluJQYxPYUk
 rtctools/simulation/io_mixin.py,sha256=DizXxYg3MhOqyYXdHVlF9rLTfOo_aXc59Jh_hzGcgkc,6163
 rtctools/simulation/pi_mixin.py,sha256=6uvqJZweP7wvEbiPmHMnOldG7_kvtqrdFVme0LVOVCo,9048
 rtctools/simulation/simulation_problem.py,sha256=FOP0JysrEccjbDevwN-qsD4IXtVZHV6BGP3Tmn9RhNM,35345
-rtc_tools-2.5.2a1.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-rtc_tools-2.5.2a1.dist-info/METADATA,sha256=8AbF0cjFYKUEkegirB5SjPCOpPS3JL1V4vdpimyf6N0,1454
-rtc_tools-2.5.2a1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-rtc_tools-2.5.2a1.dist-info/entry_points.txt,sha256=-x622IB_l1duw2M6t6syfQ4yzOiQTp0IZxKGcYRgWgk,151
-rtc_tools-2.5.2a1.dist-info/top_level.txt,sha256=pnBrb58PFPd1kp1dqa-JHU7R55h3alDNJIJnF3Jf9Dw,9
-rtc_tools-2.5.2a1.dist-info/RECORD,,
+rtc_tools-2.5.2a2.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+rtc_tools-2.5.2a2.dist-info/METADATA,sha256=Fj09TM-bI_B0APYwcNWSEygJfnT4iB4IstUXpf62bQw,1454
+rtc_tools-2.5.2a2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+rtc_tools-2.5.2a2.dist-info/entry_points.txt,sha256=-x622IB_l1duw2M6t6syfQ4yzOiQTp0IZxKGcYRgWgk,151
+rtc_tools-2.5.2a2.dist-info/top_level.txt,sha256=pnBrb58PFPd1kp1dqa-JHU7R55h3alDNJIJnF3Jf9Dw,9
+rtc_tools-2.5.2a2.dist-info/RECORD,,

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
 

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:

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))