more defined (|>) and (><) as suggested by Tracy Wadleigh

3 files changed, 14 insertions, 26 deletions

diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 0e6b3f4..fc8a6be 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -91,21 +91,17 @@ inlinePerformIO (IO m) = case m realWorld# of (# _, r #) -> r
 toList :: Storable a => Vector a -> [a]
 toList v = safeRead v $ peekArray (dim v)
 
--- | an alternative to 'fromList' with explicit dimension, used also in the instances for Show (Vector a).
-(|>) :: (Storable a) => Int -> [a] -> Vector a
-infixl 9 |>
-n |> l = if length l == n then fromList l else error "|> with wrong size"
-
-{- | Like '(|>)', but explicitly truncates the list, if it is too long.
+{- | An alternative to 'fromList' with explicit dimension. The input
+     list is explicitly truncated if it is too long, so it may safely
+     be used, for instance, with infinite lists.
 
-It may safely be used, for instance, with infinite lists.
+     This is the format used in the instances for Show (Vector a).
 -}
-(|>|) :: (Storable a) => Int -> [a] -> Vector a
-infixl 9 |>|
-n |>| l = if length l' == n then 
-              fromList l' 
-            else 
-              error "|>|: list too short"
+(|>) :: (Storable a) => Int -> [a] -> Vector a
+infixl 9 |>
+n |> l = if length l' == n
+            then fromList l'
+            else error "list too short for |>"
   where l' = take n l
 
 
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 5a73c06..0b50d8a 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -16,7 +16,7 @@
 module Data.Packed.Matrix (
     Element,
     Matrix,rows,cols,
-    (><), (>|<),
+    (><),
     trans,
     reshape, flatten,
     fromLists, toLists,
@@ -118,15 +118,8 @@ ident n = diag (constant 1 n)
 
 This is the format produced by the instances of Show (Matrix a), which
 can also be used for input.
--}
-(><) :: (Element a) => Int -> Int -> [a] -> Matrix a
-r >< c = f where
-    f l | dim v == r*c = matrixFromVector RowMajor c v
-        | otherwise    = error $ "inconsistent list size = "
-                                 ++show (dim v) ++" in ("++show r++"><"++show c++")"
-        where v = fromList l
 
-{- | Like '(><)', but explicitly truncates the list, so that it can
+The input list is explicitly truncated, so that it can
 safely be used with lists that are too long (like infinite lists).
 
 Example:
@@ -136,10 +129,9 @@ Example:
  [ 1.0, 2.0, 3.0
  , 4.0, 5.0, 6.0 ]@
 
-Effectively, a more defined version of '(><)'.
 -}
-(>|<) :: (Element a) => Int -> Int -> [a] -> Matrix a
-r >|< c = f where
+(><) :: (Element a) => Int -> Int -> [a] -> Matrix a
+r >< c = f where
     f l | dim v == r*c = matrixFromVector RowMajor c v
         | otherwise    = error $ "inconsistent list size = "
                                  ++show (dim v) ++" in ("++show r++"><"++show c++")"
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index ae30c27..e53d455 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -14,7 +14,7 @@
 
 module Data.Packed.Vector (
     Vector,
-    fromList, (|>), (|>|), toList,
+    fromList, (|>), toList,
     dim, (@>),
     subVector, join,
     constant, linspace,