commit 16003ca891eeaf5ee2faf86673882b816d4d43a1 Author: Leszek Koltunski Date: Thu Feb 23 16:37:49 2023 +0100 Beginnings of the 2x2x3 solver. diff --git a/src/main/java/org/distorted/solvers/ImplementedSolversList.java b/src/main/java/org/distorted/solvers/ImplementedSolversList.java index 4a4afd15..929842df 100644 --- a/src/main/java/org/distorted/solvers/ImplementedSolversList.java +++ b/src/main/java/org/distorted/solvers/ImplementedSolversList.java @@ -19,8 +19,8 @@ public enum ImplementedSolversList CUBE3_KOCIEMBA (ObjectSignatures.CUBE_3, R.string.solver_cube3_title, R.string.solver_cube3_description, true), PYRAMINX_DUO (ObjectSignatures.PDUO_2, R.string.solver_pduo2_title, R.string.solver_pduo2_description, false), IVY (ObjectSignatures.IVY_2 , R.string.solver_ivy_title, R.string.solver_ivy_description, false), - PYRAMINX (ObjectSignatures.PYRA_3, R.string.solver_pyra3_title, R.string.solver_pyra3_description, false), TOWER (ObjectSignatures.CU_232, R.string.solver_cu232_title, R.string.solver_cu232_description, false), + PYRAMINX (ObjectSignatures.PYRA_3, R.string.solver_pyra3_title, R.string.solver_pyra3_description, false), DIAMOND (ObjectSignatures.DIAM_2, R.string.solver_diam2_title, R.string.solver_diam2_description, false), ; diff --git a/src/main/java/org/distorted/solvers/SolverCuboid232.java b/src/main/java/org/distorted/solvers/SolverCuboid232.java new file mode 100644 index 00000000..365ea4a3 --- /dev/null +++ b/src/main/java/org/distorted/solvers/SolverCuboid232.java @@ -0,0 +1,398 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2023 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is proprietary software licensed under an EULA which you should have received // +// along with the code. If not, check https://distorted.org/magic/License-Magic-Cube.html // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.solvers; + +import android.content.res.Resources; + +import org.distorted.main.R; +import org.distorted.objectlib.main.ObjectType; +import org.distorted.objectlib.main.TwistyObject; +import org.distorted.objectlib.tablebases.ImplementedTablebasesList; +import org.distorted.objectlib.tablebases.TablebaseHelpers; +import org.distorted.objectlib.tablebases.TablebasesAbstract; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class SolverCuboid232 extends SolverTablebase +{ + private static final int ERROR_CORNER_135_MISSING = -1; + private static final int ERROR_CORNER_134_MISSING = -2; + private static final int ERROR_CORNER_125_MISSING = -3; + private static final int ERROR_CORNER_124_MISSING = -4; + private static final int ERROR_CORNER_035_MISSING = -5; + private static final int ERROR_CORNER_034_MISSING = -6; + private static final int ERROR_CORNER_025_MISSING = -7; + private static final int ERROR_CORNER_024_MISSING = -8; + + private static final int ERROR_EDGE_15_MISSING = -9; + private static final int ERROR_EDGE_14_MISSING = -10; + private static final int ERROR_EDGE_05_MISSING = -11; + private static final int ERROR_EDGE_04_MISSING = -12; + + private static final int ERROR_CORNERS_CANNOT = -13; + private static final int ERROR_EDGE_TWISTED = -14; + private static final int ERROR_CORNER_TWISTED = -15; + + TablebasesAbstract mSolver; + private final int[] mFaceColors; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int edgeIs(int[] edge, int i0, int i1) + { + int c0 = mFaceColors[i0]; + int c1 = mFaceColors[i1]; + + if( edge[0]==c0 && edge[1]==c1 ) return 0; + if( edge[0]==c1 && edge[1]==c0 ) return 1; + return 2; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int retEdgePermutation(int[] output, int[][] edges) + { + for(int i=0; i<4; i++) output[i] = -1; + + for(int i=0; i<4; i++) + { + int edge0 = edgeIs(edges[i],1,5); + if( edge0==0 ) output[0]=i; + else if( edge0==1 ) return ERROR_EDGE_TWISTED; + + int edge1 = edgeIs(edges[i],1,4); + if( edge1==0 ) output[1]=i; + else if( edge1==1 ) return ERROR_EDGE_TWISTED; + + int edge2 = edgeIs(edges[i],0,5); + if( edge2==0 ) output[2]=i; + else if( edge2==1 ) return ERROR_EDGE_TWISTED; + + int edge3 = edgeIs(edges[i],0,4); + if( edge3==0 ) output[3]=i; + else if( edge3==1 ) return ERROR_EDGE_TWISTED; + } + + if( output[0]==-1 ) return ERROR_EDGE_15_MISSING; + if( output[1]==-1 ) return ERROR_EDGE_14_MISSING; + if( output[2]==-1 ) return ERROR_EDGE_05_MISSING; + if( output[3]==-1 ) return ERROR_EDGE_04_MISSING; + + return 0; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int cornerIs(int[] corner, int i0, int i1, int i2) + { + int c0 = mFaceColors[i0]; + int c1 = mFaceColors[i1]; + int c2 = mFaceColors[i2]; + + if( corner[0]==c0 && corner[1]==c1 && corner[2]==c2 ) return 0; + + if( corner[0]==c0 && corner[1]==c2 && corner[2]==c1 || + corner[0]==c1 && corner[1]==c0 && corner[2]==c2 || + corner[0]==c1 && corner[1]==c2 && corner[2]==c0 || + corner[0]==c2 && corner[1]==c0 && corner[2]==c1 || + corner[0]==c2 && corner[1]==c1 && corner[2]==c0 ) return 1; + + return 2; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int retCornerPermutation(int[] output, int[][] corners) + { + for(int i=0; i<8; i++) output[i] = -1; + + for(int i=0; i<8; i++) + { + int corner7 = cornerIs(corners[i],2,4,0); + if( corner7==0 ) output[7]=i; + else if( corner7==1 ) return ERROR_CORNER_TWISTED; + + int corner6 = cornerIs(corners[i],2,0,5); + if( corner6==0 ) output[6]=i; + else if( corner6==1 ) return ERROR_CORNER_TWISTED; + + int corner5 = cornerIs(corners[i],3,0,4); + if( corner5==0 ) output[5]=i; + else if( corner5==1 ) return ERROR_CORNER_TWISTED; + + int corner4 = cornerIs(corners[i],3,5,0); + if( corner4==0 ) output[4]=i; + else if( corner4==1 ) return ERROR_CORNER_TWISTED; + + int corner3 = cornerIs(corners[i],2,1,4); + if( corner3==0 ) output[3]=i; + else if( corner3==1 ) return ERROR_CORNER_TWISTED; + + int corner2 = cornerIs(corners[i],2,5,1); + if( corner2==0 ) output[2]=i; + else if( corner2==1 ) return ERROR_CORNER_TWISTED; + + int corner1 = cornerIs(corners[i],3,4,1); + if( corner1==0 ) output[1]=i; + else if( corner1==1 ) return ERROR_CORNER_TWISTED; + + int corner0 = cornerIs(corners[i],3,1,5); + if( corner0==0 ) output[0]=i; + else if( corner0==1 ) return ERROR_CORNER_TWISTED; + } + + if( output[0]==-1 ) return ERROR_CORNER_135_MISSING; + if( output[1]==-1 ) return ERROR_CORNER_134_MISSING; + if( output[2]==-1 ) return ERROR_CORNER_125_MISSING; + if( output[3]==-1 ) return ERROR_CORNER_124_MISSING; + if( output[4]==-1 ) return ERROR_CORNER_035_MISSING; + if( output[5]==-1 ) return ERROR_CORNER_034_MISSING; + if( output[6]==-1 ) return ERROR_CORNER_025_MISSING; + if( output[7]==-1 ) return ERROR_CORNER_024_MISSING; + + return 0; + } + +//////////////////////////////////////////////////////////////////////////////////////// + + private int computeFaceColors(int[][] corners, int[][] edges) + { + mFaceColors[1] = edges[1][0]; + mFaceColors[4] = edges[1][1]; + + if( edges[0][0]==mFaceColors[1] ) mFaceColors[5] = edges[0][1]; + else if( edges[2][0]==mFaceColors[1] ) mFaceColors[5] = edges[2][1]; + else if( edges[3][0]==mFaceColors[1] ) mFaceColors[5] = edges[3][1]; + else return ERROR_EDGE_TWISTED; + + if( edges[0][1]==mFaceColors[4] ) mFaceColors[0] = edges[0][0]; + else if( edges[2][1]==mFaceColors[4] ) mFaceColors[0] = edges[2][0]; + else if( edges[3][1]==mFaceColors[4] ) mFaceColors[0] = edges[3][0]; + else return ERROR_EDGE_TWISTED; + + boolean found2 = false; + boolean found3 = false; + + for(int c=0; c<8; c++) + { + if( !found3 && corners[c][1]==mFaceColors[4] ) + { + found3=true; + mFaceColors[3] = corners[c][0]; + } + if( !found2 && corners[c][2]==mFaceColors[4] ) + { + found2=true; + mFaceColors[2] = corners[c][0]; + } + } + + if( !found2 || !found3 ) return ERROR_CORNERS_CANNOT; + + for(int i=0; i<6; i++) + for(int j=i+1; j<6; j++) + if( mFaceColors[i]==mFaceColors[j] ) return ERROR_CORNERS_CANNOT; + + return 0; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public SolverCuboid232(Resources res, TwistyObject object) + { + super(res,object); + mFaceColors = new int[6]; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int tablebaseIndex(TwistyObject object) + { + int[][] corners= new int[8][3]; + int[][] edges = new int[4][2]; + + corners[0][0] = object.getCubitFaceStickerIndex(0,3); + corners[0][1] = object.getCubitFaceStickerIndex(0,1); + corners[0][2] = object.getCubitFaceStickerIndex(0,5); + + corners[1][0] = object.getCubitFaceStickerIndex(1,1); + corners[1][1] = object.getCubitFaceStickerIndex(1,5); + corners[1][2] = object.getCubitFaceStickerIndex(1,3); + + corners[2][0] = object.getCubitFaceStickerIndex(2,3); + corners[2][1] = object.getCubitFaceStickerIndex(2,1); + corners[2][2] = object.getCubitFaceStickerIndex(2,5); + + corners[3][0] = object.getCubitFaceStickerIndex(3,3); + corners[3][1] = object.getCubitFaceStickerIndex(3,1); + corners[3][2] = object.getCubitFaceStickerIndex(3,5); + + corners[4][0] = object.getCubitFaceStickerIndex(4,5); + corners[4][1] = object.getCubitFaceStickerIndex(4,3); + corners[4][2] = object.getCubitFaceStickerIndex(4,1); + + corners[5][0] = object.getCubitFaceStickerIndex(5,3); + corners[5][1] = object.getCubitFaceStickerIndex(5,1); + corners[5][2] = object.getCubitFaceStickerIndex(5,5); + + corners[6][0] = object.getCubitFaceStickerIndex(6,3); + corners[6][1] = object.getCubitFaceStickerIndex(6,1); + corners[6][2] = object.getCubitFaceStickerIndex(6,5); + + corners[7][0] = object.getCubitFaceStickerIndex(7,5); + corners[7][1] = object.getCubitFaceStickerIndex(7,3); + corners[7][2] = object.getCubitFaceStickerIndex(7,1); + + edges[0][0] = object.getCubitFaceStickerIndex(8,5); + edges[0][1] = object.getCubitFaceStickerIndex(8,3); + edges[1][0] = object.getCubitFaceStickerIndex(9,3); + edges[1][1] = object.getCubitFaceStickerIndex(9,5); + edges[2][0] = object.getCubitFaceStickerIndex(10,5); + edges[2][1] = object.getCubitFaceStickerIndex(10,3); + edges[3][0] = object.getCubitFaceStickerIndex(11,3); + edges[3][1] = object.getCubitFaceStickerIndex(11,5); + + int result0 = computeFaceColors(corners, edges); + if( result0<0 ) return result0; + + int[] corner_perm = new int[8]; + int result1 = retCornerPermutation(corner_perm,corners); + if( result1<0 ) return result1; + + int[] edge_perm = new int[8]; + int result2 = retEdgePermutation(edge_perm,edges); + if( result2<0 ) return result2; + + int corner_perm_num = TablebaseHelpers.computePermutationNum(corner_perm); + int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm); + + return edge_perm_num + 6*corner_perm_num; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int getColorIndex4(int face) + { + switch(mFaceColors[face]) + { + case 0: return R.string.color_yellow4; + case 1: return R.string.color_white4; + case 2: return R.string.color_blue4; + case 3: return R.string.color_green4; + case 4: return R.string.color_red4; + case 5: return R.string.color_orange4; + } + + return -1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int getColorIndex3(int face) + { + switch(mFaceColors[face]) + { + case 0: return R.string.color_yellow3; + case 1: return R.string.color_white3; + case 2: return R.string.color_blue3; + case 3: return R.string.color_green3; + case 4: return R.string.color_red3; + case 5: return R.string.color_orange3; + } + + return -1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int getColorIndex6(int face) + { + switch(mFaceColors[face]) + { + case 0: return R.string.color_yellow6; + case 1: return R.string.color_white6; + case 2: return R.string.color_blue6; + case 3: return R.string.color_green6; + case 4: return R.string.color_red6; + case 5: return R.string.color_orange6; + } + + return -1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private String edgeError(Resources res, int face0, int face1) + { + int j0 = getColorIndex3(face0); + int j1 = getColorIndex6(face1); + + String c0 = res.getString(j0); + String c1 = res.getString(j1); + + return res.getString(R.string.solver_generic_missing_edge,c0,c1); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private String cornerError(Resources res, int face0, int face1, int face2) + { + int j0 = getColorIndex3(face0); + int j1 = getColorIndex3(face1); + int j2 = getColorIndex4(face2); + + 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); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public String error(int index, Resources res) + { + switch(index) + { + case ERROR_CORNER_135_MISSING: return cornerError(res,1,3,5); + case ERROR_CORNER_134_MISSING: return cornerError(res,1,3,4); + case ERROR_CORNER_125_MISSING: return cornerError(res,1,2,5); + case ERROR_CORNER_124_MISSING: return cornerError(res,1,2,4); + case ERROR_CORNER_035_MISSING: return cornerError(res,0,3,5); + 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_EDGE_15_MISSING : return edgeError(res,1,5); + case ERROR_EDGE_14_MISSING : return edgeError(res,1,4); + case ERROR_EDGE_05_MISSING : return edgeError(res,0,5); + case ERROR_EDGE_04_MISSING : return edgeError(res,0,4); + + case ERROR_CORNERS_CANNOT : return res.getString(R.string.solver_generic_corners_cannot); + case ERROR_EDGE_TWISTED : return res.getString(R.string.solver_generic_edge_twist); + case ERROR_CORNER_TWISTED : return res.getString(R.string.solver_generic_corner_twist); + } + + return null; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int[][] solution(int index, Resources res) + { + if( mSolver==null ) + { + mSolver = ImplementedTablebasesList.createPacked(res,ObjectType.CU_232); + } + + return mSolver!=null ? mSolver.solution(index) : null; + } +} + diff --git a/src/main/java/org/distorted/solvers/SolverMain.java b/src/main/java/org/distorted/solvers/SolverMain.java index 579d022d..10a9292b 100644 --- a/src/main/java/org/distorted/solvers/SolverMain.java +++ b/src/main/java/org/distorted/solvers/SolverMain.java @@ -86,6 +86,11 @@ public class SolverMain implements Runnable SolverTablebase solver = new SolverIvyCube(mRes,mObject); solver.solve(screen); } + else if( mSignature==ObjectSignatures.CU_232 ) + { + SolverTablebase solver = new SolverCuboid232(mRes,mObject); + solver.solve(screen); + } else { screen.displayErrorDialog(mRes.getString(R.string.solver_generic_not_implemented)); diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 6ae73986..e3bf0e4a 100755 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -81,6 +81,7 @@ Löser für dieses Objekt und diese Größe noch nicht implementiert! Eine Ecke muss verdreht werden! + Eine Kante muss verdreht werden! Zwei Zentren müssen ausgetauscht werden! Die %1$s Mitte fehlt! Die %1$s-%2$s-%3$s Ecke fehlt! diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 5442baa6..64ffd129 100755 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -81,6 +81,7 @@ ¡Aún no se implementado el solucionador para este objeto y tamaño! ¡Hay que torcer una esquina! + ¡Hay que torcer una borde! ¡Hay que cambiar dos centros! ¡Falta el centro %1$s! ¡Falta la esquina %1$s-%2$s-%3$s! diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index fa897c09..33e66bca 100755 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -81,6 +81,7 @@ Solutionneur pour cet objet et cette taille non encore mis en place ! Un coin doit être tourné ! + Un bord doit être tourné ! Deux centres doivent être échangés ! Centre %1$s manquant ! Coin %1$s-%2$s-%3$s manquant ! diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 6f557f41..d84a0ccc 100755 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -82,6 +82,7 @@ このオブジェクトとサイズのソルバーはまだ実装されていません！ 1 つのコーナーをねじる必要があります。 + 片方の端をひねる必要がある! 2つのセンターを交換しなければならない! %1$sのセンターが欠けてる！ %1$s%2$s%3$sのコーナーがない! diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 5d8241ae..f39be6d2 100755 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -81,6 +81,7 @@ 아직 구현되지 않은 이 개체 및 크기에 대한 해결사! 한쪽 모서리를 비틀어야 합니다! + 한쪽 가장자리를 비틀어야 합니다! 두 개의 센터를 교환해야 합니다! %1$s 중앙이 사라졌습니다! %1$s-%2$s-%3$s 모서리 금지! diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 3f78dce7..1b9965f8 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -81,6 +81,7 @@ Rozwiązywacz takiego obiektu jest jeszcze nie zaimplementowany! Jeden z rogów musi byc obrócony! + Jedna z krawędzi musi byc obrócona! Dwa środki muszą być wymienione! Brakuje %1$s środka! Brakuje %1$s-%2$s-%3$s rogu! diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 627c781a..6a36b6ad 100755 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -81,6 +81,7 @@ Решебника для этого объекта и размера еще нет! Один угол должен быть переставлен! + Один край должен быть переставлен! Два центра должны быть обменены! Нет %1$s центра! Нет %1$s-%2$s-%3$s угла! diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 4c5f7b3d..93951b4d 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -87,6 +87,7 @@ 此对象和尺寸的求解器尚未实现！ 一个角需要扭动！ + 一条边需要扭动！ 必须要交换两个中心！ %1$s中心不見了！ 没有%1$s-%2$s-%3$s的角落! diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 5ffbde64..4d167066 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -81,6 +81,7 @@ 此對象和尺寸的求解器尚未實現！ 一個角需要扭動！ + 一個邊緣要扭動！ 兩個中鋒要互換！ %1$s的中心不见了！ 沒有%1$s-%2$s-%3$s的角落! diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3fb95896..78663e39 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -101,9 +101,11 @@ Solver for this object not implemented yet! One corner has to be twisted! + One edge has to be twisted! Two centers have to be exchanged! - The %1$s center missing! - The %1$s-%2$s-%3$s corner missing! + The %1$s center is missing! + The %1$s-%2$s-%3$s corner is missing! + The %1$s-%2$s edge is missing! Corners cannot be twisted so that all faces are monochromatic! There are only %1$d %2$s facelets. @@ -150,6 +152,13 @@ red orange + yellow + white + blue + green + red + orange + Kociemba 3x3 Solver Pyraminx Duo Solver Pyraminx Solver