diff options
author | Alberto Ruiz <aruiz@um.es> | 2015-04-09 13:27:24 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2015-04-09 13:27:24 +0200 |
commit | 77beef7f05eae57186b0051c7ef167619c1d8acb (patch) | |
tree | 3d5768564824f329f238d3fad28f90fae77087b8 | |
parent | c10f27ac40ff74612a6c773baa572573f3186506 (diff) |
merge
-rw-r--r-- | packages/base/src/Data/Packed/IO.hs | 1 | ||||
-rw-r--r-- | packages/base/src/Numeric/Vectorized.hs | 1 | ||||
-rw-r--r-- | packages/glpk/hmatrix-glpk.cabal | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/packages/base/src/Data/Packed/IO.hs b/packages/base/src/Data/Packed/IO.hs index 85f1b37..b0999a8 100644 --- a/packages/base/src/Data/Packed/IO.hs +++ b/packages/base/src/Data/Packed/IO.hs | |||
@@ -22,7 +22,6 @@ import Text.Printf(printf) | |||
22 | import Data.List(intersperse) | 22 | import Data.List(intersperse) |
23 | import Data.Complex | 23 | import Data.Complex |
24 | import Numeric.Vectorized(vectorScan,saveMatrix) | 24 | import Numeric.Vectorized(vectorScan,saveMatrix) |
25 | import Control.Applicative((<$>)) | ||
26 | import Data.Packed.Internal | 25 | import Data.Packed.Internal |
27 | 26 | ||
28 | {- | Creates a string from a matrix given a separator and a function to show each entry. Using | 27 | {- | Creates a string from a matrix given a separator and a function to show each entry. Using |
diff --git a/packages/base/src/Numeric/Vectorized.hs b/packages/base/src/Numeric/Vectorized.hs index 6f0d240..405ae01 100644 --- a/packages/base/src/Numeric/Vectorized.hs +++ b/packages/base/src/Numeric/Vectorized.hs | |||
@@ -37,7 +37,6 @@ import Foreign.C.String | |||
37 | import System.IO.Unsafe(unsafePerformIO) | 37 | import System.IO.Unsafe(unsafePerformIO) |
38 | 38 | ||
39 | import Control.Monad(when) | 39 | import Control.Monad(when) |
40 | import Control.Applicative((<$>)) | ||
41 | 40 | ||
42 | 41 | ||
43 | 42 | ||
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal index e64e3e8..8593e0a 100644 --- a/packages/glpk/hmatrix-glpk.cabal +++ b/packages/glpk/hmatrix-glpk.cabal | |||
@@ -23,7 +23,7 @@ extra-source-files: examples/simplex1.hs | |||
23 | examples/simplex5.hs | 23 | examples/simplex5.hs |
24 | 24 | ||
25 | library | 25 | library |
26 | Build-Depends: base <5, hmatrix >= 0.17 | 26 | Build-Depends: base <5, hmatrix >= 0.17, containers |
27 | 27 | ||
28 | hs-source-dirs: src | 28 | hs-source-dirs: src |
29 | 29 | ||