summaryrefslogtreecommitdiff
path: root/lib/Numeric/LinearAlgebra
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Numeric/LinearAlgebra')
-rw-r--r--lib/Numeric/LinearAlgebra/Algorithms.hs2
-rw-r--r--lib/Numeric/LinearAlgebra/Util.hs4
-rw-r--r--lib/Numeric/LinearAlgebra/Util/Convolution.hs2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 4823cec..a3f541b 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -484,7 +484,7 @@ zh k v = fromList $ replicate (k-1) 0 ++ (1:drop k xs)
484 where xs = toList v 484 where xs = toList v
485 485
486zt 0 v = v 486zt 0 v = v
487zt k v = join [subVector 0 (dim v - k) v, konst 0 k] 487zt k v = vjoin [subVector 0 (dim v - k) v, konst 0 k]
488 488
489 489
490unpackQR :: (Field t) => (Matrix t, Vector t) -> (Matrix t, Matrix t) 490unpackQR :: (Field t) => (Matrix t, Vector t) -> (Matrix t, Matrix t)
diff --git a/lib/Numeric/LinearAlgebra/Util.hs b/lib/Numeric/LinearAlgebra/Util.hs
index 532556e..f7c40d7 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
98infixl 3 & 98infixl 3 &
99(&) :: Vector Double -> Vector Double -> Vector Double 99(&) :: Vector Double -> Vector Double -> Vector Double
100a & b = Numeric.Container.join [a,b] 100a & b = vjoin [a,b]
101 101
102-- | horizontal concatenation of real matrices 102-- | horizontal concatenation of real matrices
103infixl 3 ! 103infixl 3 !
@@ -206,7 +206,7 @@ vec = flatten . trans
206 206
207vech :: Element t => Matrix t -> Vector t 207vech :: Element t => Matrix t -> Vector t
208-- ^ half-vectorization (of the lower triangular part) 208-- ^ half-vectorization (of the lower triangular part)
209vech m = Numeric.Container.join . zipWith f [0..] . toColumns $ m 209vech m = vjoin . 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
diff --git a/lib/Numeric/LinearAlgebra/Util/Convolution.hs b/lib/Numeric/LinearAlgebra/Util/Convolution.hs
index 32cb188..be9b1eb 100644
--- a/lib/Numeric/LinearAlgebra/Util/Convolution.hs
+++ b/lib/Numeric/LinearAlgebra/Util/Convolution.hs
@@ -46,7 +46,7 @@ fromList [-1.0,0.0,1.0]
46conv ker v = corr ker' v' 46conv ker v = corr ker' v'
47 where 47 where
48 ker' = (flatten.fliprl.asRow) ker 48 ker' = (flatten.fliprl.asRow) ker
49 v' | dim ker > 1 = join [z,v,z] 49 v' | dim ker > 1 = vjoin [z,v,z]
50 | otherwise = v 50 | otherwise = v
51 z = constant 0 (dim ker -1) 51 z = constant 0 (dim ker -1)
52 52