4 files changed, 22 insertions, 22 deletions
diff --git a/packages/glpk/examples/simplex1.hs b/packages/glpk/examples/simplex1.hs
index ec72bdc..e7aeaa9 100644
--- a/packages/glpk/examples/simplex1.hs
+++ b/packages/glpk/examples/simplex1.hs
@@ -4,17 +4,17 @@ import Numeric.LinearProgramming
 objFun = Maximize [10, 6, 4]
-constr = Dense [ [1,1,1]  :<: 100
+constr = Dense [ [1,1,1]  :<=: 100
-               , [10,4,5] :<: 600
+               , [10,4,5] :<=: 600
-               , [2,2,6]  :<: 300 ]
+               , [2,2,6]  :<=: 300 ]
 -- default bounds
-bnds = [ 1 :>: 0
+bnds = [ 1 :=>: 0
-       , 2 :>: 0
+       , 2 :=>: 0
-       , 3 :>: 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 ]
+    print $ simplex objFun constr [ 2 :<=: 50 ]
diff --git a/packages/glpk/examples/simplex2.hs b/packages/glpk/examples/simplex2.hs
index 0b865a6..f4e27fd 100644
--- a/packages/glpk/examples/simplex2.hs
+++ b/packages/glpk/examples/simplex2.hs
@@ -2,17 +2,17 @@ import Numeric.LinearProgramming
 prob = Maximize [4, -3, 2]
-constr1 = Sparse [ [2#1, 1#2] :<: 10
+constr1 = Sparse [ [2#1, 1#2] :<=: 10
-                 , [1#2, 5#3] :<: 20
+                 , [1#2, 5#3] :<=: 20
                 ]
-constr2 = Dense [ [2,1,0] :<: 10
+constr2 = Dense [ [2,1,0] :<=: 10
-                , [0,1,5] :<: 20
+                , [0,1,5] :<=: 20
                ]
 main = do
    print $ simplex prob constr1 []
    print $ simplex prob constr2 []
-    print $ simplex prob constr2 [ 2 :>: 1, 3 :&: (2,7)]
+    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 1df6b28..e093124 100644
--- a/packages/glpk/examples/simplex3.hs
+++ b/packages/glpk/examples/simplex3.hs
@@ -7,11 +7,11 @@ 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.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.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.04, 0.01, 0.02, 0.02, 0,    0]    :<=:  40
-    , [0.02, 0.03, 0,    0,    0.01, 0,    0]    :<:  30
+    , [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.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)
    ]
diff --git a/packages/glpk/examples/simplex4.hs b/packages/glpk/examples/simplex4.hs
index dd65002..9a205ad 100644
--- a/packages/glpk/examples/simplex4.hs
+++ b/packages/glpk/examples/simplex4.hs
@@ -7,11 +7,11 @@ 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.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.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.04#2, 0.01#3, 0.02#4, 0.02#5]               :<=:  40
-    , [0.02#1, 0.03#2, 0.01#5]                               :<:  30
+    , [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.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)
    ]

diff --git a/packages/glpk/examples/simplex1.hs b/packages/glpk/examples/simplex1.hs index ec72bdc..e7aeaa9 100644 --- a/packages/glpk/examples/simplex1.hs +++ b/packages/glpk/examples/simplex1.hs
@@ -4,17 +4,17 @@ import Numeric.LinearProgramming
4		4
5	objFun = Maximize [10, 6, 4]	5	objFun = Maximize [10, 6, 4]
6		6
7	constr = Dense [ [1,1,1] :<: 100	7	constr = Dense [ [1,1,1] :<=: 100
8	, [10,4,5] :<: 600	8	, [10,4,5] :<=: 600
9	, [2,2,6] :<: 300 ]	9	, [2,2,6] :<=: 300 ]
10		10
11	-- default bounds	11	-- default bounds
12	bnds = [ 1 :>: 0	12	bnds = [ 1 :=>: 0
13	, 2 :>: 0	13	, 2 :=>: 0
14	, 3 :>: 0 ]	14	, 3 :=>: 0 ]
15		15
16	main = do	16	main = do
17	print $ simplex objFun constr []	17	print $ simplex objFun constr []
18	print $ simplex objFun constr bnds	18	print $ simplex objFun constr bnds
19	print $ simplex objFun constr [Free 3]	19	print $ simplex objFun constr [Free 3]
20	print $ simplex objFun constr [ 2 :<: 50 ]	20	print $ simplex objFun constr [ 2 :<=: 50 ]


diff --git a/packages/glpk/examples/simplex2.hs b/packages/glpk/examples/simplex2.hs index 0b865a6..f4e27fd 100644 --- a/packages/glpk/examples/simplex2.hs +++ b/packages/glpk/examples/simplex2.hs
@@ -2,17 +2,17 @@ import Numeric.LinearProgramming
2		2
3	prob = Maximize [4, -3, 2]	3	prob = Maximize [4, -3, 2]
4		4
5	constr1 = Sparse [ [2#1, 1#2] :<: 10	5	constr1 = Sparse [ [2#1, 1#2] :<=: 10
6	, [1#2, 5#3] :<: 20	6	, [1#2, 5#3] :<=: 20
7	]	7	]
8		8
9	constr2 = Dense [ [2,1,0] :<: 10	9	constr2 = Dense [ [2,1,0] :<=: 10
10	, [0,1,5] :<: 20	10	, [0,1,5] :<=: 20
11	]	11	]
12		12
13	main = do	13	main = do
14	print $ simplex prob constr1 []	14	print $ simplex prob constr1 []
15	print $ simplex prob constr2 []	15	print $ simplex prob constr2 []
16	print $ simplex prob constr2 [ 2 :>: 1, 3 :&: (2,7)]	16	print $ simplex prob constr2 [ 2 :=>: 1, 3 :&: (2,7)]
17	print $ simplex prob constr2 [ Free 2 ]	17	print $ simplex prob constr2 [ Free 2 ]
18		18


diff --git a/packages/glpk/examples/simplex3.hs b/packages/glpk/examples/simplex3.hs index 1df6b28..e093124 100644 --- a/packages/glpk/examples/simplex3.hs +++ b/packages/glpk/examples/simplex3.hs
@@ -7,11 +7,11 @@ prob = Minimize [0.03, 0.08, 0.17, 0.12, 0.15, 0.21, 0.38]
7		7
8	constr = Dense	8	constr = Dense
9	[ [1,1,1,1,1,1,1] :==: 2000	9	[ [1,1,1,1,1,1,1] :==: 2000
10	, [0.15, 0.04, 0.02, 0.04, 0.2,0.01, 0.03] :<: 60	10	, [0.15, 0.04, 0.02, 0.04, 0.2,0.01, 0.03] :<=: 60
11	, [0.03, 0.05, 0.08, 0.02, 0.06, 0.01, 0] :<: 100	11	, [0.03, 0.05, 0.08, 0.02, 0.06, 0.01, 0] :<=: 100
12	, [0.02, 0.04, 0.01, 0.02, 0.02, 0, 0] :<: 40	12	, [0.02, 0.04, 0.01, 0.02, 0.02, 0, 0] :<=: 40
13	, [0.02, 0.03, 0, 0, 0.01, 0, 0] :<: 30	13	, [0.02, 0.03, 0, 0, 0.01, 0, 0] :<=: 30
14	, [0.7, 0.75, 0.8, 0.75, 0.8, 0.97, 0] :>: 1500	14	, [0.7, 0.75, 0.8, 0.75, 0.8, 0.97, 0] :=>: 1500
15	, [0.02, 0.06, 0.08, 0.12, 0.02, 0.01, 0.97] :&: (250,300)	15	, [0.02, 0.06, 0.08, 0.12, 0.02, 0.01, 0.97] :&: (250,300)
16	]	16	]
17		17


diff --git a/packages/glpk/examples/simplex4.hs b/packages/glpk/examples/simplex4.hs index dd65002..9a205ad 100644 --- a/packages/glpk/examples/simplex4.hs +++ b/packages/glpk/examples/simplex4.hs
@@ -7,11 +7,11 @@ prob = Minimize [0.03, 0.08, 0.17, 0.12, 0.15, 0.21, 0.38]
7		7
8	constr = Sparse	8	constr = Sparse
9	[ [1#1,1#2,1#3,1#4,1#5,1#6,1#7] :==: 2000	9	[ [1#1,1#2,1#3,1#4,1#5,1#6,1#7] :==: 2000
10	, [0.15#1, 0.04#2, 0.02#3, 0.04#4, 0.2#5,0.01#6, 0.03#7] :<: 60	10	, [0.15#1, 0.04#2, 0.02#3, 0.04#4, 0.2#5,0.01#6, 0.03#7] :<=: 60
11	, [0.03#1, 0.05#2, 0.08#3, 0.02#4, 0.06#5, 0.01#6] :<: 100	11	, [0.03#1, 0.05#2, 0.08#3, 0.02#4, 0.06#5, 0.01#6] :<=: 100
12	, [0.02#1, 0.04#2, 0.01#3, 0.02#4, 0.02#5] :<: 40	12	, [0.02#1, 0.04#2, 0.01#3, 0.02#4, 0.02#5] :<=: 40
13	, [0.02#1, 0.03#2, 0.01#5] :<: 30	13	, [0.02#1, 0.03#2, 0.01#5] :<=: 30
14	, [0.7#1, 0.75#2, 0.8#3, 0.75#4, 0.8#5, 0.97#6] :>: 1500	14	, [0.7#1, 0.75#2, 0.8#3, 0.75#4, 0.8#5, 0.97#6] :=>: 1500
15	, [0.02#1, 0.06#2, 0.08#3, 0.12#4, 0.02#5, 0.01#6, 0.97#7] :&: (250,300)	15	, [0.02#1, 0.06#2, 0.08#3, 0.12#4, 0.02#5, 0.01#6, 0.97#7] :&: (250,300)
16	]	16	]
17		17