Revision 5d99af6c
Added by Leszek Koltunski over 1 year ago
| src/main/java/org/distorted/solvers/SolverCube2.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebaseHelpers; |
| ... | ... | |
| 288 | 288 |
{
|
| 289 | 289 |
if( mSolver==null ) |
| 290 | 290 |
{
|
| 291 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.CUBE_2);
|
|
| 291 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.CUBE_2.name() );
|
|
| 292 | 292 |
} |
| 293 | 293 |
|
| 294 | 294 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverCuboid232.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebaseHelpers; |
| ... | ... | |
| 409 | 409 |
{
|
| 410 | 410 |
if( mSolver==null ) |
| 411 | 411 |
{
|
| 412 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.CU_232);
|
|
| 412 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.CU_232.name() );
|
|
| 413 | 413 |
} |
| 414 | 414 |
|
| 415 | 415 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverCuboid323.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TBCuboid323; |
| ... | ... | |
| 446 | 446 |
{
|
| 447 | 447 |
if( mSolver==null ) |
| 448 | 448 |
{
|
| 449 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.CU_323); |
|
| 450 |
//mSolver = ImplementedTablebasesList.createUnpacked(ObjectSignatures.CU_323); |
|
| 451 |
//if( mSolver!=null ) mSolver.createTablebase(1); |
|
| 449 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.CU_323.name() ); |
|
| 452 | 450 |
} |
| 453 | 451 |
|
| 454 | 452 |
((TBCuboid323)mSolver).initialize(); |
| src/main/java/org/distorted/solvers/SolverDino4.java | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
import org.distorted.main.R; |
| 17 | 17 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 18 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 18 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 19 | 19 |
import org.distorted.objectlib.main.TwistyObject; |
| 20 | 20 |
import org.distorted.objectlib.shape.ShapeHexahedron; |
| 21 | 21 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| ... | ... | |
| 177 | 177 |
{
|
| 178 | 178 |
if( mSolver==null ) |
| 179 | 179 |
{
|
| 180 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.DIN4_3);
|
|
| 180 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DIN4_3.name() );
|
|
| 181 | 181 |
} |
| 182 | 182 |
|
| 183 | 183 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverDino6.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TBDino6; |
| ... | ... | |
| 442 | 442 |
{
|
| 443 | 443 |
if( mSolver==null ) |
| 444 | 444 |
{
|
| 445 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.DINO_3);
|
|
| 445 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DINO_3.name() );
|
|
| 446 | 446 |
} |
| 447 | 447 |
|
| 448 | 448 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverIvyCube.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebaseHelpers; |
| ... | ... | |
| 245 | 245 |
{
|
| 246 | 246 |
if( mSolver==null ) |
| 247 | 247 |
{
|
| 248 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.IVY_2);
|
|
| 248 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.IVY_2.name() );
|
|
| 249 | 249 |
} |
| 250 | 250 |
|
| 251 | 251 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverJing.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TBPyraminx; |
| ... | ... | |
| 527 | 527 |
{
|
| 528 | 528 |
if( mSolver==null ) |
| 529 | 529 |
{
|
| 530 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.JING_2);
|
|
| 530 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.JING_2.name());
|
|
| 531 | 531 |
} |
| 532 | 532 |
|
| 533 | 533 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverPyraminx.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebaseHelpers; |
| ... | ... | |
| 540 | 540 |
{
|
| 541 | 541 |
if( mSolver==null ) |
| 542 | 542 |
{
|
| 543 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.PYRA_3);
|
|
| 543 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.PYRA_3.name());
|
|
| 544 | 544 |
} |
| 545 | 545 |
|
| 546 | 546 |
return mSolver!=null ? mSolver.solution(index,mCornerTwist,os) : null; |
| src/main/java/org/distorted/solvers/SolverPyraminxDiamond.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebaseHelpers; |
| ... | ... | |
| 366 | 366 |
{
|
| 367 | 367 |
if( mSolver==null ) |
| 368 | 368 |
{
|
| 369 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.PDIA_3);
|
|
| 369 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.PDIA_3.name() );
|
|
| 370 | 370 |
} |
| 371 | 371 |
|
| 372 | 372 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverPyraminxDuo.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebasesAbstract; |
| ... | ... | |
| 290 | 290 |
{
|
| 291 | 291 |
if( mSolver==null ) |
| 292 | 292 |
{
|
| 293 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.PDUO_2);
|
|
| 293 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.PDUO_2.name() );
|
|
| 294 | 294 |
} |
| 295 | 295 |
|
| 296 | 296 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverSkewb.java | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
import org.distorted.main.R; |
| 17 | 17 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 18 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 18 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 19 | 19 |
import org.distorted.objectlib.main.TwistyObject; |
| 20 | 20 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 21 | 21 |
import org.distorted.objectlib.tablebases.TBSkewb; |
| ... | ... | |
| 389 | 389 |
{
|
| 390 | 390 |
if( mSolver==null ) |
| 391 | 391 |
{
|
| 392 |
mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.SKEW_2);
|
|
| 392 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.SKEW_2.name() );
|
|
| 393 | 393 |
} |
| 394 | 394 |
|
| 395 | 395 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
| src/main/java/org/distorted/solvers/SolverSkewbDiamond.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import org.distorted.main.R; |
| 15 | 15 |
import org.distorted.objectlib.helpers.OperatingSystemInterface; |
| 16 |
import org.distorted.objectlib.main.ObjectSignatures;
|
|
| 16 |
import org.distorted.objectlib.main.ObjectType;
|
|
| 17 | 17 |
import org.distorted.objectlib.main.TwistyObject; |
| 18 | 18 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
| 19 | 19 |
import org.distorted.objectlib.tablebases.TablebaseHelpers; |
| ... | ... | |
| 503 | 503 |
{
|
| 504 | 504 |
if( mSolver==null ) |
| 505 | 505 |
{
|
| 506 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.DIAM_2);
|
|
| 506 |
mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DIAM_2.name());
|
|
| 507 | 507 |
} |
| 508 | 508 |
|
| 509 | 509 |
return mSolver!=null ? mSolver.solution(index,null,os) : null; |
Also available in: Unified diff
Jings: further corrections.