comply with CAP V2023.08-07 (start using the 'LinearCombinationOfMorp…

…hisms' operation) and bump FreydCategoriesForCAP to V2023.08-02
homalg-project · Aug 14, 2023 · 25ae038 · 25ae038
1 parent 1088e8d
commit 25ae038
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/FreydCategoriesForCAP/PackageInfo.g b/FreydCategoriesForCAP/PackageInfo.g
@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "FreydCategoriesForCAP",
 Subtitle := "Freyd categories - Formal (co)kernels for additive categories",
-Version := "2023.08-01",
+Version := "2023.08-02",
 Date := (function ( ) if IsBound( GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE ) then return GAPInfo.SystemEnvironment.GAP_PKG_RELEASE_DATE; else return Concatenation( ~.Version{[ 1 .. 4 ]}, "-", ~.Version{[ 6, 7 ]}, "-01" ); fi; end)( ),
 License := "GPL-2.0-or-later",
 
@@ -87,7 +87,7 @@ PackageDoc := rec(
 
 Dependencies := rec(
   GAP := ">= 4.12.1",
-  NeededOtherPackages := [ [ "CAP", ">= 2023.06-04" ],
+  NeededOtherPackages := [ [ "CAP", ">= 2023.08-07" ],
                            [ "MatricesForHomalg", ">= 2023.01-01" ],
                            [ "GradedRingForHomalg", ">=2019.08.07" ],
                            [ "MonoidalCategories", ">= 2023.02-04" ],

diff --git a/FreydCategoriesForCAP/gap/CategoryOfRows.gi b/FreydCategoriesForCAP/gap/CategoryOfRows.gi
@@ -1326,9 +1326,8 @@ AddFinalDerivationBundle( "Using BasisOfExternalHom and CoefficientsOfMorphism t
                     [
                       [ BasisOfExternalHom, 1 ],
                       [ CoefficientsOfMorphism, 2 ],
-                      [ MultiplyWithElementOfCommutativeRingForMorphisms, 2 ],
-                      [ PreComposeList, 2 ],
-                      [ SumOfMorphisms, 1 ]
+                      [ LinearCombinationOfMorphisms, 1 ],
+                      [ PreComposeList, 2 ]
                     ],
                     [
                       HomomorphismStructureOnObjects,
@@ -1405,8 +1404,7 @@ AddFinalDerivationBundle( "Using BasisOfExternalHom and CoefficientsOfMorphism t
   InterpretMorphismFromDistinguishedObjectToHomomorphismStructureAsMorphism,
   [
     [ BasisOfExternalHom, 1 ],
-    [ MultiplyWithElementOfCommutativeRingForMorphisms, 2 ],
-    [ SumOfMorphisms, 1 ]
+    [ LinearCombinationOfMorphisms, 1 ],
   ],
   function ( cat, a, b, iota )
     local coeffs, basis;
@@ -1415,7 +1413,7 @@ AddFinalDerivationBundle( "Using BasisOfExternalHom and CoefficientsOfMorphism t
 
     basis := BasisOfExternalHom( cat, a, b );
 
-    return SumOfMorphisms( cat, a, ListN( coeffs, basis, { c, m } -> MultiplyWithElementOfCommutativeRingForMorphisms( cat, c, m ) ), b );
+    return LinearCombinationOfMorphisms( cat, a, coeffs, basis, b );
 
   end
 ] :

diff --git a/FreydCategoriesForCAP/gap/LinearClosure.gi b/FreydCategoriesForCAP/gap/LinearClosure.gi
@@ -854,7 +854,7 @@ InstallMethodWithCache( ExtendFunctorToLinearClosureOfSource,
 
         supp := List( supp, m -> ApplyFunctor( F, m ) );
 
-        return Sum( ListN( coeffs, supp, MultiplyWithElementOfCommutativeRingForMorphisms ) );
+        return LinearCombinationOfMorphisms( s, coeffs, supp, r );
 
     end );