gamspy 1.19.2__py3-none-any.whl → 1.19.3__py3-none-any.whl

gamspy/_backend/backend.py

@@ -222,9 +222,7 @@ class Backend(ABC):
             symbols = filtered_names
 
         if len(symbols) != 0:
-            self.container._load_records_from_gdx(
-                self.container._gdx_out, symbols, create_if_not_declared=True
-            )
+            self.container._load_records_from_gdx(self.container._gdx_out, symbols)
             self.make_unmodified(symbols)
 
         if relaxed_domain_mapping:

gamspy/_cli/show.py

@@ -67,9 +67,9 @@ SOLVER_PAGE_MAP = {
 
 # cm: component_map, ia: is_academic
 EVALUATIONS: dict[str, Callable[[dict[str, bool], bool], bool]] = {
-    "ANTIGONE": lambda cm, ia: cm["AT"]
-    and (cm["CP"] or cm["CL"])
-    and (cm["CO"] or cm["SN"]),
+    "ANTIGONE": lambda cm, ia: (
+        cm["AT"] and (cm["CP"] or cm["CL"]) and (cm["CO"] or cm["SN"])
+    ),
     "BARON": lambda cm, ia: cm["BA"],
     "CBC": lambda cm, ia: True,
     "CONOPT": lambda cm, ia: cm["CO"],

gamspy/_container.py

@@ -588,7 +588,6 @@ class Container(gt.Container):
     def _filter_load_symbols(
         self,
         symbol_names: dict[str, str] | list[str],
-        create_if_not_declared: bool = False,
     ) -> dict[str, str] | list[str]:
         if isinstance(symbol_names, list):
             names = []
@@ -598,12 +597,7 @@ class Container(gt.Container):
                     if not isinstance(symbol, gt.Alias) and symbol.synchronize:
                         names.append(name)
                 else:
-                    if create_if_not_declared:
-                        names.append(name)
-                    else:
-                        raise ValidationError(
-                            f"Cannot load records of `{name}` because it does not exist in the container."
-                        )
+                    names.append(name)
 
             return names
 
@@ -619,13 +613,7 @@ class Container(gt.Container):
 
         return mapping
 
-    def _load_records_from_gdx(
-        self,
-        load_from: str,
-        names: Iterable[str],
-        *,
-        create_if_not_declared: bool = False,
-    ) -> None:
+    def _load_records_from_gdx(self, load_from: str, names: Iterable[str]) -> None:
         self._temp_container.read(load_from, names)
         original_state = self._options.miro_protect
         self._options.miro_protect = False
@@ -636,12 +624,7 @@ class Container(gt.Container):
                 self[name].records = updated_records
                 self[name].domain_labels = self[name].domain_names
             else:
-                if create_if_not_declared:
-                    self._read(load_from, [name])
-                else:
-                    raise ValidationError(
-                        f"Cannot load records of `{name}` because it does not exist in the container."
-                    )
+                self._read(load_from, [name])
 
         self._options.miro_protect = original_state
         self._temp_container.data = {}
@@ -989,54 +972,28 @@ class Container(gt.Container):
         if isinstance(load_from, Path):
             load_from = str(load_from.resolve())
 
-        create_if_not_declared = symbol_names is None
         if symbol_names is None:
             # If no symbol names are given, all records in the gdx should be loaded
             symbol_names = utils._get_symbol_names_from_gdx(
                 self.system_directory, load_from
             )
             self._add_statement(f"$declareAndLoad {load_from}")
-            symbol_names = self._filter_load_symbols(
-                symbol_names,  # type: ignore
-                create_if_not_declared,
-            )
-            self._load_records_from_gdx(
-                load_from, symbol_names, create_if_not_declared=create_if_not_declared
-            )
+            symbol_names = self._filter_load_symbols(symbol_names)  # type: ignore
+            self._load_records_from_gdx(load_from, symbol_names)
             self._synch_with_gams()
             return
 
-        if isinstance(symbol_names, list):
-            symbol_names = self._filter_load_symbols(
-                symbol_names, create_if_not_declared
-            )
-            self._add_statement(f"$gdxIn {load_from}")
-            symbols_str = " ".join(symbol_names)
-            self._add_statement(f"$loadDC {symbols_str}")
-            self._add_statement("$gdxIn")
-        elif isinstance(symbol_names, dict):
-            symbol_names = self._filter_load_symbols(
-                symbol_names, create_if_not_declared
-            )
-            self._add_statement(f"$gdxIn {load_from}")
-            symbols_str = " ".join(
-                [f"{value}={key}" for key, value in symbol_names.items()]  # type: ignore
-            )
-            self._add_statement(f"$loadDC {symbols_str}")
-            self._add_statement("$gdxIn")
+        if isinstance(symbol_names, (list, dict)):
+            symbol_names = self._filter_load_symbols(symbol_names)
         else:
             raise TypeError("`symbol_names` must be either a list or a dictionary.")
 
-        self._options._debug_options["gdx"] = self._gdx_out
-        self._options._debug_options["gdxSymbols"] = "newOrChanged"
-        self._synch_with_gams()
-
         if isinstance(symbol_names, dict):
             self._load_records_with_rename(load_from, symbol_names)
         else:
-            self._load_records_from_gdx(
-                load_from, symbol_names, create_if_not_declared=create_if_not_declared
-            )
+            self._load_records_from_gdx(load_from, symbol_names)
+
+        self._synch_with_gams()
 
     def addGamsCode(self, gams_code: str) -> None:
         """

gamspy/_miro.py

@@ -41,9 +41,7 @@ def load_miro_symbol_records(container: Container):
             for name in container._miro_input_symbols
             if not container[name]._already_loaded
         ]
-        container._load_records_from_gdx(
-            MIRO_GDX_IN, names, create_if_not_declared=True
-        )
+        container._load_records_from_gdx(MIRO_GDX_IN, names)
         for name in names:
             symbol = container[name]
             symbol._already_loaded = True
@@ -56,9 +54,7 @@ def load_miro_symbol_records(container: Container):
 
     # Load records of miro output symbols
     if MIRO_GDX_OUT and container._miro_output_symbols:
-        container._load_records_from_gdx(
-            MIRO_GDX_OUT, container._miro_output_symbols, create_if_not_declared=True
-        )
+        container._load_records_from_gdx(MIRO_GDX_OUT, container._miro_output_symbols)
 
     for name in container._miro_input_symbols + container._miro_output_symbols:
         container[name].modified = False

{gamspy-1.19.2.dist-info → gamspy-1.19.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gamspy
-Version: 1.19.2
+Version: 1.19.3
 Summary: Python-based algebraic modeling interface to GAMS
 Author-email: GAMS Development Corporation <support@gams.com>
 Project-URL: homepage, https://gams.com/sales/gamspy_facts/

{gamspy-1.19.2.dist-info → gamspy-1.19.3.dist-info}/RECORD

@@ -2,11 +2,11 @@ gamspy/__init__.py,sha256=-_5LylEYCb8fEHbV4gJdNbvRUEw-k2Wk61BP6da_XxU,1725
 gamspy/__main__.py,sha256=3HW3NYEe4pZnGhJ10s1G0vaZAkI9Zl_lXqHT9iDNXQg,108
 gamspy/_communication.py,sha256=18drDsKxi1Iv6oAKZfKGJcPYYWebBQsyeOxiEKXZngE,7148
 gamspy/_config.py,sha256=n7RXUFczIlol15-mxhnj54fHXHet8HcOnWiGm3mpMgg,3589
-gamspy/_container.py,sha256=f3Stz_u8OmPeJg7t1X0CdGnyxrMHlPRjLspcrBNfamg,53926
+gamspy/_container.py,sha256=l11e3G42JUjyWwZAdiSP_q51OMSlUYfkZiRwDnv5vV8,52180
 gamspy/_convert.py,sha256=e8lvdB3itXrQip8wAr-7yP-CuYB2nt1TD7Y-Y4TE3jc,23460
 gamspy/_database.py,sha256=SVo4lEfS0Q2f80uMu7k71BBQNRwUei-2KFc_EGxsOcw,6873
 gamspy/_extrinsic.py,sha256=OGrlNzcSQjoIZw8lpsk_4SObEAhGX5bkc_D0d3lPZMQ,4807
-gamspy/_miro.py,sha256=tBYepYfJSjwR3MlstS8m58doBPLZLJe_vyerSVIw7qg,12347
+gamspy/_miro.py,sha256=MeFGcaFtNgtydWjH0KS0l9y3mNy7tPyXwm43jwomodg,12245
 gamspy/_model.py,sha256=afL02j_C6n8WnI9tjWo_92C0YCfaG17eITVst7deQEA,59219
 gamspy/_model_instance.py,sha256=9FDyT4VTcPk7z0aIalVHcHB8GqMKZywvo1C_BlbnbZI,24394
 gamspy/_options.py,sha256=Lar_oWaq5M8HbweGMwrIFdtUdR_Q751oJ_z95yAawdc,29576
@@ -26,7 +26,7 @@ gamspy/_algebra/number.py,sha256=TpjB7fppzv3xHX6IDdfx0Q_SzGuBueEXVQonSkeWGqI,184
 gamspy/_algebra/operable.py,sha256=1sFr29_7A9RKVxDlTY9fC_g4sNRavNOYpjACWzvyjRc,6315
 gamspy/_algebra/operation.py,sha256=JD8icFThcZ6vaewEErhox8vhwcGm4QJd4lhaatRBE9c,26152
 gamspy/_backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamspy/_backend/backend.py,sha256=X85Mxzp6efW3psi1ITYWTkN3l6Vc7mWMA_fzdjcav0c,9276
+gamspy/_backend/backend.py,sha256=VgLL3CiFydkf1ZF8ttaOlWsDtkJIoRdi_md4tVh789Q,9217
 gamspy/_backend/engine.py,sha256=DMJHtXsaZMEAdv6IgboMYqYeLX7LLvBwketgoGxmuQ4,31839
 gamspy/_backend/local.py,sha256=oi3hPokeEAbcPF3gCvaQXBn77-x-Lx8n4LY6U3aZMN8,3814
 gamspy/_backend/neos.py,sha256=64Rr0ZrzRc1_AWYgUmvKrTbkUP4qVYygM0ZdrNt9Zbg,17775
@@ -39,7 +39,7 @@ gamspy/_cli/mps2gms.py,sha256=4zmM5gS_YlgkzBcgHDzjM6F_r2vKJTi0P_ZYgZxjoEw,4192
 gamspy/_cli/probe.py,sha256=K7fYwfdk-2mGGQKAxXFvkWMRJ1qYTUpX2tvklU56JZU,1122
 gamspy/_cli/retrieve.py,sha256=bnTcIbHJfkq-dvrFitdkxsjQNZz-Cx4-LiaRfhe0cYM,2446
 gamspy/_cli/run.py,sha256=oaWT4alxSXqPDF2mRYmfy5aOWCKoEExUfqYoAT_zSUM,4387
-gamspy/_cli/show.py,sha256=6YpZq5TWrwPnx56mOzIk709NPypqMG_gP6YOi_6AMEk,10681
+gamspy/_cli/show.py,sha256=z7P_8u8iQ-9B1shi-_GlU9TSzMdg5j3Bxt7Q2CXc2xQ,10689
 gamspy/_cli/uninstall.py,sha256=_g3SbT6G7DZcYgtmHLhaGl1B9jY1K3D0sStifxIyqxQ,5183
 gamspy/_cli/util.py,sha256=ey3Wn7tCEggkr-sjcLqrVBda-jdadjWOn-APhSe4toE,2849
 gamspy/_symbols/__init__.py,sha256=p0Zd7XytuOe8kRclN1lFrRFaN_btFSSGdIBSXrlp03E,450
@@ -82,9 +82,9 @@ gamspy/math/matrix.py,sha256=PmYsMhF8Pq3bcgtyINryq4xV36i4KW0BtcFApOvt8GQ,16365
 gamspy/math/misc.py,sha256=hXfjwDYILcp68PiBWuEXCqbVEquhtyst4xMXd-lYFXg,39887
 gamspy/math/probability.py,sha256=gAVU_PTfbjXuN6i8XNjZpIYvFg8dPk1imZCbKQloSG0,4290
 gamspy/math/trigonometric.py,sha256=VBWQcP3ggl1oGDEzRs2M_T88HPJn9N0QfMJZwEUkx4w,4276
-gamspy-1.19.2.dist-info/licenses/LICENSE,sha256=I7K4bIaFtw6qvHJ1bgwnxfJIGSJ6zZrEt6l46t6c_Zg,1189
-gamspy-1.19.2.dist-info/METADATA,sha256=IqRTI6emSDxIvtLA-w_3JGHS928bBRrT7_a3x4JX3io,3883
-gamspy-1.19.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-gamspy-1.19.2.dist-info/entry_points.txt,sha256=tzgC7L0Y_BiyagBCaYOPK7lE4olRJKM_PH2inmMvj60,48
-gamspy-1.19.2.dist-info/top_level.txt,sha256=fsq4q5lfdb2GEZC9O3PUih38s7TfIgolIaO5NgR3Hf8,7
-gamspy-1.19.2.dist-info/RECORD,,
+gamspy-1.19.3.dist-info/licenses/LICENSE,sha256=I7K4bIaFtw6qvHJ1bgwnxfJIGSJ6zZrEt6l46t6c_Zg,1189
+gamspy-1.19.3.dist-info/METADATA,sha256=vzXomAjfo5kpG0buf5DIMvljubUkm-8G33T_zcI6tDU,3883
+gamspy-1.19.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+gamspy-1.19.3.dist-info/entry_points.txt,sha256=tzgC7L0Y_BiyagBCaYOPK7lE4olRJKM_PH2inmMvj60,48
+gamspy-1.19.3.dist-info/top_level.txt,sha256=fsq4q5lfdb2GEZC9O3PUih38s7TfIgolIaO5NgR3Hf8,7
+gamspy-1.19.3.dist-info/RECORD,,