rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use append/3 rather than set_difference/3 to gather witnesses in bagof/3 and setof/3 (#1663, #1664)

Browse Source
This commit is contained in:
Mark Thom
2022-12-12 23:55:43 -07:00
parent 705f421d53
commit a5054c0064
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/builtins.pl
View File

@@ -745,11 +745,10 @@ findall_with_existential(Template, Goal, PairedSolutions, Witnesses0, Witnesses)
bagof(Template, Goal, Solution) :- bagof(Template, Goal, Solution) :-
error:can_be(list, Solution), error:can_be(list, Solution),
term_variables(Template, TemplateVars0), term_variables(Template, TemplateVars),
term_variables(Goal, GoalVars0), term_variables(Goal, GoalVars),
sort(TemplateVars0, TemplateVars), term_variables(TemplateVars+GoalVars, TGVs),
sort(GoalVars0, GoalVars), lists:append(TemplateVars, Witnesses0, TGVs),
set_difference(GoalVars, TemplateVars, Witnesses0),
findall_with_existential(Template, Goal, PairedSolutions0, Witnesses0, Witnesses), findall_with_existential(Template, Goal, PairedSolutions0, Witnesses0, Witnesses),
keysort(PairedSolutions0, PairedSolutions), keysort(PairedSolutions0, PairedSolutions),
group_by_variants(PairedSolutions, GroupedSolutions), group_by_variants(PairedSolutions, GroupedSolutions),
@@ -773,11 +772,10 @@ iterate_variants_and_sort([_|GroupSolutions], Ws, Solution) :-
setof(Template, Goal, Solution) :- setof(Template, Goal, Solution) :-
error:can_be(list, Solution), error:can_be(list, Solution),
term_variables(Template, TemplateVars0), term_variables(Template, TemplateVars),
term_variables(Goal, GoalVars0), term_variables(Goal, GoalVars),
sort(TemplateVars0, TemplateVars), term_variables(TemplateVars+GoalVars, TGVs),
sort(GoalVars0, GoalVars), lists:append(TemplateVars, Witnesses0, TGVs),
set_difference(GoalVars, TemplateVars, Witnesses0),
findall_with_existential(Template, Goal, PairedSolutions0, Witnesses0, Witnesses), findall_with_existential(Template, Goal, PairedSolutions0, Witnesses0, Witnesses),
keysort(PairedSolutions0, PairedSolutions), keysort(PairedSolutions0, PairedSolutions),
group_by_variants(PairedSolutions, GroupedSolutions), group_by_variants(PairedSolutions, GroupedSolutions),