Merge pull request #205 from mohamed-barakat/prepare1

First preparation for the "functional" refactoring

Author: zickgraf

gap/FinSetsForCAP.gd gap/FinSets.gdgap/FinSetsForCAP.gd renamed to gap/FinSets.gd

@@ -38,6 +38,7 @@ DeclareCategory( "IsSkeletalFiniteSetMap",
 #! @Returns an integer
 DeclareAttribute( "Length",
         IsSkeletalFiniteSet );
+
 CapJitAddTypeSignature( "Length", [ IsSkeletalFiniteSet ], IsBigInt );
 
 #! @Description
@@ -47,6 +48,7 @@ CapJitAddTypeSignature( "Length", [ IsSkeletalFiniteSet ], IsBigInt );
 #! @Returns a list
 DeclareAttribute( "AsList",
         IsSkeletalFiniteSet );
+
 CapJitAddTypeSignature( "AsList", [ IsSkeletalFiniteSet ], rec( filter := IsList, element_type := rec( filter := IsBigInt ) ) );
 
 #! @Description
@@ -55,6 +57,7 @@ CapJitAddTypeSignature( "AsList", [ IsSkeletalFiniteSet ], rec( filter := IsList
 #! @Returns a list
 DeclareAttribute( "AsList",
         IsSkeletalFiniteSetMap );
+
 CapJitAddTypeSignature( "AsList", [ IsSkeletalFiniteSetMap ], rec( filter := IsList, element_type := rec( filter := IsBigInt ) ) );
 
 #! @Section Skeletal Constructors

gap/FinSetsForCAP.gi gap/FinSets.gigap/FinSetsForCAP.gi renamed to gap/FinSets.gi

@@ -257,31 +257,31 @@ InstallGlobalFunction( INSTALL_FUNCTIONS_FOR_SKELETAL_FIN_SETS,
 
 ##
 AddObjectConstructor( SkeletalFinSets,
-  function ( SkeletalFinSets, n )
+  function ( cat, n )
 
-    return FinSet( SkeletalFinSets, n );
+    return FinSet( cat, n );
 
 end );
 
 ##
 AddObjectDatum( SkeletalFinSets,
-  function ( SkeletalFinSets, n )
+  function ( cat, n )
 
     return Length( n );
 
 end );
 
 ##
 AddMorphismConstructor( SkeletalFinSets,
-  function ( SkeletalFinSets, source, map, range )
+  function ( cat, source, map, range )
 
-    return MapOfFinSets( SkeletalFinSets, source, map, range );
+    return MapOfFinSets( cat, source, map, range );
 
 end );
 
 ##
 AddMorphismDatum( SkeletalFinSets,
-  function ( SkeletalFinSets, map )
+  function ( cat, map )
 
     return AsList( map );
 
@@ -368,7 +368,7 @@ end );
 AddImageObject( SkeletalFinSets,
   function ( cat, phi )
 
-    return FinSet( SkeletalFinSets, BigInt( Length( Set( AsList( phi ) ) ) ) );
+    return FinSet( cat, BigInt( Length( Set( AsList( phi ) ) ) ) );
 
 end );
 
@@ -531,7 +531,7 @@ end );
 AddTerminalObject( SkeletalFinSets,
   function ( cat )
 
-    return FinSet( SkeletalFinSets, BigInt( 1 ) );
+    return FinSet( cat, BigInt( 1 ) );
 
 end );
 
@@ -547,7 +547,7 @@ end );
 AddDirectProduct( SkeletalFinSets,
   function ( cat, L )
 
-    return FinSet( SkeletalFinSets, Product( List( L, Length ) ) );
+    return FinSet( cat, Product( List( L, Length ) ) );
 
 end );
 
@@ -593,7 +593,7 @@ AddEqualizer( SkeletalFinSets,
 
     Eq := Filtered( [ 0 .. Length( s ) - 1 ], x -> ForAll( [ 1 .. Length( D ) - 1 ], j -> D2[j][1 + x] = D2[j + 1][1 + x] ) );
 
-    return FinSet( SkeletalFinSets, Length( Eq ) );
+    return FinSet( cat, Length( Eq ) );
 
 end );
 
@@ -640,7 +640,7 @@ end );
 AddInitialObject( SkeletalFinSets,
   function ( cat )
 
-    return FinSet( SkeletalFinSets, BigInt( 0 ) );
+    return FinSet( cat, BigInt( 0 ) );
 
 end );
 
@@ -700,7 +700,7 @@ end );
 AddCoproduct( SkeletalFinSets,
   function ( cat, L )
 
-    return FinSet( SkeletalFinSets, Sum( List( L, Length ) ) );
+    return FinSet( cat, Sum( List( L, Length ) ) );
 
 end );
 
