gamspy 1.19.1__tar.gz → 1.19.3__tar.gz

{gamspy-1.19.1/src/gamspy.egg-info → gamspy-1.19.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gamspy
-Version: 1.19.1
+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.1 → gamspy-1.19.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gamspy"
-version = "1.19.1"
+version = "1.19.3"
 authors = [
   { name = "GAMS Development Corporation", email = "support@gams.com" },
 ]

{gamspy-1.19.1 → gamspy-1.19.3}/src/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-1.19.1 → gamspy-1.19.3}/src/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-1.19.1 → gamspy-1.19.3}/src/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,53 +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
             )
-            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
-            )
+            self._add_statement(f"$declareAndLoad {load_from}")
+            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-1.19.1 → gamspy-1.19.3}/src/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.1 → gamspy-1.19.3}/src/gamspy/_validation.py

@@ -331,7 +331,8 @@ def validate_domain(
                 try:
                     if (
                         given != "*"
-                        and len(actual.records) < 1000
+                        and actual.records is not None
+                        and len(actual.records) < 100
                         and not actual.records.isin([given]).sum().any()
                     ):
                         raise ValidationError(

{gamspy-1.19.1 → gamspy-1.19.3/src/gamspy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gamspy
-Version: 1.19.1
+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.1 → gamspy-1.19.3}/tests/test_gamspy.py

@@ -18,7 +18,7 @@ from gamspy.exceptions import GamspyException, ValidationError
 
 @pytest.mark.unit
 def test_version():
-    assert gp.__version__ == "1.19.1"
+    assert gp.__version__ == "1.19.3"
 
 
 @pytest.mark.unit
@@ -73,20 +73,20 @@ def test_config():
 def test_domain_checking_config_performance():
     gp.set_options({"DOMAIN_VALIDATION": 1})
     m = gp.Container()
-    i = gp.Set(m, records=range(999))
+    i = gp.Set(m, records=range(99))
     a = gp.Parameter(m, domain=i)
     start = time.time()
-    for idx in range(999):
+    for idx in range(99):
         _ = a[idx] + a[idx] + a[idx] + a[idx] + a[idx] + a[idx] + a[idx] + a[idx]
 
     timing_with_validation = time.time() - start
 
     gp.set_options({"DOMAIN_VALIDATION": 0})
     m = gp.Container()
-    i = gp.Set(m, records=range(999))
+    i = gp.Set(m, records=range(99))
     a = gp.Parameter(m, domain=i)
     start = time.time()
-    for idx in range(999):
+    for idx in range(99):
         _ = a[idx] + a[idx] + a[idx] + a[idx] + a[idx] + a[idx] + a[idx] + a[idx]
     timing_without_validation = time.time() - start
     gp.set_options({"DOMAIN_VALIDATION": 1})