Project

General

Profile

« Previous | Next » 

Revision cff92952

Added by Leszek Koltunski about 1 year ago

Progess with Skewb solver.

View differences:

src/main/java/org/distorted/solvers/SolverPyraminxDuo.java
31 31
  private static final int ERROR_CENTER_B_MISSING = -7;
32 32
  private static final int ERROR_CENTER_R_MISSING = -8;
33 33

  
34
  private static final int ERROR_TWO_CENTERS_SWAP = -9;
34
  private static final int ERROR_TWO_CENTERS      = -9;
35 35
  private static final int ERROR_CORNER_TWISTED   = -10;
36 36

  
37 37
  private static final int ERROR_CORNERS_CANNOT   = -11;
......
227 227
    int twist_gr = computeCenterTwist(centers,faces[1],faces[2]);
228 228
    int twist_ry = computeCenterTwist(centers,faces[2],faces[0]);
229 229

  
230
    if( (twist_ry-twist_gr+1)%3 != 0 ) return ERROR_TWO_CENTERS_SWAP;
230
    if( (twist_ry-twist_gr+1)%3 != 0 ) return ERROR_TWO_CENTERS;
231 231

  
232 232
    int total_twist=0;
233 233

  
......
275 275
                                     return res.getString(R.string.solver_generic_missing_center,colorB);
276 276
      case ERROR_CENTER_R_MISSING  : String colorR = res.getString(R.string.color_red2);
277 277
                                     return res.getString(R.string.solver_generic_missing_center,colorR);
278
      case ERROR_TWO_CENTERS_SWAP  : return res.getString(R.string.solver_generic_two_centers);
278
      case ERROR_TWO_CENTERS       : return res.getString(R.string.solver_generic_two_centers);
279 279
      case ERROR_CORNER_TWISTED    : return res.getString(R.string.solver_generic_corner_twist);
280 280
      case ERROR_CORNERS_CANNOT    : return res.getString(R.string.solver_generic_corners_cannot);
281 281
      }

Also available in: Unified diff