diff options
| author | Alberto Ruiz <aruiz@um.es> | 2014-04-23 14:19:34 +0200 |
|---|---|---|
| committer | Alberto Ruiz <aruiz@um.es> | 2014-04-23 14:19:34 +0200 |
| commit | 7c5adb83c9cb632c39eb2d844a1496e2a7a23e8b (patch) | |
| tree | ec80d2d2533fcf1a2c1f1f021bc0669767ec7817 /lib/Data/Packed/Internal/Matrix.hs | |
| parent | eaa21e363a62274b3b457556d8f41b10cc335513 (diff) | |
join -> vjoin
Diffstat (limited to 'lib/Data/Packed/Internal/Matrix.hs')
| -rw-r--r-- | lib/Data/Packed/Internal/Matrix.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index 7504b39..5e6e649 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 | |||
| 154 | fromRows :: Element t => [Vector t] -> Matrix t | 154 | fromRows :: Element t => [Vector t] -> Matrix t |
| 155 | fromRows vs = case compatdim (map dim vs) of | 155 | fromRows 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 . Data.Packed.Internal.Vector.join . map (adapt c) $ vs | 157 | Just c -> reshape c . vjoin . 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 |