commit 030f1bf43ae19760dc05cf8cd5be0cf53aa2dab1
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Mar 1 18:24:52 2023 +0100

    Progress with Skewb Diamond solver.

diff --git a/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java b/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
index 8d2a4871..adc8cb3e 100644
--- a/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
+++ b/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
@@ -276,35 +276,35 @@ public class SolverSkewbDiamond extends SolverTablebase
 
   private void getCorners(TwistyObject object, int[][] corners)
     {
-    corners[0][0] = object.getCubitFaceStickerIndex( 0,0); // FR
-    corners[0][1] = object.getCubitFaceStickerIndex( 0,1);
-    corners[0][2] = object.getCubitFaceStickerIndex( 0,5);
-    corners[0][3] = object.getCubitFaceStickerIndex( 0,4);
-
-    corners[1][0] = object.getCubitFaceStickerIndex( 1,1); // BR
-    corners[1][1] = object.getCubitFaceStickerIndex( 1,2);
-    corners[1][2] = object.getCubitFaceStickerIndex( 1,6);
-    corners[1][3] = object.getCubitFaceStickerIndex( 1,5);
-
-    corners[2][0] = object.getCubitFaceStickerIndex( 2,2); // BL
-    corners[2][1] = object.getCubitFaceStickerIndex( 2,3);
-    corners[2][2] = object.getCubitFaceStickerIndex( 2,7);
-    corners[2][3] = object.getCubitFaceStickerIndex( 2,6);
-
-    corners[3][0] = object.getCubitFaceStickerIndex( 3,3); // FL
-    corners[3][1] = object.getCubitFaceStickerIndex( 3,0);
-    corners[3][2] = object.getCubitFaceStickerIndex( 3,4);
-    corners[3][3] = object.getCubitFaceStickerIndex( 3,7);
+    corners[0][0] = object.getCubitFaceStickerIndex( 0,5); // FR
+    corners[0][1] = object.getCubitFaceStickerIndex( 0,4);
+    corners[0][2] = object.getCubitFaceStickerIndex( 0,0);
+    corners[0][3] = object.getCubitFaceStickerIndex( 0,1);
+
+    corners[1][0] = object.getCubitFaceStickerIndex( 1,2); // BR
+    corners[1][1] = object.getCubitFaceStickerIndex( 1,6);
+    corners[1][2] = object.getCubitFaceStickerIndex( 1,5);
+    corners[1][3] = object.getCubitFaceStickerIndex( 1,1);
+
+    corners[2][0] = object.getCubitFaceStickerIndex( 2,7); // BL
+    corners[2][1] = object.getCubitFaceStickerIndex( 2,6);
+    corners[2][2] = object.getCubitFaceStickerIndex( 2,2);
+    corners[2][3] = object.getCubitFaceStickerIndex( 2,3);
+
+    corners[3][0] = object.getCubitFaceStickerIndex( 3,0); // FL
+    corners[3][1] = object.getCubitFaceStickerIndex( 3,4);
+    corners[3][2] = object.getCubitFaceStickerIndex( 3,7);
+    corners[3][3] = object.getCubitFaceStickerIndex( 3,3);
 
     corners[4][0] = object.getCubitFaceStickerIndex( 4,0); // U
     corners[4][1] = object.getCubitFaceStickerIndex( 4,3);
     corners[4][2] = object.getCubitFaceStickerIndex( 4,2);
     corners[4][3] = object.getCubitFaceStickerIndex( 4,1);
 
-    corners[5][0] = object.getCubitFaceStickerIndex( 5,6); // D
-    corners[5][1] = object.getCubitFaceStickerIndex( 5,7);
-    corners[5][2] = object.getCubitFaceStickerIndex( 5,4);
-    corners[5][3] = object.getCubitFaceStickerIndex( 5,5);
+    corners[5][0] = object.getCubitFaceStickerIndex( 5,5); // D
+    corners[5][1] = object.getCubitFaceStickerIndex( 5,6);
+    corners[5][2] = object.getCubitFaceStickerIndex( 5,7);
+    corners[5][3] = object.getCubitFaceStickerIndex( 5,4);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -331,6 +331,11 @@ public class SolverSkewbDiamond extends SolverTablebase
     getCorners(object,corners);
     getCenters(object,centers);
 
+for(int j=0; j<8; j++)
+  {
+  android.util.Log.e("D", "center "+j+" : "+centers[j]);
+  }
+
     int result1 = checkAllCentersPresent(centers);
     if( result1<0 ) return result1;
 
@@ -349,6 +354,16 @@ public class SolverSkewbDiamond extends SolverTablebase
     if( !even2 ) return ERROR_TWO_CENTERS;
 
     int[] corners_twist = getCornersTwist(corners_perm, corners);
+
+android.util.Log.e("D", "faces: "+mFaceColors[0]+" "+mFaceColors[1]+" "+mFaceColors[2]+" "
++mFaceColors[3]+" "+mFaceColors[4]+" "+mFaceColors[5]+" "+mFaceColors[6]+" "+mFaceColors[7]);
+
+android.util.Log.e("D", "corn perm: "+corners_perm[0]+" "+corners_perm[1]+" "+corners_perm[2]+" "
++corners_perm[3]+" "+corners_perm[4]+" "+corners_perm[5]);
+
+android.util.Log.e("D", "corn twist: "+corners_twist[0]+" "+corners_twist[1]+" "+corners_twist[2]+" "
++corners_twist[3]+" "+corners_twist[4]+" "+corners_twist[5]);
+
     int totalTwist = getTotalTwist(corners_twist);
     if( totalTwist<0 ) return ERROR_CORNER_TWIST;
 
@@ -400,7 +415,7 @@ public class SolverSkewbDiamond extends SolverTablebase
 
   private int getColorIndex2(int face)
     {
-    switch(mFaceColors[face])
+    switch(face)
       {
       case 0: return R.string.color_violet2;
       case 1: return R.string.color_grey2;
@@ -470,7 +485,7 @@ public class SolverSkewbDiamond extends SolverTablebase
     if( mSolver==null )
       {
       mSolver = ImplementedTablebasesList.createUnpacked(ObjectType.DIAM_2);
-      if( mSolver!=null ) mSolver.createTablebase();
+     // if( mSolver!=null ) mSolver.createTablebase();
       }
 
     return mSolver!=null ? mSolver.solution(index) : null;