Skip to content

Commit

Permalink
Rename order to OrderFunc
Browse files Browse the repository at this point in the history
... to avoid clashes with tons of existing code
  • Loading branch information
fingolfin committed Sep 26, 2022
1 parent 57b6b2b commit 04888e7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion doc/recognition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ set this attribute.
</ManSection>

<ManSection>
<Attr Name="order" Arg="ri"/>
<Attr Name="OrderFunc" Arg="ri"/>
<Description>
This attribute returns a function that computes the order of an element
of the group being recognised. Usually this is just the operation
Expand Down
2 changes: 1 addition & 1 deletion gap/base/recognition.gd
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ DeclareAttribute( "isone", IsRecogNode, "mutable" );
# Used to compare group elements after recognition:
DeclareAttribute( "isequal", IsRecogNode, "mutable" );
# Used to compute order of group elements after recognition:
DeclareAttribute( "order", IsRecogNode, "mutable" );
DeclareAttribute( "OrderFunc", IsRecogNode, "mutable" );
# Used to check whether two group elements commute:
DeclareAttribute( "docommute", IsRecogNode, "mutable" );

Expand Down
12 changes: 6 additions & 6 deletions gap/base/recognition.gi
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ InstallMethod( RecogNode,
if projective then
Setisone(ri,IsOneProjective);
Setisequal(ri,IsEqualProjective);
ri!.order := RECOG.ProjectiveOrder;
SetOrderFunc(ri, RECOG.ProjectiveOrder);
else
Setisone(ri,IsOne);
Setisequal(ri,\=);
ri!.order := Order;
SetOrderFunc(ri, Order);
fi;
Setdocommute(ri, function(x,y)
local a,b;
Expand Down Expand Up @@ -298,13 +298,13 @@ InstallMethod( RandomElmOrd,
if not IsBound(ri!.randr[pos]) then
ri!.randr[pos] := Next(ri!.prodrep);
fi;
ri!.rando[pos] := ri!.order(ri!.randr[pos]!.el);
ri!.rando[pos] := OrderFunc(ri)(ri!.randr[pos]!.el);
fi;
res := rec( order := ri!.rando[pos], projective := ri!.projective,
el := ri!.randr[pos] );
else
res := rec( el := Next(ri!.prodrep) );
res.order := ri!.order(res.el!.el);
res.order := OrderFunc(ri)(res.el!.el);
res.projective := ri!.projective;
Add(ri!.rando,res.order);
fi;
Expand All @@ -326,12 +326,12 @@ InstallMethod( GetElmOrd, "for a recognition node and a record",
if IsBound(ri!.rando[r.nr]) then
r.order := ri!.rando[r.nr];
else
ri!.rando[r.nr] := ri!.order(ri!.randr[r.nr]!.el);
ri!.rando[r.nr] := OrderFunc(ri)(ri!.randr[r.nr]!.el);
r.order := ri!.rando[r.nr];
fi;
else
x := StripMemory(r.el);
r.order := ri!.order(x);
r.order := OrderFunc(ri)(x);
fi;
end );

Expand Down
4 changes: 2 additions & 2 deletions gap/generic/KnownNilpotent.gi
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function(ri,G)
if IsBound(ri!.primes) then # this is a message from ourselves from above!
primes := ri!.primes;
else
ords := List(gens,ri!.order);
ords := List(gens,OrderFunc(ri));
primes := Union(List(ords,o->Set(Factors(o))));
RemoveSet(primes,1); # in case there were identities!
fi;
Expand All @@ -95,7 +95,7 @@ function(ri,G)
cut := QuoInt(Length(primes),2);
data := rec( primesfactor := primes{[1..cut]},
primeskernel := primes{[cut+1..Length(primes)]},
orderfunc := ri!.order );
orderfunc := OrderFunc(ri) );
decompositionData := List(gensm, x-> RECOG.DecomposeNilpotent(data,x));
gensfac := List(decompositionData,x -> StripMemory(x[2]));
gensker := List(decompositionData,x -> x[1]);
Expand Down
2 changes: 1 addition & 1 deletion gap/projective/almostsimple.gi
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ function(ri,G)
Info(InfoRecog,2,"Ruled out all sporadic groups.");
return NeverApplicable;
elif i <= Length(gens) then
r.order := ri!.order(r.el);
r.order := OrderFunc(ri)(r.el);
else
GetElmOrd(ri,r);
fi;
Expand Down

0 comments on commit 04888e7

Please sign in to comment.