Simplify class verification in LinExpr.fromstring()

[linpy.git] / examples / squares.py

diff --git a/examples/squares.py b/examples/squares.py
index ea48fe4..98e2ca8 100755 (executable)
--- a/examples/squares.py
+++ b/examples/squares.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 from linpy import *
+import matplotlib.pyplot as plt
+from matplotlib import pylab
 
 a, x, y, z = symbols('a x y z')
 
@@ -13,7 +15,6 @@ 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)
 p = Le(2*x+1, y) & Le(-2*x-1, y) & Le(y, 1)
 
-
 universe = Polyhedron([])
 q = sq1 - sq2
 e = Empty
@@ -60,19 +61,27 @@ print('lexographic max of sq2:', sq2.lexmax()) #test lexmax()
 print()
 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 sq1 bounded?', sq1.isbounded()) #bounded should return True
 print('is sq5 bounded?', sq5.isbounded()) #unbounded should return False
 print()
 print('sq6:', sq6)
-print('sq6 simplified:', sq6.sample())
-print()
-print(universe.project([x]))
-print('sq7 with out constraints involving y and a', sq7.project([a, z, x, y])) #drops dims that are passed
-print()
-print('sq1 has {} parameters'.format(sq1.num_parameters()))
+print('sample Polyhedron from sq6:', sq6.sample())
 print()
-print('does sq1 constraints involve x?', sq1.involves_dims([x]))
+print('sq7 with out constraints involving y and a', sq7.project([a, z, x, y])) 
 print()
 print('the verticies for s are:', p.vertices())
-print()
-print(p.plot())
+
+
+# plotting the intersection of two squares
+square1 = Le(0, x) & Le(x, 2) & Le(0, y) & Le(y, 2)
+square2 = Le(1, x) & Le(x, 3) & Le(1, y) & Le(y, 3)
+
+fig = plt.figure()
+plot = fig.add_subplot(1, 1, 1, aspect='equal')
+square1.plot(plot, facecolor='red', alpha=0.3)
+square2.plot(plot, facecolor='blue', alpha=0.3)
+
+squares = Polyhedron(square1 + square2)
+squares.plot(plot, facecolor='blue', alpha=0.3)
+
+pylab.show()