Small rework of optimal vs maxsols

I wanted to make the "optimal" and "maxsolutions" options mutually
exclusive, but in the end I decided there is value in keeping both
(e.g. for specifying a limit to the number of solutions when asking
for "all" optimal").

Now optimal cannot be negative anymore, for the same reason of maxsolutions.

The interface user (shell, UI) will have to take care of handling this
in a way that makes sense for the user. Usually this means setting
the maximum number of solutions to UINT_MAX (or a similar very high
number) when the user wants "all optimal".

2 files changed, 3 insertions, 4 deletions

diff --git a/python/examples/solve.py b/python/examples/solve.py
index b939183..a60c432 100644
--- a/python/examples/solve.py
+++ b/python/examples/solve.py
@@ -23,7 +23,7 @@ data = bytearray(open("tables/" + solver, "rb").read())
 cube = nissy.applymoves(nissy.solved_cube, "U F R2");
 
 # Solve!
-solutions = nissy.solve(cube, solver, nissy.nissflag_normal, 0, 9, 3, -1, 4, data)
+solutions = nissy.solve(cube, solver, nissy.nissflag_normal, 0, 9, 3, 20, 4, data)
 
 # Print the solutions, one per line
 print("Found ", len(solutions), " solutions:")
diff --git a/python/nissy_module.c b/python/nissy_module.c
index e92cfd9..46570dc 100644
--- a/python/nissy_module.c
+++ b/python/nissy_module.c
@@ -324,8 +324,7 @@ PyDoc_STRVAR(solve_doc,
 "  - minmoves: the minimum number of moves to use\n"
 "  - maxmoves: the maximum number of moves to use\n"
 "  - maxsolution: the maximum number of solutions to return\n"
-"  - optimal: the largest number of moves from the shortest solution"
-"(set to -1 to ignore)\n"
+"  - optimal: the largest number of moves from the shortest solution\n"
 "  - threads: the number of threads to use (0 for default)\n"
 "  - data: a bytearray containing the data for the solver\n"
 "\n"
@@ -343,7 +342,7 @@ solve(PyObject *self, PyObject *args)
         PyByteArrayObject *data;
         PyObject *list, *item;
 
-        if (!PyArg_ParseTuple(args, "ssIIIIiiY", &cube, &solver, &nissflag,
+        if (!PyArg_ParseTuple(args, "ssIIIIIIY", &cube, &solver, &nissflag,
              &minmoves, &maxmoves, &maxsolutions, &optimal, &threads, &data))
                 return NULL;