Start of better naming

6 files changed, 19 insertions, 24 deletions

diff --git a/packages/sundials/hmatrix-sundials.cabal b/packages/sundials/hmatrix-sundials.cabal
index b7fa0fe..234bb9c 100644
--- a/packages/sundials/hmatrix-sundials.cabal
+++ b/packages/sundials/hmatrix-sundials.cabal
@@ -32,19 +32,19 @@ library
   exposed-modules:     Numeric.Sundials.ODEOpts,
                        Numeric.Sundials.ARKode.ODE,
                        Numeric.Sundials.CVode.ODE
-  other-modules:       Types,
-                       Arkode
+  other-modules:       Numeric.Sundials.CLangToHaskellTypes,
+                       Numeric.Sundials.Arkode
   c-sources:           src/helpers.c src/helpers.h
   default-language:    Haskell2010
 
 test-suite hmatrix-sundials-testsuite
   type:                exitcode-stdio-1.0
   main-is:             Main.hs
-  other-modules:       Types,
+  other-modules:       Numeric.Sundials.CLangToHaskellTypes,
                        Numeric.Sundials.ODEOpts,
                        Numeric.Sundials.ARKode.ODE,
                        Numeric.Sundials.CVode.ODE,
-                       Arkode
+                       Numeric.Sundials.Arkode
   build-depends:       base >=4.10 && <4.11,
                        inline-c >=0.6 && <0.7,
                        vector >=0.12 && <0.13,
diff --git a/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs b/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs
index 8b713c6..a8d418b 100644
--- a/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs
+++ b/packages/sundials/src/Numeric/Sundials/ARKode/ODE.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -Wall #-}
-
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE MultiWayIf #-}
@@ -141,9 +139,9 @@ import           Numeric.LinearAlgebra.HMatrix (Vector, Matrix, toList, (><),
                                                 subMatrix, rows, cols, toLists,
                                                 size, subVector)
 
-import qualified Types as T
-import           Arkode
-import qualified Arkode as B
+import qualified Numeric.Sundials.CLangToHaskellTypes as T
+import           Numeric.Sundials.Arkode
+import qualified Numeric.Sundials.Arkode as B
 import qualified Numeric.Sundials.ODEOpts as SO
 
 
@@ -160,7 +158,7 @@ C.include "<arkode/arkode_direct.h>"          -- access to ARKDls interface
 C.include "<sundials/sundials_types.h>"       -- definition of type realtype
 C.include "<sundials/sundials_math.h>"
 C.include "../../../helpers.h"
-C.include "Arkode_hsc.h"
+C.include "Numeric/Sundials/Arkode_hsc.h"
 
 
 type Jacobian = Double -> Vector Double -> Matrix Double
@@ -448,7 +446,7 @@ solveOdeC method initStepSize jacH (absTols, relTol) fun f0 ts = unsafePerformIO
   diagnostics :: V.Vector CLong <- createVector 10 -- FIXME
   diagMut <- V.thaw diagnostics
   -- We need the types that sundials expects. These are tied together
-  -- in 'Types'. FIXME: The Haskell type is currently empty!
+  -- in 'CLangToHaskellTypes'. FIXME: The Haskell type is currently empty!
   let funIO :: CDouble -> Ptr T.SunVector -> Ptr T.SunVector -> Ptr () -> IO CInt
       funIO x y f _ptr = do
         -- Convert the pointer we get from C (y) to a vector, and then
@@ -516,7 +514,7 @@ solveOdeC method initStepSize jacH (absTols, relTol) fun f0 ts = unsafePerformIO
                          /* problem as fully implicit and set f_E to NULL and f_I to f.         */
 
                          /* Here we use the C types defined in helpers.h which tie up with */
