diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2024-12-07 16:38:40 +0100 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2024-12-07 16:38:40 +0100 |
| commit | 9ac266c76f39620d8343e46ca41cb09d1534384c (patch) | |
| tree | 823bd419d99fe0f00e6b5b713237a73b4ec7ffca /test/130_allowednext_h48 | |
| parent | ea25a7ccad625c4e664dfd114147971b8a2677f3 (diff) | |
| download | nissy-core-9ac266c76f39620d8343e46ca41cb09d1534384c.tar.gz nissy-core-9ac266c76f39620d8343e46ca41cb09d1534384c.zip | |
Merge the "solver-experiments" branch that I have been working on for
a few weeks. This include mainly three things:
1. Various tweaks for a total performance gain of around 30%.
2. Take into account symmetries and avoid repeated work. This
required a re-work of the splitting into tasks before the solve.
3. Add a second fallback table (eoesep). This gives huge performance
gains for particular scrambles (e.g. superflip).
After merging this commit, remove and re-generate all pruning tables.
Squashed commit of the following:
commit 60f0705d2d69050e6a30581a2810f686d6f69b80
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Sat Dec 7 16:06:48 2024 +0100
Fix indentation
commit cc5d489a251812b6188c0ba264ac6cb2236f1afe
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Sat Dec 7 15:56:19 2024 +0100
Updated documentation
commit a3f605dd628546e52564f82b139feb473b0725f3
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Sat Dec 7 14:01:11 2024 +0100
use eoesep table as second fallback
commit c75e43c9116c64f97e92b0fe038be8a032925a72
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Fri Dec 6 16:13:23 2024 +0100
First commit for gendata_eoesep
commit fea7688ab8bdc5ae0c3480622e2510a3bcd39248
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Dec 3 17:31:00 2024 +0100
Add scramble to tool
commit 66866cb71dea4ca8278ecb9e90ff4295771feb42
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Dec 3 17:22:59 2024 +0100
Added tool to check multiple solutions
commit ef65611c772c3996bddca8d181da3538e0af1674
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Dec 3 17:16:20 2024 +0100
Write all solutions for symmetric positions
commit e3ded26db7d7d4ae7c0e2488151ed14f581f7b8e
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Nov 26 09:14:54 2024 +0100
Added symmetry filter (TODO: print excluded solutions)
commit 864c437a9751c58d58562650ca9eba4a9e6ad3eb
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Mon Nov 25 14:51:13 2024 +0100
Improved task split
commit b88926d36d7ab0c64c5fe3bb954fd15d41267fba
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Fri Nov 22 19:06:41 2024 +0100
Reworked tasks for multi-threading in view of symmetry filter
commit 26fa653f97df8cd601aecb80eaf89f0a00e9ba9f
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Thu Oct 31 15:37:43 2024 +0100
Added transform move
commit 19f655ef94d658eaa2fefb5cea3c167a3ec58db6
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Thu Oct 31 09:29:15 2024 +0100
Clarified doc
commit 3b0fe1e5ef8b628854e30f0f0067300e2763c954
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Thu Oct 31 08:36:58 2024 +0100
Handle solved cube correctly
commit 57705cbc4982e3abe97a36ed64871738d4f721c0
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Thu Oct 31 08:24:30 2024 +0100
Close file
commit fc7d462b58bcf3d3a3fbf26c1f3bd04c640a4898
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Oct 29 15:05:48 2024 +0100
Removed stats tool
commit 359bf7cb49ef405ee76ed662207d47cb2abcc5a9
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Oct 29 15:01:51 2024 +0100
Updated theory doc
commit 39c315af562bc4ce896f41004388a4c34d475d37
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Oct 29 14:51:40 2024 +0100
Remove unused constants
commit 57a5d24538aa59a4df9221dad2f99e9f0286bd9d
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Tue Oct 29 10:20:38 2024 +0100
Add tool to solve scrambles from file
commit 07e2918c216636891b1fa6adecc9756086a901e9
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Mon Oct 28 17:00:00 2024 +0100
Add make table to tool
commit f5e5266c654eb027a5a35c57cc618555246f5e5e
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Mon Oct 28 09:35:49 2024 +0100
Remove old solver, other small things
commit a1ec78025b7959dbb845213f7f4e6851ecebc204
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Sun Oct 27 02:00:29 2024 +0200
Improvements
commit 8eea23dbe888d923e662e24ae969130e2c67b999
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Sat Oct 26 12:24:19 2024 +0200
Makefile fix
commit 3fc3927beacc78971cefeb42da8d71fe6c015fc1
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Fri Oct 25 18:25:09 2024 +0200
More performance gains
commit 7b4efa1f9af9722de1ab9ccfc27899825a0d12c4
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Fri Oct 25 15:53:20 2024 +0200
Alternative solver implementation, small performance gain
Diffstat (limited to 'test/130_allowednext_h48')
21 files changed, 0 insertions, 83 deletions
diff --git a/test/130_allowednext_h48/00_empty_U.in b/test/130_allowednext_h48/00_empty_U.in deleted file mode 100644 index 28271a6..0000000 --- a/test/130_allowednext_h48/00_empty_U.in +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 0 | ||
| 2 | 0 | ||
| 3 | |||
diff --git a/test/130_allowednext_h48/00_empty_U.out b/test/130_allowednext_h48/00_empty_U.out deleted file mode 100644 index 8607955..0000000 --- a/test/130_allowednext_h48/00_empty_U.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x3FFFF | ||
diff --git a/test/130_allowednext_h48/01_F.in b/test/130_allowednext_h48/01_F.in deleted file mode 100644 index e7ae375..0000000 --- a/test/130_allowednext_h48/01_F.in +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | 0 | ||
| 2 | 1 | ||
| 3 | F | ||
| 4 | |||
diff --git a/test/130_allowednext_h48/01_F.out b/test/130_allowednext_h48/01_F.out deleted file mode 100644 index 5d6f843..0000000 --- a/test/130_allowednext_h48/01_F.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x38FFF | ||
diff --git a/test/130_allowednext_h48/02_U2.in b/test/130_allowednext_h48/02_U2.in deleted file mode 100644 index 2c5ee5f..0000000 --- a/test/130_allowednext_h48/02_U2.in +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 0 | ||
| 2 | 1 | ||
| 3 | U | ||
diff --git a/test/130_allowednext_h48/02_U2.out b/test/130_allowednext_h48/02_U2.out deleted file mode 100644 index a9a5adb..0000000 --- a/test/130_allowednext_h48/02_U2.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x3FFF8 | ||
diff --git a/test/130_allowednext_h48/03_R_L.in b/test/130_allowednext_h48/03_R_L.in deleted file mode 100644 index b6c0625..0000000 --- a/test/130_allowednext_h48/03_R_L.in +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | 0 | ||
| 2 | 2 | ||
| 3 | R | ||
| 4 | L' | ||
| 5 | |||
diff --git a/test/130_allowednext_h48/03_R_L.out b/test/130_allowednext_h48/03_R_L.out deleted file mode 100644 index a4aa4b2..0000000 --- a/test/130_allowednext_h48/03_R_L.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x3F03F | ||
diff --git a/test/130_allowednext_h48/04_D.in b/test/130_allowednext_h48/04_D.in deleted file mode 100644 index 83da556..0000000 --- a/test/130_allowednext_h48/04_D.in +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 0 | ||
| 2 | 1 | ||
| 3 | D | ||
diff --git a/test/130_allowednext_h48/04_D.out b/test/130_allowednext_h48/04_D.out deleted file mode 100644 index fe91843..0000000 --- a/test/130_allowednext_h48/04_D.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x3FFC0 | ||
diff --git a/test/130_allowednext_h48/05_U_F_B2.in b/test/130_allowednext_h48/05_U_F_B2.in deleted file mode 100644 index 67e090f..0000000 --- a/test/130_allowednext_h48/05_U_F_B2.in +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | 0 | ||
| 2 | 2 | ||
| 3 | U | ||
| 4 | F | ||
| 5 | |||
diff --git a/test/130_allowednext_h48/05_U_F_B2.out b/test/130_allowednext_h48/05_U_F_B2.out deleted file mode 100644 index 5d6f843..0000000 --- a/test/130_allowednext_h48/05_U_F_B2.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x38FFF | ||
diff --git a/test/130_allowednext_h48/06_empty_bound.in b/test/130_allowednext_h48/06_empty_bound.in deleted file mode 100644 index 389e262..0000000 --- a/test/130_allowednext_h48/06_empty_bound.in +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | 2 | ||
| 2 | 0 | ||
diff --git a/test/130_allowednext_h48/06_empty_bound.out b/test/130_allowednext_h48/06_empty_bound.out deleted file mode 100644 index eb601fc..0000000 --- a/test/130_allowednext_h48/06_empty_bound.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x2DB6D | ||
diff --git a/test/130_allowednext_h48/07_F_bound.in b/test/130_allowednext_h48/07_F_bound.in deleted file mode 100644 index b3ae33d..0000000 --- a/test/130_allowednext_h48/07_F_bound.in +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 2 | ||
| 2 | 1 | ||
| 3 | F | ||
diff --git a/test/130_allowednext_h48/07_F_bound.out b/test/130_allowednext_h48/07_F_bound.out deleted file mode 100644 index 0dc8997..0000000 --- a/test/130_allowednext_h48/07_F_bound.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x28B6D | ||
diff --git a/test/130_allowednext_h48/08_U_D_bound_inverse.in b/test/130_allowednext_h48/08_U_D_bound_inverse.in deleted file mode 100644 index 707f7e0..0000000 --- a/test/130_allowednext_h48/08_U_D_bound_inverse.in +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | 3 | ||
| 2 | 2 | ||
| 3 | U | ||
| 4 | D2 \ No newline at end of file | ||
diff --git a/test/130_allowednext_h48/08_U_D_bound_inverse.out b/test/130_allowednext_h48/08_U_D_bound_inverse.out deleted file mode 100644 index 6f47cf0..0000000 --- a/test/130_allowednext_h48/08_U_D_bound_inverse.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x2DB40 | ||
diff --git a/test/130_allowednext_h48/09_R_false_bound.in b/test/130_allowednext_h48/09_R_false_bound.in deleted file mode 100644 index 0b1d441..0000000 --- a/test/130_allowednext_h48/09_R_false_bound.in +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 1 | ||
| 2 | 1 | ||
| 3 | R \ No newline at end of file | ||
diff --git a/test/130_allowednext_h48/09_R_false_bound.out b/test/130_allowednext_h48/09_R_false_bound.out deleted file mode 100644 index 121bfeb..0000000 --- a/test/130_allowednext_h48/09_R_false_bound.out +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | 0x3FE3F | ||
diff --git a/test/130_allowednext_h48/allowednext_h48_tests.c b/test/130_allowednext_h48/allowednext_h48_tests.c deleted file mode 100644 index 64ded35..0000000 --- a/test/130_allowednext_h48/allowednext_h48_tests.c +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | #include "../test.h" | ||
| 2 | |||
| 3 | uint32_t allowednextmove_h48(uint8_t *, uint8_t, uint32_t); | ||
| 4 | |||
| 5 | static char *moves[] = { | ||
| 6 | "U", "U2", "U'", | ||
| 7 | "D", "D2", "D'", | ||
| 8 | "R", "R2", "R'", | ||
| 9 | "L", "L2", "L'", | ||
| 10 | "F", "F2", "F'", | ||
| 11 | "B", "B2", "B'", | ||
| 12 | }; | ||
| 13 | |||
| 14 | void run(void) { | ||
| 15 | char movestr[STRLENMAX]; | ||
| 16 | uint8_t m[100]; | ||
| 17 | int n, i, j, bound; | ||
| 18 | |||
| 19 | fgets(movestr, STRLENMAX, stdin); | ||
| 20 | bound = atoi(movestr); | ||
| 21 | |||
| 22 | fgets(movestr, STRLENMAX, stdin); | ||
| 23 | n = atoi(movestr); | ||
| 24 | |||
| 25 | for (i = 0; i < n; i++) { | ||
| 26 | fgets(movestr, STRLENMAX, stdin); | ||
| 27 | movestr[strcspn(movestr, "\n")] = 0; | ||
| 28 | for (j = 0; j < 18; j++) | ||
| 29 | if (!strcmp(movestr, moves[j])) | ||
| 30 | m[i] = j; | ||
| 31 | } | ||
| 32 | |||
| 33 | fprintf(stderr, "Last two: %s, %s\n", | ||
| 34 | n > 1 ? moves[m[n-2]] : "-", | ||
| 35 | n > 0 ? moves[m[n-1]] : "-"); | ||
| 36 | uint32_t allowed = allowednextmove_h48(m, n, bound); | ||
| 37 | printf("0x%05X\n", allowed); | ||
| 38 | } | ||
