MinimalGeneratingSet for solvable non-pc groups

lib/grp.gi

@@ -107,21 +107,21 @@ end);
 ##
 #M  MinimalGeneratingSet(<G>) . . . . . . . . . . . . . for groups
 ##
-InstallMethod(MinimalGeneratingSet,"solvable group via pc",true,
-  [IsGroup],0,
+InstallMethod(MinimalGeneratingSet,"test solvable and 2-generator noncyclic",
+  true, [IsGroup and IsFinite],0,
 function(G)
 local i;
-  if not IsSolvableGroup(G) then
-    if IsGroup(G) and HasGeneratorsOfGroup(G)
+  if not HasIsSolvableGroup(G) and IsSolvableGroup(G) and
+  CanEasilyComputePcgs(G)  then
+    # discovered solvable -- redo
+    return MinimalGeneratingSet(G);
+  elif not IsSolvableGroup(G) then
+    if IsGroup(G) and (not IsCyclic(G)) and HasGeneratorsOfGroup(G)
         and Length(GeneratorsOfGroup(G)) = 2 then
       return GeneratorsOfGroup(G);
     fi;
     TryNextMethod();
   fi;
-  i:=IsomorphismPcGroup(G);
-  G:=Image(i,G);
-  G:=MinimalGeneratingSet(G);
-  return List(G,j->PreImagesRepresentative(i,j));
 end);
 
 #############################################################################

lib/grppcatr.gi

@@ -612,7 +612,7 @@ end;
 ##
 InstallMethod( MinimalGeneratingSet,
     "pcgs computable groups using special pcgs",
-    true, [ IsPcGroup and IsFinite ], 0,
+    true, [ IsSolvableGroup and IsFinite and CanEasilyComputePcgs], 0,
 
 function( G )
     local spec, weights, first, m, mingens, i, start, next, j,
@@ -662,13 +662,8 @@ end );
 #M  SmallGeneratingSet(<G>) 
 ##
 InstallMethod(SmallGeneratingSet,"using minimal generating set",true,
-  [IsPcGroup and IsFinite],0,
-function (G)
-  if Length(Pcgs(G))>14 then
-    TryNextMethod();
-  fi;
-  return MinimalGeneratingSet(G);
-end);
+  [IsSolvableGroup and IsFinite and CanEasilyComputePcgs],0,
+  MinimalGeneratingSet);
 
 #############################################################################
 ##