2 files changed, 41 insertions, 12 deletions

diff --git a/README b/README
index 8c6f954..00188ce 100644
--- a/README
+++ b/README
@@ -10,10 +10,10 @@ INSTALLATION
 (More detailed information is included in the "tutorial",
 available in the web page of the project.)
 
-$ runhaskell Setup.hs configure --prefix=$HOME
-$ runhaskell Setup.hs build
-$ runhaskell Setup.hs haddock
-$ runhaskell Setup.hs install --user
+$ runhaskell Setup.lhs configure --prefix=$HOME
+$ runhaskell Setup.lhs build
+$ runhaskell Setup.lhs haddock
+$ runhaskell Setup.lhs install --user
 
 USING ATLAS
 
@@ -27,11 +27,23 @@ $ runhaskell examples/tests.hs
 EXAMPLES
 
 $ ghci
-Prelude> :m + GSL
-Prelude GSL> let quad = integrateQNG 1E-10
-Prelude GSL> quad (^2) 0 1
+Prelude> :m + Numeric.GSL
+Prelude Numeric.GSL> let quad = integrateQNG 1E-10
+Prelude Numeric.GSL> quad (^2) 0 1
 (0.3333333333333333,3.700743415417188e-15)
-Prelude GSL> :q
+
+Prelude Numeric.GSL> :m + Numeric.LinearAlgebra
+Prelude Numeric.LinearAlgebra> let m = (2><3)[1,2,3,4,5,6::Double]
+Prelude Numeric.LinearAlgebra> let (u,d,v) = full svd m
+Prelude Numeric.LinearAlgebra> d
+(2><3)
+ [ 9.508032000695724,                0.0, 0.0
+ ,               0.0, 0.7728696356734838, 0.0 ]
+Prelude Numeric.LinearAlgebra> u <> d <> trans v
+(2><3)
+ [ 1.0000000000000004,               2.0, 3.0
+ , 3.9999999999999996, 5.000000000000001, 6.0 ]
+Prelude Numeric.GSL> :q
 Leaving GHCi.
 
 --------------------------------------------------------------------------------------
diff --git a/examples/parallel.hs b/examples/parallel.hs
index 2ad686e..8f67863 100644
--- a/examples/parallel.hs
+++ b/examples/parallel.hs
@@ -1,10 +1,27 @@
 import System(getArgs)
 import Numeric.LinearAlgebra
 import Control.Parallel.Strategies
+import System.Time
 
-work k = vectorMax s
-    where (_,s,_) = svd (ident k :: Matrix Double)
+inParallel = parMap rwhnf id
+
+parMul x y = fromBlocks [[ay],[by]]
+    where p = rows x `div` 2
+          a = takeRows p x
+          b = dropRows p x
+          [ay,by] = inParallel [a<>y,b<>y]
 
 main = do
-    args <- (read . head) `fmap` getArgs
-    print $ sum $ parMap rnf work args
\ No newline at end of file
+    n <- (read . head) `fmap` getArgs
+    let m = ident n :: Matrix Double
+    time $ print $ vectorMax $ takeDiag $ parMul m m
+    time $ print $ vectorMax $ takeDiag $ m <> m
+
+a = (2><3) [1..6::Double]
+b = (3><4) [1..12::Double]
+
+time act = do
+    t0 <- getClockTime
+    act
+    t1 <- getClockTime
+    print $ tdSec $ normalizeTimeDiff $ diffClockTimes t1 t0