From 7c5adb83c9cb632c39eb2d844a1496e2a7a23e8b Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@um.es>
Date: Wed, 23 Apr 2014 14:19:34 +0200
Subject: join -> vjoin

---
 lib/Numeric/LinearAlgebra/Algorithms.hs       | 2 +-
 lib/Numeric/LinearAlgebra/Util.hs             | 4 ++--
 lib/Numeric/LinearAlgebra/Util/Convolution.hs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/Numeric/LinearAlgebra')

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)
               where xs = toList v
 
 zt 0 v = v
-zt k v = join [subVector 0 (dim v - k) v, konst 0 k]
+zt k v = vjoin [subVector 0 (dim v - k) v, konst 0 k]
 
 
 unpackQR :: (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)
 -- | concatenation of real vectors
 infixl 3 &
 (&) :: Vector Double -> Vector Double -> Vector Double
-a & b = Numeric.Container.join [a,b]
+a & b = vjoin [a,b]
 
 -- | horizontal concatenation of real matrices
 infixl 3 !
@@ -206,7 +206,7 @@ vec = flatten . trans
 
 vech :: Element t => Matrix t -> Vector t
 -- ^ half-vectorization (of the lower triangular part)
-vech m = Numeric.Container.join . zipWith f [0..] . toColumns $ m
+vech m = vjoin . zipWith f [0..] . toColumns $ m
   where
     f k v = subVector k (dim v - k) v
 
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]
 conv ker v = corr ker' v'
   where
     ker' = (flatten.fliprl.asRow) ker
-    v' | dim ker > 1 = join [z,v,z]
+    v' | dim ker > 1 = vjoin [z,v,z]
        | otherwise   = v
     z = constant 0 (dim ker -1)
 
-- 
cgit v1.2.3