poly_con_rel class update

Author: ComboProblem

pplite/__init__.py

@@ -33,5 +33,5 @@
         )
 
 from .polyhedron import (
-        NNC_Polyhedron
+        NNC_Polyhedron, Polyhedron_Constraint_Rel
         )

pplite/polyhedron.pxd

@@ -13,7 +13,5 @@ cdef class Polyhedron_Constraint_Rel(object):
 cdef class Polyhedron_Generator_Rel(object):
     cdef Poly_Gen_Rel* thisptr
 
-
-
 # cdef class Constraint_Proxy(object):
 #     cdef Cons_Proxy c_proxy

pplite/polyhedron.pyx

@@ -10,6 +10,7 @@ from .constraint cimport Constraint
 from .generators cimport PPliteGenerator
 from .linear_algebra cimport Variable, Linear_Expression, Affine_Expression
 from .intervals cimport Interval
+from cysignals.signals cimport sig_on, sig_off
 
 cdef class NNC_Polyhedron(object):
     r"""
@@ -677,18 +678,48 @@ cdef class Polyhedron_Constraint_Rel(object):
     def __cinit__(self):
         self.thisptr = NULL
     def __dealloc__(self):
+        # assert self.thisptr!=NULL
         del self.thisptr
-    def __init__(self):
-        pass
-    def nothing(self):
-        pass
-    def is_disjoint(self):
+    def __repr__(self):
+        rel = []
+        if self.implies(Polyhedron_Constraint_Rel.is_disjoint()):
+            rel.append('is_disjoint')
+        if self.implies(Polyhedron_Constraint_Rel.strictly_intersects()):
+            rel.append('strictly_intersects')
+        if self.implies(Polyhedron_Constraint_Rel.is_included()):
+            rel.append('is_included')
+        if self.implies(Polyhedron_Constraint_Rel.saturates()):
+            rel.append('saturates')
+        if rel:
+            return ', '.join(rel)
+        else:
+            return 'nothing'       
+
+    @classmethod
+    def nothing(cls):
+        """
+        TESTS::
+        >>> from pplite import Polyhedron_Constraint_Rel
+        >>> Polyhedron_Constraint_Rel.nothing()
+        nothing
+        """
+        cdef Poly_Con_Rel rel  = PPlite_NOTHING
+        cdef Poly_Con_Rel * rel_pointer
+        sig_on()
+        try:
+            rel_pointer = &rel
+            relation = Polyhedron_Constraint_Rel()
+            relation.thisptr = rel_pointer
+        finally:
+            sig_off()
+        return relation
+    def is_disjoint(cls):
         pass
-    def strictly_intersects(self):
+    def strictly_intersects(cls):
         pass
-    def is_included(self):
+    def is_included(cls):
         pass
-    def saturates(self):
+    def saturates(cls):
         pass
     def implies(self, other):
         pass
@@ -714,7 +745,7 @@ cdef Topol string_to_Topol(t):
     if  t == "nnc":
         tt = Topol.NNC
         return tt
-    raise ValueError("Topology type conversion failed.")
+    raise ValueError("Unrecognized string {0}.".format(t))
 
 cdef Spec_Elem string_to_Spec_Elem(s):
     cdef Spec_Elem ss
@@ -724,4 +755,24 @@ cdef Spec_Elem string_to_Spec_Elem(s):
     if  s == "universe":
         ss = Spec_Elem.UNIVERSE
         return ss
-    raise ValueError("Spec_Elem type conversion failed.")
+    raise ValueError("Unrecognized string {0}.".format(s))
+
+
+
+
+cdef Poly_Con_Rel _new_Poly_Con_Rel(s):
+    if s == "nothing":
+        return PPlite_NOTHING
+
+    raise ValueError("Unrecognized string {0}.".format(s))
+
+# cdef _new_Poly_Con_Rel_Nothing():
+#     cdef Poly_Con_Rel rel = Polyhedron_Constraint_Rel()
+#     rel.thisptr = new NOTHING
+#     return rel
+
+
+# cdef _new_Poly_Gen_Rel():
+#     rel = Polyhedron_Generator_Rel()
+#     rel.thisptr = new Poly_Gen_Rel()
+#     return rel

pplite/pplite_decl.pxd

@@ -51,7 +51,7 @@ cdef extern from "flint/fmpq.h":
     void fmpq_get_mpz_frac(mpz_t a, mpz_t b, fmpq_t c)
     void fmpq_set_si(fmpq_t res, slong p, ulong q)
 
-# Starting pplite definitons
+# Starting pplite definitions
 
 cdef extern from "pplite/pplite.hh" namespace "pplite":
 
@@ -415,7 +415,6 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
 
 # "pplite/Bits.hh"
 
-
     # "pplite/BBox.hh" 
     # Note: We are explicitly defining the two possible Box classes.
 
@@ -489,7 +488,6 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
         cppbool inf_ub(dim_type i)
         const FLINT_Rational& lb(dim_type i)
         const FLINT_Rational& ub(dim_type i)
-
         # Itvs itvs
         # Volume_Info volume
 
@@ -573,7 +571,7 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
         #     MINIMIZED
         #     PENDING
         # cdef struct Sys "Sys<Cons>"
-        # struct Sys_
+
         ctypedef struct cs "Sys<Cons>":
             pass
 
@@ -630,7 +628,7 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
         cppbool max(const Affine_Expr& ae, FLINT_Rational& value, cppbool* included_ptr, Gen* g_ptr)
         Itv get_bounds(Var var)
         Itv get_bounds(Affine_Expr& ae)
-        # # Itv get_bounds(Itv_Expr& ie)
+        # Itv get_bounds(Itv_Expr& ie)
         # Index_Set get_unconstrained()
         size_t hash() 
         Cons_Proxy cons() # not directly used.
@@ -684,7 +682,7 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
         void remove_higher_space_dims(dim_type new_dim)
         void expand_space_dim(Var var, dim_type m)
         # void fold_space_dims(const Index_Set& vars, Var dest) 
-        ## semantically const, but may affect syntactic reper
+        ## semantically const, but may affect syntactic representation 
         void minimize() 
 
     cppbool operator==(const Poly& x, const Poly& y)
@@ -713,7 +711,12 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
         Poly_Gen_Rel subsumes()
         cppbool implies(const Poly_Gen_Rel& y)
 
-
+    Poly_Con_Rel PPlite_NOTHING "pplite::Poly_Con_Rel::nothing()"
+    # Poly_Con_Rel IS_DISJOINT "Poly::Impl::IS_DISJOINT"
+    # Poly_Con_Rel STRICTLY_INTERSECTS "Poly::Impl::STRICTLY_INTERSECTS"
+    # Poly_Con_Rel IS_INCLUDED "Poly::Impl::IS_INCLUDED"
+    # Poly_Con_Rel SATURATES "Poly::Impl::SATURATES"
+    # Poly_Con_Rel EVERYTHING "Poly::Impl::EVERYTHING"
 # PPLite/U_Poly.hh
 
     # cdef cppclass U_Wrap:
@@ -725,12 +728,4 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
 
 # "pplite/mater_iterator.hh"
     # cdef struct[Sys, Impl] Mater_Sys:
-    #     pass
-
-
-
-#to do define Sys<Cons>
-#define Sys<Gens>
-# this is in Poly_Impl
-# where is cons?
-# general question, in C++ code, how do you quickly find the names of things/backtrace this. 
+    #     pass