move ResolveProposition step over to rspace system

[scpubgit/DX.git] / lib / DX / Step / ResolveProposition.pm

diff --git a/lib/DX/Step/ResolveProposition.pm b/lib/DX/Step/ResolveProposition.pm
index ee5ff14..07a0d5c 100644 (file)
--- a/lib/DX/Step/ResolveProposition.pm
+++ b/lib/DX/Step/ResolveProposition.pm
@@ -1,21 +1,51 @@
 package DX::Step::ResolveProposition;
 
 use DX::Step::EnterRecheck;
+use DX::Step::Backtrack;
 
 use Types::Standard qw(ArrayRef);
-use DX::Utils qw(deparse);
+use DX::Utils qw(deparse step);
 
 use DX::Class;
 
 with 'DX::Role::Step';
 
-has actions => (is => 'ro', isa => ArrayRef[Action], required => 1);
-
-has depends_on => (is => 'ro', isa => DependencyGroupList, required => 1);
-
 has resolves => (is => 'ro', isa => Proposition);
 
-has alternative_step => (is => 'ro', isa => Step);
+has resolution_space => (is => 'ro', isa => ResolutionSpace);
+
+has current_resolution => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  $self->resolution_space->next_resolution;
+});
+
+has actions => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  $self->current_resolution->actions;
+});
+
+has depends_on => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  my $_expand_dep = sub {
+    my ($type, @path) = @{$_[0]};
+    my @expanded = map {
+      ref() ? @{$_->value_path or return ()} : $_
+    } @path;
+    return [ $type, @expanded ];
+  };
+  [ map $_expand_dep->($_),
+      @{$self->current_resolution->veracity_depends_on} ];
+});
+
+has alternative_step => (is => 'lazy', init_arg => undef, builder => sub {
+  my ($self) = @_;
+  my $rspace = $self->resolution_space->remaining_resolution_space;
+  return undef unless @{$rspace->members};
+  return step(
+    resolves => $self->resolves,
+    resolution_space => $rspace
+  );
+});
 
 sub but_first {
   my ($self, @actions) = @_;
@@ -28,34 +58,29 @@ sub but_with_dependencies_on {
 }
 
 sub apply_to {
-  my ($self, $ss) = @_;
-  trace 'step.apply.old_hyp '.$self => $ss->current_hypothesis;
-  trace 'step.apply.actions '.$self => $self->actions;
-  my $new_ss = $self->_apply_to_ss($ss);
-  return $ss->but(next_step => DX::Step::Backtrack->new) unless $new_ss;
-  trace 'step.apply.new_hyp '.$self => $new_ss->current_hypothesis;
+  my ($self, $old_ss) = @_;
   my $ns = do {
-    if (my $prop = $new_ss->next_proposition) {
+    if (my $prop = $old_ss->next_proposition) {
       DX::Step::ConsiderProposition->new(
         proposition => $prop
       )
     } else {
-      $new_ss->on_solution_step
+      $old_ss->on_solution_step
     }
   };
-  my $alt_step = $self->alternative_step;
-  return (
-    $new_ss->but(
-      next_step => $ns,
-      ($alt_step
-        ? (alternatives => [
-            [ $ss->current_hypothesis, $alt_step ],
-            @{$ss->alternatives}
-          ])
-        : ()
-      ),
+  my $ss = $old_ss->but(
+    next_step => $ns,
+    (@{$self->actions}
+      ? (adjustments_made => [
+          [ $self, $old_ss ],
+          @{$old_ss->adjustments_made}
+        ])
+      : ()
     ),
   );
+  my $new_ss = $self->_apply_to_ss($ss);
+  return $ss->but(next_step => DX::Step::Backtrack->new) unless $new_ss;
+  return $new_ss;
 }
 
 sub _apply_to_ss {
@@ -73,36 +98,18 @@ sub _apply_to_ss {
 
 sub _recheck_for {
   my ($self, $old_ss, @recheck) = @_;
-  return $old_ss unless @recheck;
-  my $ss  = $old_ss;
-  foreach my $prop (@recheck) {
-    return undef unless $ss = $self->_recheck_one($ss, $prop);
-  }
-  return $ss;
-}
 
-sub _recheck_one {
-  my ($self, $old_ss, $prop) = @_;
+  return $old_ss unless @recheck;
 
   my $ss = $old_ss->but(
     next_step => DX::Step::EnterRecheck->new(
-      proposition_list => [ $prop ],
-      on_completion_step => DX::Step::MarkAsSolution->new,
+      proposition_list => \@recheck,
+      on_completion_step => $old_ss->next_step,
+      on_failure_step => DX::Step::Backtrack->new,
     ),
   );
 
-  my $sp = DX::SearchProcess->new(
-    current_search_state => $ss,
-  );
-
-  my $sol_sp = $sp->find_solution;
-
-  unless ($sol_sp) {
-    trace 'step.recheck.fail' => 'argh';
-    return undef;
-  }
-
-  return $sol_sp->current_search_state->but(is_solution_state => 0);
+  return $ss;
 }
 
 1;