From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 12 Feb 2013 17:16:39 +0000 (-0500)
Subject: Move the Vector and Matrix modules under Linear.
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=3c5015c938c96f70b15c6292198a01390ee6540a;p=numerical-analysis.git

Move the Vector and Matrix modules under Linear.
---

diff --git a/.ghci b/.ghci
index 2578080..9035a17 100644
--- 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 88455aa..71c1524 100644
--- 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 ae1c588..63c0348 100644
--- 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 1aaf78d..7cc5e00 100644
--- 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)