Project

General

Profile

« Previous | Next » 

Revision c64217f7

Added by Leszek Koltunski about 1 year ago

CU_323 solver: minor.

View differences:

src/main/java/org/distorted/objectlib/tablebases/TBCuboid323.java
51 51
    }
52 52

  
53 53
///////////////////////////////////////////////////////////////////////////////////////////////////
54
// if upper==true, then the edge3 is the 'half-fixed' front edge. Remove it from the permutation.
55
// Otherwise edge1 is the one; remove it.
54
// We must have perm[1]==1 or perm[1]==3, depending on if inPlace==true;
55
// remove this extraneous perm member.
56 56

  
57 57
  public static int[] edgePermTo7(int[] perm)
58 58
    {
......
75 75
    }
76 76

  
77 77
///////////////////////////////////////////////////////////////////////////////////////////////////
78
// reverse the above
78 79

  
79 80
  private static int[] edgePermTo8(int[] perm, boolean inPlace)
80 81
    {
......
104 105

  
105 106
  public TBCuboid323(OperatingSystemInterface os)
106 107
    {
107
    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});
108
    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});
108 109
    }
109 110

  
110 111
///////////////////////////////////////////////////////////////////////////////////////////////////
......
288 289
    int[] edge_perm7 = new int[7];
289 290
    TablebaseHelpers.getPermutationFromNum(edge_perm7,7,edgePermNum);
290 291
    int[] edge_perm8 = edgePermTo8(edge_perm7,inPlace);
291

  
292
/*
293
TablebaseHelpers.displayTable(corner_perm, "CORNER");
294
TablebaseHelpers.displayTable(edge_perm8, "EDGE8");
295
TablebaseHelpers.displayTable(edge_perm7, "EDGE7");
296
android.util.Log.e("D", "inPlace="+inPlace);
297
*/
292 298
    int[] quats = new int[18];
293 299

  
294 300
    for(int i=0; i<8; i++)

Also available in: Unified diff