pyoframe 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

pyoframe/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.0'
-__version_tuple__ = version_tuple = (0, 2, 0)
+__version__ = version = '0.2.1'
+__version_tuple__ = version_tuple = (0, 2, 1)
+
+__commit_id__ = commit_id = None

pyoframe/core.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import warnings
 from abc import ABC, abstractmethod
 from typing import (
     TYPE_CHECKING,
@@ -1148,16 +1147,22 @@ class Constraint(ModelElementWithId):
         except KeyError:
             setter = self._model.poi.set_constraint_raw_attribute
 
+        constr_type = (
+            poi.ConstraintType.Quadratic
+            if self.lhs.is_quadratic
+            else poi.ConstraintType.Linear
+        )
+
         if self.dimensions is None:
             for key in self.data.get_column(CONSTRAINT_KEY):
-                setter(poi.ConstraintIndex(poi.ConstraintType.Linear, key), name, value)
+                setter(poi.ConstraintIndex(constr_type, key), name, value)
         else:
             for key, value in (
                 self.data.join(value, on=self.dimensions, how="inner")
                 .select(pl.col(CONSTRAINT_KEY), pl.col(col_name))
                 .iter_rows()
             ):
-                setter(poi.ConstraintIndex(poi.ConstraintType.Linear, key), name, value)
+                setter(poi.ConstraintIndex(constr_type, key), name, value)
 
     @unwrap_single_values
     def _get_attribute(self, name):
@@ -1169,21 +1174,16 @@ class Constraint(ModelElementWithId):
         except KeyError:
             getter = self._model.poi.get_constraint_raw_attribute
 
-        with (
-            warnings.catch_warnings()
-        ):  # map_elements without return_dtype= gives a warning
-            warnings.filterwarnings(
-                action="ignore", category=pl.exceptions.MapWithoutReturnDtypeWarning
-            )
-            return self.data.with_columns(
-                pl.col(CONSTRAINT_KEY)
-                .map_elements(
-                    lambda v_id: getter(
-                        poi.ConstraintIndex(poi.ConstraintType.Linear, v_id), name
-                    )
-                )
-                .alias(col_name)
-            ).select(self.dimensions_unsafe + [col_name])
+        constr_type = (
+            poi.ConstraintType.Quadratic
+            if self.lhs.is_quadratic
+            else poi.ConstraintType.Linear
+        )
+
+        ids = self.data.get_column(CONSTRAINT_KEY).to_list()
+        attr = [getter(poi.ConstraintIndex(constr_type, v_id), name) for v_id in ids]
+        data = self.data.with_columns(pl.Series(attr).alias(col_name))
+        return data.select(self.dimensions_unsafe + [col_name])
 
     def on_add_to_model(self, model: "Model", name: str):
         super().on_add_to_model(model, name)
@@ -1546,17 +1546,10 @@ class Variable(ModelElementWithId, SupportsMath, SupportPolarsMethodMixin):
         except KeyError:
             getter = self._model.poi.get_variable_raw_attribute
 
-        with (
-            warnings.catch_warnings()
-        ):  # map_elements without return_dtype= gives a warning
-            warnings.filterwarnings(
-                action="ignore", category=pl.exceptions.MapWithoutReturnDtypeWarning
-            )
-            return self.data.with_columns(
-                pl.col(VAR_KEY)
-                .map_elements(lambda v_id: getter(poi.VariableIndex(v_id), name))
-                .alias(col_name)
-            ).select(self.dimensions_unsafe + [col_name])
+        ids = self.data.get_column(VAR_KEY).to_list()
+        attr = [getter(poi.VariableIndex(v_id), name) for v_id in ids]
+        data = self.data.with_columns(pl.Series(attr).alias(col_name))
+        return data.select(self.dimensions_unsafe + [col_name])
 
     def _assign_ids(self):
         kwargs = dict(domain=self.vtype.to_poi())

{pyoframe-0.2.0.dist-info → pyoframe-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyoframe
-Version: 0.2.0
+Version: 0.2.1
 Summary: Blazing fast linear program interface
 Author-email: Bravos Power <dev@bravospower.com>
 License-Expression: MIT

{pyoframe-0.2.0.dist-info → pyoframe-0.2.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pyoframe/__init__.py,sha256=YswFUwm6GX98dXeT99hqxWqYWLELS71JZf1OpT1kvCg,619
 pyoframe/_arithmetic.py,sha256=agJm2Sl4EjEG7q4n2YHka4mGfCQI3LjOXLaW6oCfGiQ,17222
-pyoframe/_version.py,sha256=iB5DfB5V6YB5Wo4JmvS-txT42QtmGaWcWp3udRT7zCI,511
+pyoframe/_version.py,sha256=vYqoJTG51NOUmYyL0xt8asRK8vUT4lGAdal_EZ59mvw,704
 pyoframe/constants.py,sha256=WBCmhunavNVwJcmg9ojnA6TVJCLSrgWVE4YKZnhZNz4,4192
-pyoframe/core.py,sha256=kK-eMI7teakAAG4JjOiwRBsCgNJIlOxR0b4JOUlQHs4,67239
+pyoframe/core.py,sha256=fjCu4eY7QJSFvVfCNtMq-o_spoo76FWO4AviCssHGoo,66925
 pyoframe/model.py,sha256=a7pEwagVxHC1ZUMr8ifO4n0ca5Ways3wip-Wps0rlcg,14257
 pyoframe/model_element.py,sha256=YmAdx4yM5irGTiZ5uQmDa-u05QdFKngIFy8qNnogvzo,5911
 pyoframe/monkey_patch.py,sha256=9IfS14G6IPabmM9z80jzi_D4Rq0Mdx5aUCA39Yi2tgE,2044
 pyoframe/objective.py,sha256=PBWxj30QkFlsvY6ijZ6KjyKdrJARD4to0ieF6GUqaQU,3238
 pyoframe/util.py,sha256=dHIwAyyD9wn36yM8IOlrboTGUGA7STq3IBTxfYSOPjU,13480
-pyoframe-0.2.0.dist-info/licenses/LICENSE,sha256=u_Spw4ynlwTMRZeCX-uacv_hBU547pBygiA6d2ONNV4,1074
-pyoframe-0.2.0.dist-info/METADATA,sha256=GTwsHP14u5Zwb1E4pnjyeCS9-0DVmLXjNlo3ebZiSbw,3607
-pyoframe-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyoframe-0.2.0.dist-info/top_level.txt,sha256=10z3OOJSVLriQ0IrFLMH8CH9zByugPWolqhlHlkNjV4,9
-pyoframe-0.2.0.dist-info/RECORD,,
+pyoframe-0.2.1.dist-info/licenses/LICENSE,sha256=u_Spw4ynlwTMRZeCX-uacv_hBU547pBygiA6d2ONNV4,1074
+pyoframe-0.2.1.dist-info/METADATA,sha256=_rmMdRjfEkv-1xn9UkjVubVxNUqSKgluVmXz7nSaRnA,3607
+pyoframe-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyoframe-0.2.1.dist-info/top_level.txt,sha256=10z3OOJSVLriQ0IrFLMH8CH9zByugPWolqhlHlkNjV4,9
+pyoframe-0.2.1.dist-info/RECORD,,