@@ -734,7 +734,7 @@ end );
 AddCoequalizer( SkeletalFinSets,
   function ( cat, s, D )
 
-    return FinSet( SkeletalFinSets, BigInt( Length( SKELETAL_FIN_SETS_ExplicitCoequalizer( s, D ) ) ) );
+    return FinSet( cat, BigInt( Length( SKELETAL_FIN_SETS_ExplicitCoequalizer( s, D ) ) ) );
 
 end );
 
@@ -817,7 +817,7 @@ AddExponentialOnObjects( SkeletalFinSets,
     m := Length( M );
     n := Length( N );
 
-    return FinSet( SkeletalFinSets, n ^ m );
+    return FinSet( cat, n ^ m );
 
 end );
 
@@ -880,24 +880,19 @@ AddExponentialOnMorphismsWithGivenExponentials( SkeletalFinSets,
 
     mors := ExactCoverWithGlobalElements( cat, MN );
 
-    return MapOfFinSets(
-              cat,
-              S,
-              List( mors,
-                function ( mor )
-                  return
-                    AsList( CartesianLambdaIntroduction( cat,
-                            PreComposeList(
-                                    cat,
-                                    [ alpha,
-                                      CartesianLambdaElimination( cat,
-                                              M,
-                                              N,
-                                              mor ),
-                                      beta ] ) ) )[1 + 0];
-                  
-              end ),
-              T );
+    return MapOfFinSets( cat,
+                   S,
+                   List( mors, mor ->
+                         AsList( CartesianLambdaIntroduction( cat,
+                                 PreComposeList(
+                                         cat,
+                                         [ alpha,
+                                           CartesianLambdaElimination( cat,
+                                                   M,
+                                                   N,
+                                                   mor ),
+                                           beta ] ) ) )[1 + 0] ),
+                   T );
 
 end, 1 + Sum( [ [ "ExponentialOnObjects", 1 ],
                 [ "ExactCoverWithGlobalElements", 1 ],

gap/SkeletalFinSetsForCAP.gd gap/SkeletalFinSets.gdgap/SkeletalFinSetsForCAP.gd renamed to gap/SkeletalFinSets.gd

@@ -6,9 +6,9 @@
 
 ReadPackage( "FinSetsForCAP", "gap/Tools.gd" );
 
-ReadPackage( "FinSetsForCAP", "gap/FinSetsForCAP.gd" );
+ReadPackage( "FinSetsForCAP", "gap/FinSets.gd" );
 
-ReadPackage( "FinSetsForCAP", "gap/SkeletalFinSetsForCAP.gd" );
+ReadPackage( "FinSetsForCAP", "gap/SkeletalFinSets.gd" );
 
 #= comment for Julia
 if IsPackageMarkedForLoading( "JuliaInterface", ">= 0.2" ) then

gap/SkeletalFinSetsForCAP.gi gap/SkeletalFinSets.gigap/SkeletalFinSetsForCAP.gi renamed to gap/SkeletalFinSets.gi

@@ -8,9 +8,9 @@ ReadPackage( "FinSetsForCAP", "gap/Tools.gi" );
 
 ReadPackage( "FinSetsForCAP", "gap/precompiled_categories/CategoryOfSkeletalFinSetsPrecompiled.gi" );
 
-ReadPackage( "FinSetsForCAP", "gap/FinSetsForCAP.gi" );
+ReadPackage( "FinSetsForCAP", "gap/FinSets.gi" );
 
-ReadPackage( "FinSetsForCAP", "gap/SkeletalFinSetsForCAP.gi" );
+ReadPackage( "FinSetsForCAP", "gap/SkeletalFinSets.gi" );
 
 #= comment for Julia
 if IsPackageMarkedForLoading( "JuliaInterface", ">= 0.2" ) then