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.

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

Improve an AsList method for domains with stored GeneratorsOfDomain #3473

Merged
merged 1 commit into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions lib/domain.gi
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,19 @@ InstallImmediateMethod( Enumerator,
InstallMethod( AsList,
"for a domain with stored domain generators",
[ IsDomain and HasGeneratorsOfDomain ],
D -> DuplicateFreeList( GeneratorsOfDomain( D ) ) );
function( D )
if HasIsDuplicateFreeList( GeneratorsOfDomain( D ) )
and IsDuplicateFreeList( GeneratorsOfDomain( D ) ) then
return GeneratorsOfDomain( D );
else
return DuplicateFreeList( GeneratorsOfDomain( D ) );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about this some more, I am not really sure anymore whether this is an "improvement", as the description of this PR claims: AsList is an attribute. So we are talking about a one-time cost here. Now, with the old code, we'd just call DuplicateFreeList, which performs an O(n^2) algorithm.
With this "improvement", we instead first run IsDuplicateFreeList, which also is O(n^2). And if it fails, we still run DuplicateFreeList. So while there may be scenarios where this saves something (namely memory, but not performance), there are also scenarios where it results in a slow-down.

Are there any real-world applications that motivate this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I'm completely fine with changing the condition to
HasIsDuplicateFreeList( GeneratorsOfDomain( D ) ) and IsDuplicateFreeList( GeneratorsOfDomain( D ) ).

Copy link
Contributor Author

@ssiccha ssiccha May 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any real-world applications that motivate this change?

I want AsList(Domain([1..3])) to return the range [1..3]. At the moment gap returns the plain list [1,2,3]. As the range [1..3] knows that it is a IsDuplicateFreeList in this situation there should be no reason to copy it and create a new plain list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed the condition to
HasIsDuplicateFreeList( GeneratorsOfDomain( D ) ) and IsDuplicateFreeList( GeneratorsOfDomain( D ) )

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With HasIsDuplicateFreeList it is of course fine.

fi;
end );

InstallMethod( Enumerator,
"for a domain with stored domain generators",
[ IsDomain and HasGeneratorsOfDomain ],
D -> DuplicateFreeList( GeneratorsOfDomain( D ) ) );
AsList );


#############################################################################
Expand Down
16 changes: 16 additions & 0 deletions tst/testinstall/domain.tst
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,21 @@ Domain([ 1 .. 5 ])
gap> Domain(FamilyObj(1), []);
Domain([ ])

# AsList and Enumerator for domains which know their GeneratorsOfDomain
gap> r := Immutable([1..3]);;
gap> d := Domain(r);;
gap> IsIdenticalObj(AsList(d), r);
true
gap> IsIdenticalObj(Enumerator(d), r);
true
gap> r := Immutable([1,2,3,1]);;
gap> d := Domain(r);;
gap> IsIdenticalObj(GeneratorsOfDomain(d), r);
true
gap> IsIdenticalObj(AsList(d), r);
false
gap> IsIdenticalObj(Enumerator(d), r);
false

#
gap> STOP_TEST("domain.tst");