/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision 277401c0

Pyraminx Duo solver: solutions (coming from unpacked DB recreated each time) seem to be working.

         mMovesText.setText(act.getString(R.string.mo_placeholder,mCurrMove,mNumMoves));
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setupMoves(final RubikActivity act, int[][] moves)
+        {
         mCanRotate= true;
         mCurrMove = 0;
         mNumMoves = moves==null ? 0 : moves.length;
         mMoves    = moves;
         mMovesText.setText(act.getString(R.string.mo_placeholder,mCurrMove,mNumMoves));
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void savePreferences(SharedPreferences.Editor editor)

+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void setSolved(final int[][] moves)
+        {
         mSolving = false;
         final RubikActivity act = mWeakAct.get();
         if( act!=null )
+          {
           act.runOnUiThread(new Runnable()
+            {
             @Override
             public void run()
+              {
               ScreenList.switchScreen(act, ScreenList.SOLU);
               RubikScreenSolution solution = (RubikScreenSolution) ScreenList.SOLU.getScreenClass();
               solution.setupMoves(act, moves);
+              }
             });
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void displayErrorDialog(String message)

src/main/java/org/distorted/solvers/SolverPyraminxDuo.java
34	34
35	35	private static final int ERROR_CORNERS_CANNOT = -11;
36	36
37
38	37	///////////////////////////////////////////////////////////////////////////////////////////////////
39	38
40	39	private boolean cornerEqual(int[] corner, int c1, int c2, int c3)
...	...
281	280
282	281	///////////////////////////////////////////////////////////////////////////////////////////////////
283	282
284		public String solution(int index, Resources res)
	283	public int[][] solution(int index, Resources res)
285	284	{
286	285	TablebasesPyraminxDuo tb = new TablebasesPyraminxDuo();
287	286	tb.createTablebase();
288
289		return "";
	287	return tb.solution(index);
290	288	}
291	289	}
292	290

src/main/java/org/distorted/solvers/SolverTablebase.java
25	25
26	26	public abstract int tablebaseIndex(TwistyObject object);
27	27	public abstract String error(int index, Resources res);
28		public abstract String solution(int index, Resources res);
	28	public abstract int[][] solution(int index, Resources res);
29	29
30	30	///////////////////////////////////////////////////////////////////////////////////////////////////
31	31	// PUBLIC API
...	...
39	39
40	40	///////////////////////////////////////////////////////////////////////////////////////////////////
41	41
42		public void solve(RubikScreenSolver solver)
	42	public void solve(RubikScreenSolver screen)
43	43	{
44		String result;
45
46	44	int index = tablebaseIndex(mObject);
47	45
48	46	if( index>=0 )
49	47	{
50		result = solution(index,mRes);
51		solver.setSolved(result);
	48	int[][] moves = solution(index,mRes);
	49	screen.setSolved(moves);
52	50	}
53	51	else
54	52	{
55	53	String error = error(index,mRes);
56		solver.displayErrorDialog(error);
	54	screen.displayErrorDialog(error);
57	55	}
58	56	}
59	57	}

Also available in: Unified diff