format aperture in backtrack trace

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

diff --git a/lib/DX/SearchState.pm b/lib/DX/SearchState.pm
index 8b08596..dd0a724 100644 (file)
--- a/lib/DX/SearchState.pm
+++ b/lib/DX/SearchState.pm
@@ -1,6 +1,5 @@
 package DX::SearchState;
 
-use Types::Standard qw(Maybe Bool);
 use DX::Step::Backtrack;
 use DX::Step::ConsiderProposition;
 use DX::Step::MarkAsSolution;
@@ -16,6 +15,8 @@ has decisions_taken => (is => 'ro', isa => DecisionList, 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);
 
 has on_solution_step => (is => 'ro', isa => Maybe[Step], required => 1);
@@ -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,
   );
 }
@@ -55,11 +57,4 @@ sub with_one_step {
   return $step->apply_to($self);
 }
 
-sub force_backtrack {
-  my ($self) = @_;
-  return $self->but(
-    next_step => DX::Step::Backtrack->new,
-  )->with_one_step;
-}
-
 1;