Revision e728219a
Added by Leszek Koltunski 11 days ago
| src/main/java/org/distorted/phasedsolver/SolverActivity.java | ||
|---|---|---|
| 26 | 26 |
import org.distorted.objectlib.algphases.PhaseCyclicPerm1; |
| 27 | 27 |
import org.distorted.objectlib.algphases.PhaseCyclicPerm2; |
| 28 | 28 |
import org.distorted.objectlib.algphases.PhaseNotCyclic; |
| 29 |
import org.distorted.objectlib.algphases.PhaseRegex; |
|
| 29 | 30 |
import org.distorted.objectlib.algsolvers.*; |
| 30 | 31 |
import org.distorted.objectlib.main.InitAssets; |
| 31 | 32 |
import org.distorted.objectlib.main.ObjectControl; |
| ... | ... | |
| 194 | 195 |
int yellowCrossQuat = 1; |
| 195 | 196 |
int yellowCornerCubit= 4; |
| 196 | 197 |
int yellowCornerQuat = 1; |
| 198 |
int[][] yellowCorners= new int[][]{ {4,5,6,7} };
|
|
| 199 |
String reg = "(3,8,5,6){-2,0,2} (11)";
|
|
| 200 |
String regex = reg+" "+reg+" "+reg+" "+reg; |
|
| 197 | 201 |
|
| 198 | 202 |
Phase[] phases = |
| 199 | 203 |
{
|
| ... | ... | |
| 203 | 207 |
new PhaseCyclicOrie1( so, yellowCrossCubit , yellowCrossQuat ), |
| 204 | 208 |
new PhaseCyclicPerm2( so, yellowCrossCubit , yellowCrossQuat ), |
| 205 | 209 |
new PhaseCyclicPerm1( so, yellowCornerCubit, yellowCornerQuat ), |
| 210 |
new PhaseRegex( so, regex, yellowCorners ) |
|
| 206 | 211 |
}; |
| 207 | 212 |
|
| 208 | 213 |
PhasedSolver ps = new PhasedSolver(so,phases); |
Also available in: Unified diff
3x3 beginner should 'mostly' work now (the 'perm of the LL corners' phase can still fail - we need to define appropriate PhaseRegex here)