Merge pull request #78 from mohamed-barakat/CartesianEvaluationMorphismWithGivenSource

made CartesianEvaluationMorphismWithGivenSource purely functional

Author: zickgraf

PackageInfo.g

@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "FinSetsForCAP",
 Subtitle := "The elementary topos of (skeletal) finite sets",
-Version := "2021.12-03",
+Version := "2021.12-04",
 
 Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
 License := "GPL-2.0-or-later",

gap/SkeletalFinSetsForCAP.gi

@@ -689,7 +689,7 @@ end );
 AddMonomorphismIntoSomeInjectiveObjectWithGivenSomeInjectiveObject( SkeletalFinSets,
   function ( cat, M, injective_object )
 
-    return MapOfFinSets( M, List( M, x -> x ), injective_object );
+    return MapOfFinSets( M, AsList( M ), injective_object );
 
 end );
 
@@ -721,13 +721,11 @@ end );
 ##
 AddUniversalMorphismFromCoproductWithGivenCoproduct( SkeletalFinSets,
   function ( cat, L, test_object, tau, S )
-    local T, cmp;
+    local cmp;
 
-    T := Range( tau[1] );
-
-    cmp := Concatenation( List( [ 1 .. Length( tau ) ], x -> AsList( tau[x] ) ) );
-
-    return MapOfFinSets( S, cmp, T );
+    cmp := Concatenation( List( tau, t -> AsList( t ) ) );
+    
+    return MapOfFinSets( S, cmp, test_object );
 
 end );
 
@@ -804,12 +802,13 @@ end );
 ##
 AddCartesianBraidingInverseWithGivenDirectProducts( SkeletalFinSets,
   function ( cat, MN, M, N, NM )
-    local m, n;
+    local n, mn;
 
-    m := Length( M );
     n := Length( N );
 
-    return MapOfFinSets( MN, List( AsList( MN ), k -> ( k-1 ) mod n * m + Int( ( k-1 ) / n ) + 1 ), NM );
+    mn := Length( MN );
+    
+    return MapOfFinSets( MN, List( [ 0 .. mn - 1 ] , i -> 1 + ( i mod mn ) + QuoInt( i, n ) ), NM );
 
 end );
 
@@ -848,13 +847,12 @@ end );
 ##
 AddCartesianEvaluationMorphismWithGivenSource( SkeletalFinSets,
   function ( cat, M, N, HM_NxM )
-    local HM_N, m;
+    local m, n;
 
     m := Length( M );
+    n := Length( N );
 
-    HM_N := List( Tuples( AsList( N ), m ), x -> MapOfFinSets( M, x, N ) );
-    
-    return MapOfFinSets( HM_NxM, List( Cartesian( HM_N, AsList( M ) ), fx -> fx[1](fx[2]) ), N );
+    return MapOfFinSets( HM_NxM, List( [ 0 .. Length( HM_NxM ) - 1 ], i -> 1 + RemInt( QuoInt( QuoInt( i, m ), n^(m - RemInt( i, m ) - 1 ) ), n ) ), N );
 
 end );
 

gap/precompiled_categories/CategoryOfSkeletalFinSetsPrecompiled.gi

@@ -10,13 +10,12 @@ BindGlobal( "ADD_FUNCTIONS_FOR_CategoryOfSkeletalFinSetsPrecompiled", function (
 
 ########
 function ( cat_1, s_1, a_1, b_1, r_1 )
-    local hoisted_1_1, hoisted_2_1;
-    hoisted_2_1 := Length( a_1 );
-    hoisted_1_1 := Length( b_1 );
-    return MapOfFinSets( s_1, List( AsList( s_1 ), function ( k_2 )
-              local deduped_1_2;
-              deduped_1_2 := k_2 - 1;
-              return deduped_1_2 mod hoisted_1_1 * hoisted_2_1 + Int( deduped_1_2 / hoisted_1_1 ) + 1;
+    local hoisted_1_1, hoisted_2_1, deduped_3_1;
+    deduped_3_1 := Length( s_1 );
+    hoisted_2_1 := Length( b_1 );
+    hoisted_1_1 := deduped_3_1;
+    return MapOfFinSets( s_1, List( [ 0 .. deduped_3_1 - 1 ], function ( i_2 )
+              return 1 + i_2 mod hoisted_1_1 + QUO_INT( i_2, hoisted_2_1 );
           end ), r_1 );
 end
 ########
@@ -28,10 +27,11 @@ end
 
 ########
 function ( cat_1, a_1, b_1, s_1 )
-    return MapOfFinSets( s_1, List( Cartesian( List( Tuples( AsList( b_1 ), Length( a_1 ) ), function ( x_2 )
-                  return MapOfFinSets( a_1, x_2, b_1 );
-              end ), AsList( a_1 ) ), function ( fx_2 )
-              return fx_2[1]( fx_2[2] );
+    local hoisted_1_1, hoisted_2_1;
+    hoisted_2_1 := Length( b_1 );
+    hoisted_1_1 := Length( a_1 );
+    return MapOfFinSets( s_1, List( [ 0 .. Length( s_1 ) - 1 ], function ( i_2 )
+              return 1 + REM_INT( QUO_INT( QUO_INT( i_2, hoisted_1_1 ), hoisted_2_1 ^ (hoisted_1_1 - REM_INT( i_2, hoisted_1_1 ) - 1) ), hoisted_2_1 );
           end ), b_1 );
 end
 ########
@@ -567,9 +567,7 @@ end
 
 ########
 function ( cat_1, A_1, I_1 )
-    return MapOfFinSets( A_1, List( A_1, function ( x_2 )
-              return x_2;
-          end ), I_1 );
+    return MapOfFinSets( A_1, AsList( A_1 ), I_1 );
 end
 ########
 
@@ -710,9 +708,9 @@ end
 
 ########
 function ( cat_1, objects_1, T_1, tau_1, P_1 )
-    return MapOfFinSets( P_1, Concatenation( List( [ 1 .. Length( tau_1 ) ], function ( x_2 )
-                return AsList( tau_1[x_2] );
-            end ) ), Range( tau_1[1] ) );
+    return MapOfFinSets( P_1, Concatenation( List( tau_1, function ( t_2 )
+                return AsList( t_2 );
+            end ) ), T_1 );
 end
 ########