Improve haddock

1 files changed, 20 insertions, 25 deletions

diff --git a/packages/sundials/src/Main.hs b/packages/sundials/src/Main.hs
index d22fafa..b65d668 100644
--- a/packages/sundials/src/Main.hs
+++ b/packages/sundials/src/Main.hs
@@ -94,44 +94,39 @@ kSaxis :: [(Double, Double)] -> P.Axis B D.V2 Double
 kSaxis xs = P.r2Axis &~ do
   P.linePlot' xs
 
-butcherTableauTex :: (Show a, Element a) => Matrix a -> String
-butcherTableauTex m = render $
-                    vcat [ text ("\n\\begin{array}{c|" ++ (concat $ replicate n "c") ++ "}")
-                         , us
-                         , text "\\end{array}"
-                         ]
+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 -> "c_" ++ show i ++ " & " ++ r) [1..n] ss
+    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
-  -- $$
-  -- \begin{array}{c|cccc}
-  -- c_1    & a_{11} & a_{12}& \dots & a_{1s}\\
-  -- c_2    & a_{21} & a_{22}& \dots & a_{2s}\\
-  -- \vdots & \vdots & \vdots& \ddots& \vdots\\
-  -- c_s    & a_{s1} & a_{s2}& \dots & a_{ss} \\
-  -- \hline
-  --        & b_1    & b_2   & \dots & b_s\\
-  --        & b^*_1  & b^*_2 & \dots & b^*_s\\
-  -- \end{array}
-  -- $$
-
-  let res = btGet (SDIRK_2_1_2 undefined)
+
+  let res = butcherTable (SDIRK_2_1_2 undefined)
   putStrLn $ show res
-  putStrLn $ butcherTableauTex $ fst res
+  putStrLn $ butcherTableauTex res
 
-  let res = btGet (KVAERNO_4_2_3 undefined)
+  let res = butcherTable (KVAERNO_4_2_3 undefined)
   putStrLn $ show res
-  putStrLn $ butcherTableauTex $ fst res
+  putStrLn $ butcherTableauTex res
 
-  let res = btGet (SDIRK_5_3_4 undefined)
+  let res = butcherTable (SDIRK_5_3_4 undefined)
   putStrLn $ show res
-  putStrLn $ butcherTableauTex $ fst res
+  putStrLn $ butcherTableauTex res
 
   let res1 = odeSolve brusselator [1.2, 3.1, 3.0] (fromList [0.0, 0.1 .. 10.0])
   renderRasterific "diagrams/brusselator.png"