projects
/
linpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Getting vertices when version < 0.13
[linpy.git]
/
pypol
/
domains.py
diff --git
a/pypol/domains.py
b/pypol/domains.py
index
fdb0ab0
..
600049c
100644
(file)
--- a/
pypol/domains.py
+++ b/
pypol/domains.py
@@
-260,16
+260,18
@@
class Domain:
_RE_COORDINATE = re.compile(r'\((?P<num>\-?\d+)\)(/(?P<den>\d+))?')
def vertices(self):
_RE_COORDINATE = re.compile(r'\((?P<num>\-?\d+)\)(/(?P<den>\d+))?')
def vertices(self):
+ #returning list of verticies
+ from .polyhedra import Polyhedron
islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
vertices = libisl.isl_basic_set_compute_vertices(islbset);
vertices = islhelper.isl_vertices_vertices(vertices)
points = []
for vertex in vertices:
islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
vertices = libisl.isl_basic_set_compute_vertices(islbset);
vertices = islhelper.isl_vertices_vertices(vertices)
points = []
for vertex in vertices:
- expr = libisl.isl_vertex_get_expr(vertex);
+ expr = libisl.isl_vertex_get_expr(vertex);
if islhelper.isl_version < '0.13':
if islhelper.isl_version < '0.13':
- string = islhelper.isl_set_to_str(expr)
-
print(string
)
- # to be continued...
+ #pass bset from expr to points to get verticies
+
exp = Polyhedron._fromislbasicset(expr, self.symbols
)
+ points.append(exp.points())
else:
# horrible hack, find a cleaner solution
string = islhelper.isl_multi_aff_to_str(expr)
else:
# horrible hack, find a cleaner solution
string = islhelper.isl_multi_aff_to_str(expr)
@@
-301,6
+303,11
@@
class Domain:
points.append(point)
return points
points.append(point)
return points
+ def subs(self, symbol, expression=None):
+ polyhedra = [polyhedron.subs(symbol, expression)
+ for polyhedron in self.polyhedra]
+ return Domain(*polyhedra)
+
@classmethod
def _fromislset(cls, islset, symbols):
from .polyhedra import Polyhedron
@classmethod
def _fromislset(cls, islset, symbols):
from .polyhedra import Polyhedron
@@
-323,6
+330,7
@@
class Domain:
self._dimension = len(self._symbols)
return self
self._dimension = len(self._symbols)
return self
+ @classmethod
def _toislset(cls, polyhedra, symbols):
polyhedron = polyhedra[0]
islbset = polyhedron._toislbasicset(polyhedron.equalities,
def _toislset(cls, polyhedra, symbols):
polyhedron = polyhedra[0]
islbset = polyhedron._toislbasicset(polyhedron.equalities,