package DX::Step::ResolveProposition;
-use Types::Standard qw(ArrayRef);
-use DX::Utils qw(deparse);
+use DX::Step::EnterRecheck;
+use DX::Step::Backtrack;
+
+use DX::Utils qw(expand_deps);
+
use DX::Class;
with 'DX::Role::Step';
-has actions => (is => 'ro', isa => ArrayRef[Action], required => 1);
+has resolution_space => (is => 'ro', isa => ResolutionSpace);
-has depends_on => (is => 'ro', isa => DependencyGroupList, required => 1);
+sub resolves { shift->resolution_space->proposition }
-has resolves => (is => 'ro', isa => Proposition);
+sub current_resolution { shift->resolution_space->next_resolution }
-has alternative_step => (is => 'ro', isa => Step);
+sub actions { shift->current_resolution->actions }
+
+sub depends_on { shift->current_resolution->veracity_depends_on }
sub but_first {
my ($self, @actions) = @_;
}
sub apply_to {
- my ($self, $ss) = @_;
- my $old_hyp = $ss->current_hypothesis;
- trace 'step.apply.old_hyp '.$self => $old_hyp;
- trace 'step.apply.actions '.$self => $self->actions;
- my $new_hyp = $self->_apply_to_hyp($old_hyp);
- return $ss->but(next_step => DX::Step::Backtrack->new) unless $new_hyp;
- trace 'step.apply.new_hyp '.$self => $new_hyp;
+ my ($self, $old_ss) = @_;
+ trace resolve => [ statement => [
+ [ symbol => 'resolve' ],
+ [ block => [
+ [ statement => [
+ [ symbol => 'proposition' ],
+ @{$self->resolves->for_deparse->[1]},
+ ] ],
+ (@{$self->actions}
+ ? [ statement => [
+ [ symbol => 'actions' ],
+ [ block => $self->actions ],
+ ] ]
+ : ()),
+ [ statement => [
+ [ symbol => 'depends_on' ],
+ [ block => [
+ map [ statement => [
+ [ symbol => (split '::', ${$_->[0]})[-1] ],
+ [ value_path => [ @{$_}[1..$#$_] ] ]
+ ] ], @{$self->depends_on}
+ ] ],
+ ] ],
+ ] ]
+ ] ];
my $ns = do {
- if (my $prop = $ss->next_proposition($new_hyp)) {
+ if (my $prop = $old_ss->next_proposition) {
DX::Step::ConsiderProposition->new(
proposition => $prop
)
} else {
- $ss->on_solution_step
+ $old_ss->on_solution_step
}
};
- my $alt_step = $self->alternative_step;
- return (
- $ss->but(
- current_hypothesis => $new_hyp,
- next_step => $ns,
- ($alt_step
- ? (alternatives => [ [ $old_hyp, $alt_step ], @{$ss->alternatives} ])
- : ()
- ),
- ),
+ my $ss = $old_ss->but(
+ next_step => $ns,
+ decisions_taken => [
+ [ $self->resolution_space, $old_ss ],
+ @{$old_ss->decisions_taken}
+ ],
);
-}
-
-sub _apply_to_hyp {
- my ($self, $old_hyp) = @_;
+ my $old_hyp = $old_ss->current_hypothesis;
(my $hyp, my @recheck) = $old_hyp->with_resolution(
$self->resolves, $self->depends_on, $self->actions
);
- return $self->_recheck_hyp_for($hyp, @recheck);
-}
-
-sub _recheck_hyp_for {
- my ($self, $old_hyp, @recheck) = @_;
- return undef unless $old_hyp;
- return $old_hyp unless @recheck;
- my $hyp = $old_hyp;
- foreach my $prop (@recheck) {
- return undef unless $hyp = $self->_recheck_one($hyp, $prop);
- }
- return $hyp;
-}
-
-sub _recheck_one {
- my ($self, $old_hyp, $prop) = @_;
-
- my $ap = DX::ActionPolicy::LockScope->new(
- lock_to_depth => $old_hyp->scope->depth,
- next_policy => $old_hyp->action_policy,
+ return $ss->but(next_step => DX::Step::Backtrack->new) unless $hyp;
+ return $self->_recheck_for(
+ $ss->but(current_hypothesis => $hyp),
+ @recheck
);
+}
- # we should probably be doing something about pruning the scope
- # but that's completely pointless until we have rules
-
- my $hyp = ref($old_hyp)->new(
- scope => $old_hyp->scope,
- resolved_propositions => DX::ResolvedPropositionSet->new_empty,
- actions => [],
- action_applications => [],
- action_policy => $ap,
- );
-
- my $pseq = DX::PropositionSequence->new(
- members => [ $prop ],
- external_names => {},
- internal_names => {},
- );
-
- trace 'step.recheck.hyp' => $hyp;
-
- my $ss = DX::SearchState->new(
- current_hypothesis => $hyp,
- alternatives => [],
- propositions => $pseq,
- next_step => DX::Step::ConsiderProposition->new(
- proposition => $prop,
- ),
- is_solution_state => 0,
- on_exhaustion_step => undef,
- on_solution_step => DX::Step::MarkAsSolution->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;
- }
-
- my $sol_rps = $sol_sp->current_hypothesis->resolved_propositions;
+sub _recheck_for {
+ my ($self, $old_ss, @recheck) = @_;
- my $rps = $old_hyp->resolved_propositions;
+ return $old_ss unless @recheck;
- $rps = $rps->with_updated_dependencies_for(
- $prop, $sol_rps->dependencies_for($prop)
+ my $ss = $old_ss->but(
+ next_step => DX::Step::EnterRecheck->new(
+ proposition_list => \@recheck,
+ on_completion_step => $old_ss->next_step,
+ on_failure_step => DX::Step::Backtrack->new,
+ ),
);
- trace 'step.recheck.done' => 'yay';
-
- return $old_hyp->but(resolved_propositions => $rps);
+ return $ss;
}
1;