add exhaustionstep and resumesearch concepts

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

diff --git a/lib/DX/SearchState.pm b/lib/DX/SearchState.pm
index eea032c..415b22a 100644 (file)
--- a/lib/DX/SearchState.pm
+++ b/lib/DX/SearchState.pm
@@ -1,6 +1,5 @@
 package DX::SearchState;
 
-use Types::Standard qw(Maybe);
 use DX::Step::Backtrack;
 use DX::Step::ConsiderProposition;
 use DX::Step::MarkAsSolution;
@@ -12,9 +11,11 @@ has next_step => (is => 'ro', isa => Maybe[Step], required => 1);
 
 has propositions => (is => 'ro', isa => PropositionSequence, required => 1);
 
-has adjustments_made => (is => 'ro', isa => AdjustmentList, required => 1);
+has decisions_taken => (is => 'ro', isa => DecisionList, required => 1);
 
-has is_solution_state => (is => 'ro', required => 1);
+has is_solution_state => (is => 'ro', isa => Bool, required => 1);
+
+has is_exhaustion_state => (is => 'ro', isa => Bool, required => 1);
 
 has on_exhaustion_step => (is => 'ro', isa => Maybe[Step], required => 1);
 
@@ -32,7 +33,7 @@ sub new_for {
   my ($class, $hyp, $props) = @_;
   $class->new(
     current_hypothesis => $hyp,
-    adjustments_made => [],
+    decisions_taken => [],
     propositions => $props,
     (@{$props->members}
       ? (
@@ -41,9 +42,10 @@ sub new_for {
           ),
           is_solution_state => 0,
         )
-      : ( next_step => undef, is_solution_state => 1 )
+      : ( next_step => DX::Step::MarkAsExhaustion->new, is_solution_state => 1 )
     ),
-    on_exhaustion_step => undef,
+    is_exhaustion_state => 0,
+    on_exhaustion_step => DX::Step::MarkAsExhaustion->new,
     on_solution_step => DX::Step::MarkAsSolution->new,
   );
 }
@@ -51,14 +53,12 @@ sub new_for {
 sub with_one_step {
   my ($self) = @_;
   return undef unless my $step = $self->next_step;
-  trace step => $step;
+  #trace step => $step;
   return $step->apply_to($self);
 }
 
 sub force_backtrack {
   my ($self) = @_;
-  my ($first_alt, @rest_alt) = @{$self->adjustments_made};
-  return undef unless $first_alt;
   return $self->but(
     next_step => DX::Step::Backtrack->new,
   )->with_one_step;