Project

General

Profile

« Previous | Next » 

Revision b6f55b25

Added by Leszek Koltunski about 1 year ago

CU_323 solver: corrections.

View differences:

src/main/java/org/distorted/solvers/SolverCuboid323.java
288 288
    getEdges(object,edges);
289 289
    getCenters(object,centers);
290 290

  
291
for(int i=0; i<8; i++) android.util.Log.e("D", "corner: "+i+" : "+corners[i][0]+" "+corners[i][1]+" "+corners[i][2]);
292
for(int i=0; i<8; i++) android.util.Log.e("D", "edge: "+i+" : "+edges[i][0]+" "+edges[i][1]);
291
//for(int i=0; i<8; i++) android.util.Log.e("D", "corner: "+i+" : "+corners[i][0]+" "+corners[i][1]+" "+corners[i][2]);
292
//for(int i=0; i<8; i++) android.util.Log.e("D", "edge: "+i+" : "+edges[i][0]+" "+edges[i][1]);
293 293

  
294 294
    int result0 = computeFaceColors(corners, edges, centers);
295 295
    if( result0<0 ) return result0;
......
298 298
    int result1 = retCornerPermutation(corner_perm,corners);
299 299
    if( result1<0 ) return result1;
300 300

  
301
android.util.Log.e("D", "upper: "+mUpper);
302
for(int i=0; i<6; i++) android.util.Log.e("D", "face color: "+mFaceColors[i]);
301
//android.util.Log.e("D", "upper: "+mUpper);
302
//for(int i=0; i<6; i++) android.util.Log.e("D", "face color: "+mFaceColors[i]);
303 303

  
304 304
    int[] edge_perm = new int[8];
305 305
    int result2 = retEdgePermutation(edge_perm,edges);
306 306
    if( result2<0 ) return result2;
307 307

  
308
    TablebaseHelpers.displayTable(corner_perm, "CORNER PERM");
309
    TablebaseHelpers.displayTable(edge_perm, "EDGE PERM");
308
//    TablebaseHelpers.displayTable(corner_perm, "CORNER PERM");
309
//    TablebaseHelpers.displayTable(edge_perm, "EDGE PERM");
310 310

  
311 311
    int[] edge_perm2 = TBCuboid323.edgePermTo7(edge_perm,mUpper); // edge1 (lower) or edge3 (upper) is fixed!
312 312

  
......
314 314
    int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm2);
315 315
    boolean inPlace = isFrontEdgeInItsPlace(edges);
316 316

  
317
android.util.Log.e("D", "corner_perm_num: "+corner_perm_num+" edge_perm_num: "+edge_perm_num+" inPlace: "+inPlace);
317
//android.util.Log.e("D", "corner_perm_num: "+corner_perm_num+" edge_perm_num: "+edge_perm_num+" inPlace: "+inPlace);
318 318

  
319 319
    TBCuboid323.setUpper(mUpper);
320 320

  
......
468 468
    if( mSolver==null )
469 469
      {
470 470
      mSolver = ImplementedTablebasesList.createUnpacked(ObjectSignatures.CU_323);
471
      if( mSolver!=null ) mSolver.createTablebase(4);
471
      if( mSolver!=null ) mSolver.createTablebase(-1);
472 472
      }
473 473

  
474 474
    return null;//mSolver!=null ? mSolver.solution(index,null,os) : null;

Also available in: Unified diff