Merge pull request #1 from mboes/sundials

Cleanups to Sundials PR

1 files changed, 16 insertions, 18 deletions

diff --git a/packages/sundials/src/Main.hs b/packages/sundials/src/Main.hs
index 5e51372..d1f6755 100644
--- a/packages/sundials/src/Main.hs
+++ b/packages/sundials/src/Main.hs
@@ -1,6 +1,5 @@
-{-# OPTIONS_GHC -Wall #-}
+module Main where
 
-import qualified Data.Vector.Storable as V
 import           Numeric.Sundials.Arkode.ODE
 import           Numeric.LinearAlgebra
 
@@ -9,11 +8,10 @@ import qualified Diagrams.Prelude as D
 import           Diagrams.Backend.Rasterific
 
 import           Control.Lens
-import           Data.List (zip4)
 
-
-brusselator _t x = [ a - (w + 1) * u + v * u^2
-                   , w * u - v * u^2
+brusselator :: a -> [Double] -> [Double]
+brusselator _t x = [ a - (w + 1) * u + v * u^(2::Int)
+                   , w * u - v * u^(2::Int)
                    , (b - w) / eps - w * u
                    ]
   where
@@ -24,6 +22,7 @@ brusselator _t x = [ a - (w + 1) * u + v * u^2
     v = x !! 1
     w = x !! 2
 
+stiffish :: Double -> [Double] -> [Double]
 stiffish t v = [ lamda * u + 1.0 / (1.0 + t * t) - lamda * atan t ]
   where
     lamda = -100.0
@@ -45,15 +44,14 @@ kSaxis xs = P.r2Axis &~ do
 
 main :: IO ()
 main = do
-  let res = odeSolve brusselator [1.2, 3.1, 3.0] (fromList [0.0, 0.1 .. 10.0])
-  putStrLn $ show res
-  renderRasterific "diagrams/brusselator.png"
-                   (D.dims2D 500.0 500.0)
-                   (renderAxis $ lSaxis $ [0.0, 0.1 .. 10.0]:(toLists $ tr res))
-
-  let res = odeSolve stiffish [0.0] (fromList [0.0, 0.1 .. 10.0])
-  putStrLn $ show res
-  renderRasterific "diagrams/stiffish.png"
-                   (D.dims2D 500.0 500.0)
-                   (renderAxis $ kSaxis $ zip [0.0, 0.1 .. 10.0] (concat $ toLists res))
-  
+  do let res = odeSolve brusselator [1.2, 3.1, 3.0] (fromList [0.0, 0.1 .. 10.0])
+     putStrLn $ show res
+     renderRasterific "diagrams/brusselator.png"
+                      (D.dims2D 500.0 500.0)
+                      (renderAxis $ lSaxis $ [0.0, 0.1 .. 10.0]:(toLists $ tr res))
+
+  do let res = odeSolve stiffish [0.0] (fromList [0.0, 0.1 .. 10.0])
+     putStrLn $ show res
+     renderRasterific "diagrams/stiffish.png"
+                      (D.dims2D 500.0 500.0)
+                      (renderAxis $ kSaxis $ zip [0.0, 0.1 .. 10.0] (concat $ toLists res))