Project

General

Profile

« Previous | Next » 

Revision a4569df4

Added by Leszek Koltunski about 1 year ago

Beginnings of the 2x2 solver.

View differences:

src/main/java/org/distorted/solvers/SolverCuboid232.java
291 291

  
292 292
    int corner_perm_num = TablebaseHelpers.computePermutationNum(corner_perm);
293 293
    int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm2);
294
/*
295
    android.util.Log.e("D", "corner perm num="+corner_perm_num);
296
    for(int i=0; i<8; i++)
297
      {
298
      android.util.Log.e("D", "corner perm "+i+" "+corner_perm[i]);
299
      }
300 294

  
301
    android.util.Log.e("D", "edge perm num="+edge_perm_num);
302
    for(int i=0; i<4; i++)
303
      {
304
      android.util.Log.e("D", "edge perm "+i+" "+edge_perm[i]);
305
      }
306
    for(int i=0; i<3; i++)
307
      {
308
      android.util.Log.e("D", "edge perm2 "+i+" "+edge_perm2[i]);
309
      }
310
*/
311 295
    return edge_perm_num + 6*corner_perm_num;
312 296
    }
313 297

  
......
319 303
      {
320 304
      case 0: return R.string.color_yellow4;
321 305
      case 1: return R.string.color_white4;
322
      case 2: return R.string.color_blue4;
323
      case 3: return R.string.color_green4;
306
      case 2: return R.string.color_green4;
307
      case 3: return R.string.color_blue4;
324 308
      case 4: return R.string.color_red4;
325 309
      case 5: return R.string.color_orange4;
326 310
      }
......
336 320
      {
337 321
      case 0: return R.string.color_yellow3;
338 322
      case 1: return R.string.color_white3;
339
      case 2: return R.string.color_blue3;
340
      case 3: return R.string.color_green3;
323
      case 2: return R.string.color_green3;
324
      case 3: return R.string.color_blue3;
341 325
      case 4: return R.string.color_red3;
342 326
      case 5: return R.string.color_orange3;
343 327
      }
......
353 337
      {
354 338
      case 0: return R.string.color_yellow6;
355 339
      case 1: return R.string.color_white6;
356
      case 2: return R.string.color_blue6;
357
      case 3: return R.string.color_green6;
340
      case 2: return R.string.color_green6;
341
      case 3: return R.string.color_blue6;
358 342
      case 4: return R.string.color_red6;
359 343
      case 5: return R.string.color_orange6;
360 344
      }

Also available in: Unified diff