Invert all of the rotations.

diff --git a/src/Cube.hs b/src/Cube.hs
index cfe0e6090ed20c02f6e32acfe66fcecd797dce95..5b5f2af690d3230bf06595ae133a05b313b840a3 100644 (file)
--- a/src/Cube.hs
+++ b/src/Cube.hs
@@ -198,7 +198,7 @@ tetrahedron1 c =
       v1' = center (front_face c)
       v2' = Face.v1 (front_face c)
       v3' = Face.v2 (front_face c)
-      fv' = rotate (Cube.fv c) ccwx
+      fv' = rotate (Cube.fv c) cwx
 
 tetrahedron2 :: Cube -> Tetrahedron
 tetrahedron2 c =
@@ -208,7 +208,7 @@ tetrahedron2 c =
       v1' = center (front_face c)
       v2' = Face.v2 (front_face c)
       v3' = Face.v3 (front_face c)
-      fv' = rotate (Cube.fv c) (ccwx . ccwx)
+      fv' = rotate (Cube.fv c) (cwx . cwx)
 
 tetrahedron3 :: Cube -> Tetrahedron
 tetrahedron3 c =
@@ -218,7 +218,7 @@ tetrahedron3 c =
       v1' = center (front_face c)
       v2' = Face.v3 (front_face c)
       v3' = Face.v0 (front_face c)
-      fv' = rotate (Cube.fv c) cwx
+      fv' = rotate (Cube.fv c) ccwx
 
 tetrahedron4 :: Cube -> Tetrahedron
 tetrahedron4 c =
@@ -228,7 +228,7 @@ tetrahedron4 c =
       v1' = center (top_face c)
       v2' = Face.v0 (top_face c)
       v3' = Face.v1 (top_face c)
-      fv' = rotate (Cube.fv c) cwy
+      fv' = rotate (Cube.fv c) ccwy
 
 tetrahedron5 :: Cube -> Tetrahedron
 tetrahedron5 c =
@@ -238,7 +238,7 @@ tetrahedron5 c =
       v1' = center (top_face c)
       v2' = Face.v1 (top_face c)
       v3' = Face.v2 (top_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) ccwz
+      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) cwz
 
 tetrahedron6 :: Cube -> Tetrahedron
 tetrahedron6 c =
@@ -248,7 +248,7 @@ tetrahedron6 c =
       v1' = center (top_face c)
       v2' = Face.v2 (top_face c)
       v3' = Face.v3 (top_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) (ccwz . ccwz)
+      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) (cwz . cwz)
 
 tetrahedron7 :: Cube -> Tetrahedron
 tetrahedron7 c =
@@ -258,7 +258,7 @@ tetrahedron7 c =
       v1' = center (top_face c)
       v2' = Face.v3 (top_face c)
       v3' = Face.v0 (top_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) cwz
+      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) ccwz
 
 tetrahedron8 :: Cube -> Tetrahedron
 tetrahedron8 c =
@@ -268,7 +268,7 @@ tetrahedron8 c =
       v1' = center (back_face c)
       v2' = Face.v0 (back_face c)
       v3' = Face.v1 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) cwy
+      fv' = rotate (Tetrahedron.fv (tetrahedron4 c)) ccwy
 
 tetrahedron9 :: Cube -> Tetrahedron
 tetrahedron9 c =
@@ -278,7 +278,7 @@ tetrahedron9 c =
       v1' = center (back_face c)
       v2' = Face.v1 (back_face c)
       v3' = Face.v2 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) ccwx
+      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) cwx
 
 tetrahedron10 :: Cube -> Tetrahedron
 tetrahedron10 c =
@@ -288,7 +288,7 @@ tetrahedron10 c =
       v1' = center (back_face c)
       v2' = Face.v2 (back_face c)
       v3' = Face.v3 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) (ccwx . ccwx)
+      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) (cwx . cwx)
 
 
 tetrahedron11 :: Cube -> Tetrahedron
@@ -299,7 +299,7 @@ tetrahedron11 c =
       v1' = center (back_face c)
       v2' = Face.v3 (back_face c)
       v3' = Face.v0 (back_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) cwx
+      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) ccwx
 
 
 tetrahedron12 :: Cube -> Tetrahedron
@@ -310,7 +310,7 @@ tetrahedron12 c =
       v1' = center (down_face c)
       v2' = Face.v0 (down_face c)
       v3' = Face.v1 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) cwy
+      fv' = rotate (Tetrahedron.fv (tetrahedron8 c)) ccwy
 
 
 tetrahedron13 :: Cube -> Tetrahedron
@@ -321,7 +321,7 @@ tetrahedron13 c =
       v1' = center (down_face c)
       v2' = Face.v1 (down_face c)
       v3' = Face.v2 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron12 c)) ccwz
+      fv' = rotate (Tetrahedron.fv (tetrahedron12 c)) cwz
 
 
 tetrahedron14 :: Cube -> Tetrahedron
@@ -332,7 +332,7 @@ tetrahedron14 c =
       v1' = center (down_face c)
       v2' = Face.v2 (down_face c)
       v3' = Face.v3 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron13 c)) (ccwz . ccwz)
+      fv' = rotate (Tetrahedron.fv (tetrahedron13 c)) (cwz . cwz)
 
 
 tetrahedron15 :: Cube -> Tetrahedron
@@ -343,7 +343,7 @@ tetrahedron15 c =
       v1' = center (down_face c)
       v2' = Face.v3 (down_face c)
       v3' = Face.v0 (down_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron12 c)) cwz
+      fv' = rotate (Tetrahedron.fv (tetrahedron12 c)) ccwz
 
 
 tetrahedron16 :: Cube -> Tetrahedron
@@ -354,7 +354,7 @@ tetrahedron16 c =
       v1' = center (right_face c)
       v2' = Face.v0 (right_face c)
       v3' = Face.v1 (right_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron0 c)) ccwz
+      fv' = rotate (Tetrahedron.fv (tetrahedron0 c)) cwz
 
 
 tetrahedron17 :: Cube -> Tetrahedron
@@ -398,7 +398,7 @@ tetrahedron20 c =
       v1' = center (left_face c)
       v2' = Face.v0 (left_face c)
       v3' = Face.v1 (left_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron0 c)) cwz
+      fv' = rotate (Tetrahedron.fv (tetrahedron0 c)) ccwz
 
 
 tetrahedron21 :: Cube -> Tetrahedron
@@ -409,7 +409,7 @@ tetrahedron21 c =
       v1' = center (left_face c)
       v2' = Face.v1 (left_face c)
       v3' = Face.v2 (left_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron20 c)) ccwy
+      fv' = rotate (Tetrahedron.fv (tetrahedron20 c)) cwy
 
 
 tetrahedron22 :: Cube -> Tetrahedron
@@ -420,7 +420,7 @@ tetrahedron22 c =
       v1' = center (left_face c)
       v2' = Face.v2 (left_face c)
       v3' = Face.v3 (left_face c)
-      fv' = rotate (Tetrahedron.fv (tetrahedron20 c)) ccwy
+      fv' = rotate (Tetrahedron.fv (tetrahedron20 c)) (cwy . cwy)
 
 
 tetrahedron23 :: Cube -> Tetrahedron