summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2014-04-29 19:17:48 +0200
committerAlberto Ruiz <aruiz@um.es>2014-04-29 19:17:48 +0200
commit56eb38203d29bf2a9d21c3dc66c07b3d4f92651b (patch)
tree6483a9a8bd6ac1140b09d15d5c005d1b7c570dcc
parent1b5e84ec979105d54fee51d19fccddb52026be69 (diff)
added 2 em dash for vertical concatenation
-rw-r--r--lib/Numeric/LinearAlgebra/Util.hs13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/Numeric/LinearAlgebra/Util.hs b/lib/Numeric/LinearAlgebra/Util.hs
index b38aeb2..be01bc1 100644
--- a/lib/Numeric/LinearAlgebra/Util.hs
+++ b/lib/Numeric/LinearAlgebra/Util.hs
@@ -10,6 +10,7 @@ Stability : provisional
10 10
11-} 11-}
12----------------------------------------------------------------------------- 12-----------------------------------------------------------------------------
13{-# OPTIONS_HADDOCK hide #-}
13 14
14module Numeric.LinearAlgebra.Util( 15module Numeric.LinearAlgebra.Util(
15 16
@@ -19,7 +20,7 @@ module Numeric.LinearAlgebra.Util(
19 diagl, 20 diagl,
20 row, 21 row,
21 col, 22 col,
22 (&), (¦), (#), 23 (&), (¦), (——), (#),
23 (?), (¿), 24 (?), (¿),
24 rand, randn, 25 rand, randn,
25 cross, 26 cross,
@@ -114,12 +115,20 @@ infixl 3 &
114(&) :: Vector Double -> Vector Double -> Vector Double 115(&) :: Vector Double -> Vector Double -> Vector Double
115a & b = vjoin [a,b] 116a & b = vjoin [a,b]
116 117
117-- | (00A6) horizontal concatenation of real matrices 118-- | horizontal concatenation of real matrices
119--
120-- (0x00a6 broken bar)
118infixl 3 ¦ 121infixl 3 ¦
119(¦) :: Matrix Double -> Matrix Double -> Matrix Double 122(¦) :: Matrix Double -> Matrix Double -> Matrix Double
120a ¦ b = fromBlocks [[a,b]] 123a ¦ b = fromBlocks [[a,b]]
121 124
122-- | vertical concatenation of real matrices 125-- | vertical concatenation of real matrices
126--
127-- (0x2014, em dash)
128(——) :: Matrix Double -> Matrix Double -> Matrix Double
129infixl 2 ——
130a —— b = fromBlocks [[a],[b]]
131
123(#) :: Matrix Double -> Matrix Double -> Matrix Double 132(#) :: Matrix Double -> Matrix Double -> Matrix Double
124infixl 2 # 133infixl 2 #
125a # b = fromBlocks [[a],[b]] 134a # b = fromBlocks [[a],[b]]