commit ecf3f149c9b9d314cc66b5cebc85a7ef3c3d48f3 Author: Leszek Koltunski Date: Sun Aug 8 16:46:59 2021 +0200 Move the TwistyObject.retCubePosition() to the solver. diff --git a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java index d0c5442a..7eb65632 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedAbstract.java @@ -583,12 +583,4 @@ abstract class TwistyBandagedAbstract extends TwistyObject return true; } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// only needed for solvers - there are no Bandaged solvers ATM) - - public String retObjectString() - { - return ""; - } } diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index 91478c68..d824f456 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -374,132 +374,6 @@ class TwistyCube extends TwistyObject return true; } -/////////////////////////////////////////////////////////////////////////////////////////////////// -// order: Up --> Right --> Front --> Down --> Left --> Back -// (because the first implemented Solver - the two-phase Cube3 one - expects such order) -// -// Solved 3x3x3 Cube maps to "UUUUUUUUURRRRRRRRRFFFFFFFFFDDDDDDDDDLLLLLLLLLBBBBBBBBB" -// -// s : size of the cube; let index = a*s + b (i.e. a,b = row,column) -// -// Up : index --> b 6*s*s - 12*s + 7 - index -// Front : index --> if b==0 : s*s - 1 - index -// if b==s-1: 6*s*s -11*s +6 - index -// else -// a==0: s*s + s-1 + 4*(b-1)*(s-1) + 2*(s-2) + s -// else: s*s + s-1 + 4*(b-1)*(s-1) + 2*(s-1-a) -// Down : index --> b==0 ? (s-1-a) : s*s + s-1 + 4*(b-1)*(s-1) - a -// Left : index --> (s-1-a)*s + b -// Back : index --> if b==s-1: s*(s-1-a) -// if b==0 : 5*s*s -12*s + 8 + (s-1-a)*s -// else -// if a==s-1: s*s + 4*(s-2-b)*(s-1) -// else : s*s + 4*(s-2-b)*(s-1) + s + (s-2-a)*2 - - public String retObjectString() - { - StringBuilder objectString = new StringBuilder(); - int layers = getNumLayers(); - int len = layers*layers; - int cubitIndex, row, col, color,face; - - final int RIGHT= 0; - final int LEFT = 1; - final int UP = 2; - final int DOWN = 3; - final int FRONT= 4; - final int BACK = 5; - - // 'I' - interior, theoretically can happen - final char[] FACE_NAMES = { 'R', 'L', 'U', 'D', 'F', 'B', 'I'}; - - face = UP; - - for(int i=0; i Right --> Front --> Down --> Left --> Back +// (because the first implemented Solver - the two-phase Cube3 one - expects such order) +// +// Solved 3x3x3 Cube maps to "UUUUUUUUURRRRRRRRRFFFFFFFFFDDDDDDDDDLLLLLLLLLBBBBBBBBB" +// +// s : size of the cube; let index = a*s + b (i.e. a,b = row,column) +// +// Up : index --> b 6*s*s - 12*s + 7 - index +// Front : index --> if b==0 : s*s - 1 - index +// if b==s-1: 6*s*s -11*s +6 - index +// else +// a==0: s*s + s-1 + 4*(b-1)*(s-1) + 2*(s-2) + s +// else: s*s + s-1 + 4*(b-1)*(s-1) + 2*(s-1-a) +// Down : index --> b==0 ? (s-1-a) : s*s + s-1 + 4*(b-1)*(s-1) - a +// Left : index --> (s-1-a)*s + b +// Back : index --> if b==s-1: s*(s-1-a) +// if b==0 : 5*s*s -12*s + 8 + (s-1-a)*s +// else +// if a==s-1: s*s + 4*(s-2-b)*(s-1) +// else : s*s + 4*(s-2-b)*(s-1) + s + (s-2-a)*2 + + private String prepareCube3position() + { + StringBuilder objectString = new StringBuilder(); + int layers = mObject.getNumLayers(); + int len = layers*layers; + int cubitIndex, row, col, color,face; + + final int RIGHT= 0; + final int LEFT = 1; + final int UP = 2; + final int DOWN = 3; + final int FRONT= 4; + final int BACK = 5; + + // 'I' - interior, theoretically can happen + final char[] FACE_NAMES = { 'R', 'L', 'U', 'D', 'F', 'B', 'I'}; + + face = UP; + + for(int i=0; i