Merge pull request #66 from ourstudio-se/63-implement-puan-rspy-020

63 implement puan rspy 020

Author: znittzel

puan/logic/plog/__init__.py

@@ -215,7 +215,7 @@ def flatten(self) -> list:
             )
         )
 
-    def to_polyhedron(self, active: bool = False) -> pnd.ge_polyhedron:
+    def to_polyhedron(self, active: bool = False, reduced: bool = False) -> pnd.ge_polyhedron:
 
         """
             Converts into a polyhedron.
@@ -244,7 +244,7 @@ def to_polyhedron(self, active: bool = False) -> pnd.ge_polyhedron:
                 )
             )
         )
-        lineqs = pst.TheoryPy(
+        polyhedron_rs = pst.TheoryPy(
             list(
                 map(
                     lambda x: pst.StatementPy(
@@ -263,47 +263,28 @@ def to_polyhedron(self, active: bool = False) -> pnd.ge_polyhedron:
                     flatten_dict.values()
                 )
             )
-        ).to_lineqs()
-        M = np.zeros((len(lineqs), 1+len(variable_id_map)))
-        for i, lineq in enumerate(lineqs):
-            M[i, list(map(lambda x: x+1, lineq.indices))] = lineq.coeffs
-            M[i, 0] = -1*lineq.bias
-
-        polyhedron = pnd.ge_polyhedron(
-            M, 
+        ).to_polyhedron(active, reduced)
+
+        id_variable_map = dict(variable_id_map.values())
+        polyedron_array = np.hstack(
+            (
+                np.array(polyhedron_rs.b).reshape(-1,1), 
+                np.array(np.array_split(polyhedron_rs.a.val, polyhedron_rs.a.nrows))
+            )
+        )
+        return pnd.ge_polyhedron(
+            polyedron_array, 
             variables=[puan.variable.support_vector_variable()]+list(
-                itertools.chain(
-                    map(
-                        lambda x: x[1].variable if hasattr(x[1], "variable") else x[1], 
-                        variable_id_map.values()
-                    )
-                )
-            ),
-            index=list(
                 map(
-                    lambda x: x[1].variable,
-                    filter(
-                        lambda x: type(x[1]) != puan.variable, 
-                        variable_id_map.values()
-                    )
+                    maz.compose(
+                        id_variable_map.get,
+                        operator.attrgetter("id")
+                    ), 
+                    polyhedron_rs.variables
                 )
-            )
+            ),
         )
 
-        # assume top node for now until
-        # this is default in puan-rspy
-        if self.variable in polyhedron.variables and active:
-
-            polyhedron = polyhedron.reduce_columns(
-                polyhedron.A.construct(
-                    *{self.variable.id: 1}.items(), 
-                    default_value=np.nan,
-                    dtype=float,
-                )
-            )
-
-        return polyhedron
-
     def negate(self) -> "AtLeast":
 
         """

requirements.txt

@@ -4,4 +4,4 @@ maz==0.0.1
 more_itertools>=8.12.0
 dictdiffer==0.9.0
 toposort==1.7
-puan-rspy>=0.1.8
+puan-rspy==0.2.1

setup.py

@@ -15,7 +15,7 @@
             "more-itertools",
             "maz>=0.0.1",
             "dictdiffer==0.9.0",
-            "puan-rspy>=0.1.8",
+            "puan-rspy==0.2.1",
             "toposort==1.7"
         ],
         packages=[

tests/test_puan.py

@@ -223,7 +223,8 @@ def test_json_conversion_id_should_be_returned_if_explicitly_defined(proposition
 def test_from_short_wont_crash(short_proposition):
 
     # Should raise if has sub propositions and bounds are other than (0,1) 
-    if len(short_proposition[2]) > 0 and short_proposition[4] != (0,1):
+    # OR if upper bound is strict lower than lower bound
+    if (len(short_proposition[2]) > 0 and short_proposition[4] != (0,1)) or (short_proposition[4][1] < short_proposition[4][0]):
         with pytest.raises(Exception):
             pg.AtLeast.from_short(short_proposition)
     else: