Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak ShowImpliedFilters some more #2340

Merged
merged 1 commit into from
Apr 9, 2018
Merged

Tweak ShowImpliedFilters some more #2340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions lib/methwhy.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,19 +301,30 @@ BIND_GLOBAL("ShowImpliedFilters",function(filter)
flags:=FLAGS_FILTER(filter);
implied := WITH_IMPS_FLAGS(flags);
atomic readonly IMPLICATIONS_SIMPLE do
# select all implications which involved <filter> in the requirements
f:=Filtered(IMPLICATIONS_SIMPLE, x->IS_SUBSET_FLAGS(x[2],flags));
Append(f, Filtered(IMPLICATIONS_COMPOSED, x->IS_SUBSET_FLAGS(x[2],flags)));
extra_implications:=[];
for implication in f do
diff_reqs:=SUB_FLAGS(implication[2],flags); # the additional requirements
diff_impls:=SUB_FLAGS(implication[1],implied); # the additional implications
diff_impls:=SUB_FLAGS(diff_impls,diff_reqs);
if SIZE_FLAGS(diff_reqs) > 0 and SIZE_FLAGS(diff_impls) > 0 then
Add(extra_implications, [diff_reqs, diff_impls]);
fi;
od;
od; # end atomic

extra_implications:=[];
for implication in f do
# the additional requirements
diff_reqs:=SUB_FLAGS(implication[2],flags);
if SIZE_FLAGS(diff_reqs) = 0 then
Assert(0, IS_SUBSET_FLAGS(implied,implication[1]));
continue;
fi;
# the combined implications...
diff_impls:=implication[1];
# ... minus those implications that already follow from <filter>
diff_impls:=SUB_FLAGS(diff_impls,implied);
# ... minus those implications that already follow from diff_reqs
diff_impls:=SUB_FLAGS(diff_impls,WITH_IMPS_FLAGS(diff_reqs));
if SIZE_FLAGS(diff_impls) > 0 then
Add(extra_implications, [diff_reqs, diff_impls]);
fi;
od;

# remove "obvious" implications
if IS_ELEMENTARY_FILTER(filter) then
implied := SUB_FLAGS(implied, flags);
Expand Down