diff options
author | Adam Vogt <vogt.adam@gmail.com> | 2014-01-30 01:47:39 -0500 |
---|---|---|
committer | Adam Vogt <vogt.adam@gmail.com> | 2014-01-30 01:52:35 -0500 |
commit | b60cffc90daa55c82d0190965d51588aa7d1edce (patch) | |
tree | d1591264f97ff30dc2c39201a27986585f6d46a0 /lib/Numeric/LinearAlgebra/Util.hs | |
parent | 4382cadadfb4b9312c49fa5fe51537f60a7e2f54 (diff) |
rename variables so Prelude.join will not cause problems
* background:
http://www.haskell.org/haskellwiki/Functor-Applicative-Monad_Proposal#Current_stage:_Prepare_GHC
* the change happens in ghc-7.10, and these changes fix warnings with 7.8
Diffstat (limited to 'lib/Numeric/LinearAlgebra/Util.hs')
-rw-r--r-- | lib/Numeric/LinearAlgebra/Util.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Numeric/LinearAlgebra/Util.hs b/lib/Numeric/LinearAlgebra/Util.hs index 39566ab..532556e 100644 --- a/lib/Numeric/LinearAlgebra/Util.hs +++ b/lib/Numeric/LinearAlgebra/Util.hs | |||
@@ -97,7 +97,7 @@ ones r c = konst 1 (r,c) | |||
97 | -- | concatenation of real vectors | 97 | -- | concatenation of real vectors |
98 | infixl 3 & | 98 | infixl 3 & |
99 | (&) :: Vector Double -> Vector Double -> Vector Double | 99 | (&) :: Vector Double -> Vector Double -> Vector Double |
100 | a & b = join [a,b] | 100 | a & b = Numeric.Container.join [a,b] |
101 | 101 | ||
102 | -- | horizontal concatenation of real matrices | 102 | -- | horizontal concatenation of real matrices |
103 | infixl 3 ! | 103 | infixl 3 ! |
@@ -206,7 +206,7 @@ vec = flatten . trans | |||
206 | 206 | ||
207 | vech :: Element t => Matrix t -> Vector t | 207 | vech :: Element t => Matrix t -> Vector t |
208 | -- ^ half-vectorization (of the lower triangular part) | 208 | -- ^ half-vectorization (of the lower triangular part) |
209 | vech m = join . zipWith f [0..] . toColumns $ m | 209 | vech m = Numeric.Container.join . zipWith f [0..] . toColumns $ m |
210 | where | 210 | where |
211 | f k v = subVector k (dim v - k) v | 211 | f k v = subVector k (dim v - k) v |
212 | 212 | ||