error checking for simplex

4 files changed, 20 insertions, 20 deletions

diff --git a/packages/glpk/examples/simplex1.hs b/packages/glpk/examples/simplex1.hs
index 9639f37..ec72bdc 100644
--- a/packages/glpk/examples/simplex1.hs
+++ b/packages/glpk/examples/simplex1.hs
@@ -5,17 +5,16 @@ import Numeric.LinearProgramming
 objFun = Maximize [10, 6, 4]
 
 constr = Dense [ [1,1,1]  :<: 100
-               , [10,4,5] :<: 600 
+               , [10,4,5] :<: 600
                , [2,2,6]  :<: 300 ]
 
 -- default bounds
 bnds = [ 1 :>: 0
        , 2 :>: 0
        , 3 :>: 0 ]
-         
+
 main = do
     print $ simplex objFun constr []
     print $ simplex objFun constr bnds
     print $ simplex objFun constr [Free 3]
     print $ simplex objFun constr [ 2 :<: 50 ]
-
diff --git a/packages/glpk/examples/simplex2.hs b/packages/glpk/examples/simplex2.hs
index 40e4bbd..0b865a6 100644
--- a/packages/glpk/examples/simplex2.hs
+++ b/packages/glpk/examples/simplex2.hs
@@ -1,17 +1,18 @@
 import Numeric.LinearProgramming
 
-prob = Maximize [4, 3, -2, 7]
+prob = Maximize [4, -3, 2]
 
-constr1 = Sparse [ [1#1, 1#2] :<: 10
-                 , [1#3, 1#4] :<: 10 
+constr1 = Sparse [ [2#1, 1#2] :<: 10
+                 , [1#2, 5#3] :<: 20
                  ]
 
-constr2 = Dense [ [1,1,0,0] :<: 10
-                , [0,0,1,1] :<: 10 
+constr2 = Dense [ [2,1,0] :<: 10
+                , [0,1,5] :<: 20
                 ]
 
 main = do
     print $ simplex prob constr1 []
-    print $ simplex prob constr2 [ 2 :>: 1, 4 :&: (2,7)]
-    print $ simplex prob constr2 [ Free 3 ]
+    print $ simplex prob constr2 []
+    print $ simplex prob constr2 [ 2 :>: 1, 3 :&: (2,7)]
+    print $ simplex prob constr2 [ Free 2 ]
 
diff --git a/packages/glpk/examples/simplex3.hs b/packages/glpk/examples/simplex3.hs
index 3a7e8e8..1df6b28 100644
--- a/packages/glpk/examples/simplex3.hs
+++ b/packages/glpk/examples/simplex3.hs
@@ -7,12 +7,12 @@ prob = Minimize [0.03, 0.08, 0.17, 0.12, 0.15, 0.21, 0.38]
 
 constr = Dense
     [ [1,1,1,1,1,1,1]                           :==: 2000
-    , [0.15, 0.04, 0.02, 0.04, 0.2,0.01, 0.03]   :<:  60 
-    , [0.03, 0.05, 0.08, 0.02, 0.06, 0.01, 0]    :<:  100 
-    , [0.02, 0.04, 0.01, 0.02, 0.02, 0,    0]    :<:  40 
+    , [0.15, 0.04, 0.02, 0.04, 0.2,0.01, 0.03]   :<:  60
+    , [0.03, 0.05, 0.08, 0.02, 0.06, 0.01, 0]    :<:  100
+    , [0.02, 0.04, 0.01, 0.02, 0.02, 0,    0]    :<:  40
     , [0.02, 0.03, 0,    0,    0.01, 0,    0]    :<:  30
-    , [0.7,  0.75, 0.8,  0.75, 0.8,  0.97,  0]   :>:  1500 
-    , [0.02, 0.06, 0.08, 0.12, 0.02, 0.01, 0.97] :&: (250,300) 
+    , [0.7,  0.75, 0.8,  0.75, 0.8,  0.97,  0]   :>:  1500
+    , [0.02, 0.06, 0.08, 0.12, 0.02, 0.01, 0.97] :&: (250,300)
     ]
 
 bounds = [ 1 :&: (0,200)
diff --git a/packages/glpk/examples/simplex4.hs b/packages/glpk/examples/simplex4.hs
index 8496f6d..dd65002 100644
--- a/packages/glpk/examples/simplex4.hs
+++ b/packages/glpk/examples/simplex4.hs
@@ -7,12 +7,12 @@ prob = Minimize [0.03, 0.08, 0.17, 0.12, 0.15, 0.21, 0.38]
 
 constr = Sparse
     [ [1#1,1#2,1#3,1#4,1#5,1#6,1#7]                          :==: 2000
-    , [0.15#1, 0.04#2, 0.02#3, 0.04#4, 0.2#5,0.01#6, 0.03#7] :<: 60 
-    , [0.03#1, 0.05#2, 0.08#3, 0.02#4, 0.06#5, 0.01#6]       :<: 100 
-    , [0.02#1, 0.04#2, 0.01#3, 0.02#4, 0.02#5]               :<:  40 
+    , [0.15#1, 0.04#2, 0.02#3, 0.04#4, 0.2#5,0.01#6, 0.03#7] :<: 60
+    , [0.03#1, 0.05#2, 0.08#3, 0.02#4, 0.06#5, 0.01#6]       :<: 100
+    , [0.02#1, 0.04#2, 0.01#3, 0.02#4, 0.02#5]               :<:  40
     , [0.02#1, 0.03#2, 0.01#5]                               :<:  30
-    , [0.7#1,  0.75#2, 0.8#3,  0.75#4, 0.8#5,  0.97#6]       :>:  1500 
-    , [0.02#1, 0.06#2, 0.08#3, 0.12#4, 0.02#5, 0.01#6, 0.97#7] :&: (250,300) 
+    , [0.7#1,  0.75#2, 0.8#3,  0.75#4, 0.8#5,  0.97#6]       :>:  1500
+    , [0.02#1, 0.06#2, 0.08#3, 0.12#4, 0.02#5, 0.01#6, 0.97#7] :&: (250,300)
     ]
 
 bounds = [ 1 :&: (0,200)