diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-04-09 12:48:57 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-04-09 12:48:57 +0200 |
commit | c10f27ac40ff74612a6c773baa572573f3186506 (patch) | |
tree | efe9bf1b62e20c1163eed98753c4bef2afca6d06 /packages/glpk/examples/simplex4.hs | |
parent | 5eba1bc309d7845366e8d00849d85426bf8f666d (diff) | |
parent | 8d7c921bdff0d57a4579d3de71cd5ba3bf5276a1 (diff) |
merge recent changes
Diffstat (limited to 'packages/glpk/examples/simplex4.hs')
-rw-r--r-- | packages/glpk/examples/simplex4.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||