VEC: use the Square type for inRange

Algebra/Vector.hs

@@ -11,11 +11,11 @@ import MyPrelude
 
 
 -- |Checks whether the Point is in a given dimension.
-inRange :: Coord -- ^ X dimension
+inRange :: Square -- ^ the square, defined by x/y dimensions
-        -> Coord -- ^ Y dimension
+        -> PT     -- ^ Coordinate
-        -> PT    -- ^ Coordinates
+        -> Bool   -- ^ result
-        -> Bool  -- ^ result
+inRange ((xlD, xuD), (ylD, yuD)) p =
-inRange (xlD, xuD) (ylD, yuD) p = x <= xuD && x >= xlD && y <= yuD && y >= ylD
+  x <= xuD && x >= xlD && y <= yuD && y >= ylD
   where
     (x, y) = unp2 p
 

Algebra/VectorTypes.hs

@@ -9,6 +9,7 @@ type Vec     = R2
 type PT      = P2
 type Coord   = (Double, Double)
 type Segment = (PT, PT)
+type Square  = (Coord, Coord)
 
 
 data Alignment = CW

Graphics/Diagram/Types.hs

@@ -138,4 +138,4 @@ maybeDiag b d
 
 
 filterValidPT :: DiagProp -> [PT] -> [PT]
-filterValidPT p = filter (inRange (dX p) (dY p))
+filterValidPT p = filter (inRange (dX p, dY p))