3 files changed, 28 insertions, 23 deletions

diff --git a/src/alg.c b/src/alg.c
index 4c732a3..27af676 100644
--- a/src/alg.c
+++ b/src/alg.c
@@ -474,32 +474,36 @@ unniss(Alg *alg)
 }
 
 void
-init_movesets()
+init_moveset(Moveset *ms)
 {
-        int i, j;
+        int j;
         uint64_t l, one;
         Move m, l2, l1;
-        Moveset *ms;
 
         one = 1;
 
-        for (i = 0; i < nmoveset; i++) {
-                ms = all_ms[i];
+        for (j = 0, m = U; m < NMOVES; m++)
+                if (ms->allowed(m))
+                        ms->sorted_moves[j++] = m;
+        ms->sorted_moves[j] = NULLMOVE;
 
-                for (j = 0, m = U; m < NMOVES; m++)
-                        if (ms->allowed(m))
-                                ms->sorted_moves[j++] = m;
-                ms->sorted_moves[j] = NULLMOVE;
-
-                for (l1 = 0; l1 < NMOVES; l1++) { 
-                        for (l2 = 0; l2 < NMOVES; l2++) { 
-                                ms->mask[l2][l1] = 0;
-                                for (l=0; ms->sorted_moves[l]!=NULLMOVE; l++) {
-                                        m = ms->sorted_moves[l];
-                                        if (ms->allowed_next(l2, l1, m))
-                                                ms->mask[l2][l1] |= (one<<m);
-                                }
+        for (l1 = 0; l1 < NMOVES; l1++) { 
+                for (l2 = 0; l2 < NMOVES; l2++) { 
+                        ms->mask[l2][l1] = 0;
+                        for (l=0; ms->sorted_moves[l]!=NULLMOVE; l++) {
+                                m = ms->sorted_moves[l];
+                                if (ms->allowed_next(l2, l1, m))
+                                        ms->mask[l2][l1] |= (one<<m);
                         }
                 }
         }
 }
+
+void
+init_all_movesets()
+{
+        int i;
+
+        for (i = 0; i < nmoveset; i++)
+                init_moveset(all_ms[i]);
+}
diff --git a/src/alg.h b/src/alg.h
index ea95a9c..d32c8bf 100644
--- a/src/alg.h
+++ b/src/alg.h
@@ -35,7 +35,8 @@ void        print_alglist(AlgList *al, bool l);
 void        swapmove(Move *m1, Move *m2);
 void        unniss(Alg *alg);
 
-void        init_movesets();
+void        init_moveset(Moveset *ms);
+void        init_all_movesets();
 
 #endif
 
diff --git a/src/commands.c b/src/commands.c
index 9ecc9c7..740736c 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -367,7 +367,7 @@ solve_exec(CommandArgs *args)
         Cube c;
         AlgList *sols;
 
-        init_movesets();
+        init_all_movesets();
         init_symcoord();
 
         c = apply_alg(args->scramble, (Cube){0});
@@ -388,7 +388,7 @@ scramble_exec(CommandArgs *args)
         Alg *scr;
         int i;
 
-        init_movesets();
+        init_all_movesets();
         init_symcoord();
 
         srand(time(NULL));
@@ -407,7 +407,7 @@ gen_exec(CommandArgs *args)
         int i;
 
         fprintf(stderr, "Generating coordinates...\n");
-        init_movesets();
+        init_all_movesets();
         init_symcoord();
 
         fprintf(stderr, "Generating pruning tables...\n");
@@ -460,7 +460,7 @@ twophase_exec(CommandArgs *args)
         Cube c;
         Alg *sol;
 
-        init_movesets();
+        init_all_movesets();
         init_symcoord();
 
         c = apply_alg(args->scramble, (Cube){0});