pyoframe 0.1.2__tar.gz → 0.1.3__tar.gz

{pyoframe-0.1.2/src/pyoframe.egg-info → pyoframe-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyoframe
-Version: 0.1.2
+Version: 0.1.3
 Summary: Blazing fast linear program interface
 Author-email: Bravos Power <dev@bravospower.com>
 Project-URL: Homepage, https://bravos-power.github.io/pyoframe/
@@ -32,6 +32,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: gurobipy; extra == "dev"
 Requires-Dist: highsbox; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs-material==9.*; extra == "docs"
 Requires-Dist: mkdocstrings[python]; extra == "docs"

{pyoframe-0.1.2 → pyoframe-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyoframe"
-version = "0.1.2"
+version = "0.1.3"
 authors = [{ name = "Bravos Power", email = "dev@bravospower.com" }]
 description = "Blazing fast linear program interface"
 readme = "README.md"
@@ -36,7 +36,8 @@ dev = [
     "pre-commit",
     "gurobipy",
     "highsbox",
-    "pre-commit"
+    "pre-commit",
+    "coverage"
 ]
 docs = [
     "mkdocs-material==9.*",

{pyoframe-0.1.2 → pyoframe-0.1.3}/src/pyoframe/_arithmetic.py

@@ -363,16 +363,67 @@ def _add_dimension(self: "Expression", target: "Expression") -> "Expression":
 
 
 def _sum_like_terms(df: pl.DataFrame) -> pl.DataFrame:
-    """Combines terms with the same variables. Removes quadratic column if they all happen to cancel."""
+    """Combines terms with the same variables."""
     dims = [c for c in df.columns if c not in RESERVED_COL_KEYS]
     var_cols = [VAR_KEY] + ([QUAD_VAR_KEY] if QUAD_VAR_KEY in df.columns else [])
-    df = (
-        df.group_by(dims + var_cols, maintain_order=True)
-        .sum()
-        .filter(pl.col(COEF_KEY) != 0)
-    )
+    df = df.group_by(dims + var_cols, maintain_order=True).sum()
+    return df
+
+
+def _simplify_expr_df(df: pl.DataFrame) -> pl.DataFrame:
+    """
+    Removes the quadratic column and terms with a zero coefficient, when applicable.
+
+    Specifically, zero coefficient terms are always removed, except if they're the only terms in which case the expression contains a single term.
+    The quadratic column is removed if the expression is not a quadratic.
+
+    Examples:
+
+        >>> import polars as pl
+        >>> df = pl.DataFrame({ VAR_KEY: [CONST_TERM, 1], QUAD_VAR_KEY: [CONST_TERM, 1], COEF_KEY: [1.0, 0]})
+        >>> _simplify_expr_df(df)
+        shape: (1, 2)
+        ┌───────────────┬─────────┐
+        │ __variable_id ┆ __coeff │
+        │ ---           ┆ ---     │
+        │ i64           ┆ f64     │
+        ╞═══════════════╪═════════╡
+        │ 0             ┆ 1.0     │
+        └───────────────┴─────────┘
+        >>> df = pl.DataFrame({"t": [1, 1, 2, 2, 3, 3], VAR_KEY: [CONST_TERM, 1, CONST_TERM, 1, 1, 2], QUAD_VAR_KEY: [CONST_TERM, CONST_TERM, CONST_TERM, CONST_TERM, CONST_TERM, 1], COEF_KEY: [1, 0, 0, 0, 1, 0]})
+        >>> _simplify_expr_df(df)
+        shape: (3, 3)
+        ┌─────┬───────────────┬─────────┐
+        │ t   ┆ __variable_id ┆ __coeff │
+        │ --- ┆ ---           ┆ ---     │
+        │ i64 ┆ i64           ┆ i64     │
+        ╞═════╪═══════════════╪═════════╡
+        │ 1   ┆ 0             ┆ 1       │
+        │ 2   ┆ 0             ┆ 0       │
+        │ 3   ┆ 1             ┆ 1       │
+        └─────┴───────────────┴─────────┘
+    """
+    df_filtered = df.filter(pl.col(COEF_KEY) != 0)
+    if len(df_filtered) < len(df):
+        dims = [c for c in df.columns if c not in RESERVED_COL_KEYS]
+        if dims:
+            dim_values = df.select(dims).unique(maintain_order=True)
+            df = (
+                dim_values.join(df_filtered, on=dims, how="left")
+                .with_columns(pl.col(COEF_KEY).fill_null(0))
+                .fill_null(CONST_TERM)
+            )
+        else:
+            df = df_filtered
+            if df.is_empty():
+                df = pl.DataFrame(
+                    {VAR_KEY: [CONST_TERM], COEF_KEY: [0]},
+                    schema={VAR_KEY: KEY_TYPE, COEF_KEY: pl.Float64},
+                )
+
     if QUAD_VAR_KEY in df.columns and (df.get_column(QUAD_VAR_KEY) == CONST_TERM).all():
         df = df.drop(QUAD_VAR_KEY)
+
     return df
 
 

{pyoframe-0.1.2 → pyoframe-0.1.3}/src/pyoframe/core.py

@@ -25,6 +25,7 @@ from pyoframe._arithmetic import (
     _add_expressions,
     _get_dimensions,
     _multiply_expressions,
+    _simplify_expr_df,
 )
 from pyoframe.constants import (
     COEF_KEY,
@@ -424,21 +425,9 @@ class Expression(ModelElement, SupportsMath, SupportPolarsMethodMixin):
                     f"Cannot create an expression with duplicate indices:\n{duplicated_data}."
                 )
 
-        super().__init__(data)
+        data = _simplify_expr_df(data)
 
-    # Might add this in later
-    # @classmethod
-    # def empty(cls, dimensions=[], type=None):
-    #     data = {COEF_KEY: [], VAR_KEY: []}
-    #     data.update({d: [] for d in dimensions})
-    #     schema = {COEF_KEY: pl.Float64, VAR_KEY: pl.UInt32}
-    #     if type is not None:
-    #         schema.update({d: t for d, t in zip(dimensions, type)})
-    #     return Expression(
-    #         pl.DataFrame(data).with_columns(
-    #             *[pl.col(c).cast(t) for c, t in schema.items()]
-    #         )
-    #     )
+        super().__init__(data)
 
     @classmethod
     def constant(cls, constant: int | float) -> "Expression":
@@ -1011,7 +1000,7 @@ class Expression(ModelElement, SupportsMath, SupportPolarsMethodMixin):
                 self,
                 size=len(self),
                 dimensions=self.shape,
-                terms=len(self.data),
+                terms=self.terms,
                 degree=2 if self.degree() == 2 else None,
             )
         if include_header and include_data:
@@ -1031,6 +1020,27 @@ class Expression(ModelElement, SupportsMath, SupportPolarsMethodMixin):
     def __str__(self) -> str:
         return self.to_str()
 
+    @property
+    def terms(self) -> int:
+        """
+        Number of terms across all subexpressions.
+
+        Expressions equal to zero count as one term.
+
+        Examples:
+            >>> import polars as pl
+            >>> m = pf.Model()
+            >>> m.v = pf.Variable({"t": [1, 2]})
+            >>> coef = pl.DataFrame({"t": [1, 2], "coef": [0, 1]})
+            >>> coef*(m.v+4)
+            <Expression size=2 dimensions={'t': 2} terms=3>
+            [1]: 0
+            [2]: 4  + v[2]
+            >>> (coef*(m.v+4)).terms
+            3
+        """
+        return len(self.data)
+
 
 @overload
 def sum(over: Union[str, Sequence[str]], expr: SupportsToExpr) -> "Expression": ...

{pyoframe-0.1.2 → pyoframe-0.1.3}/src/pyoframe/model.py

@@ -39,7 +39,7 @@ class Model:
             Typically, this parameter can be omitted (`None`) as it will automatically be
             set when the objective is set using `.minimize` or `.maximize`.
 
-    Example:
+    Examples:
         >>> m = pf.Model()
         >>> m.X = pf.Variable()
         >>> m.my_constraint = m.X <= 10
@@ -273,7 +273,7 @@ class Model:
         !!! warning "Gurobi only"
             This method only works with the Gurobi solver. Open an issue if you'd like to see support for other solvers.
 
-        Example:
+        Examples:
             >>> m = pf.Model(solver="gurobi")
             >>> m.X = pf.Variable(vtype=pf.VType.BINARY, lb=0)
             >>> m.Y = pf.Variable(vtype=pf.VType.INTEGER, lb=0)
@@ -310,7 +310,7 @@ class Model:
         !!! warning "Gurobi only"
             This method only works with the Gurobi solver. Open an issue if you'd like to see support for other solvers.
 
-        Example:
+        Examples:
             >>> m = pf.Model(solver="gurobi")
             >>> m.X = pf.Variable(lb=0, ub=2)
             >>> m.Y = pf.Variable(lb=0, ub=2)
@@ -329,6 +329,35 @@ class Model:
         """
         self.poi.computeIIS()
 
+    def dispose(self):
+        """
+        Tries to close the solver connection by deleting the model and forcing the garbage collector to run.
+
+        Once this method is called, this model is no longer usable.
+
+        This method will not work if you still have variables that reference parts of this model.
+        Unfortunately, this is a limitation from the underlying solver interface library.
+        See https://github.com/metab0t/PyOptInterface/issues/36 for context.
+
+        Examples:
+            >>> m = pf.Model()
+            >>> m.X = pf.Variable()
+            >>> m.dispose()
+            >>> m.X
+            Traceback (most recent call last):
+            ...
+            AttributeError: 'Model' object has no attribute 'X'
+        """
+        import gc
+
+        for attr in dir(self):
+            if not attr.startswith("__"):
+                try:
+                    delattr(self, attr)
+                except AttributeError:
+                    pass
+        gc.collect()
+
     def _set_param(self, name, value):
         self.poi.set_raw_parameter(name, value)
 

{pyoframe-0.1.2 → pyoframe-0.1.3}/src/pyoframe/model_element.py

@@ -145,7 +145,7 @@ class SupportPolarsMethodMixin(ABC):
         """
         Filters elements by the given criteria and then drops the filtered dimensions.
 
-        Example:
+        Examples:
             >>> m = pf.Model()
             >>> m.v = pf.Variable([{"hour": ["00:00", "06:00", "12:00", "18:00"]}, {"city": ["Toronto", "Berlin", "Paris"]}])
             >>> m.v.pick(hour="06:00")

{pyoframe-0.1.2 → pyoframe-0.1.3/src/pyoframe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyoframe
-Version: 0.1.2
+Version: 0.1.3
 Summary: Blazing fast linear program interface
 Author-email: Bravos Power <dev@bravospower.com>
 Project-URL: Homepage, https://bravos-power.github.io/pyoframe/
@@ -32,6 +32,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: gurobipy; extra == "dev"
 Requires-Dist: highsbox; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs-material==9.*; extra == "docs"
 Requires-Dist: mkdocstrings[python]; extra == "docs"

{pyoframe-0.1.2 → pyoframe-0.1.3}/src/pyoframe.egg-info/requires.txt

@@ -15,6 +15,7 @@ pytest-cov
 pre-commit
 gurobipy
 highsbox
+coverage
 
 [docs]
 mkdocs-material==9.*

{pyoframe-0.1.2 → pyoframe-0.1.3}/tests/test_arithmetic.py

@@ -479,3 +479,44 @@ def test_variable_equals():
     m.optimize()
     assert m.maximize.value == 300
     assert m.maximize.evaluate() == 300
+
+
+def test_adding_expressions_that_cancel():
+    m = Model()
+    m.x = Variable(pl.DataFrame({"t": [0, 1]}))
+    m.y = Variable(pl.DataFrame({"t": [0, 1]}))
+
+    coef_1 = pl.DataFrame({"t": [0, 1], "value": [1, -1]})
+    coef_2 = pl.DataFrame({"t": [0, 1], "value": [1, 1]})
+
+    m.c = coef_1 * m.x + coef_2 * m.x + m.y >= 0
+
+
+def test_adding_cancelling_expressions_no_dim():
+    m = Model()
+    m.X = Variable()
+    m.c = m.X - m.X >= 0
+
+
+def test_adding_empty_expression():
+    m = Model()
+    m.x = Variable(pl.DataFrame({"t": [0, 1]}))
+    m.y = Variable(pl.DataFrame({"t": [0, 1]}))
+    m.z = Variable(pl.DataFrame({"t": [0, 1]}))
+    m.c = 0 * m.x + m.y >= 0
+    m.c_2 = 0 * m.x + 0 * m.y + m.z >= 0
+    m.c_3 = m.z + 0 * m.x + 0 * m.y >= 0
+
+
+def test_to_and_from_quadratic():
+    m = Model()
+    df = pl.DataFrame({"dim": [1, 2, 3], "value": [1, 2, 3]})
+    m.x1 = Variable()
+    m.x2 = Variable()
+    expr1 = df * m.x1
+    expr2 = df * m.x2 * 2 + 4
+    expr3 = expr1 * expr2
+    expr4 = expr3 - df * m.x1 * df * m.x2 * 2
+    assert expr3.is_quadratic
+    assert not expr4.is_quadratic
+    assert expr4.terms == 3