Project

General

Profile

« Previous | Next » 

Revision 4f144873

Added by Leszek Koltunski 11 months ago

Progress with PhasedSolver.
Turns out 3x3 beginner phase 3 can still fail.

View differences:

src/main/java/org/distorted/phasedsolver/SolverActivity.java
23 23 
import org.distorted.library.type.Static3D;
24 24 
import org.distorted.objectlib.algphases.Phase;
25 25 
import org.distorted.objectlib.algphases.PhaseCyclicOrie1;
26 
import org.distorted.objectlib.algphases.PhaseCyclicPerm1;
27 26 
import org.distorted.objectlib.algphases.PhaseCyclicPerm2;
28 27 
import org.distorted.objectlib.algphases.PhaseNotCyclic;
29 28 
import org.distorted.objectlib.algphases.PhaseRegex;
......
193 192 
      int[][] secondLayer  = new int[][]{ {8},{9},{10},{11} };
194 193 
      int yellowCrossCubit = 14;
195 194 
      int yellowCrossQuat  = 1;
196 
      int yellowCornerCubit= 4;
197 
      int yellowCornerQuat = 1;
198 195 
      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;
196 
      String partA = "(5,6,3,9,5,8,3,11)";
197 
      String partB = "(5,12,3,15,5,14,3,17)";
198 
      String partC = "(5,11,3,8,5,9,3,6)";
199 
      String regex1 = "["+partA+"{-1,0,1};"+partB+"] "+partC+"{-1,0,1}";
200 
      String part = "(3,8,5,6){-2,0,2} (11)";
201 
      String regex2 = part+" "+part+" "+part+" "+part;
202 
      String regex = regex1+" "+regex2;
201 203 

  		




  202
  204
  
    
      Phase[] phases =


  		




  203
  205
  
    
              {


  		




  ......




  206
  208
  
    
                new PhaseNotCyclic( secondLayer),


  		




  207
  209
  
    
                new PhaseCyclicOrie1( so, yellowCrossCubit , yellowCrossQuat ),


  		




  208
  210
  
    
                new PhaseCyclicPerm2( so, yellowCrossCubit , yellowCrossQuat ),


  		




  209
  
  
    
                new PhaseCyclicPerm1( so, yellowCornerCubit, yellowCornerQuat ),


  		




  210
  
  
    
                new PhaseRegex( so, regex, yellowCorners )


  		




  
  211
  
    
                new PhaseRegex( so, regex, yellowCorners ),


  		




  211
  212
  
    
              };


  		




  212
  213
  
    

  		




  213
  214
  
    
      PhasedSolver ps = new PhasedSolver(so,phases);


  		












Also available in:  Unified diff