diff options
author | CJ East <cje@ieee.org> | 2015-01-12 23:53:51 +1100 |
---|---|---|
committer | CJ East <cje@ieee.org> | 2015-01-12 23:53:51 +1100 |
commit | 9ef9a9a1c2e2319358fb164bc18a8a0efb23893b (patch) | |
tree | 35666b648b4e8a7488805af82b9da65d7fa50a67 /packages/glpk | |
parent | 432d80a0b65b0be64fe0dc0d7816f1f738895458 (diff) |
Minor fixes for examples
Diffstat (limited to 'packages/glpk')
-rw-r--r-- | packages/glpk/examples/simplex1.hs | 6 | ||||
-rw-r--r-- | packages/glpk/examples/simplex2.hs | 2 | ||||
-rw-r--r-- | packages/glpk/examples/simplex3.hs | 2 | ||||
-rw-r--r-- | packages/glpk/examples/simplex4.hs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/packages/glpk/examples/simplex1.hs b/packages/glpk/examples/simplex1.hs index e7aeaa9..a326555 100644 --- a/packages/glpk/examples/simplex1.hs +++ b/packages/glpk/examples/simplex1.hs | |||
@@ -9,9 +9,9 @@ constr = Dense [ [1,1,1] :<=: 100 | |||
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 [] |
diff --git a/packages/glpk/examples/simplex2.hs b/packages/glpk/examples/simplex2.hs index f4e27fd..e9e8859 100644 --- a/packages/glpk/examples/simplex2.hs +++ b/packages/glpk/examples/simplex2.hs | |||
@@ -13,6 +13,6 @@ constr2 = Dense [ [2,1,0] :<=: 10 | |||
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 e093124..0997320 100644 --- a/packages/glpk/examples/simplex3.hs +++ b/packages/glpk/examples/simplex3.hs | |||
@@ -11,7 +11,7 @@ constr = Dense | |||
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 9a205ad..22b131c 100644 --- a/packages/glpk/examples/simplex4.hs +++ b/packages/glpk/examples/simplex4.hs | |||
@@ -11,7 +11,7 @@ constr = Sparse | |||
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 | ||