Move the Vector and Matrix modules under Linear.

diff --git a/.ghci b/.ghci
index 257808016bed1ad42e02c2b23d958fd6ea647092..9035a17e8b378f5c446a0914161f935dc01dc2ba 100644 (file)
--- a/.ghci
+++ b/.ghci
@@ -6,12 +6,12 @@
 :load src/Aliases.hs
   src/Integration/Simpson.hs
   src/Integration/Trapezoid.hs
-  src/Matrix.hs
+  src/Linear/Matrix.hs
+  src/Linear/Vector.hs
   src/Misc.hs
   src/Normed.hs
   src/ODE/IVP.hs
   src/Roots/Simple.hs
-  src/Vector.hs
 :}
 
 -- Just for convenience.
@@ -20,12 +20,12 @@ import Data.Number.BigFloat
 import Aliases
 import Integration.Simpson
 import Integration.Trapezoid
-import Matrix
+import Linear.Vector
+import Linear.Matrix
 import Misc
 import Normed
 import ODE.IVP
 import Roots.Simple
-import Vector
 
 -- Use a calmer prompt.
 :set prompt "numerical-analysis> "

diff --git a/numerical-analysis.cabal b/numerical-analysis.cabal
index 88455aa6b969bb16ec38bb2517079de432390ea7..71c15241ec9f60cec3ef5d54d1faf085b085fd65 100644 (file)
--- a/numerical-analysis.cabal
+++ b/numerical-analysis.cabal
@@ -17,8 +17,9 @@ description:
 data-files: makefile
 
 library
-  exposed-modules: Integration.Simpson, Integration.Trapezoid, Matrix
-    Misc, Normed, ODE.IVP, Roots.Simple, Roots.Fast, Vector
+  exposed-modules: Integration.Simpson, Integration.Trapezoid,
+    Linear.Matrix, Linear.Vector, Misc, Normed, ODE.IVP, Roots.Simple,
+    Roots.Fast
 
   build-depends:
     base              >= 3 && < 5,

diff --git a/src/Matrix.hs b/src/Linear/Matrix.hs
similarity index 99%
rename from src/Matrix.hs
rename to src/Linear/Matrix.hs
index ae1c5884af20623f27425e10dcd6e8e01e41e823..63c0348cd9e6e0ce676ce5c17c1629890836a6e6 100644 (file)
--- a/src/Matrix.hs
+++ b/src/Linear/Matrix.hs
@@ -4,10 +4,9 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TypeFamilies #-}
 
-module Matrix
+module Linear.Matrix
 where
 
-import Vector
 import Data.Vector.Fixed (
   Dim,
   Vector
@@ -20,6 +19,8 @@ import qualified Data.Vector.Fixed as V (
   )
 import Data.Vector.Fixed.Internal (arity)
 
+import Linear.Vector
+
 type Mat v w a = Vn v (Vn w a)
 type Mat2 a = Mat Vec2D Vec2D a
 type Mat3 a = Mat Vec3D Vec3D a

diff --git a/src/Vector.hs b/src/Linear/Vector.hs
similarity index 99%
rename from src/Vector.hs
rename to src/Linear/Vector.hs
index 1aaf78daa42e31ca0eae5e106b52aa3827276882..7cc5e005ef22dab30af2ad8d0721550eecffd070 100644 (file)
--- a/src/Vector.hs
+++ b/src/Linear/Vector.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
 
-module Vector
+module Linear.Vector
 where
 
 import Data.List (intercalate)