Port to diagrams >1.3

Test/Vector.hs

@@ -21,19 +21,19 @@ newtype PosRoundDouble = PosRoundDouble { getPRD :: Double }
   deriving (Eq, Ord, Show, Read)
 
 
-newtype RoundR2 = RoundR2 { getRR2 :: R2 }
+newtype RoundR2 = RoundR2 { getRR2 :: V2 Double }
   deriving (Eq, Ord, Show, Read)
 
 
-newtype PosRoundR2 = PosRoundR2 { getPRR2 :: R2 }
+newtype PosRoundR2 = PosRoundR2 { getPRR2 :: V2 Double }
   deriving (Eq, Ord, Show, Read)
 
 
-newtype RoundP2 = RoundP2 { getRP2 :: P2 }
+newtype RoundP2 = RoundP2 { getRP2 :: P2 Double }
   deriving (Eq, Ord, Show, Read)
 
 
-newtype PosRoundP2 = PosRoundP2 { getPRP2 :: P2 }
+newtype PosRoundP2 = PosRoundP2 { getPRP2 :: P2 Double }
   deriving (Eq, Ord, Show, Read)
 
 
@@ -72,11 +72,11 @@ instance Arbitrary PosRoundP2 where
                 <*> (arbitrary :: Gen PosRoundDouble)
 
 
-instance Arbitrary R2 where
+instance Arbitrary (V2 Double) where
   arbitrary = curry r2 <$> arbitrary <*> arbitrary
 
 
-instance Arbitrary P2 where
+instance Arbitrary (P2 Double) where
   arbitrary = curry p2 <$> arbitrary <*> arbitrary
 
 
@@ -131,42 +131,42 @@ onPTProp1 pt = onPT id pt == pt
 
 
 -- add a random value to the point coordinates
-onPTProp2 :: PT -> Positive R2 -> Bool
-onPTProp2 pt (Positive (R2 rx ry))
+onPTProp2 :: PT -> Positive (V2 Double) -> Bool
+onPTProp2 pt (Positive (V2 rx ry))
   = onPT (\(x, y) -> (x + rx, y + ry)) pt /= pt
 
 
 -- angle between two vectors both on the x-axis must be 0
 getAngleProp1 :: Positive Vec -> Positive Vec -> Bool
-getAngleProp1 (Positive (R2 x1 _)) (Positive (R2 x2 _))
-  = getAngle (R2 x1 0) (R2 x2 0) == 0
+getAngleProp1 (Positive (V2 x1 _)) (Positive (V2 x2 _))
+  = getAngle (V2 x1 0) (V2 x2 0) == 0
 
 
 -- angle between two vectors both on the y-axis must be 0
 getAngleProp2 :: Positive Vec -> Positive Vec -> Bool
-getAngleProp2 (Positive (R2 _ y1)) (Positive (R2 _ y2))
-  = getAngle (R2 0 y1) (R2 0 y2) == 0
+getAngleProp2 (Positive (V2 _ y1)) (Positive (V2 _ y2))
+  = getAngle (V2 0 y1) (V2 0 y2) == 0
 
 
 -- angle between two vectors both on the x-axis but with opposite direction
 -- must be pi
 getAngleProp3 :: Positive Vec -> Positive Vec -> Bool
-getAngleProp3 (Positive (R2 x1 _)) (Positive (R2 x2 _))
-  = getAngle (R2 (negate x1) 0) (R2 x2 0) == pi
+getAngleProp3 (Positive (V2 x1 _)) (Positive (V2 x2 _))
+  = getAngle (V2 (negate x1) 0) (V2 x2 0) == pi
 
 
 -- angle between two vectors both on the y-axis but with opposite direction
 -- must be pi
 getAngleProp4 :: Positive Vec -> Positive Vec -> Bool
-getAngleProp4 (Positive (R2 _ y1)) (Positive (R2 _ y2))
-  = getAngle (R2 0 (negate y1)) (R2 0 y2) == pi
+getAngleProp4 (Positive (V2 _ y1)) (Positive (V2 _ y2))
+  = getAngle (V2 0 (negate y1)) (V2 0 y2) == pi
 
 
 -- angle between vector in x-axis direction and y-axis direction must be
 -- p/2
 getAngleProp5 :: Positive Vec -> Positive Vec -> Bool
-getAngleProp5 (Positive (R2 x1 _)) (Positive (R2 _ y2))
-  = getAngle (R2 x1 0) (R2 0 y2) == pi / 2
+getAngleProp5 (Positive (V2 x1 _)) (Positive (V2 _ y2))
+  = getAngle (V2 x1 0) (V2 0 y2) == pi / 2
 
 
 -- commutative
@@ -213,8 +213,8 @@ scalarProdProp4 (RoundDouble s1) (RoundDouble s2) (RoundR2 v1) (RoundR2 v2)
 
 -- orthogonal
 scalarProdProp5 :: Positive Vec -> Positive Vec -> Bool
-scalarProdProp5 (Positive (R2 x1 _)) (Positive (R2 _ y2))
-  = scalarProd (R2 x1 0) (R2 0 y2) == 0
+scalarProdProp5 (Positive (V2 x1 _)) (Positive (V2 _ y2))
+  = scalarProd (V2 x1 0) (V2 0 y2) == 0
 
 
 -- this is almost the same as the function definition
@@ -262,10 +262,10 @@ vp2Prop1 p1' p2'
 vp2Prop2 :: PT -> PT -> Bool
 vp2Prop2 p1' p2'
   | p1' == origin && p2' == origin = True
-  | otherwise = vp2 p1' p2' == (\(R2 x y) -> negate x ^& negate y)
+  | otherwise = vp2 p1' p2' == (\(V2 x y) -> negate x ^& negate y)
                                  (vp2 p2' p1')
                 &&
-                vp2 p2' p1' == (\(R2 x y) -> negate x ^& negate y)
+                vp2 p2' p1' == (\(V2 x y) -> negate x ^& negate y)
                                  (vp2 p1' p2')