Remove duplicate methods in coordinates.py, continued

[linpy.git] / examples / squares.py

diff --git a/examples/squares.py b/examples/squares.py
index e622c27..e00821e 100755 (executable)
--- a/examples/squares.py
+++ b/examples/squares.py
@@ -9,8 +9,11 @@ sq2 = Le(2, x) & Le(x, 4) & Le(2, y) & Le(y, 4)
 sq3 = Le(0, x) & Le(x, 3) & Le(0, y) & Le(y, 3)
 sq4 = Le(1, x) & Le(x, 2) & Le(1, y) & Le(y, 2)
 sq5 = Le(1, x) & Le(x, 2) & Le(1, y)
 sq3 = Le(0, x) & Le(x, 3) & Le(0, y) & Le(y, 3)
 sq4 = Le(1, x) & Le(x, 2) & Le(1, y) & Le(y, 2)
 sq5 = Le(1, x) & Le(x, 2) & Le(1, y)

-sq6 = Le(1, x) & Le(x, 2) & Le(1, y) & Eq(y, 3)
+sq6 = Le(1, x) & Le(x, 2) & Le(1, y) & Le(y, 3)

 sq7 = Le(0, x) & Le(x, 2) & Le(0, y) & Eq(z, 2) & Le(a, 3)
 sq7 = Le(0, x) & Le(x, 2) & Le(0, y) & Eq(z, 2) & Le(a, 3)

+p = Le(2*x+1, y) & Le(-2*x-1, y) & Le(y, 1)
+
+

 universe = Polyhedron([])
 q = sq1 - sq2
 e = Empty
 universe = Polyhedron([])
 q = sq1 - sq2
 e = Empty


@@ -55,7 +58,7 @@ print()
 print('lexographic min of sq2:', sq2.lexmin()) #test lexmax()
 print('lexographic max of sq2:', sq2.lexmax()) #test lexmax()
 print()
 print('lexographic min of sq2:', sq2.lexmin()) #test lexmax()
 print('lexographic max of sq2:', sq2.lexmax()) #test lexmax()
 print()

-print('Polyhedral hull of sq1 + sq2 is:', q.polyhedral_hull()) #test polyhedral hull
+print('Polyhedral hull of sq1 + sq2 is:', q.aspolyhedron()) #test polyhedral hull

 print()
 print('is sq1 bounded?', sq1.isbounded()) #unbounded should return True
 print('is sq5 bounded?', sq5.isbounded()) #unbounded should return False
 print()
 print('is sq1 bounded?', sq1.isbounded()) #unbounded should return True
 print('is sq5 bounded?', sq5.isbounded()) #unbounded should return False


@@ -69,3 +72,7 @@ print()
 print('sq1 has {} parameters'.format(sq1.num_parameters()))
 print()
 print('does sq1 constraints involve x?', sq1.involves_dims([x]))
 print('sq1 has {} parameters'.format(sq1.num_parameters()))
 print()
 print('does sq1 constraints involve x?', sq1.involves_dims([x]))

+print()
+print('the verticies for s are:', p.vertices())
+print()
+print(p.plot())