Take advantage of implications to simplify some code

gap-system · Jun 7, 2018 · 51d898c · 51d898c
1 parent 4ef4c7f
commit 51d898c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/lib/coll.gi b/lib/coll.gi
@@ -3079,7 +3079,7 @@ local filt;
     fi;
     return;
   fi;
-  if sz=0 then filt:=IsEmpty and IsNonTrivial; # IsNonTrivial hold
+  if sz=0 then filt:=IsEmpty;
   elif sz=1 then filt:=IsTrivial;
   elif sz=infinity then filt:=IsNonTrivial and HasIsFinite;
   else filt:=IsNonTrivial and IsFinite;

diff --git a/lib/grp.gi b/lib/grp.gi
@@ -4316,12 +4316,12 @@ function(fam,filt,gens,id,isgroup)
       fi;
       if id<>fail then # cannot do identity in magma
         if ForAny(gens,x->x<>id) then
-          filt:=filt and HasIsTrivial and IsNonTrivial;
+          filt:=filt and IsNonTrivial;
           if isgroup and Length(gens)<=1 then # cyclic not for magmas
             filt:=filt and IsCyclic;
           fi;
         else
-          filt:=filt and IsTrivial and HasIsNonTrivial;
+          filt:=filt and IsTrivial;
         fi;
       fi;
     elif isgroup and Length(gens)<=1 then # cyclic not for magmas
@@ -4379,8 +4379,7 @@ local G,fam,typ;
   fam:= CollectionsFamily( FamilyObj( id ) );
 
   typ:=IsGroup and IsAttributeStoringRep
-        and HasGeneratorsOfMagmaWithInverses and HasOne and IsTrivial and
-        HasIsEmpty and HasIsNonTrivial;
+        and HasGeneratorsOfMagmaWithInverses and HasOne and IsTrivial;
   typ:=NewType(fam,typ);
 
   G:= rec();

diff --git a/lib/grpmat.gi b/lib/grpmat.gi
@@ -868,9 +868,7 @@ local G,fam,typ,f;
 
   if not IsFinite(gens) then TryNextMethod(); fi;
   typ:=MakeGroupyType(FamilyObj([id]), IsGroup and IsAttributeStoringRep 
-            and HasGeneratorsOfMagmaWithInverses and IsFinitelyGeneratedGroup
-            and HasIsEmpty and IsFinite and HasOne
-            and IsTrivial and HasIsNonTrivial,
+            and HasGeneratorsOfMagmaWithInverses and HasOne and IsTrivial,
             gens,id,true);
 
   f:=DefaultScalarDomainOfMatrixList([id]);

diff --git a/lib/grppc.gi b/lib/grppc.gi
@@ -412,10 +412,7 @@ local G,fam,typ,pcgs;
 
   # pc groups are always finite and gens is finite.
   typ:=IsGroup and IsAttributeStoringRep 
-        and HasGeneratorsOfMagmaWithInverses and HasOne
-        and IsFinite and IsFinitelyGeneratedGroup
-        and IsTrivial and HasIsNonTrivial
-        and HasIsEmpty and IsSolvableGroup
+        and HasGeneratorsOfMagmaWithInverses and HasOne and IsTrivial
         and HasFamilyPcgs and HasHomePcgs and HasGeneralizedPcgs;
   typ:=NewType(fam,typ);
 

diff --git a/lib/modulrow.gi b/lib/modulrow.gi
@@ -35,9 +35,9 @@ local M,typ;   # the free module record, result
     fi;
 
     if n=0 then
-      typ:=typ and IsTrivial and HasIsNonTrivial and IsFinite;
+      typ:=typ and IsTrivial;
     else
-      typ:=typ and HasIsTrivial and IsNonTrivial;
+      typ:=typ and IsNonTrivial;
     fi;
 
     if n<>infinity and HasIsFinite(R) and IsFinite(R) then

diff --git a/lib/vspcrow.gi b/lib/vspcrow.gi
@@ -64,9 +64,9 @@ InstallMethod( LeftModuleByGenerators,
     fi;
 
     if Length(mat)>0 and ForAny(mat,x->not IsZero(x)) then
-      typ:=typ and HasIsTrivial and IsNonTrivial;
+      typ:=typ and IsNonTrivial;
     else
-      typ:=typ and IsTrivial and HasIsNonTrivial;
+      typ:=typ and IsTrivial;
     fi;
 
     if HasIsFinite(F) then
@@ -98,9 +98,7 @@ InstallMethod( LeftModuleByGenerators,
     fi;
 #T explicit 2nd argument above!
 
-    typ:=IsAttributeStoringRep and HasIsEmpty and IsFiniteDimensional
-         and IsGaussianRowSpace and IsTrivial and HasIsNonTrivial and
-         IsFinite;
+    typ:=IsAttributeStoringRep and IsGaussianRowSpace and IsTrivial;
 
     V:= Objectify( NewType( CollectionsFamily( FamilyObj( F ) ),typ),
                    rec() );
@@ -132,9 +130,9 @@ InstallMethod( LeftModuleByGenerators,
     fi;
 
     if Length(mat)>0 and ForAny(mat,x->not IsZero(x)) then
-      typ:=typ and HasIsTrivial and IsNonTrivial;
+      typ:=typ and IsNonTrivial;
     else
-      typ:=typ and IsTrivial and HasIsNonTrivial;
+      typ:=typ and IsTrivial;
     fi;
 
     if HasIsFinite(F) then