Revision ddd51b3d
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/solvers/SolverCuboid232.java | ||
|---|---|---|
| 182 | 182 |
|
| 183 | 183 |
for(int c=0; c<8; c++) |
| 184 | 184 |
{
|
| 185 |
if( !found3 && corners[c][1]==mFaceColors[4] ) |
|
| 185 |
if( !found3 && corners[c][1]==mFaceColors[4] && corners[c][2]==mFaceColors[1] )
|
|
| 186 | 186 |
{
|
| 187 | 187 |
found3=true; |
| 188 | 188 |
mFaceColors[3] = corners[c][0]; |
| 189 | 189 |
} |
| 190 |
if( !found2 && corners[c][2]==mFaceColors[4] ) |
|
| 190 |
if( !found2 && corners[c][1]==mFaceColors[1] && corners[c][2]==mFaceColors[4] )
|
|
| 191 | 191 |
{
|
| 192 | 192 |
found2=true; |
| 193 | 193 |
mFaceColors[2] = corners[c][0]; |
| ... | ... | |
| 211 | 211 |
|
| 212 | 212 |
ret[0] = perm[0]; |
| 213 | 213 |
ret[1] = perm[2]; |
| 214 |
ret[3] = perm[3];
|
|
| 214 |
ret[2] = perm[3];
|
|
| 215 | 215 |
|
| 216 | 216 |
if( ret[0]>1 ) ret[0]--; |
| 217 | 217 |
if( ret[1]>1 ) ret[1]--; |
| ... | ... | |
| 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 |
} |
|
| 294 | 300 |
|
| 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 |
*/ |
|
| 295 | 311 |
return edge_perm_num + 6*corner_perm_num; |
| 296 | 312 |
} |
| 297 | 313 |
|
Also available in: Unified diff
CU_232 solver: filtering the position should work now