REBASE: Manual/test fixes. Some forgotten links into full code and sp…

…eacial treatments.
gap-system · May 24, 2018 · 57632d0 · 57632d0
1 parent 0303d25
commit 57632d0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/lib/csetgrp.gi b/lib/csetgrp.gi
@@ -222,6 +222,8 @@ local o,b,img,G1,c,m,mt,hardlimit,gens,t,k,intersize;
   fi;
 
   # use maximals, use `Try` as we call with limiting options
+  IsNaturalAlternatingGroup(G);
+  IsNaturalSymmetricGroup(G);
   m:=TryMaximalSubgroupClassReps(G:cheap,intersize:=intersize,nolattice);
   if m<>fail and Length(m)>0 then
 

diff --git a/lib/grp.gd b/lib/grp.gd
@@ -1146,8 +1146,9 @@ DeclareAttribute( "ConjugacyClasses", IsGroup );
 ##  <Ref Func="MaximalSubgroupClassReps"/>.
 ##  <Example><![CDATA[
 ##  gap> ConjugacyClassesMaximalSubgroups(g);
-##  [ AlternatingGroup( [ 1 .. 4 ] )^G, Group( [ (1,2,3), (1,2) ] )^G, 
-##    Group( [ (1,2), (3,4), (1,3)(2,4) ] )^G ]
+##  [ Group( [ (2,4,3), (1,4)(2,3), (1,3)(2,4) ] )^G,
+##    Group( [ (3,4), (1,4)(2,3), (1,3)(2,4) ] )^G,
+##    Group( [ (3,4), (2,4,3) ] )^G ]
 ##  ]]></Example>
 ##  </Description>
 ##  </ManSection>
@@ -1193,8 +1194,8 @@ DeclareAttribute( "MaximalSubgroups", IsGroup );
 ##  of <A>G</A>.
 ##  <Example><![CDATA[
 ##  gap> MaximalSubgroupClassReps(g);
-##  [ Alt( [ 1 .. 4 ] ), Group([ (1,2,3), (1,2) ]), Group([ (1,2), (3,4),
-##      (1,3)(2,4) ]) ]
+##  [ Group([ (2,4,3), (1,4)(2,3), (1,3)(2,4) ]), Group([ (3,4), (1,4)
+##    (2,3), (1,3)(2,4) ]), Group([ (3,4), (2,4,3) ]) ]
 ##  ]]></Example>
 ##  </Description>
 ##  </ManSection>

diff --git a/lib/grp.gi b/lib/grp.gi
@@ -1361,7 +1361,9 @@ local H,a,m,i,l;
 
   # compute anew for new group to avoid taint
   H:=Group(GeneratorsOfGroup(G));
-  if HasSize(G) then SetSize(H,G);fi;
+  for i in [Size,IsNaturalAlternatingGroup,IsNaturalSymmetricGroup] do
+    if Tester(i)(G) then Setter(i)(H,i(G));fi;
+  od;
   m:=TryMaximalSubgroupClassReps(H:
           cheap:=false,intersize:=false,inmax:=false,nolattice:=false);
   l:=[];

diff --git a/lib/maxsub.gi b/lib/maxsub.gi
@@ -992,6 +992,9 @@ end);
 InstallMethod(MaximalSubgroupClassReps,"TF method",true,
   [IsGroup and IsFinite and CanComputeFittingFree],OVERRIDENICE,DoMaxesTF);
 
+InstallMethod(TryMaximalSubgroupClassReps,"TF method",true,
+  [IsGroup and IsFinite and CanComputeFittingFree],OVERRIDENICE,DoMaxesTF);
+
 #InstallMethod(MaximalSubgroupClassReps,"perm group",true,
 #  [IsPermGroup and IsFinite],0,DoMaxesTF);
 

diff --git a/tst/testbugfix/2018-05-24-IntermediateSubgroups.tst b/tst/testbugfix/2018-05-24-IntermediateSubgroups.tst
@@ -14,4 +14,3 @@ gap> n1:= Normalizer( g, s1 );;  Size( n1 );
 gap> int:=IntermediateGroup(g,s1);;
 gap> IsGroup(int);
 true
-