diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | TODO.md | 17 | ||||
| -rw-r--r-- | doc/nissy.1 | 4 | ||||
| -rw-r--r-- | src/shell.c | 4 | ||||
| -rw-r--r-- | www/index.html | 2 |
6 files changed, 15 insertions, 16 deletions
| @@ -1,6 +1,6 @@ | |||
| 1 | # See LICENSE file for copyright and license details. | 1 | # See LICENSE file for copyright and license details. |
| 2 | 2 | ||
| 3 | VERSION = 2.1-current | 3 | VERSION = 2.0.2 |
| 4 | 4 | ||
| 5 | PREFIX = /usr/local | 5 | PREFIX = /usr/local |
| 6 | MANPREFIX = ${PREFIX}/share/man | 6 | MANPREFIX = ${PREFIX}/share/man |
| @@ -4,7 +4,7 @@ A Rubik's cube solver and FMC assistant. | |||
| 4 | For optimal HTM solving Nissy uses techniques from Herbert Kociemba's | 4 | For optimal HTM solving Nissy uses techniques from Herbert Kociemba's |
| 5 | [Cube Explorer](http://kociemba.org/cube.htm) and Tomas Rokicki's | 5 | [Cube Explorer](http://kociemba.org/cube.htm) and Tomas Rokicki's |
| 6 | [nxopt](https://github.com/rokicki/cube20src/blob/master/nxopt.md). | 6 | [nxopt](https://github.com/rokicki/cube20src/blob/master/nxopt.md). |
| 7 | With 4 cores at 2.5GHz and using less than 3Gb of RAM, Nissy can find an | 7 | With 4 cores at 2.5GHz and using about 3Gb of RAM, Nissy can find an |
| 8 | optimal solution in about a minute on average. | 8 | optimal solution in about a minute on average. |
| 9 | 9 | ||
| 10 | Nissy can also solve many different substeps of Thistlethwaite's algorithm | 10 | Nissy can also solve many different substeps of Thistlethwaite's algorithm |
| @@ -4,14 +4,9 @@ This is a list of things that I would like to add or change at some point. | |||
| 4 | It's more of a personal reminder than anything else. | 4 | It's more of a personal reminder than anything else. |
| 5 | 5 | ||
| 6 | ## Version 2.0.2 | 6 | ## Version 2.0.2 |
| 7 | * General idea: only improvement on generating pruning tables, no new | 7 | ### Changelog |
| 8 | commands or anything else | 8 | * Only improved table generation speed, but this required huge changes in |
| 9 | ### Tables management | 9 | coordinates.c and symcoord.c (+ some minor changes in other parts). |
| 10 | * Check files in tables directory, add command to remove old / extraneous files | ||
| 11 | * Add checksum to check that tables are generated / downloaded correctly | ||
| 12 | ### Documentation | ||
| 13 | * Write an examples.md file | ||
| 14 | * More screenshots! | ||
| 15 | 10 | ||
| 16 | ## For version 2.1 | 11 | ## For version 2.1 |
| 17 | ### Coordinates | 12 | ### Coordinates |
| @@ -43,6 +38,12 @@ It's more of a personal reminder than anything else. | |||
| 43 | ### Loading at startup vs dynamically | 38 | ### Loading at startup vs dynamically |
| 44 | * Consider moving more things to the initial loading phase (i.e. remove | 39 | * Consider moving more things to the initial loading phase (i.e. remove |
| 45 | many of the "initialized" parts) | 40 | many of the "initialized" parts) |
| 41 | ### Documentation | ||
| 42 | * Write an examples.md file | ||
| 43 | * More screenshots! | ||
| 44 | ### Tables management | ||
| 45 | * Check files in tables directory, add command to remove old / extraneous files | ||
| 46 | * Add checksum to check that tables are generated / downloaded correctly | ||
| 46 | 47 | ||
| 47 | ## Commands | 48 | ## Commands |
| 48 | 49 | ||
diff --git a/doc/nissy.1 b/doc/nissy.1 index 5193b11..138d6ae 100644 --- a/doc/nissy.1 +++ b/doc/nissy.1 | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | .Nm | 16 | .Nm |
| 17 | is a Rubik's Cube solver. | 17 | is a Rubik's Cube solver. |
| 18 | It uses techniques from Herbert Kociemba's Cube Explorer and | 18 | It uses techniques from Herbert Kociemba's Cube Explorer and |
| 19 | Tomas Rokicki's nxopt. With 4 cores at 2.5GHz and using less than 3Gb | 19 | Tomas Rokicki's nxopt. With 4 cores at 2.5GHz and using about 3Gb |
| 20 | of RAM, Nissy can find the optimal solution for a random Rubik's cube position | 20 | of RAM, Nissy can find the optimal solution for a random Rubik's cube position |
| 21 | in about a minute on average. | 21 | in about a minute on average. |
| 22 | Nissy can also solve different substeps of the Thistlethwaite's algorithm and more. | 22 | Nissy can also solve different substeps of the Thistlethwaite's algorithm and more. |
| @@ -264,7 +264,7 @@ The file will look something like this: | |||
| 264 | .Dl D\(aq F R\(aq D B L2 B R2 L U L U2 B D\(aq U R U F2 (18) | 264 | .Dl D\(aq F R\(aq D B L2 B R2 L U L U2 B D\(aq U R U F2 (18) |
| 265 | . | 265 | . |
| 266 | .Sh AUTHORS | 266 | .Sh AUTHORS |
| 267 | .An Sebastiano Tronto Aq Mt sebastiano.tronto@gmail.com | 267 | .An Sebastiano Tronto Aq Mt sebastiano@tronto.net |
| 268 | . | 268 | . |
| 269 | .Sh SOURCE CODE | 269 | .Sh SOURCE CODE |
| 270 | Source code is available at | 270 | Source code is available at |
diff --git a/src/shell.c b/src/shell.c index 77d5d1d..0001e0d 100644 --- a/src/shell.c +++ b/src/shell.c | |||
| @@ -148,9 +148,7 @@ main(int argc, char *argv[]) | |||
| 148 | fprintf(stderr, | 148 | fprintf(stderr, |
| 149 | "--- Warning ---\n" | 149 | "--- Warning ---\n" |
| 150 | "Some pruning tables are missing or unreadable\n" | 150 | "Some pruning tables are missing or unreadable\n" |
| 151 | "You can generate them with `nissy gen -t 4'\n" | 151 | "You can generate them with `nissy gen'.\n" |
| 152 | "Here `4' is the number of threads. Use more if your " | ||
| 153 | "CPU has them, or expect it to take a while.\n" | ||
| 154 | "---------------\n\n" | 152 | "---------------\n\n" |
| 155 | ); | 153 | ); |
| 156 | } | 154 | } |
diff --git a/www/index.html b/www/index.html index 1df2133..0b7e67e 100644 --- a/www/index.html +++ b/www/index.html | |||
| @@ -36,7 +36,7 @@ for random positions using techniques from Herbert Kociemba's | |||
| 36 | <a href="http://kociemba.org/cube.htm">Cube Explorer</a> and | 36 | <a href="http://kociemba.org/cube.htm">Cube Explorer</a> and |
| 37 | Tomas Rokicki's | 37 | Tomas Rokicki's |
| 38 | <a href="https://github.com/rokici/cube20src/blob/master/nxopt.md">nxopt</a>. | 38 | <a href="https://github.com/rokici/cube20src/blob/master/nxopt.md">nxopt</a>. |
| 39 | With 4 cores at 2.5GHz and using less than 3Gb of RAM, Nissy can find an optimal | 39 | With 4 cores at 2.5GHz and using about 3Gb of RAM, Nissy can find an optimal |
| 40 | solution in about a minute on average. | 40 | solution in about a minute on average. |
| 41 | </p> | 41 | </p> |
| 42 | 42 | ||