-                         /* the Haskell types defined in Types                             */
+                         /* the Haskell types defined in CLangToHaskellTypes                             */
                          if ($(int method) < MIN_DIRK_NUM) {
                            flag = ARKodeInit(arkode_mem, $fun:(int (* funIO) (double t, SunVector y[], SunVector dydt[], void * params)), NULL, T0, y);
                            if (check_flag(&flag, "ARKodeInit", 1)) return 1;
diff --git a/packages/sundials/src/Arkode.hsc b/packages/sundials/src/Numeric/Sundials/Arkode.hsc
index 558ce9e..f5e5dc1 100644
--- a/packages/sundials/src/Arkode.hsc
+++ b/packages/sundials/src/Numeric/Sundials/Arkode.hsc
@@ -1,4 +1,4 @@
-module Arkode where
+|module Numeric.Sundials.Arkode where
 
 import Foreign
 import Foreign.C.Types
diff --git a/packages/sundials/src/Types.hs b/packages/sundials/src/Numeric/Sundials/CLangToHaskellTypes.hs
index 04e4280..0908cbe 100644
--- a/packages/sundials/src/Types.hs
+++ b/packages/sundials/src/Numeric/Sundials/CLangToHaskellTypes.hs
@@ -1,12 +1,9 @@
-{-# OPTIONS_GHC -Wall #-}
-
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE EmptyDataDecls #-}
 
-module Types where
+module Numeric.Sundials.CLangToHaskellTypes where
 
 import           Foreign.C.Types
 
@@ -24,7 +21,7 @@ data SunMatrix = SunMatrix { rows :: CInt
                            , vals :: V.Vector CDouble
                            }
 
--- FIXME: Is this true?
+-- | This is true only if configured/ built as 64 bits
 type SunIndexType = CLong
 
 sunTypesTable :: Map.Map CT.TypeSpecifier TH.TypeQ
diff --git a/packages/sundials/src/Numeric/Sundials/CVode/ODE.hs b/packages/sundials/src/Numeric/Sundials/CVode/ODE.hs
index 0871f9b..1cd072f 100644
--- a/packages/sundials/src/Numeric/Sundials/CVode/ODE.hs
+++ b/packages/sundials/src/Numeric/Sundials/CVode/ODE.hs
@@ -90,8 +90,8 @@ import           Numeric.LinearAlgebra.Devel (createVector)
 import           Numeric.LinearAlgebra.HMatrix (Vector, Matrix, toList, rows,
                                                 cols, toLists, size, reshape)
 
-import qualified Types as T
-import           Arkode (cV_ADAMS, cV_BDF)
+import qualified Numeric.Sundials.CLangToHaskellTypes as T
+import           Numeric.Sundials.Arkode (cV_ADAMS, cV_BDF)
 import           Numeric.Sundials.ODEOpts (ODEOpts(..), Jacobian)
 import qualified Numeric.Sundials.ODEOpts as SO
 
@@ -109,7 +109,7 @@ C.include "<cvode/cvode_direct.h>"        -- access to CVDls interface
 C.include "<sundials/sundials_types.h>"   -- definition of type realtype
 C.include "<sundials/sundials_math.h>"
 C.include "../../../helpers.h"
-C.include "Arkode_hsc.h"
+C.include "Numeric/Sundials/Arkode_hsc.h"
 
 
 -- | Stepping functions
@@ -252,7 +252,7 @@ solveOdeC maxNumSteps_ minStep_ method initStepSize jacH (aTols, rTol) fun f0 ts
   diagnostics :: V.Vector CLong <- createVector 10 -- FIXME
   diagMut <- V.thaw diagnostics
   -- We need the types that sundials expects. These are tied together
-  -- in 'Types'. FIXME: The Haskell type is currently empty!
+  -- in 'CLangToHaskellTypes'. FIXME: The Haskell type is currently empty!
   let funIO :: CDouble -> Ptr T.SunVector -> Ptr T.SunVector -> Ptr () -> IO CInt
       funIO x y f _ptr = do
         -- Convert the pointer we get from C (y) to a vector, and then
diff --git a/packages/sundials/src/Numeric/Sundials/ODEOpts.hs b/packages/sundials/src/Numeric/Sundials/ODEOpts.hs
index 538b474..56dc12c 100644
--- a/packages/sundials/src/Numeric/Sundials/ODEOpts.hs
+++ b/packages/sundials/src/Numeric/Sundials/ODEOpts.hs
@@ -10,8 +10,8 @@ import qualified Data.Vector.Storable.Mutable as VM
 
 import           Numeric.LinearAlgebra.HMatrix (Vector, Matrix)
 
-import qualified Types as T
-import qualified Arkode as B
+import qualified Numeric.Sundials.CLangToHaskellTypes as T
+import qualified Numeric.Sundials.Arkode as B
 
 type Jacobian = Double -> Vector Double -> Matrix Double