commit 5da7a80bab1e3440c794d64869b47fa47a3ea427
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Feb 13 18:39:56 2023 +0100

    Progress with PDuo solver

diff --git a/src/main/java/org/distorted/solvers/SolverCube3.java b/src/main/java/org/distorted/solvers/SolverCube3.java
index 9d401aaf..ef003e18 100644
--- a/src/main/java/org/distorted/solvers/SolverCube3.java
+++ b/src/main/java/org/distorted/solvers/SolverCube3.java
@@ -123,37 +123,37 @@ public class SolverCube3
     for(int i=0; i<9; i++)
       {
       int face = mapCubitToFace(U_INDEX[i],U);
-      int color = mObject.getCubitFaceColorIndex(U_INDEX[i], face);
+      int color = mObject.getCubitFaceStickerIndex(U_INDEX[i], face);
       objectString.append(FACE_NAMES[color]);
       }
     for(int i=0; i<9; i++)
       {
       int face = mapCubitToFace(R_INDEX[i],R);
-      int color = mObject.getCubitFaceColorIndex(R_INDEX[i], face);
+      int color = mObject.getCubitFaceStickerIndex(R_INDEX[i], face);
       objectString.append(FACE_NAMES[color]);
       }
     for(int i=0; i<9; i++)
       {
       int face = mapCubitToFace(F_INDEX[i],F);
-      int color = mObject.getCubitFaceColorIndex(F_INDEX[i], face);
+      int color = mObject.getCubitFaceStickerIndex(F_INDEX[i], face);
       objectString.append(FACE_NAMES[color]);
       }
     for(int i=0; i<9; i++)
       {
       int face = mapCubitToFace(D_INDEX[i],D);
-      int color = mObject.getCubitFaceColorIndex(D_INDEX[i], face);
+      int color = mObject.getCubitFaceStickerIndex(D_INDEX[i], face);
       objectString.append(FACE_NAMES[color]);
       }
     for(int i=0; i<9; i++)
       {
       int face = mapCubitToFace(L_INDEX[i],L);
-      int color = mObject.getCubitFaceColorIndex(L_INDEX[i], face);
+      int color = mObject.getCubitFaceStickerIndex(L_INDEX[i], face);
       objectString.append(FACE_NAMES[color]);
       }
     for(int i=0; i<9; i++)
       {
       int face = mapCubitToFace(B_INDEX[i],B);
-      int color = mObject.getCubitFaceColorIndex(B_INDEX[i], face);
+      int color = mObject.getCubitFaceStickerIndex(B_INDEX[i], face);
       objectString.append(FACE_NAMES[color]);
       }
 
diff --git a/src/main/java/org/distorted/solvers/SolverMain.java b/src/main/java/org/distorted/solvers/SolverMain.java
index da26b7eb..a2462e08 100644
--- a/src/main/java/org/distorted/solvers/SolverMain.java
+++ b/src/main/java/org/distorted/solvers/SolverMain.java
@@ -77,7 +77,7 @@ public class SolverMain implements Runnable
       SolverCube3 solver = new SolverCube3(mRes,mObject);
       solver.solve(screen);
       }
-    if( mSignature==ObjectSignatures.PDUO_2 )
+    else if( mSignature==ObjectSignatures.PDUO_2 )
       {
       SolverTablebase solver = new SolverPyraminxDuo(mRes,mObject);
       solver.solve(screen);
diff --git a/src/main/java/org/distorted/solvers/pduo/SolverPyraminxDuo.java b/src/main/java/org/distorted/solvers/pduo/SolverPyraminxDuo.java
index 2c30d392..9a45b678 100644
--- a/src/main/java/org/distorted/solvers/pduo/SolverPyraminxDuo.java
+++ b/src/main/java/org/distorted/solvers/pduo/SolverPyraminxDuo.java
@@ -48,26 +48,26 @@ public class SolverPyraminxDuo extends SolverTablebase
 
   public int[] prepareQuats(TwistyObject object)
     {
-    int c0f0 = object.getCubitFaceColorIndex(0,0);
-    int c0f1 = object.getCubitFaceColorIndex(0,1);
-    int c0f2 = object.getCubitFaceColorIndex(0,2);
-
-    int c1f0 = object.getCubitFaceColorIndex(1,0);
-    int c1f1 = object.getCubitFaceColorIndex(1,1);
-    int c1f2 = object.getCubitFaceColorIndex(1,2);
-
-    int c2f0 = object.getCubitFaceColorIndex(2,0);
-    int c2f1 = object.getCubitFaceColorIndex(2,1);
-    int c2f2 = object.getCubitFaceColorIndex(2,2);
-
-    int c3f0 = object.getCubitFaceColorIndex(3,0);
-    int c3f1 = object.getCubitFaceColorIndex(3,1);
-    int c3f2 = object.getCubitFaceColorIndex(3,2);
-
-    int c4f0 = object.getCubitFaceColorIndex(4,0);
-    int c5f0 = object.getCubitFaceColorIndex(5,0);
-    int c6f0 = object.getCubitFaceColorIndex(6,0);
-    int c7f0 = object.getCubitFaceColorIndex(3,0);
+    int c0f0 = object.getCubitFaceStickerIndex(0,0);
+    int c0f1 = object.getCubitFaceStickerIndex(0,1);
+    int c0f2 = object.getCubitFaceStickerIndex(0,2);
+
+    int c1f0 = object.getCubitFaceStickerIndex(1,0);
+    int c1f1 = object.getCubitFaceStickerIndex(1,1);
+    int c1f2 = object.getCubitFaceStickerIndex(1,2);
+
+    int c2f0 = object.getCubitFaceStickerIndex(2,0);
+    int c2f1 = object.getCubitFaceStickerIndex(2,1);
+    int c2f2 = object.getCubitFaceStickerIndex(2,2);
+
+    int c3f0 = object.getCubitFaceStickerIndex(3,0);
+    int c3f1 = object.getCubitFaceStickerIndex(3,1);
+    int c3f2 = object.getCubitFaceStickerIndex(3,2);
+
+    int c4f0 = object.getCubitFaceStickerIndex(4,0);
+    int c5f0 = object.getCubitFaceStickerIndex(5,0);
+    int c6f0 = object.getCubitFaceStickerIndex(6,0);
+    int c7f0 = object.getCubitFaceStickerIndex(7,0);
 
     android.util.Log.e("D", "tip 0: "+c0f0+" "+c0f1+" "+c0f2);
     android.util.Log.e("D", "tip 1: "+c1f0+" "+c1f1+" "+c1f2);