From 3fed3a53e9df6d1d90353d8738825981b3f3720b Mon Sep 17 00:00:00 2001
From: Mohamed Barakat <mohamed.barakat@rwth-aachen.de>
Date: Mon, 16 May 2022 16:43:06 +0200
Subject: [PATCH] comply with FinSetsForCAP v2022.05-01

use von Neumann finite cardinals
---
 PackageInfo.g                        | 10 ++--------
 gap/EndAsEqualizer.gi                | 10 ++++------
 gap/ForgetfulFunctorSkeletalGSets.gi |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/PackageInfo.g b/PackageInfo.g
index 7736c7b..38c72f2 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -10,13 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "FinGSetsForCAP",
 Subtitle := "The elementary topos of (skeletal) finite G-sets",
-Version := Maximum( [
-                   "2018.09-17", ## Mohamed's version
-                   ## this line prevents merge conflicts
-                   "2017.05-26", ## Julia's version
-                   ## this line prevents merge conflicts
-                   "2021.05-01", ## Fabian's version
-                   ] ),
+Version := "2021.05-02",
 
 Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
 License := "GPL-2.0-or-later",
@@ -109,7 +103,7 @@ Dependencies := rec(
                    [ "Toposes", ">= 2021.03-01" ],
                    ],
   SuggestedOtherPackages := [
-                   [ "FinSetsForCAP", ">= 2021.03-01" ],
+                   [ "FinSetsForCAP", ">= 2022.05-01" ],
                    ],
   ExternalConditions := [ ],
 ),
diff --git a/gap/EndAsEqualizer.gi b/gap/EndAsEqualizer.gi
index 7b2af02..fce356d 100644
--- a/gap/EndAsEqualizer.gi
+++ b/gap/EndAsEqualizer.gi
@@ -11,12 +11,10 @@ InstallGlobalFunction( EndAsEqualizer, function ( C, HomC, ForgetfulFunctor, Ind
         local s, t, L, i, phi;
         s := Length( S );
         t := Length( T );
-        L := ListWithIdenticalEntries( s, 1 );
-        # lists start with entry 1, we want to start at 0 and add back 1 later
-        int := int - 1;
+        L := ListWithIdenticalEntries( s, 0 );
         i := 1;
         while int <> 0 do
-            L[ i ] := ( int mod t ) + 1;
+            L[ i ] := ( int mod t );
             int := QuoInt( int, t );
             i := i + 1;
         od;
@@ -42,10 +40,10 @@ InstallGlobalFunction( EndAsEqualizer, function ( C, HomC, ForgetfulFunctor, Ind
         
         int := 0;
         for i in [ 0 .. ( s - 1 ) ] do
-            int := int + ( imgs[ i + 1 ] - 1 ) * t^i;
+            int := int + imgs[ i + 1 ] * t^i;
         od;
 
-        return int + 1;
+        return int;
     end;
     
     HomFinSetsSkeletal := function ( S, T )
diff --git a/gap/ForgetfulFunctorSkeletalGSets.gi b/gap/ForgetfulFunctorSkeletalGSets.gi
index 9fa045c..5dea08e 100644
--- a/gap/ForgetfulFunctorSkeletalGSets.gi
+++ b/gap/ForgetfulFunctorSkeletalGSets.gi
@@ -79,7 +79,7 @@ InstallMethod( ForgetfulFunctorSkeletalFinGSets,
                 j := imgs[i][l][3];
                 
                 for h in RightCosets( group, U_i ) do
-                    Add( Set_imgs, OffsetOfCofactorInTarget( r, j ) + OffsetOfElementInCofactor( g * Representative( h ), j ) );
+                    Add( Set_imgs, -1 + OffsetOfCofactorInTarget( r, j ) + OffsetOfElementInCofactor( g * Representative( h ), j ) );
                 od;
             od;
         od;