commit c02544211f1123131fad52cef892c1a0363320e4 Author: Leszek Koltunski Date: Wed Mar 24 22:00:43 2021 +0100 Automatic scrambling of the Evil Cube works! diff --git a/src/main/java/org/distorted/bandaged/BandagedState.java b/src/main/java/org/distorted/bandaged/BandagedState.java new file mode 100644 index 00000000..64838182 --- /dev/null +++ b/src/main/java/org/distorted/bandaged/BandagedState.java @@ -0,0 +1,116 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2021 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.bandaged; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class BandagedState +{ + private final int mNumX, mNumY, mNumZ; + private final int[] mInfo; + private final int[] mTmp; + private final int LEN = 4; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public BandagedState(int[] x, int[] y, int[] z) + { + mTmp = new int[LEN]; + + mNumX = x==null ? 0 : x.length/(LEN-1); + mNumY = y==null ? 0 : y.length/(LEN-1); + mNumZ = z==null ? 0 : z.length/(LEN-1); + + mInfo = new int[LEN*(mNumX+mNumY+mNumZ)]; + int start = 0; + + for(int i=0; i. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.bandaged; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +import java.util.ArrayList; + +public class BandagedStateGraph +{ + private static final int CORNER_S = 0; + private static final int CORNER_X = 1; + private static final int CORNER_Y = 2; + private static final int CORNER_Z = 3; + + private static final int CENTER_0 = 0; + private static final int CENTER_1 = 1; + private static final int CENTER_2 = 2; + private static final int CENTER_3 = 3; + + private int mID; + private final int[] mMoves; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public BandagedStateGraph(int id) + { + mID = id; + mMoves = createMoves(mID); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static void computeGraph() + { + ArrayList graph; + + int id = 0; + int id1 = setCenter(id , CENTER_2, 0); + int id2 = setCenter(id1 , CENTER_2, 1); + int id3 = setCenter(id2 , CENTER_3, 2); + int id4 = setCenter(id3 , CENTER_2, 3); + + int id5 = setCorner(id4 , CORNER_X, 0); + int id6 = setCorner(id5 , CORNER_Y, 1); + int id7 = setCorner(id6 , CORNER_X, 2); + int id8 = setCorner(id7 , CORNER_Z, 3); + int id9 = setCorner(id8 , CORNER_Y, 4); + int id10= setCorner(id9 , CORNER_Y, 5); + int id11= setCorner(id10, CORNER_S, 6); + int id12= setCorner(id11, CORNER_Z, 7); + + BandagedStateGraph bsg = new BandagedStateGraph(id12); + graph = new ArrayList<>(); + graph.add(bsg); + + insertChildren(graph,id12); + pruneGraph(graph); + remapGraph(graph); + + int num = graph.size(); + android.util.Log.e("D", "\n"+num+" states\n"); + + for(int i=0; i list, int id) + { + BandagedStateGraph bsg = findState(list,id); + + if( bsg==null ) + { + android.util.Log.e("D", "error: "+id+" doesn't exist"); + return; + } + + for(int i=0; i<12; i++) + { + int move = bsg.getMove(i); + + if( move!=0 ) + { + BandagedStateGraph tmp = findState(list,move); + + if( tmp==null ) + { + tmp = new BandagedStateGraph(move); + list.add(tmp); + insertChildren(list,move); + } + } + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static void pruneGraph(ArrayList list) + { + int num = list.size(), numAxis; + boolean pruned = false; + BandagedStateGraph bsg; + + for(int i=0; i list) + { + int id, num = list.size(); + BandagedStateGraph bsg; + + for(int i=0; i list, int id, int newId) + { + BandagedStateGraph bsg; + int size = list.size(); + + for(int i=0; i list, int id) + { + BandagedStateGraph bsg; + int num = list.size(); + + for(int i=0; i=0 && index<12) ? mMoves[index] : -1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private int numAxis() + { + int num = 0; + + if( mMoves[ 0]!=0 || mMoves[ 1]!=0 || mMoves[ 2]!=0 ) num++; + if( mMoves[ 3]!=0 || mMoves[ 4]!=0 || mMoves[ 5]!=0 ) num++; + if( mMoves[ 6]!=0 || mMoves[ 7]!=0 || mMoves[ 8]!=0 ) num++; + if( mMoves[ 9]!=0 || mMoves[10]!=0 || mMoves[11]!=0 ) num++; + + return num; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setMove(int index, int newMove) + { + if( index>=0 && index<12 ) mMoves[index] = newMove; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static String debug(int id) + { + int ce0 = getCenter(id,0); + int ce1 = getCenter(id,1); + int ce2 = getCenter(id,2); + int ce3 = getCenter(id,3); + + int co0 = getCorner(id,0); + int co1 = getCorner(id,1); + int co2 = getCorner(id,2); + int co3 = getCorner(id,3); + int co4 = getCorner(id,4); + int co5 = getCorner(id,5); + int co6 = getCorner(id,6); + int co7 = getCorner(id,7); + + String center = centerString(ce0) + centerString(ce1) + centerString(ce2) + centerString(ce3); + String corner = cornerString(co0) + cornerString(co1) + cornerString(co2) + cornerString(co3) + + cornerString(co4) + cornerString(co5) + cornerString(co6) + cornerString(co7); + + return center + " -" + corner; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static String centerString(int center) + { + return " "+center; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static String cornerString(int corner) + { + switch(corner) + { + case CORNER_S: return " S"; + case CORNER_X: return " X"; + case CORNER_Y: return " Y"; + case CORNER_Z: return " Z"; + } + + return "?"; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int[] createMoves(int id) + { + int[] ret = new int[12]; + + boolean moveX = xPossible(id); + boolean moveY = yPossible(id); + boolean moveZ0 = z0Possible(id); + boolean moveZ2 = z2Possible(id); + + if( moveX ) createXmoves(id,ret); + else { ret[ 0] = 0; ret[ 1] = 0; ret[ 2] = 0; } + if( moveY ) createYmoves(id,ret); + else { ret[ 3] = 0; ret[ 4] = 0; ret[ 5] = 0; } + if( moveZ0) createZ0moves(id,ret); + else { ret[ 6] = 0; ret[ 7] = 0; ret[ 8] = 0; } + if( moveZ2) createZ2moves(id,ret); + else { ret[ 9] = 0; ret[10] = 0; ret[11] = 0; } + + return ret; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static boolean xPossible(int id) + { + if( getCorner(id,4)==CORNER_X ) return false; + if( getCorner(id,5)==CORNER_X ) return false; + if( getCorner(id,6)==CORNER_X ) return false; + if( getCorner(id,7)==CORNER_X ) return false; + + if( getCenter(id,1)==CENTER_1 ) return false; + if( getCenter(id,2)==CENTER_1 ) return false; + if( getCenter(id,3)==CENTER_1 ) return false; + + return true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static boolean yPossible(int id) + { + if( getCorner(id,2)==CORNER_Y ) return false; + if( getCorner(id,3)==CORNER_Y ) return false; + if( getCorner(id,6)==CORNER_Y ) return false; + if( getCorner(id,7)==CORNER_Y ) return false; + + if( getCenter(id,0)==CENTER_0 ) return false; + if( getCenter(id,2)==CENTER_0 ) return false; + if( getCenter(id,3)==CENTER_0 ) return false; + + return true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static boolean z0Possible(int id) + { + if( getCorner(id,0)==CORNER_Z ) return false; + if( getCorner(id,2)==CORNER_Z ) return false; + if( getCorner(id,4)==CORNER_Z ) return false; + if( getCorner(id,6)==CORNER_Z ) return false; + + if( getCenter(id,0)==CENTER_1 ) return false; + if( getCenter(id,1)==CENTER_0 ) return false; + + return true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static boolean z2Possible(int id) + { + if( getCorner(id,1)==CORNER_Z ) return false; + if( getCorner(id,3)==CORNER_Z ) return false; + if( getCorner(id,5)==CORNER_Z ) return false; + if( getCorner(id,7)==CORNER_Z ) return false; + + if( getCenter(id,0)==CENTER_3 ) return false; + if( getCenter(id,1)==CENTER_2 ) return false; + + return true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int getCorner(int id, int index) + { + return (id>>(14-2*index))&3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int getCenter(int id, int index) + { + return (id>>(22-2*index))&3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int setCorner(int id, int corner, int index) + { + return id + ((corner-getCorner(id,index))<<(14-2*index)); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int setCenter(int id, int center, int index) + { + return id + ((center-getCenter(id,index))<<(22-2*index)); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static void createXmoves(int id, int[] moves) + { + int id1 = rotateX(id); + moves[0] = id1; + int id2 = rotateX(id1); + moves[1] = id2; + int id3 = rotateX(id2); + moves[2] = id3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static void createYmoves(int id, int[] moves) + { + int id1 = rotateY(id); + moves[3] = id1; + int id2 = rotateY(id1); + moves[4] = id2; + int id3 = rotateY(id2); + moves[5] = id3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static void createZ0moves(int id, int[] moves) + { + int id1 = rotateZ0(id); + moves[6] = id1; + int id2 = rotateZ0(id1); + moves[7] = id2; + int id3 = rotateZ0(id2); + moves[8] = id3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static void createZ2moves(int id, int[] moves) + { + int id1 = rotateZ2(id); + moves[ 9] = id1; + int id2 = rotateZ2(id1); + moves[10] = id2; + int id3 = rotateZ2(id2); + moves[11] = id3; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotateX(int id) + { + int newCorner4 = rotCornerX(getCorner(id,5)); + int newCorner5 = rotCornerX(getCorner(id,7)); + int newCorner6 = rotCornerX(getCorner(id,4)); + int newCorner7 = rotCornerX(getCorner(id,6)); + int newCenter = rotCenter (getCenter(id,0)); + + int id1 = setCorner(id ,newCorner4,4); + int id2 = setCorner(id1,newCorner5,5); + int id3 = setCorner(id2,newCorner6,6); + int id4 = setCorner(id3,newCorner7,7); + int id5 = setCenter(id4,newCenter ,0); + + return id5; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotateY(int id) + { + int newCorner2 = rotCornerY(getCorner(id,6)); + int newCorner3 = rotCornerY(getCorner(id,2)); + int newCorner6 = rotCornerY(getCorner(id,7)); + int newCorner7 = rotCornerY(getCorner(id,3)); + int newCenter = rotCenter (getCenter(id,1)); + + int id1 = setCorner(id ,newCorner2,2); + int id2 = setCorner(id1,newCorner3,3); + int id3 = setCorner(id2,newCorner6,6); + int id4 = setCorner(id3,newCorner7,7); + int id5 = setCenter(id4,newCenter ,1); + + return id5; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotateZ0(int id) + { + int newCorner0 = rotCornerZ(getCorner(id,2)); + int newCorner2 = rotCornerZ(getCorner(id,6)); + int newCorner4 = rotCornerZ(getCorner(id,0)); + int newCorner6 = rotCornerZ(getCorner(id,4)); + int newCenter = rotCenter (getCenter(id,2)); + + int id1 = setCorner(id ,newCorner0,0); + int id2 = setCorner(id1,newCorner2,2); + int id3 = setCorner(id2,newCorner4,4); + int id4 = setCorner(id3,newCorner6,6); + int id5 = setCenter(id4,newCenter ,2); + + return id5; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotateZ2(int id) + { + int newCorner1 = rotCornerZ(getCorner(id,3)); + int newCorner3 = rotCornerZ(getCorner(id,7)); + int newCorner5 = rotCornerZ(getCorner(id,1)); + int newCorner7 = rotCornerZ(getCorner(id,5)); + int newCenter = rotCenter (getCenter(id,3)); + + int id1 = setCorner(id ,newCorner1,1); + int id2 = setCorner(id1,newCorner3,3); + int id3 = setCorner(id2,newCorner5,5); + int id4 = setCorner(id3,newCorner7,7); + int id5 = setCenter(id4,newCenter ,3); + + return id5; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotCornerX(int corner) + { + switch(corner) + { + case CORNER_S: return CORNER_S; + case CORNER_X: android.util.Log.e("DIST", "rotateX: ERROR"); + return CORNER_S; + case CORNER_Y: return CORNER_Z; + case CORNER_Z: return CORNER_Y; + } + + return CORNER_S; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotCornerY(int corner) + { + switch(corner) + { + case CORNER_S: return CORNER_S; + case CORNER_X: return CORNER_Z; + case CORNER_Y: android.util.Log.e("DIST", "rotateY: ERROR"); + return CORNER_S; + case CORNER_Z: return CORNER_X; + } + + return CORNER_S; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotCornerZ(int corner) + { + switch(corner) + { + case CORNER_S: return CORNER_S; + case CORNER_X: return CORNER_Y; + case CORNER_Y: return CORNER_X; + case CORNER_Z: android.util.Log.e("DIST", "rotateZ: ERROR"); + return CORNER_S; + } + + return CORNER_S; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private static int rotCenter(int center) + { + switch(center) + { + case CENTER_0: return CENTER_3; + case CENTER_1: return CENTER_0; + case CENTER_2: return CENTER_1; + case CENTER_3: return CENTER_2; + } + + return CENTER_0; + } +} diff --git a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java index cf337357..fde5f544 100644 --- a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java +++ b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java @@ -25,6 +25,7 @@ import org.distorted.library.main.DistortedEffects; import org.distorted.library.main.DistortedTexture; import org.distorted.library.mesh.MeshSquare; import org.distorted.library.type.Static4D; +import org.distorted.bandaged.BandagedState; import org.distorted.main.R; import java.util.Random; @@ -38,92 +39,6 @@ class TwistyBandaged3Plate extends TwistyBandagedAbstract private boolean mUseY; private boolean mUseZ; - private static class State - { - private final int mNumX, mNumY, mNumZ; - private final int[] mInfo; - private final int[] mTmp; - private final int LEN = 4; - - State(int[] x, int[] y, int[] z) - { - mTmp = new int[LEN]; - - mNumX = x==null ? 0 : x.length/(LEN-1); - mNumY = y==null ? 0 : y.length/(LEN-1); - mNumZ = z==null ? 0 : z.length/(LEN-1); - - mInfo = new int[LEN*(mNumX+mNumY+mNumZ)]; - int start = 0; - - for(int i=0; i=scramble[num-1][0] ? newVector+1 : newVector); + mCurrState = 0; + mUseX = true; + mUseY = true; + mUseZ = true; } - float rowFloat = rnd.nextFloat(); + int total = mStates[mCurrState].getTotal(mUseX,mUseY,mUseZ); + int random= rnd.nextInt(total); + int[] info= mStates[mCurrState].getInfo(random,mUseX,mUseY,mUseZ); - for(int row=0; row "+info[3]); } ///////////////////////////////////////////////////////////////////////////////////////////////////