2 files changed, 30 insertions, 5 deletions

diff --git a/examples/Real.hs b/examples/Real.hs
index 02eba9f..9083b87 100644
--- a/examples/Real.hs
+++ b/examples/Real.hs
@@ -11,10 +11,10 @@ module Real(
     row,
     col,
     (#),(&), (//), blocks,
-    rand
+    rand, randn
 ) where
 
-import Numeric.LinearAlgebra hiding ((<>), (<|>), (<->), (<\>), (.*), (*/))
+import Numeric.LinearAlgebra hiding ((<>), (<\>))
 import System.Random(randomIO)
 
 infixl 7 <>
@@ -44,12 +44,21 @@ infixl 7 \>
 m \> v = flatten (m <\> reshape 1 v)
 
 -- | Pseudorandom matrix with uniform elements between 0 and 1.
-rand :: Int -- ^ rows
+randm :: RandDist
+     -> Int -- ^ rows
      -> Int -- ^ columns
      -> IO (Matrix Double)
-rand r c = do
+randm d r c = do
     seed <- randomIO
-    return (reshape c $ randomVector seed Uniform (r*c))
+    return (reshape c $ randomVector seed d (r*c))
+
+-- | Pseudorandom matrix with uniform elements between 0 and 1.
+rand :: Int -> Int -> IO (Matrix Double)
+rand = randm Uniform
+
+-- | Pseudorandom matrix with normal elements
+randn :: Int -> Int -> IO (Matrix Double)
+randn = randm Gaussian
 
 -- | Real identity matrix.
 eye :: Int -> Matrix Double
diff --git a/examples/ode.hs b/examples/ode.hs
index 082c46c..dc6e0ec 100644
--- a/examples/ode.hs
+++ b/examples/ode.hs
@@ -1,6 +1,9 @@
+{-# LANGUAGE ViewPatterns #-}
 import Numeric.GSL.ODE
 import Numeric.LinearAlgebra
 import Graphics.Plot
+import Debug.Trace(trace)
+debug x = trace (show x) x
 
 vanderpol mu = do
     let xdot mu t [x,v] = [v, -x + mu * v * (1-x^2)]
@@ -32,3 +35,16 @@ main = do
     harmonic 1 0.1
     kepler 0.3 60
     kepler 0.4 70
+    vanderpol' 2
+
+-- example of odeSolveV with jacobian
+vanderpol' mu = do
+    let xdot mu t (toList->[x,v]) = fromList [v, -x + mu * v * (1-x^2)]
+        jac t (toList->[x,v]) = (2><2) [ 0          ,          1
+                                       , -1-2*x*v*mu, mu*(1-x**2) ]
+        ts = linspace 1000 (0,50)
+        hi = (ts@>1 - ts@>0)/100
+        sol = toColumns $ odeSolveV (MSBDF jac) hi 1E-8 1E-8 (xdot mu) (fromList [1,0]) ts
+    mplot sol
+
+