passed easyVision tests

2 files changed, 9 insertions, 4 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index dd33943..9895393 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -144,13 +144,17 @@ transdata c1 d c2 | isReal baseOf d = scast $ transdataR c1 (scast d) c2
 --{-# RULES "transdataC" transdata=transdataC #-}
 
 -----------------------------------------------------------------
-liftMatrix :: (Vector a -> Vector b) -> Matrix a -> Matrix b
-liftMatrix f m = m { dat = f (dat m), tdat = f (tdat m) } -- check sizes
+liftMatrix :: (Field a, Field b) => (Vector a -> Vector b) -> Matrix a -> Matrix b
+liftMatrix f m = reshape (cols m) (f (cdat m))
 
 liftMatrix2 :: (Field t) => (Vector a -> Vector b -> Vector t) -> Matrix a -> Matrix b -> Matrix t
-liftMatrix2 f m1 m2 = reshape (cols m1) (f (cdat m1) (cdat m2)) -- check sizes
+liftMatrix2 f m1 m2 | compat m1 m2 = reshape (cols m1) (f (cdat m1) (cdat m2))
+                    | otherwise    = error "nonconformant matrices in liftMatrix2"
 ------------------------------------------------------------------
 
+compat :: Matrix a -> Matrix b -> Bool
+compat m1 m2 = rows m1 == rows m2 && cols m1 == cols m2
+
 dotL a b = sum (zipWith (*) a b)
 
 multiplyL a b | ok = [[dotL x y | y <- transpose b] | x <- a]
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 94f70be..27ba6a3 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -21,7 +21,8 @@ module Data.Packed.Vector (
     toComplex, comp,
     conj,
     dot,
-    linspace
+    linspace,
+    liftVector, liftVector2
 ) where
 
 import Data.Packed.Internal