Merge pull request #261 from zickgraf/master

Adjust to homalg-project/CAP_project#1691
homalg-project · Sep 25, 2024 · d7f04f7 · d7f04f7
2 parents f391737 + d4168de
commit d7f04f7
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 13 deletions.
diff --git a/PackageInfo.g b/PackageInfo.g
@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "FinSetsForCAP",
 Subtitle := "The elementary topos of (skeletal) finite sets",
-Version := "2024.08-01",
+Version := "2024.09-01",
 
 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",

diff --git a/gap/SkeletalFinSets.gi b/gap/SkeletalFinSets.gi
@@ -10,11 +10,12 @@ InstallMethod( SkeletalCategoryOfFiniteSets,
 
  FunctionWithNamedArguments(
   [
+    [ "FinalizeCategory", true ],
     [ "no_precompiled_code", false ],
     [ "overhead", true ],
   ],
   function ( CAP_NAMED_ARGUMENTS )
-    local cat;
+    local cat, expected_weight;
 
     cat := CreateCapCategoryWithDataTypes(
         "SkeletalFinSets", IsSkeletalCategoryOfFiniteSets,
@@ -58,7 +59,44 @@ InstallMethod( SkeletalCategoryOfFiniteSets,
 
     fi;
 
-    Finalize( cat );
+    if CAP_NAMED_ARGUMENTS.FinalizeCategory then
+
+        Finalize( cat );
+
+        # check weights of operations using other primitive operations
+        if CAP_NAMED_ARGUMENTS.no_precompiled_code then
+
+            ##
+            expected_weight := 1 + Sum( [ [ "ExponentialOnObjects", 1 ],
+                                          [ "ExactCoverWithGlobalElements", 1 ],
+                                          [ "PreComposeList", 2 ],
+                                          [ "CartesianLambdaElimination", 2 ],
+                                          [ "DirectProductToExponentialRightAdjunctMorphismWithGivenExponential", 2 ] ],
+                                  e -> e[2] * CurrentOperationWeight( cat!.derivations_weight_list, e[1] ) );
+
+            if CurrentOperationWeight( cat!.derivations_weight_list, "ExponentialOnMorphismsWithGivenExponentials" ) <> expected_weight then
+
+                # COVERAGE_IGNORE_NEXT_LINE
+                Print( "WARNING: please update the weight of ExponentialOnMorphismsWithGivenExponentials in SkeletalFinSetsForCAP to ", String( expected_weight ), "\n" );
+
+            fi;
+
+            ##
+            expected_weight := 1 + Sum( [ [ "ExponentialOnObjects", 1 ],
+                                          [ "ExactCoverWithGlobalElements", 1 ],
+                                          [ "CartesianLambdaElimination", 2 ] ],
+                                  e -> e[2] * CurrentOperationWeight( cat!.derivations_weight_list, e[1] ) );
+
+            if CurrentOperationWeight( cat!.derivations_weight_list, "MorphismsOfExternalHom" ) <> expected_weight then
+
+                # COVERAGE_IGNORE_NEXT_LINE
+                Print( "WARNING: please update the weight of MorphismsOfExternalHom in SkeletalFinSetsForCAP to ", String( expected_weight ), "\n" );
+
+            fi;
+
+        fi;
+
+    fi;
 
     return cat;
 
@@ -914,12 +952,13 @@ AddExponentialOnMorphismsWithGivenExponentials( SkeletalFinSets,
                                          range_beta ) ) )[1 + 0] ),
                    T );
 
-end, 1 + Sum( [ [ "ExponentialOnObjects", 1 ],
-                [ "ExactCoverWithGlobalElements", 1 ],
-                [ "PreComposeList", 2 ],
-                [ "CartesianLambdaElimination", 2 ],
-                [ "DirectProductToExponentialRightAdjunctMorphismWithGivenExponential", 2 ] ],
-        e -> e[2] * CurrentOperationWeight( SkeletalFinSets!.derivations_weight_list, e[1] ) ) );
+end, 1403 ); # weight = 1 + Sum(
+             # [ [ "ExponentialOnObjects", 1 ],
+             # [ "ExactCoverWithGlobalElements", 1 ],
+             # [ "PreComposeList", 2 ],
+             # [ "CartesianLambdaElimination", 2 ],
+             # [ "DirectProductToExponentialRightAdjunctMorphismWithGivenExponential", 2 ] ],
+             # e -> e[2] * CurrentOperationWeight( SkeletalFinSets!.derivations_weight_list, e[1] ) )
 
 ## Bᴸ × L → B
 AddCartesianLeftEvaluationMorphismWithGivenSource( SkeletalFinSets,
@@ -1018,10 +1057,11 @@ AddMorphismsOfExternalHom( SkeletalFinSets,
                          B,
                          mor ) );
 
-end, 1 + Sum( [ [ "ExponentialOnObjects", 1 ],
-                [ "ExactCoverWithGlobalElements", 1 ],
-                [ "CartesianLambdaElimination", 2 ] ],
-        e -> e[2] * CurrentOperationWeight( SkeletalFinSets!.derivations_weight_list, e[1] ) ) );
+end, 401 ); # weight = 1 + Sum( [
+            # [ "ExponentialOnObjects", 1 ],
+            # [ "ExactCoverWithGlobalElements", 1 ],
+            # [ "CartesianLambdaElimination", 2 ] ],
+            # e -> e[2] * CurrentOperationWeight( SkeletalFinSets!.derivations_weight_list, e[1] ) ) );
 
 end );