From 1fb68521db98ca2bfe1748c82e48b8845c3252d2 Mon Sep 17 00:00:00 2001 From: Justin Le Date: Thu, 7 Jan 2016 03:25:31 -0800 Subject: reverted my previous 'bug fixes', because it should be safe to use unwrap instead of extract for mapX functions --- packages/base/src/Numeric/LinearAlgebra/Static.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'packages/base/src/Numeric') diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs index 86c13d7..9a2bdc8 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Static.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs @@ -595,13 +595,14 @@ outerR :: (KnownNat m, KnownNat n) => R n -> R m -> L n m outerR (extract -> x) (extract -> y) = mkL (LA.outer x y) mapR :: KnownNat n => (ℝ -> ℝ) -> R n -> R n -mapR f (extract -> v) = mkR (LA.cmap f v) +mapR f (unwrap -> v) = mkR (LA.cmap f v) zipWithR :: KnownNat n => (ℝ -> ℝ -> ℝ) -> R n -> R n -> R n zipWithR f (extract -> x) (extract -> y) = mkR (LA.zipVectorWith f x y) -mapM' :: (KnownNat n, KnownNat m) => (ℂ -> ℂ) -> M n m -> M n m -mapM' f (extract -> m) = mkM (LA.cmap f m) +mapL :: (KnownNat n, KnownNat m) => (ℝ -> ℝ) -> L n m -> L n m +mapL f (unwrap -> m) = mkL (LA.cmap f m) + -------------------------------------------------------------------------------- @@ -645,13 +646,14 @@ outerC :: (KnownNat m, KnownNat n) => C n -> C m -> M n m outerC (extract -> x) (extract -> y) = mkM (LA.outer x y) mapC :: KnownNat n => (ℂ -> ℂ) -> C n -> C n -mapC f (extract -> v) = mkC (LA.cmap f v) +mapC f (unwrap -> v) = mkC (LA.cmap f v) zipWithC :: KnownNat n => (ℂ -> ℂ -> ℂ) -> C n -> C n -> C n zipWithC f (extract -> x) (extract -> y) = mkC (LA.zipVectorWith f x y) -mapL :: (KnownNat n, KnownNat m) => (ℝ -> ℝ) -> L n m -> L n m -mapL f (extract -> m) = mkL (LA.cmap f m) +mapM' :: (KnownNat n, KnownNat m) => (ℂ -> ℂ) -> M n m -> M n m +mapM' f (unwrap -> m) = mkM (LA.cmap f m) + -------------------------------------------------------------------------------- -- cgit v1.2.3