Merge VectorTypes.hs into Vector.hs

Algebra/Vector.hs

@@ -2,7 +2,6 @@
 
 module Algebra.Vector where
 
-import Algebra.VectorTypes
 import Control.Applicative
 import Data.List (sortBy)
 import Diagrams.TwoD.Types
@@ -11,6 +10,19 @@ import GHC.Float
 import MyPrelude
 
 
+type Vec     = R2
+type PT      = P2
+type Coord   = (Double, Double)
+type Segment = (PT, PT)
+type Square  = (Coord, Coord)
+
+
+data Alignment = CW
+               | CCW
+               | CL
+  deriving (Eq)
+
+
 -- |Checks whether the Point is in a given dimension.
 inRange :: Square -- ^ the square: ((xmin, xmax), (ymin, ymax))
         -> PT     -- ^ Coordinate

Algebra/VectorTypes.hs

@@ -1,18 +0,0 @@
-{-# OPTIONS_HADDOCK ignore-exports #-}
-
-module Algebra.VectorTypes where
-
-import Diagrams.TwoD.Types
-
-
-type Vec     = R2
-type PT      = P2
-type Coord   = (Double, Double)
-type Segment = (PT, PT)
-type Square  = (Coord, Coord)
-
-
-data Alignment = CW
-               | CCW
-               | CL
-  deriving (Eq)

Algorithms/GrahamScan.hs

@@ -3,7 +3,6 @@
 module Algorithms.GrahamScan where
 
 import Algebra.Vector
-import Algebra.VectorTypes
 import MyPrelude
 
 

Algorithms/KDTree.hs

@@ -16,7 +16,6 @@ module Algorithms.KDTree (kdTree
   where
 
 
-import Algebra.VectorTypes
 import Algebra.Vector
 import Data.Maybe (fromJust, catMaybes)
 import Data.Tree

Algorithms/PolygonIntersection.hs

@@ -2,7 +2,6 @@ module Algorithms.PolygonIntersection where
 
 
 import           Algebra.Vector
-import           Algebra.VectorTypes
 import           Control.Applicative
 import           Data.Dequeue (BankersDequeue)
 import qualified Data.Dequeue           as Q

Algorithms/QuadTree.hs

@@ -16,7 +16,6 @@ module Algorithms.QuadTree
     QTZipper)
   where
 
-import Algebra.VectorTypes
 import Algebra.Vector
 import Data.Foldable (foldlM)
 import Data.List (partition)

Graphics/Diagram/Gif.hs

@@ -2,7 +2,6 @@
 
 module Graphics.Diagram.Gif where
 
-import Algebra.VectorTypes
 import Algorithms.GrahamScan
 import Codec.Picture.Gif
 import qualified Data.ByteString.Char8 as B

Graphics/Diagram/Plotter.hs

@@ -2,7 +2,7 @@
 
 module Graphics.Diagram.Plotter where
 
-import Algebra.VectorTypes
+import Algebra.Vector(PT,Square)
 import Algorithms.GrahamScan
 import Algorithms.QuadTree
 import Algorithms.KDTree

Graphics/Diagram/Types.hs

@@ -3,7 +3,6 @@
 module Graphics.Diagram.Types where
 
 import Algebra.Vector
-import Algebra.VectorTypes
 import Diagrams.Backend.Cairo
 import Diagrams.Prelude
 import MyPrelude

Parser/Meshparser.hs

@@ -2,7 +2,7 @@
 
 module Parser.Meshparser (meshToArr, facesToArr) where
 
-import Algebra.VectorTypes
+import Algebra.Vector(PT)
 import Control.Applicative
 import Data.Attoparsec.ByteString.Char8
 import Data.Either