switch over to storing rspace+ss as decision list

[scpubgit/DX.git] / lib / DX / SearchProcess.pm

diff --git a/lib/DX/SearchProcess.pm b/lib/DX/SearchProcess.pm
index 437f71d..e22eaa3 100644 (file)
--- a/lib/DX/SearchProcess.pm
+++ b/lib/DX/SearchProcess.pm
@@ -6,7 +6,7 @@ use DX::Class;
 has current_search_state => (
   is => 'ro', isa => SearchState, required => 1,
   handles => [ qw(
-    current_hypothesis next_step propositions alternatives
+    current_hypothesis next_step propositions
   ) ],
 );
 
@@ -27,18 +27,19 @@ sub with_one_step {
 sub find_solution {
   my ($self) = @_;
   my $state = $self->current_search_state;
-  while ($state and $state->next_proposition) {
+  while ($state and (not $state->is_solution_state)) {
     $state = $state->with_one_step;
   }
   return undef unless $state;
-  trace 'search.solution.hyp' => $state->current_hypothesis;
   return $self->but(current_search_state => $state);
 }
 
 sub force_backtrack {
   my ($self) = @_;
   my $new_ss = $self->current_search_state->force_backtrack;
-  return undef unless $new_ss;
+  # XXX infinite loop without the next line and I'm unsure why we don't
+  # get a loop-ending undef from elsewhere if the backtrack failed
+  return undef unless $new_ss->next_step;
   return $self->but(current_search_state => $new_ss);
 }