speed improvement of beta functions

FlexibleSUSY · Dec 7, 2016 · 998f11e · 998f11e
1 parent 6e27a56
commit 998f11e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/meta/BetaFunction.m b/meta/BetaFunction.m
@@ -122,8 +122,11 @@
            expr
           ];
 
+TimeConstrainedSimplify[expr_] :=
+    TimeConstrained[Simplify[expr], FlexibleSUSY`FSSimplifyBetaFunctionsTimeConstraint, expr];
+
 CollectMatMul[expr_] :=
-    TimeConstrained[Collect[expr, SARAH`MatMul[___]],
+    TimeConstrained[Collect[expr, SARAH`MatMul[___], TimeConstrainedSimplify],
                     FlexibleSUSY`FSSimplifyBetaFunctionsTimeConstraint,
                     expr];
 
@@ -291,7 +294,7 @@
                    (* protect tensor products *)
                    expr = CConversion`ProtectTensorProducts[#, name]& /@ expr;
                    (* simplify expressions *)
-                   expr = TimeConstrained[Simplify[#], FlexibleSUSY`FSSimplifyBetaFunctionsTimeConstraint, #]& /@ expr;
+                   expr = TimeConstrainedSimplify /@ expr;
                    AppendTo[lst, BetaFunction[name, type, expr]];
                   ];
               ];