summaryrefslogtreecommitdiff
path: root/lib/Data/Packed
diff options
context:
space:
mode:
authorAdam Vogt <vogt.adam@gmail.com>2014-01-30 01:47:39 -0500
committerAdam Vogt <vogt.adam@gmail.com>2014-01-30 01:52:35 -0500
commitb60cffc90daa55c82d0190965d51588aa7d1edce (patch)
treed1591264f97ff30dc2c39201a27986585f6d46a0 /lib/Data/Packed
parent4382cadadfb4b9312c49fa5fe51537f60a7e2f54 (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/Data/Packed')
-rw-r--r--lib/Data/Packed/Internal/Matrix.hs2
-rw-r--r--lib/Data/Packed/Internal/Vector.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 255009c..7504b39 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -154,7 +154,7 @@ toLists m = splitEvery (cols m) . toList . flatten $ m
154fromRows :: Element t => [Vector t] -> Matrix t 154fromRows :: Element t => [Vector t] -> Matrix t
155fromRows vs = case compatdim (map dim vs) of 155fromRows vs = case compatdim (map dim vs) of
156 Nothing -> error "fromRows applied to [] or to vectors with different sizes" 156 Nothing -> error "fromRows applied to [] or to vectors with different sizes"
157 Just c -> reshape c . join . map (adapt c) $ vs 157 Just c -> reshape c . Data.Packed.Internal.Vector.join . map (adapt c) $ vs
158 where 158 where
159 adapt c v | dim v == c = v 159 adapt c v | dim v == c = v
160 | otherwise = constantD (v@>0) c 160 | otherwise = constantD (v@>0) c
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 85e7f4f..c99f4f0 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -16,7 +16,7 @@
16module Data.Packed.Internal.Vector ( 16module Data.Packed.Internal.Vector (
17 Vector, dim, 17 Vector, dim,
18 fromList, toList, (|>), 18 fromList, toList, (|>),
19 join, (@>), safe, at, at', subVector, takesV, 19 Data.Packed.Internal.Vector.join, (@>), safe, at, at', subVector, takesV,
20 mapVector, mapVectorWithIndex, zipVectorWith, unzipVectorWith, 20 mapVector, mapVectorWithIndex, zipVectorWith, unzipVectorWith,
21 mapVectorM, mapVectorM_, mapVectorWithIndexM, mapVectorWithIndexM_, 21 mapVectorM, mapVectorM_, mapVectorWithIndexM, mapVectorWithIndexM_,
22 foldVector, foldVectorG, foldLoop, foldVectorWithIndex, 22 foldVector, foldVectorG, foldLoop, foldVectorWithIndex,