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 /tools/301_solve_file/solve_file.c | |
| 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 'tools/301_solve_file/solve_file.c')
| -rw-r--r-- | tools/301_solve_file/solve_file.c | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/tools/301_solve_file/solve_file.c b/tools/301_solve_file/solve_file.c new file mode 100644 index 0000000..aa45df0 --- /dev/null +++ b/tools/301_solve_file/solve_file.c | |||
| @@ -0,0 +1,71 @@ | |||
| 1 | #include "../tool.h" | ||
| 2 | |||
| 3 | #define SOL_BUFFER_LEN 1000 | ||
| 4 | #define MAX_SCR 10000 | ||
| 5 | #define MAX_SCR_LEN 250 | ||
| 6 | |||
| 7 | char *solver; | ||
| 8 | int64_t size = 0, N = 0; | ||
| 9 | char *buf; | ||
| 10 | char scrambles[MAX_SCR][MAX_SCR_LEN]; | ||
| 11 | |||
| 12 | void run(void) { | ||
| 13 | int64_t i, nsols; | ||
| 14 | long long stats[NISSY_SIZE_SOLVE_STATS]; | ||
| 15 | char sol[SOL_BUFFER_LEN], cube[22]; | ||
| 16 | |||
| 17 | printf("Solved the following scrambles:\n\n"); | ||
| 18 | for (i = 0; i < N; i++) { | ||
| 19 | printf("%" PRId64 ". %s\n", i+1, scrambles[i]); | ||
| 20 | printf("Solving scramble %s\n", scrambles[i]); | ||
| 21 | if (nissy_applymoves(NISSY_SOLVED_CUBE, scrambles[i], cube) | ||
| 22 | == -1) { | ||
| 23 | printf("Invalid scramble\n"); | ||
| 24 | continue; | ||
| 25 | } | ||
| 26 | nsols = nissy_solve(cube, solver, NISSY_NISSFLAG_NORMAL, | ||
| 27 | 0, 20, 1, -1, size, buf, SOL_BUFFER_LEN, sol, stats); | ||
| 28 | if (nsols == 0) | ||
| 29 | printf("No solution found\n"); | ||
| 30 | else | ||
| 31 | printf("Solutions:\n%s\n", sol); | ||
| 32 | } | ||
| 33 | } | ||
| 34 | |||
| 35 | int main(int argc, char **argv) { | ||
| 36 | char filename[255], *scrfilename; | ||
| 37 | FILE *scrfile; | ||
| 38 | |||
| 39 | if (argc < 3) { | ||
| 40 | printf("Error: not enough arguments. " | ||
| 41 | "A solver and a scramble file must be given.\n"); | ||
| 42 | return 1; | ||
| 43 | } | ||
| 44 | |||
| 45 | solver = argv[1]; | ||
| 46 | scrfilename = argv[2]; | ||
| 47 | |||
| 48 | srand(time(NULL)); | ||
| 49 | nissy_setlogger(log_stderr); | ||
| 50 | |||
| 51 | sprintf(filename, "tables/%s", solver); | ||
| 52 | if (getdata(solver, &buf, filename) != 0) | ||
| 53 | return 1; | ||
| 54 | |||
| 55 | size = nissy_datasize(solver); | ||
| 56 | |||
| 57 | if ((scrfile = fopen(scrfilename, "r")) == NULL) { | ||
| 58 | printf("Error: could not read given file '%s'.\n", | ||
| 59 | scrfilename); | ||
| 60 | return 1; | ||
| 61 | } | ||
| 62 | |||
| 63 | printf("Reading scrambles from file '%s'.\n", scrfilename); | ||
| 64 | for (N = 0; fgets(scrambles[N], MAX_SCR_LEN, scrfile) != NULL; N++) ; | ||
| 65 | fclose(scrfile); | ||
| 66 | |||
| 67 | timerun(run); | ||
| 68 | |||
| 69 | free(buf); | ||
| 70 | return 0; | ||
| 71 | } | ||
