Revision 9613f9d9
Added by Leszek Koltunski 2 days ago
src/main/java/org/distorted/phasedsolver/SolverActivity.java | ||
---|---|---|
207 | 207 |
int[][] whiteCorners = new int[][]{ {0},{1},{2},{3} }; |
208 | 208 |
int[][] secondLayer = new int[][]{ {8},{9},{10},{11} }; |
209 | 209 |
|
210 |
int[][] yellowEdges = new int[][]{ {14,15,18,19} }; |
|
211 |
String lleoA = "(11,17,5,15,3,9)"; |
|
212 |
String lleoB = "(17,6,5,8,3,15)"; |
|
213 |
String lleoC = "(6,12,5,14,3,8)"; |
|
214 |
String lleoD = "(12,11,5,9,3,14)"; |
|
215 |
String llEdgesOrie = lleoA+"{0,1,2} "+lleoB+"{0,1,2} "+lleoC+"{0,1,2} "+lleoD+"{0,1,2}"; |
|
216 |
String llepA = "(6,5,8,5,6,4,8)"; |
|
217 |
String llepB = "(12,5,14,5,12,4,14)"; |
|
218 |
String llepC = "(11,5,9,5,11,4,9)"; |
|
219 |
String llEdgesPerm = "(3){0,1} ["+llepA+"{-1,0,1};"+llepB+"] "+llepC+"{-1,0,1}"; |
|
220 |
String llEdges = llEdgesOrie+" "+llEdgesPerm; |
|
221 |
|
|
222 |
int[][] yellowCorners= new int[][]{ {4,5,6,7} }; |
|
223 |
String llcpA = "(5,6,3,9,5,8,3,11)"; |
|
224 |
String llcpB = "(5,12,3,15,5,14,3,17)"; |
|
225 |
String llcpC = "(5,11,3,8,5,9,3,6)"; |
|
226 |
String llCornersPerm = "["+llcpA+"{-1,0,1};"+llcpB+"] "+llcpC+"{-1,0,1}"; |
|
227 |
String llco = "(3,8,5,6){-2,0,2} (11)"; |
|
228 |
String llCornersOrie = llco+" "+llco+" "+llco+" "+llco; |
|
229 |
String llCorners = llCornersPerm+" "+llCornersOrie; |
|
210 |
int[][] algsSecondL = { { 6, 3, 8, 3,15, 5,17}, {15, 5,17, 5, 6, 3, 8}, |
|
211 |
{12, 3,14, 3, 8, 5, 6}, { 8, 5, 6, 5,12, 3,14}, |
|
212 |
{11, 3, 9, 3,14, 5,12}, {14, 5,12, 5,11, 3, 9}, |
|
213 |
{17, 3,15, 3, 9, 5,11}, { 9, 5,11, 5,17, 3,15}, |
|
214 |
{3} |
|
215 |
}; |
|
230 | 216 |
|
231 | 217 |
int[][] algsEdgeOrie = { {11,17,5,15,3,9},{3} }; |
232 | 218 |
int[][] algsEdgePerm = { {6,5,8,5,6,4,8},{3} }; |
... | ... | |
235 | 221 |
|
236 | 222 |
int[][] moveTable = mObject.getMoveTable(); |
237 | 223 |
MoveProviderAll all = new MoveProviderAll(moveTable); |
224 |
MoveProviderAlgs asl = new MoveProviderAlgs(algsSecondL); |
|
238 | 225 |
MoveProviderAlgs aeO = new MoveProviderAlgs(algsEdgeOrie); |
239 | 226 |
MoveProviderAlgs aeP = new MoveProviderAlgs(algsEdgePerm); |
240 | 227 |
MoveProviderAlgs acP = new MoveProviderAlgs(algsCornPerm); |
... | ... | |
252 | 239 |
{ |
253 | 240 |
new PhaseMitm( mObject, all, wcr), |
254 | 241 |
new PhaseMitm( mObject, all, wco), |
255 |
new PhaseMitm( mObject, all, sla),
|
|
242 |
new PhaseMitm( mObject, asl, sla),
|
|
256 | 243 |
new PhaseMitm( mObject, aeO, oll), |
257 | 244 |
new PhaseMitm( mObject, aeP, pll), |
258 | 245 |
new PhaseMitm( mObject, acP, pcl), |
Also available in: Unified diff
Still some fixes.