Merge pull request #1690 from zickgraf/master

Avoid unnecessary trigger of derivations and do not rely on AddPrimitiveOperation when installing final derivations

Author: zickgraf

CAP/PackageInfo.g

@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "CAP",
 Subtitle := "Categories, Algorithms, Programming",
-Version := "2024.09-23",
+Version := "2024.09-24",
 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",
 

CAP/gap/Derivations.gi

@@ -108,13 +108,6 @@ FunctionWithNamedArguments(
   function( CAP_NAMED_ARGUMENTS, d, weight, C )
     local method_name, func;
 
-    Info( DerivationInfo, 1, Concatenation( "install(",
-                                            String( weight ),
-                                            ") ",
-                                            TargetOperation( d ),
-                                            ": ",
-                                            Description( d ), "\n" ) );
-    
     method_name := TargetOperation( d );
     func := DerivationFunction( d );
 
@@ -459,14 +452,26 @@ BindGlobal( "TryToInstallDerivation", function ( owl, d )
 
     if new_weight < current_weight or (new_weight = current_weight and current_derivation <> fail and d!.position_in_derivations_by_target < current_derivation!.position_in_derivations_by_target) then
 
+        Info( DerivationInfo, 1, Concatenation( "install(",
+                                                String( new_weight ),
+                                                ") ",
+                                                target,
+                                                ": ",
+                                                Description( d ), "\n" ) );
+        
         # Previously, `InstallDerivationForCategory` was called at this point.
         # However, this could lead to methods being overwritten if cheaper derivations become available while adding primitive installations to a category.
         # Hence, we now install the derivations in `Finalize`.
 
         owl!.operation_weights.( target ) := new_weight;
         owl!.operation_derivations.( target ) := d;
 
-        InstallDerivationsUsingOperation( owl, target );
+        # if the weight has not changed, there is no need to re-trigger the chain of derivations
+        if new_weight <> current_weight then
+            
+            InstallDerivationsUsingOperation( owl, target );
+            
+        fi;
 
     fi;
 
@@ -519,18 +524,26 @@ end );
 
 InstallMethod( AddPrimitiveOperation,
                [ IsOperationWeightList, IsString, IsInt ],
-function( owl, op_name, weight )
+function( owl, op_name, new_weight )
+  local current_weight;
 
     Info( DerivationInfo, 1, Concatenation( "install(",
-                                  String( weight ),
+                                  String( new_weight ),
                                   ") ",
                                   op_name,
                                   ": primitive installation\n" ) );
 
-    owl!.operation_weights.( op_name ) := weight;
+    current_weight := owl!.operation_weights.( op_name );
+    
+    owl!.operation_weights.( op_name ) := new_weight;
     owl!.operation_derivations.( op_name ) := fail;
 
-    InstallDerivationsUsingOperation( owl, op_name );
+    # if the weight has not changed, there is no need to re-trigger the chain of derivations
+    if new_weight <> current_weight then
+        
+        InstallDerivationsUsingOperation( owl, op_name );
+        
+    fi;
 
 end );
 

CAP/gap/Finalize.gi

@@ -292,7 +292,7 @@ InstallMethod( Finalize,
     [ "FinalizeCategory", true ],
   ],
   function( CAP_NAMED_ARGUMENTS, category )
-    local derivation_list, weight_list, current_install, current_final_derivation, weight, old_weights, categorical_properties, diff, properties_with_logic, property, i, derivation, operation, property_name, installed_operations_of_homomorphism_structure, original_REORDER_METHODS_SUSPENSION_LEVEL;
+    local derivation_list, weight_list, current_install, current_final_derivation, op_name, new_weight, current_weight, old_weights, categorical_properties, diff, properties_with_logic, property, i, derivation, operation, property_name, installed_operations_of_homomorphism_structure, original_REORDER_METHODS_SUSPENSION_LEVEL;
 
     if IsFinalized( category ) then
 
@@ -391,16 +391,35 @@ InstallMethod( Finalize,
 
             for derivation in current_final_derivation.derivations do
 
-                weight := OperationWeightUsingDerivation( weight_list, derivation );
+                op_name := TargetOperation( derivation );
+                new_weight := OperationWeightUsingDerivation( weight_list, derivation );
+                current_weight := CurrentOperationWeight( weight_list, op_name );
 
-                Assert( 0, weight <> infinity );
+                Assert( 0, new_weight <> infinity );
 
                 # When installing a final derivation bundle, the installation of the first operations in the bundle
                 # might trigger (normal) derivations of later operations it the bundle, which might be cheaper then
                 # the derivations provided in the bundle.
-                if weight <= CurrentOperationWeight( weight_list, TargetOperation( derivation ) ) then
+                if new_weight <= current_weight then
 
-                    InstallDerivationForCategory( derivation, weight, category : IsFinalDerivation := true );
+                    Info( DerivationInfo, 1, Concatenation( "install(",
+                                                            String( new_weight ),
+                                                            ") ",
+                                                            op_name,
+                                                            ": ",
+                                                            Description( derivation ), "\n" ) );
+                    
+                    InstallDerivationForCategory( derivation, new_weight, category : IsFinalDerivation := true );
+                    
+                    weight_list!.operation_weights.( op_name ) := new_weight;
+                    weight_list!.operation_derivations.( op_name ) := fail;
+                    
+                    # if the weight has not changed, there is no need to re-trigger the chain of derivations
+                    if new_weight <> current_weight then
+                        
+                        InstallDerivationsUsingOperation( weight_list, op_name );
+                        
+                    fi;
 
                 fi;
 

CAP/gap/InstallAdds.gi

@@ -285,9 +285,8 @@ InstallMethod( AddCapOperation,
 
     fi;
 
-    if not is_derivation then
+    if not (is_derivation or is_final_derivation) then
 
-        # Final derivations are not handled by the original derivation mechanism and are thus just like primitive operations for it.
         AddPrimitiveOperation( category!.derivations_weight_list, function_name, weight );
 
     fi;

FreydCategoriesForCAP/gap/CategoryOfRows.gi

@@ -41,6 +41,9 @@ InstallMethod( CategoryOfRows,
 
         SetIsRigidSymmetricCoclosedMonoidalCategory( cat, true );
 
+        # since methods have been added before, we have to reevaluate the derivations
+        Reevaluate( cat!.derivations_weight_list );
+        
     fi;
 
     INSTALL_FUNCTIONS_FOR_CATEGORY_OF_ROWS( cat );