diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/base/THANKS.md | 2 | ||||
-rw-r--r-- | packages/glpk/hmatrix-glpk.cabal | 2 | ||||
-rw-r--r-- | packages/glpk/src/Numeric/LinearProgramming.hs | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/packages/base/THANKS.md b/packages/base/THANKS.md index 07b75b8..2e9574b 100644 --- a/packages/base/THANKS.md +++ b/packages/base/THANKS.md | |||
@@ -157,5 +157,7 @@ module reorganization, monadic mapVectorM, and many other improvements. | |||
157 | 157 | ||
158 | - Denis Laxalde separated the gsl tests from the base ones. | 158 | - Denis Laxalde separated the gsl tests from the base ones. |
159 | 159 | ||
160 | - Dylan Thurston reported an error in the glpk documentation. | ||
161 | |||
160 | - Ian Ross reported the max/minIndex bug. | 162 | - Ian Ross reported the max/minIndex bug. |
161 | 163 | ||
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal index c115459..cd761e0 100644 --- a/packages/glpk/hmatrix-glpk.cabal +++ b/packages/glpk/hmatrix-glpk.cabal | |||
@@ -1,5 +1,5 @@ | |||
1 | Name: hmatrix-glpk | 1 | Name: hmatrix-glpk |
2 | Version: 0.4.0.1 | 2 | Version: 0.4.0.2 |
3 | License: GPL | 3 | License: GPL |
4 | License-file: LICENSE | 4 | License-file: LICENSE |
5 | Author: Alberto Ruiz | 5 | Author: Alberto Ruiz |
diff --git a/packages/glpk/src/Numeric/LinearProgramming.hs b/packages/glpk/src/Numeric/LinearProgramming.hs index 5de8577..b0537cc 100644 --- a/packages/glpk/src/Numeric/LinearProgramming.hs +++ b/packages/glpk/src/Numeric/LinearProgramming.hs | |||
@@ -17,7 +17,8 @@ maximize 4 x_1 - 3 x_2 + 2 x_3 | |||
17 | subject to | 17 | subject to |
18 | 18 | ||
19 | 2 x_1 + x_2 <= 10 | 19 | 2 x_1 + x_2 <= 10 |
20 | x_3 + 5 x_4 <= 20 | 20 | |
21 | x_2 + 5 x_3 <= 20 | ||
21 | 22 | ||
22 | and | 23 | and |
23 | 24 | ||