Merging changes into master

Author: tkralphs

src/grumpy/examples/DrawPolyhedron.py

@@ -11,7 +11,7 @@
 except ImportError:
     CYLP_INSTALLED = False
 
-import MIP4 as LP
+import LP6 as LP
 
 def disp_polyhedron(A = None, b = None, points = None, rays = None, c = None, obj_val = None,
                     opt = None, loc = None):
@@ -85,4 +85,3 @@ def disp_polyhedron(A = None, b = None, points = None, rays = None, c = None, ob
         print LP.b
 
         disp_polyhedron(A = p.hrep.A, b = p.hrep.b)
-     

src/grumpy/examples/LP2.py

@@ -1,8 +1,32 @@
 numVars = 2
+numCons = 4
+points = None
+rays = []
 A = [[-9, 5],
      [1, -13],
      [5, -1],
      [-1, 5]]
 #b = [0, 0, 32, 20]
 b = [0, 0, 16, 10]
 c = [1, 1]
+
+sense = ('Max', '<=')
+integerIndices = [0, 1]
+
+cuts = [
+        [4, .00000000008],
+        [.0000000008, 4], 
+        [3, 1],
+        [1, 3],
+        [2, .0000000004],
+        [.0000000004, 2]
+        ]
+
+rhs = [
+        14,
+        10, 
+        12,
+        10,
+        6,
+        4
+        ]

src/grumpy/examples/LP3.py

@@ -7,4 +7,3 @@
      [-3, 7]]
 b = [0, 0, 18, 8]
 c = [1, 1]
-