commit 20d6e6885f51bb020f29406cf852afe1fa21174c Author: leszek Date: Sun Dec 22 22:16:09 2024 +0100 minor diff --git a/src/main/java/org/distorted/solvers/SolverTablebasePDUO2.java b/src/main/java/org/distorted/solvers/SolverTablebasePDUO2.java index 0de2d840..08c13c16 100644 --- a/src/main/java/org/distorted/solvers/SolverTablebasePDUO2.java +++ b/src/main/java/org/distorted/solvers/SolverTablebasePDUO2.java @@ -241,36 +241,44 @@ public class SolverTablebasePDUO2 extends SolverTablebase return green_face + 4*(corner_twist[3] + 3*(corner_twist[2] + 3*(corner_twist[1] + 3*corner_twist[0]))); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private String cornerError(Resources res, int color0, int color1, int color2) + { + int j0 = getTetColor(color0,3); + int j1 = getTetColor(color1,3); + int j2 = getTetColor(color2,4); + + String c0 = res.getString(j0); + String c1 = res.getString(j1); + String c2 = res.getString(j2); + + return res.getString(R.string.solver_generic_missing_corner,c0,c1,c2); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private String centerError(Resources res, int face) + { + int color = getTetColor(face,2); + String clr= res.getString(color); + return res.getString(R.string.solver_generic_missing_center,clr); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public String error(int index, Resources res) { switch(index) { - case ERROR_CORNER_YBR_MISSING: String c01 = res.getString(R.string.color_yellow3); - String c02 = res.getString(R.string.color_blue3); - String c03 = res.getString(R.string.color_red4); - return res.getString(R.string.solver_generic_missing_corner,c01,c02,c03); - case ERROR_CORNER_GBR_MISSING: String c11 = res.getString(R.string.color_green3); - String c12 = res.getString(R.string.color_blue3); - String c13 = res.getString(R.string.color_red4); - return res.getString(R.string.solver_generic_missing_corner,c11,c12,c13); - case ERROR_CORNER_GYR_MISSING: String c21 = res.getString(R.string.color_green3); - String c22 = res.getString(R.string.color_yellow3); - String c23 = res.getString(R.string.color_red4); - return res.getString(R.string.solver_generic_missing_corner,c21,c22,c23); - case ERROR_CORNER_GYB_MISSING: String c31 = res.getString(R.string.color_green3); - String c32 = res.getString(R.string.color_yellow3); - String c33 = res.getString(R.string.color_blue4); - return res.getString(R.string.solver_generic_missing_corner,c31,c32,c33); - case ERROR_CENTER_G_MISSING : String colorG = res.getString(R.string.color_green2); - return res.getString(R.string.solver_generic_missing_center,colorG); - case ERROR_CENTER_Y_MISSING : String colorY = res.getString(R.string.color_yellow2); - return res.getString(R.string.solver_generic_missing_center,colorY); - case ERROR_CENTER_B_MISSING : String colorB = res.getString(R.string.color_blue2); - return res.getString(R.string.solver_generic_missing_center,colorB); - case ERROR_CENTER_R_MISSING : String colorR = res.getString(R.string.color_red2); - return res.getString(R.string.solver_generic_missing_center,colorR); + case ERROR_CORNER_YBR_MISSING: return cornerError(res,3,2,1); + case ERROR_CORNER_GBR_MISSING: return cornerError(res,3,2,0); + case ERROR_CORNER_GYR_MISSING: return cornerError(res,3,1,0); + case ERROR_CORNER_GYB_MISSING: return cornerError(res,2,1,0); + case ERROR_CENTER_G_MISSING : return centerError(res,0); + case ERROR_CENTER_Y_MISSING : return centerError(res,1); + case ERROR_CENTER_B_MISSING : return centerError(res,2); + case ERROR_CENTER_R_MISSING : return centerError(res,3); case ERROR_TWO_CENTERS : return res.getString(R.string.solver_generic_two_centers); case ERROR_CORNER_TWISTED : return res.getString(R.string.solver_generic_corner_twist); case ERROR_CORNERS_CANNOT : return res.getString(R.string.solver_generic_corners_cannot); diff --git a/src/main/java/org/distorted/solvers/SolverTablebaseSKEW2.java b/src/main/java/org/distorted/solvers/SolverTablebaseSKEW2.java index 1b64ed50..d6f590fc 100644 --- a/src/main/java/org/distorted/solvers/SolverTablebaseSKEW2.java +++ b/src/main/java/org/distorted/solvers/SolverTablebaseSKEW2.java @@ -361,19 +361,16 @@ public class SolverTablebaseSKEW2 extends SolverTablebase case ERROR_CORNER_034_MISSING : return cornerError(res,0,3,4); case ERROR_CORNER_025_MISSING : return cornerError(res,0,2,5); case ERROR_CORNER_024_MISSING : return cornerError(res,0,2,4); - case ERROR_CENTER_0_MISSING : return centerError(res,0); case ERROR_CENTER_1_MISSING : return centerError(res,1); case ERROR_CENTER_2_MISSING : return centerError(res,2); case ERROR_CENTER_3_MISSING : return centerError(res,3); case ERROR_CENTER_4_MISSING : return centerError(res,4); case ERROR_CENTER_5_MISSING : return centerError(res,5); - case ERROR_CORNERS_CANNOT : return res.getString(R.string.solver_generic_corners_cannot); case ERROR_CORNER_TWISTED : return res.getString(R.string.solver_generic_corner_twist); case ERROR_TWO_CENTERS : return res.getString(R.string.solver_generic_two_centers); case ERROR_TWO_CORNERS : return res.getString(R.string.solver_generic_two_corners); - case ERROR_FREE_CORNERS_NOT_EVEN: return res.getString(R.string.solver_generic_free_corners_odd); case ERROR_FREE_CORNERS_ROTATED : return res.getString(R.string.solver_generic_free_corners_rotated); }