Interface changes, progress with python

2 files changed, 12 insertions, 8 deletions

diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index bcc8b33..36b6875 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -65,12 +65,13 @@ solve_h48_appendsolution(dfsarg_solveh48_t *arg)
 
         if (strl < 0)
                 goto solve_h48_appendsolution_error;
-        *arg->nextsol += strl; 
-        arg->solutions_size -= strl;
+        *arg->nextsol += strl-1; 
+        arg->solutions_size -= strl-1;
 
         if (arg->npremoves) {
                 **arg->nextsol = ' ';
                 (*arg->nextsol)++;
+                arg->solutions_size--;
 
                 invertmoves(arg->premoves, arg->npremoves, invertedpremoves);
                 strl = writemoves(invertedpremoves,
@@ -78,13 +79,14 @@ solve_h48_appendsolution(dfsarg_solveh48_t *arg)
 
                 if (strl < 0)
                         goto solve_h48_appendsolution_error;
-                *arg->nextsol += strl;
-                arg->solutions_size -= strl;
+                *arg->nextsol += strl-1;
+                arg->solutions_size -= strl-1;
         }
         LOG("Solution found: %s\n", solution);
 
         **arg->nextsol = '\n';
         (*arg->nextsol)++;
+        arg->solutions_size--;
         (*arg->nsols)++;
 
 solve_h48_appendsolution_error:
diff --git a/src/solvers/h48/solve_multithread.h b/src/solvers/h48/solve_multithread.h
index 8e00404..d8c81af 100644
--- a/src/solvers/h48/solve_multithread.h
+++ b/src/solvers/h48/solve_multithread.h
@@ -36,13 +36,14 @@ solve_h48_appendsolution_thread(dfsarg_solveh48_t *arg, task_queue_t *tq)
 
         if (strl < 0)
                 goto solve_h48_appendsolution_thread_error;
-        *arg->nextsol += strl;
-        arg->solutions_size -= strl;
+        *arg->nextsol += strl-1;
+        arg->solutions_size -= strl-1;
 
         if (arg->npremoves)
         {
                 **arg->nextsol = ' ';
                 (*arg->nextsol)++;
+                arg->solutions_size--;
 
                 invertmoves(arg->premoves, arg->npremoves, invertedpremoves);
                 strl = writemoves(invertedpremoves,
@@ -50,13 +51,14 @@ solve_h48_appendsolution_thread(dfsarg_solveh48_t *arg, task_queue_t *tq)
 
                 if (strl < 0)
                         goto solve_h48_appendsolution_thread_error;
-                *arg->nextsol += strl;
-                arg->solutions_size -= strl;
+                *arg->nextsol += strl-1;
+                arg->solutions_size -= strl-1;
         }
         LOG("Solution found: %s\n", solution);
 
         **arg->nextsol = '\n';
         (*arg->nextsol)++;
+        arg->solutions_size--;
         (*arg->nsols)++;
 
 solve_h48_appendsolution_thread_error: