/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 5cf34c5f

Added by Leszek Koltunski over 4 years ago

ID 5cf34c5f047228b50270a6cb2bb979c8644b59c0
Parent 4e248bcc
Child ca445c23

Make chances to randimoze a given row when scrambling dependant on the type of Object.

The point: in case of the Cube, all rows should have equal chances. In case of the Pyraminx, the smaller the row, the smaller the chance should be. In particular the trivial 4 corners of the tetraherdon should have a very small chance to be selected.

       private RubikObject mObject;
       private int mNumAxis;
       private int mBasicAngle;
       private int mSize;
       private float[] mRowChances;
       Effect[] mNodeEffects;
       int[] mNodeEffectPosition;
-...
             mLastVector = (newVector>=mLastVector ? newVector+1 : newVector);
+            }
           int rowBitmap  = (1<<mRnd.nextInt(mSize));
           int row=0;
           float rowFloat = mRnd.nextFloat();
           for(int i=0; i<mRowChances.length; i++)
+            {
             if( rowFloat<=mRowChances[i] )
+              {
               row=i;
               break;
+              }
+            }
           int rowBitmap  = (1<<row);
           int angle= randomizeAngle();
           int absAngle = (angle<0 ? -angle : angle);
           long durationMillis =  absAngle*mDurationSingleTurn;
           long durationMillis = absAngle*mDurationSingleTurn;
           mNumScramblesLeft--;
           if( absAngle==2 ) mNumDoubleScramblesLeft--;
-...
+        {
         mObject     = post.getObject();
         mPostRender = post;
         mRowChances = mObject.getRowChances();
         mObject.solve();
         mNumAxis    = mObject.getRotationAxis().length;
         mBasicAngle = mObject.getBasicAngle();
         mSize       = mObject.getSize();
         int numScrambles = post.getNumScrambles();
         int dura = (int)(duration*Math.pow(numScrambles,0.6f));

         return getSize();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float[] getRowChances()
+        {
         int size = getSize();
         float[] chances = new float[size];
         for(int i=0; i<size; i++)
+          {
           chances[i] = (i+1.0f) / size;
+          }
         return chances;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float returnRotationFactor(float offset)
-...
           objectString.append(FACE_NAMES[color]);
+          }
         // android.util.Log.e("cube", "string: "+objectString.toString());
         return objectString.toString();
+        }
+    }

src/main/java/org/distorted/objects/RubikObject.java
588	588	public abstract float returnMultiplier();
589	589	public abstract float returnRotationFactor(float offset);
590	590	public abstract String retObjectString();
	591	public abstract float[] getRowChances();
591	592	}

         return getSize()/(SQ3/2);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float[] getRowChances()
+        {
         int size = getSize();
         int total = size*(size+1)/2;
         float running=0.0f;
         float[] chances = new float[size];
         for(int i=0; i<size; i++)
+          {
           running += (size-i);
           chances[i] = running / total;
+          }
         return chances;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public float returnRotationFactor(float offset)

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision 5cf34c5f

Added by Leszek Koltunski over 4 years ago