/ - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision 08451d7f

Added by Leszek Koltunski about 1 year ago

ID 08451d7f017116b7338111302154bee71e7b720e
Parent d2216784
Child d0eb4ae9

CU_323 solver: remove mUpper.

               {6,7,4,2,5,3,1,0}
           };
       private static boolean mUpper;
       private static boolean mFixedEdgeIsDown;
       private int[][] mAngles;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void setUpper(boolean upper, boolean isDown )
       public static void setDown(boolean isDown )
+        {
         mUpper = upper;
         mFixedEdgeIsDown = isDown;
+        }
-...
     // if upper==true, then the edge3 is the 'half-fixed' front edge. Remove it from the permutation.
     // Otherwise edge1 is the one; remove it.
       public static int[] edgePermTo7(int[] perm, boolean upper)
       public static int[] edgePermTo7(int[] perm)
+        {
         int val;
         int[] ret = new int[7];
         if( upper )
+          {
           ret[0] = perm[0];
           ret[1] = perm[1];
           ret[2] = perm[2];
           ret[3] = perm[4];
           ret[4] = perm[5];
           ret[5] = perm[6];
           ret[6] = perm[7];
           val = perm[3];
+          }
         else
+          {
           ret[0] = perm[0];
           ret[1] = perm[2];
           ret[2] = perm[3];
           ret[3] = perm[4];
           ret[4] = perm[5];
           ret[5] = perm[6];
           ret[6] = perm[7];
           val = perm[1];
+          }
         ret[0] = perm[0];
         ret[1] = perm[2];
         ret[2] = perm[3];
         ret[3] = perm[4];
         ret[4] = perm[5];
         ret[5] = perm[6];
         ret[6] = perm[7];
         int val = perm[1];
         for(int i=0; i<7; i++)
           if( ret[i]>val ) ret[i]--;
-...
       private static int[] edgePermTo8(int[] perm, boolean inPlace)
+        {
         int[] ret = new int[8];
         int val = inPlace ? 1:3;
         if( mUpper )
+          {
           int val = inPlace ? 3:1;
           ret[0] = perm[0]; if( ret[0]>=val ) ret[0]++;
           ret[1] = perm[1]; if( ret[1]>=val ) ret[1]++;
           ret[2] = perm[2]; if( ret[2]>=val ) ret[2]++;
           ret[3] = val;
           ret[4] = perm[3]; if( ret[4]>=val ) ret[4]++;
           ret[5] = perm[4]; if( ret[5]>=val ) ret[5]++;
           ret[6] = perm[5]; if( ret[6]>=val ) ret[6]++;
           ret[7] = perm[6]; if( ret[7]>=val ) ret[7]++;
+          }
         else
+          {
           int val = inPlace ? 1:3;
           ret[0] = perm[0]; if( ret[0]>=val ) ret[0]++;
           ret[1] = val;
           ret[2] = perm[1]; if( ret[2]>=val ) ret[2]++;
           ret[3] = perm[2]; if( ret[3]>=val ) ret[3]++;
           ret[4] = perm[3]; if( ret[4]>=val ) ret[4]++;
           ret[5] = perm[4]; if( ret[5]>=val ) ret[5]++;
           ret[6] = perm[5]; if( ret[6]>=val ) ret[6]++;
           ret[7] = perm[6]; if( ret[7]>=val ) ret[7]++;
+          }
         ret[0] = perm[0]; if( ret[0]>=val ) ret[0]++;
         ret[1] = val;
         ret[2] = perm[1]; if( ret[2]>=val ) ret[2]++;
         ret[3] = perm[2]; if( ret[3]>=val ) ret[3]++;
         ret[4] = perm[3]; if( ret[4]>=val ) ret[4]++;
         ret[5] = perm[4]; if( ret[5]>=val ) ret[5]++;
         ret[6] = perm[5]; if( ret[6]>=val ) ret[6]++;
         ret[7] = perm[6]; if( ret[7]>=val ) ret[7]++;
         return ret;
+        }
-...
       public TBCuboid323(OperatingSystemInterface os)
+        {
         super(os,new int[] {R.raw.cu_323_pruning6,R.raw.cu_323_pruning7}, new int[] {R.raw.cu_323_pruning17,R.raw.cu_323_pruning18});
         super(os,new int[] {R.raw.cu_323_pruning6,R.raw.cu_323_pruning7}, null);//new int[] {R.raw.cu_323_pruning17,R.raw.cu_323_pruning18});
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // we can never really move the fixed front edge, because if we do so, we would also rotate the
     // rotation axis themselves! (see getIndex() where the cubit quats are normalized)
     // Fixed front edge is always iin the front, up or down (depending on value of mFixedEdgeIsDown)
     // Fixed front edge is always in the front, up or down (depending on value of mFixedEdgeIsDown)
     // If the edge is up and we are moving along Y axis, invert!
       @Override
-...
       int[] getHighPruningLevels()
+        {
         return new int[] {17,18};
         return null;//new int[] {17,18};
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       private boolean isFrontEdgeInItsPlace(int[] perm)
+        {
         int index = mUpper?3:1;
         return perm[index]==index;
         return perm[1]==1;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void correctQuats(int[] quats)
+        {
         int mult=0, index = mUpper? 11:9;
         int mult=0;
         switch(quats[index])
         switch(quats[9])
+          {
           case 0: case 5: return;
           case 4: case 7: mult=2; break;
-...
           edge_perm8[i]  = findIndex( EDGE_MAP[i]  , quats[i+8]);
+          }
         int[] edge_perm7 = edgePermTo7(edge_perm8,mUpper);
         int[] edge_perm7 = edgePermTo7(edge_perm8);
         int corner_perm_num = TablebaseHelpers.computePermutationNum(corner_perm);
         int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm7);

         return false;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void testPruning(int level)
+        {
         for( int supp : PruningTable.SUPPORTED )
+          {
           PruningTable table = new PruningTable(mTablebase, level, supp);
           int size = mTablebase.getSize();
           StringBuilder sb = new StringBuilder();
           int num = 0;
           for(int i=0; i<size; i++)
+            {
             if (table.contains(i))
+              {
               if ((num % 10) == 0) sb.append("\n");
               num++;
               sb.append(i);
               sb.append(' ');
+              }
+            }
           android.util.Log.e("D", "numbers: " + sb);
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void test()
+        {
         int[] q1= {0,0,0,0,1,1,1,1, 0,0,0,0,1,1,1,1, 0,0};
         int index = getIndex(q1);
         int[] q2= getQuats(index);
         int index1= 89894;
         int index2= 735014;
         int[] q1= getQuats(index1);
         int[] q2= getQuats(index2);
         TablebaseHelpers.displayTable(q1, "QUATS1");
         TablebaseHelpers.displayTable(q2, "QUATS2");
         android.util.Log.e("D", "index="+index);
         int index3 = getIndex(q1);
         int index4 = getIndex(q2);
         android.util.Log.e("D", "index3="+index3+" index4="+index4);
+        }
+    }

Also available in: Unified diff

Project

General

Profile

TwistyPuzzleLib

Revision 08451d7f

Added by Leszek Koltunski about 1 year ago