Reverted to 2.0.3

1 files changed, 458 insertions, 80 deletions

diff --git a/src/solve.c b/src/solve.c
index 2d0c94d..d4c0f18 100644
--- a/src/solve.c
+++ b/src/solve.c
@@ -1,122 +1,500 @@
-#define SOLVE_C
-
 #include "solve.h"
 
-void
-dfs(DfsArg *arg, Solver *solver, Threader *threader)
+/* Local functions ***********************************************************/
+
+static bool        allowed_next(Move move, DfsArg *arg);
+static bool        cancel_niss(DfsArg *arg);
+static void        copy_dfsarg(DfsArg *src, DfsArg *dst);
+static void        dfs(DfsArg *arg);
+static void        dfs_branch(DfsArg *arg);
+static bool        dfs_check_solved(DfsArg *arg);
+static bool        dfs_switch(DfsArg *arg);
+static void        dfs_niss(DfsArg *arg);
+static bool        dfs_stop(DfsArg *arg);
+static void *      instance_thread(void *arg);
+static void        invert_branch(DfsArg *arg);
+static void        multidfs(Cube c, Trans t, Step *s, SolveOptions *opts,
+                            AlgList *sols, int d);
+static bool        niss_makes_sense(DfsArg *arg);
+static bool        solvestop(int d, int op, SolveOptions *opts, AlgList *sols);
+
+/* Local functions ***********************************************************/
+
+static bool
+allowed_next(Move m, DfsArg *arg)
+{
+        bool bad, allowed, order;
+        uint64_t mbit;
+
+        mbit    = ((uint64_t)1) << m;
+        bad     = mbit & arg->badmoves;
+        allowed = mbit & arg->step->moveset->mask[arg->last2][arg->last1];
+        order   = !commute(arg->last1, m) || arg->last1 < m;
+
+        return allowed && !bad && order;
+}
+
+static bool
+cancel_niss(DfsArg *arg)
+{
+        Moveset *ms;
+        Move i1, i2;
+        bool p, p1, p2, q, q1, q2;
+
+        if (arg->last1inv == NULLMOVE)
+                return false;
+
+        ms = arg->step->moveset;
+        i1 = inverse_move(arg->last1inv);
+        i2 = inverse_move(arg->last2inv);
+
+        p1 = !ms->allowed_next(arg->last2, arg->last1, i1);
+        p2 = !ms->allowed_next(arg->last2, i1, arg->last1);
+        p = p1 || (commute(i1, arg->last1) && p2);
+
+        q1 = !ms->allowed_next(arg->last2, arg->last1, i2);
+        q2 = !ms->allowed_next(arg->last2, i2, arg->last1);
+        q = q1 || (commute(i2, arg->last1) && q2);
+
+        return p || (commute(i1, i2) && q);
+}
+
+static void
+copy_dfsarg(DfsArg *src, DfsArg *dst)
+{
+        dst->step          = src->step;
+        dst->opts          = src->opts;
+        dst->t             = src->t;
+        dst->cube          = src->cube;
+        dst->inverse       = src->inverse;
+        dst->d             = src->d;
+        dst->badmoves      = src->badmoves;
+        dst->badmovesinv   = src->badmovesinv;
+        dst->niss          = src->niss;
+        dst->last1         = src->last1;
+        dst->last2         = src->last2;
+        dst->last1inv      = src->last1inv;
+        dst->last2inv      = src->last2inv;
+        dst->sols          = src->sols;
+        dst->sols_mutex    = src->sols_mutex;
+        dst->current_alg   = src->current_alg;
+
+        copy_estimatedata(src->ed, dst->ed);
+}
+
+static void
+dfs(DfsArg *arg)
+{
+        bool sw = false;
+
+        if (dfs_stop(arg))
+                return;
+
+        if (dfs_check_solved(arg))
+                return;
+
+        if (arg->step->final && (sw = dfs_switch(arg)))
+                invert_branch(arg);
+        dfs_branch(arg);
+
+        if (arg->opts->can_niss && !arg->niss && niss_makes_sense(arg))
+                dfs_niss(arg);
+
+        if (sw)
+                invert_branch(arg);
+}
+
+static void
+dfs_branch(DfsArg *arg)
 {
         int i;
-        DfsArg newarg;
-        Alg *sol;
         Move m;
+        DfsArg *newarg;
 
-        if (arg->current_alg->len > arg->d)
-                return;
+        newarg = malloc(sizeof(DfsArg));
+        newarg->ed = malloc(sizeof(EstimateData));
 
-        if (solver->is_solved(solver->param, arg->cubedata)) {
-/* TODO: the "all" option should be re-implemented as setting
-validate to null */
+        for (i = 0; arg->step->moveset->sorted_moves[i] != NULLMOVE; i++) {
+                m = arg->step->moveset->sorted_moves[i];
+                if (allowed_next(m, arg)) {
+                        copy_dfsarg(arg, newarg);
+                        newarg->last2 = arg->last1;
+                        newarg->last1 = m;
+                        newarg->cube  = apply_move(m, arg->cube);
+                        append_move(arg->current_alg, m, newarg->niss);
 
-/* TODO: we also have to check if cancel with NISS;
-we can't because we have no access to the s->final field
-this should be done by the step's validator? */
-                sol = solver->validate_solution(solver->param,arg->current_alg);
-                bool accepted = sol != NULL;
-                bool too_short = arg->current_alg->len != arg->d;
+                        dfs(newarg);
 
-                if (accepted && !too_short) {
-/* TODO: arg->t got lost in refactoring */
-/*                      transform_alg(inverse_trans(arg->t), sol);*/
-                        if (arg->opts->verbose)
-                                print_alg(sol, false);
-                        threader->append_sol(sol, arg->threaddata);
+                        arg->current_alg->len--;
                 }
-                return;
         }
 
-        if (arg->current_alg->len == arg->d)
-                return;
+        free(newarg->ed);
+        free(newarg);
+}
+
+static bool
+dfs_check_solved(DfsArg *arg)
+{
+        if (!arg->step->is_done(arg->cube))
+                return false;
+
+        if (arg->current_alg->len == arg->d) {
+                if ((arg->step->is_valid(arg->current_alg) || arg->opts->all)
+                    && (!arg->step->final || !cancel_niss(arg))) {
+
+                        pthread_mutex_lock(arg->sols_mutex);
+
+                        if (arg->sols->len < arg->opts->max_solutions) {
+                                append_alg(arg->sols, arg->current_alg);
+
+                                transform_alg(
+                                    inverse_trans(arg->t), 
+                                    arg->sols->last->alg
+                                );
+                                if (arg->step->final)
+                                        inplace(unniss, arg->sols->last->alg);
+
+                                if (arg->opts->verbose)
+                                        print_alg(arg->sols->last->alg, false);
+                        }
+
+                        pthread_mutex_unlock(arg->sols_mutex);
+                }
+        }
+
+        return true;
+}
+
+static void
+dfs_niss(DfsArg *arg)
+{
+        DfsArg *newarg;
+
+        newarg = malloc(sizeof(DfsArg));
+        newarg->ed = malloc(sizeof(EstimateData));
+
+        copy_dfsarg(arg, newarg);
+        swapmove(&(newarg->last1), &(newarg->last1inv));
+        swapmove(&(newarg->last2), &(newarg->last2inv));
+        newarg->niss = !(arg->niss);
+        newarg->cube = inverse_cube(arg->cube);
+
+        dfs(newarg);
+
+        free(newarg->ed);
+        free(newarg);
+}
+
+static bool
+dfs_stop(DfsArg *arg)
+{
+        int lowerbound;
+        bool b;
+
+        lowerbound = arg->step->estimate(arg);
+        if (arg->opts->can_niss && !arg->niss)
+                lowerbound = MIN(1, lowerbound);
+
+        if (arg->current_alg->len + lowerbound > arg->d) {
+                 b = true;
+        } else {
+                pthread_mutex_lock(arg->sols_mutex);
+                b = arg->sols->len >= arg->opts->max_solutions;
+                pthread_mutex_unlock(arg->sols_mutex);
+        }
+
+        return b;
+}
+
+static bool
+dfs_switch(DfsArg *arg)
+{
+        int i, bn, bi;
+
+        bn = 0;
+        for (i = 0; arg->step->moveset->sorted_moves[i] != NULLMOVE; i++)
+                if (allowed_next(arg->step->moveset->sorted_moves[i], arg))
+                        bn++;
+        
+        swapmove(&(arg->last1), &(arg->last1inv));
+        swapmove(&(arg->last2), &(arg->last2inv));
+        swapu64(&(arg->badmoves), &(arg->badmovesinv));
+
+        bi = 0;
+        for (i = 0; arg->step->moveset->sorted_moves[i] != NULLMOVE; i++)
+                if (allowed_next(arg->step->moveset->sorted_moves[i], arg))
+                        bi++;
+        
+        swapmove(&(arg->last1), &(arg->last1inv));
+        swapmove(&(arg->last2), &(arg->last2inv));
+        swapu64(&(arg->badmoves), &(arg->badmovesinv));
+
+        return bi < bn;
+}
+
+static void *
+instance_thread(void *arg)
+{
+        bool b;
+        Cube c;
+        ThreadDataSolve *td;
+        AlgListNode *node;
+        DfsArg darg;
+
+        td = (ThreadDataSolve *)arg;
+
+        while (1) {
+                b = false;
+
+                pthread_mutex_lock(td->start_mutex);
+                if ((node = *(td->node)) == NULL)
+                        b = true;
+                else
+                        *(td->node) = (*(td->node))->next;
+                pthread_mutex_unlock(td->start_mutex);
+
+                if (b)
+                        break;
+
+                c = node->alg->inv[0] ?
+                    apply_move(node->alg->move[0], inverse_cube(td->cube)) :
+                    apply_move(node->alg->move[0], td->cube);
+
+                darg.step            = td->step;
+                darg.opts            = td->opts;
+                darg.t               = td->t;
+                darg.cube            = c;
+                darg.d               = td->depth;
+                darg.niss            = node->alg->inv[0];
+                darg.last1           = node->alg->move[0];
+                darg.last2           = NULLMOVE;
+                darg.last1inv        = NULLMOVE;
+                darg.last2inv        = NULLMOVE;
+                darg.sols            = td->sols;
+                darg.sols_mutex      = td->sols_mutex;
+                darg.current_alg     = new_alg("");
+                append_move(darg.current_alg, node->alg->move[0],
+                            node->alg->inv[0]);
+                darg.ed              = malloc(sizeof(EstimateData));
+                reset_estimatedata(darg.ed);
+                darg.badmoves        = 0;
+                darg.badmovesinv     = 0;
+
+                dfs(&darg);
+
+                free_alg(darg.current_alg);
+                free(darg.ed);
+        }
+
+        return NULL;
+}
+
+static void
+invert_branch(DfsArg *arg)
+{
+        Cube aux;
+
+        aux = arg->cube;
+        arg->cube = is_solved(arg->inverse) ?
+                    inverse_cube(arg->cube) : arg->inverse;
+        arg->inverse = aux;
+
+        swapu64(&(arg->badmoves), &(arg->badmovesinv));
+        arg->niss = !(arg->niss);
+        swapmove(&(arg->last1), &(arg->last1inv));
+        swapmove(&(arg->last2), &(arg->last2inv));
+        invert_estimatedata(arg->ed);
+}
+
+static void
+multidfs(Cube c, Trans tr, Step *s, SolveOptions *opts, AlgList *sols, int d)
+{
+        int i;
+        Alg *alg;
+        AlgList *start;
+        AlgListNode **node;
+        pthread_t t[opts->nthreads];
+        ThreadDataSolve td[opts->nthreads];
+        pthread_mutex_t *start_mutex, *sols_mutex;
 
-/* TODO: do not alloc */
-        newarg.cubedata = solver->alloc_cubedata(solver->param);
-        for (i = 0; solver->moveset->sorted_moves[i] != NULLMOVE; i++) {
-                m = solver->moveset->sorted_moves[i];
-                if (solver->moveset->can_append(arg->current_alg, m, arg->niss)
-                    && compare_last(arg->current_alg, m, arg->niss) >= 0) {
-                        append_move(arg->current_alg, m, arg->niss);
+        node  = malloc(sizeof(AlgListNode *));
+        start_mutex = malloc(sizeof(pthread_mutex_t));
+        sols_mutex  = malloc(sizeof(pthread_mutex_t));
 
-                        solver->copy_cubedata(
-                            solver->param, arg->cubedata, newarg.cubedata);
-                        newarg.threaddata  = arg->threaddata;
-                        newarg.opts        = arg->opts;
-                        newarg.d           = arg->d;
-                        newarg.niss        = arg->niss;
-                        newarg.current_alg = arg->current_alg;
-                        if (!solver->move_check_stop(
-                            solver->param, &newarg, threader))
-                                dfs(&newarg, solver, threader);
+        start = new_alglist();
+        pthread_mutex_init(start_mutex, NULL);
+        pthread_mutex_init(sols_mutex,  NULL);
 
-                        remove_last_move(arg->current_alg);
+        for (i = 0; s->moveset->sorted_moves[i] != NULLMOVE; i++) {
+                alg = new_alg("");
+                append_move(alg, s->moveset->sorted_moves[i], false);
+                append_alg(start, alg);
+                if (opts->can_niss) {
+                        alg->inv[0] = true;
+                        append_alg(start, alg);
                 }
+                free_alg(alg);
         }
-        solver->free_cubedata(solver->param, newarg.cubedata);
+        *node = start->first;
 
-        if (arg->opts->can_niss && !arg->niss &&
-            solver->niss_makes_sense(
-            solver->param, arg->cubedata, arg->current_alg)) {
-                solver->invert_cube(solver->param, arg->cubedata);
-                arg->niss = true;
-                dfs(arg, solver, threader);
+        for (i = 0; i < opts->nthreads; i++) {
+                td[i].thid          = i;
+                td[i].t             = tr;
+                td[i].cube          = c;
+                td[i].step          = s;
+                td[i].depth         = d;
+                td[i].opts          = opts;
+                td[i].start         = start;
+                td[i].node          = node;
+                td[i].sols          = sols;
+                td[i].start_mutex   = start_mutex;
+                td[i].sols_mutex    = sols_mutex;
+                pthread_create(&t[i], NULL, instance_thread, &td[i]);
         }
+
+        for (i = 0; i < opts->nthreads; i++)
+                pthread_join(t[i], NULL);
+
+        free_alglist(start);
+        free(node);
+        free(start_mutex);
+        free(sols_mutex);
+}
+
+static bool
+niss_makes_sense(DfsArg *arg)
+{
+        Cube testcube;
+
+        testcube = apply_move(inverse_move(arg->last1), (Cube){0});
+        return arg->current_alg->len == 0 || !arg->step->is_done(testcube);
 }
 
+static bool
+solvestop(int d, int op, SolveOptions *opts, AlgList *sols)
+{
+        bool opt_done, max_moves_exceeded, max_sols_exceeded;
+
+        opt_done = opts->optimal != -1 && op != -1 && d > opts->optimal + op;
+        max_moves_exceeded = d > opts->max_moves;
+        max_sols_exceeded = sols->len >= opts->max_solutions;
+
+        return opt_done || max_moves_exceeded || max_sols_exceeded;
+}
+
+/* Public functions **********************************************************/
+
 AlgList *
-solve(Cube *cube, SolveOptions *opts, Solver **solver, Threader *threader)
+solve(Cube cube, Step *step, SolveOptions *opts)
 {
-        int i, d, optimal;
-        bool ready[MAX_SOLVERS], stop, one_ready;
-        DfsArg arg[MAX_SOLVERS];
+        bool ready;
+        int i, d, op, nt;
         AlgList *sols;
+        Cube c;
+        Trans tt[NTRANS];
+
+        prepare_step(step, opts);
 
-        one_ready = false;
-        for (i = 0; solver[i] != NULL; i++) {
-                arg[i].cubedata =
-                    solver[i]->prepare_cube(solver[i]->param, cube);
-                arg[i].opts = opts;
-                ready[i] = arg[i].cubedata != NULL;
-                one_ready = one_ready || ready[i];
+        if (step->detect != NULL) {
+                nt = step->detect(cube, tt);
+        } else {
+                tt[0] = step->pre_trans;
+                ready = step->ready == NULL ||
+                        step->ready(apply_trans(tt[0], cube));
+                nt = ready ? 1 : 0;
         }
 
         sols = new_alglist();
-        if (!one_ready) {
-                fprintf(stderr, "Cube not ready for solving\n");
+
+        if (nt == 0) {
+                fprintf(stderr, "Cube not ready for solving step: ");
+                fprintf(stderr, "%s\n", step->ready_msg);
                 return sols;
         }
 
-        optimal = opts->max_moves;
-        stop = false;
-        for (d = opts->min_moves; d <= opts->max_moves && !stop; d++) {
+        if (opts->min_moves == 0) {
+                for (i = 0; i < nt; i++) {
+                        c = apply_trans(tt[i], cube);
+                        if (step->is_done(c)) {
+                                append_alg(sols, new_alg(""));
+                                return sols;
+                        }
+                }
+        }
+
+        op = -1;
+        for (d = opts->min_moves; !solvestop(d, op, opts, sols); d++) {
                 if (opts->verbose)
                         fprintf(stderr, "Searching depth %d\n", d);
 
-                for (i = 0; solver[i] != NULL && !stop; i++) {
-                        if (!ready[i])
-                                continue;
+                for (i = 0; i < nt && !solvestop(d, op, opts, sols); i++) {
+                        c = apply_trans(tt[i], cube);
+                        multidfs(c, tt[i], step, opts, sols, d);
+                        if (sols->len > 0 && op == -1)
+                                op = d;
+                }
+        }
+
+        return sols;
+}
+
+/* TODO: make more general! */
+Alg *
+solve_2phase(Cube cube, int nthreads)
+{
+        int bestlen, newb;
+        Alg *bestalg, *ret;
+        AlgList *sols1, *sols2;
+        AlgListNode *i;
+        Cube c;
+        SolveOptions opts1, opts2;
 
-                        arg[i].d = d;
-                        threader->dispatch(&arg[i], sols, solver[i], threader);
+        opts1.min_moves     = 0;
+        opts1.max_moves     = 13;
+        opts1.max_solutions = 20;
+        opts1.nthreads      = nthreads;
+        opts1.optimal       = 3;
+        opts1.can_niss      = false;
+        opts1.verbose       = false;
+        opts1.all           = true;
 
-                        if (sols->len > 0)
-                                optimal = MIN(optimal, d);
+        opts2.min_moves     = 0;
+        opts2.max_moves     = 19;
+        opts2.max_solutions = 1;
+        opts2.nthreads      = nthreads;
+        opts2.can_niss      = false;
+        opts2.verbose       = false;
 
-                        stop = sols->len >= opts->max_solutions;
+        /* We skip step1 if it is solved on any axis */
+        if (drany_HTM.is_done(cube)) {
+                sols1 = new_alglist();
+                append_alg(sols1, new_alg(""));
+        } else {
+                sols1 = solve(cube, &drany_HTM, &opts1);
+        }
+        bestalg = new_alg("");
+        bestlen = 999;
+        for (i = sols1->first; i != NULL; i = i->next) {
+                c = apply_alg(i->alg, cube);
+                sols2 = solve(c, &dranyfin_DR, &opts2);
+                
+                if (sols2->len > 0) {
+                        newb = i->alg->len + sols2->first->alg->len;
+                        if (newb < bestlen) {
+                                bestlen = newb;
+                                copy_alg(i->alg, bestalg);
+                                compose_alg(bestalg, sols2->first->alg);
+                        }
                 }
-                stop = stop ||
-                       (opts->optimal != -1 && d >= opts->optimal + optimal);
+
+                free_alglist(sols2);
         }
 
-/* TODO: some cleanup (free cubedata) */
-/* TODO: actually, preparation should be done somewhere else */
+        free_alglist(sols1);
 
-        return sols;
+        ret = cleanup(bestalg);
+        free_alg(bestalg);
+
+        return ret;
 }