Some examples and a new version number

Author: idontgetoutmuch

examples/ButcherTableau.hs

@@ -0,0 +1,47 @@
+{-# OPTIONS_GHC -Wall #-}
+
+import           Numeric.Sundials.ARKode.ODE
+import           Numeric.LinearAlgebra
+
+import           Data.List (intercalate)
+
+import           Text.PrettyPrint.HughesPJClass
+
+
+butcherTableauTex :: ButcherTable -> String
+butcherTableauTex (ButcherTable m c b b2) =
+  render $
+  vcat [ text ("\n\\begin{array}{c|" ++ (concat $ replicate n "c") ++ "}")
+       , us
+       , text "\\hline"
+       , text bs <+> text "\\\\"
+       , text b2s <+> text "\\\\"
+       , text "\\end{array}"
+       ]
+  where
+    n = rows m
+    rs = toLists m
+    ss = map (\r -> intercalate " & " $ map show r) rs
+    ts = zipWith (\i r -> show i ++ " & " ++ r) (toList c) ss
+    us = vcat $ map (\r -> text r <+> text "\\\\") ts
+    bs  = " & " ++ (intercalate " & " $ map show $ toList b)
+    b2s = " & " ++ (intercalate " & " $ map show $ toList b2)
+
+main :: IO ()
+main = do
+
+  let res = butcherTable (SDIRK_2_1_2 undefined)
+  putStrLn $ show res
+  putStrLn $ butcherTableauTex res
+
+  let resA = butcherTable (KVAERNO_4_2_3 undefined)
+  putStrLn $ show resA
+  putStrLn $ butcherTableauTex resA
+
+  let resB = butcherTable (SDIRK_5_3_4 undefined)
+  putStrLn $ show resB
+  putStrLn $ butcherTableauTex resB
+
+  let resC = butcherTable (FEHLBERG_6_4_5 undefined)
+  putStrLn $ show resC
+  putStrLn $ butcherTableauTex resC

examples/sundials.hs

@@ -0,0 +1,56 @@
+{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
+
+{-# LANGUAGE ViewPatterns #-}
+
+import           Numeric.Sundials.ARKode.ODE
+import           Numeric.LinearAlgebra
+import           Graphics.Plot
+
+vanderpol mu = do
+    let xdot nu _t [x,v] = [v, -x + nu * v * (1-x*x)]
+        xdot _ _ _ = error "vanderpol RHS not defined"
+        ts = linspace 1000 (0,50)
+        sol = toColumns $ odeSolve (xdot mu) [1,0] ts
+    mplot (ts : sol)
+    mplot sol
+
+
+harmonic w d = do
+    let xdot u dd _t [x,v] = [v, a*x + b*v] where a = -u*u; b = -2*dd*u
+        xdot _ _ _ _ = error "harmonic RHS not defined"
+        ts = linspace 100 (0,20)
+        sol = odeSolve (xdot w d) [1,0] ts
+    mplot (ts : toColumns sol)
+
+
+kepler v a = mplot (take 2 $ toColumns sol) where
+    xdot _t [x,y,vx,vy] = [vx,vy,x*k,y*k]
+        where g=1
+              k=(-g)*(x*x+y*y)**(-1.5)
+    xdot _ _ = error "kepler RHS not defined"
+    ts = linspace 100 (0,30)
+    sol = odeSolve xdot [4, 0, v * cos (a*degree), v * sin (a*degree)] ts
+    degree = pi/180
+
+
+main = do
+    vanderpol 2
+    harmonic 1 0
+    harmonic 1 0.1
+    kepler 0.3 60
+    kepler 0.4 70
+    vanderpol' 2
+
+-- example of odeSolveV with jacobian
+vanderpol' mu = do
+    let xdot nu _t (toList->[x,v]) = fromList [v, -x + nu * v * (1-x*x)]
+        xdot _ _ _ = error "vanderpol' RHS not defined"
+        jac _ (toList->[x,v]) = (2><2) [ 0          ,          1
+                                       , -1-2*x*v*mu, mu*(1-x**2) ]
+        jac _ _ = error "vanderpol' Jacobian not defined"
+        ts = linspace 1000 (0,50)
+        hi = pure $ (ts!1 - ts!0) / 100.0
+        sol = toColumns $ odeSolveV (SDIRK_5_3_4 jac) hi 1E-8 1E-8 (xdot mu) (fromList [1,0]) ts
+    mplot sol
+
+

hmatrix-sundials.cabal

@@ -1,5 +1,5 @@
 name:                hmatrix-sundials
-version:             0.19.1.0
+version:             0.20.0.0
 synopsis:            hmatrix interface to sundials
 description:         An interface to the solving suite SUNDIALS. Currently, it
                      mimics the solving interface in hmstrix-gsl but
@@ -61,3 +61,21 @@ test-suite hmatrix-sundials-testsuite
                        sundials_cvode
   c-sources:           src/helpers.c
   default-language:    Haskell2010
+
+executable sundials
+  main-is:             sundials.hs
+  build-depends:       base >=4.10 && <4.11,
+                       hmatrix,
+                       hmatrix-sundials,
+                       hmatrix-gsl
+  hs-source-dirs:      examples
+  default-language:    Haskell2010
+
+executable butcherTableau
+  main-is:             ButcherTableau.hs
+  build-depends:       base >=4.10 && <4.11,
+                       hmatrix,
+                       hmatrix-sundials,
+                       pretty
+  hs-source-dirs:      examples
+  default-language:    Haskell2010