From 9ef9a9a1c2e2319358fb164bc18a8a0efb23893b Mon Sep 17 00:00:00 2001 From: CJ East Date: Mon, 12 Jan 2015 23:53:51 +1100 Subject: Minor fixes for examples --- packages/glpk/examples/simplex1.hs | 6 +++--- packages/glpk/examples/simplex2.hs | 2 +- packages/glpk/examples/simplex3.hs | 2 +- packages/glpk/examples/simplex4.hs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') 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 , [2,2,6] :<=: 300 ] -- default bounds -bnds = [ 1 :=>: 0 - , 2 :=>: 0 - , 3 :=>: 0 ] +bnds = [ 1 :>=: 0 + , 2 :>=: 0 + , 3 :>=: 0 ] main = do 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 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 e093124..0997320 100644 --- a/packages/glpk/examples/simplex3.hs +++ b/packages/glpk/examples/simplex3.hs @@ -11,7 +11,7 @@ constr = Dense , [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.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 9a205ad..22b131c 100644 --- a/packages/glpk/examples/simplex4.hs +++ b/packages/glpk/examples/simplex4.hs @@ -11,7 +11,7 @@ constr = Sparse , [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.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) ] -- cgit v1.2.3