improve benchmarks

Author: oameye

benchmark/baseline_v6.json

@@ -19,101 +19,122 @@ using QuestBase:
     power_of,
     substitute_all,
     is_harmonic,
+    is_function,
+    count_derivatives,
+    add_div,
     DifferentialEquation,
     HarmonicVariable,
-    d
-using Symbolics: Symbolics, @variables, unwrap, expand, Num, Equation
+    HarmonicEquation,
+    add_harmonic!,
+    rearrange_standard!,
+    d,
+    var_name
+using Symbolics: Symbolics, @variables, unwrap, expand, Num, Equation, Differential
 using SymbolicUtils: BasicSymbolic
 
 const SUITE = BenchmarkGroup()
 
 # --- Setup variables ---
 @variables t x(t) y(t) ω0 ω F k a b c f θ
+D = Differential(t)
 
-# --- Symbolic utilities ---
+# ==========================================================================
+# Symbolic utilities
+# ==========================================================================
 SUITE["symbolic_utils"] = BenchmarkGroup()
 
-expr_add = a + b + c
-expr_mul = a * b * c
-expr_div = a / b
 expr_nested = (a + b * c)^2 + (a - c) / b
 expr_complex = a + b * cos(f * t) + c * sin(f * t)
 
-SUITE["symbolic_utils"]["expand_all_simple"] = @benchmarkable expand_all($expr_add)
 SUITE["symbolic_utils"]["expand_all_nested"] = @benchmarkable expand_all($expr_nested)
 SUITE["symbolic_utils"]["expand_all_trig"] = @benchmarkable expand_all($expr_complex)
 
 SUITE["symbolic_utils"]["expand_fraction"] = @benchmarkable expand_fraction(
-    $(unwrap((a + b) / c))
+    $(unwrap((a^2 + b * c + a * b^2 + c^3) / (a + b)))
 )
+
 SUITE["symbolic_utils"]["_apply_termwise_add"] = @benchmarkable _apply_termwise(
-    identity, $(unwrap(expr_add))
+    simplify_complex, $(unwrap(a^2 + b * c + a * b^2 + c^3 + a * b * c))
 )
 SUITE["symbolic_utils"]["_apply_termwise_mul"] = @benchmarkable _apply_termwise(
-    identity, $(unwrap(expr_mul))
+    simplify_complex, $(unwrap(a * b * c * (a + b) * (b + c)))
 )
 SUITE["symbolic_utils"]["_apply_termwise_div"] = @benchmarkable _apply_termwise(
-    identity, $(unwrap(expr_div))
+    simplify_complex, $(unwrap((a^2 + b * c + c^3) / (a * b + c^2)))
 )
 
 SUITE["symbolic_utils"]["simplify_complex_add"] = @benchmarkable simplify_complex(
-    $(unwrap(Complex{Num}(a + b, 0 * a)))
+    $(unwrap(Complex{Num}(a^2 + b * c, 0 * a)))
 )
 SUITE["symbolic_utils"]["simplify_complex_real"] = @benchmarkable simplify_complex(
-    $(Complex{Num}(a, 0 * a))
+    $(Complex{Num}(a^2 + b * c, 0 * a))
 )
 
 SUITE["symbolic_utils"]["get_independent_simple"] = @benchmarkable get_independent(
-    $a + $b + $c, $t
+    $(a^2 + b * c + a * b), $t
 )
 SUITE["symbolic_utils"]["get_independent_trig"] = @benchmarkable get_independent(
-    $(cos(f * t)^2 + a + b), $t
+    $(cos(f * t)^2 + a * sin(f * t) + b), $t
 )
 
-SUITE["symbolic_utils"]["get_all_terms_add"] = @benchmarkable get_all_terms($expr_add)
 SUITE["symbolic_utils"]["get_all_terms_nested"] = @benchmarkable get_all_terms($expr_nested)
 
-# --- Exponentials ---
+SUITE["symbolic_utils"]["is_function_true"] = @benchmarkable is_function(
+    $(cos(f * t)^2 + a), $t
+)
+SUITE["symbolic_utils"]["is_function_false"] = @benchmarkable is_function(
+    $(a^2 + b * c), $t
+)
+
+SUITE["symbolic_utils"]["count_derivatives_0"] = @benchmarkable count_derivatives($x)
+SUITE["symbolic_utils"]["count_derivatives_2"] = @benchmarkable count_derivatives(
+    $(d(d(x, t), t))
+)
+
+SUITE["symbolic_utils"]["var_name"] = @benchmarkable var_name($x)
+
+# ==========================================================================
+# Exponentials
+# ==========================================================================
 SUITE["exponentials"] = BenchmarkGroup()
 
 SUITE["exponentials"]["expand_exp_power"] = @benchmarkable expand_exp_power(
-    $(unwrap(exp(a)^3))
+    $(unwrap(exp(a)^3 + exp(b)^2 + a * exp(c)^4))
 )
-SUITE["exponentials"]["expand_exp_power_nested"] = @benchmarkable expand_exp_power(
-    $(unwrap(exp(a)^3 + exp(b)^2))
-)
-
 SUITE["exponentials"]["simplify_exp_products"] = @benchmarkable simplify_exp_products(
-    $(unwrap(exp(a) * exp(b)))
-)
-SUITE["exponentials"]["simplify_exp_products_multi"] = @benchmarkable simplify_exp_products(
-    $(unwrap(exp(3a) * exp(4b)))
+    $(unwrap(exp(3a) * exp(4b) + exp(a) * exp(c)))
 )
 
-# --- Fourier ---
+# ==========================================================================
+# Fourier
+# ==========================================================================
 SUITE["fourier"] = BenchmarkGroup()
 
-trig_expr_simple = cos(f * t)
 trig_expr_sq = cos(f * t)^2
 trig_expr_product =
     (a * sin(f * t) + b * cos(f * t)) *
     (a * sin(2 * f * t) + b * cos(2 * f * t)) *
     (a * sin(3 * f * t) + b * cos(3 * f * t))
 trig_expr_hard = (a + b * cos(f * t + θ)^2)^3 * sin(f * t)
 
-SUITE["fourier"]["trig_to_exp_simple"] = @benchmarkable trig_to_exp($trig_expr_simple)
 SUITE["fourier"]["trig_to_exp_sq"] = @benchmarkable trig_to_exp($trig_expr_sq)
+SUITE["fourier"]["trig_to_exp_product"] = @benchmarkable trig_to_exp($trig_expr_product)
+
+exp_sum = unwrap(exp(im * a) + exp(-im * a) + exp(im * (a + b)))
+SUITE["fourier"]["exp_to_trig_sum"] = @benchmarkable exp_to_trig($exp_sum)
 
-SUITE["fourier"]["exp_to_trig"] = @benchmarkable exp_to_trig($(unwrap(exp(im * a))))
+SUITE["fourier"]["add_div"] = @benchmarkable add_div(
+    $(a / (b + c) + b / (a + c))
+)
 
 SUITE["fourier"]["trig_reduce_simple"] = @benchmarkable trig_reduce($trig_expr_sq)
 SUITE["fourier"]["trig_reduce_product"] = @benchmarkable trig_reduce($trig_expr_product)
 
 SUITE["fourier"]["fourier_cos_term_simple"] = @benchmarkable fourier_cos_term(
-    $trig_expr_simple, $f, $t
+    $(cos(f * t)), $f, $t
 )
 SUITE["fourier"]["fourier_cos_term_sq"] = @benchmarkable fourier_cos_term(
-    $(cos(f * t)^2), $(2f), $t
+    $trig_expr_sq, $(2f), $t
 )
 SUITE["fourier"]["fourier_sin_term_simple"] = @benchmarkable fourier_sin_term(
     $(sin(f * t)), $f, $t
@@ -125,23 +146,28 @@ SUITE["fourier"]["fourier_cos_term_hard"] = @benchmarkable fourier_cos_term(
     $trig_expr_hard, $f, $t
 )
 
-# --- Powers ---
+# ==========================================================================
+# Powers
+# ==========================================================================
 SUITE["powers"] = BenchmarkGroup()
 
 SUITE["powers"]["max_power_simple"] = @benchmarkable max_power($(a^2 + b), $a)
 SUITE["powers"]["max_power_nested"] = @benchmarkable max_power($(a * ((a + b)^4)^2 + a), $a)
 SUITE["powers"]["power_of_pow"] = @benchmarkable power_of($(unwrap(a^3)), $(unwrap(a)))
-SUITE["powers"]["drop_powers_simple"] = @benchmarkable drop_powers($(a^2 + b), $a, 1)
+SUITE["powers"]["drop_powers_single_var"] = @benchmarkable drop_powers(
+    $((a + b)^3 + a^2 * b + a * b^2), $a, 2
+)
 SUITE["powers"]["drop_powers_multi"] = @benchmarkable drop_powers($((a + b)^2), [$a, $b], 1)
 SUITE["powers"]["drop_powers_high"] = @benchmarkable drop_powers(
     $((a + b)^3 + (a + b)^5), [$a, $b], 4
 )
 
-# --- Substitution ---
+# ==========================================================================
+# Substitution
+# ==========================================================================
 SUITE["substitution"] = BenchmarkGroup()
 
 @variables d_var e_var f_var g_var h_var
-rules_small = Dict(a => b)
 rules_medium = Dict(a => b, c => d_var, e_var => f_var)
 expr_sub = a + b + c + d_var + e_var + f_var
 
@@ -154,8 +180,16 @@ SUITE["substitution"]["substitute_all_3rules"] = @benchmarkable substitute_all(
 SUITE["substitution"]["substitute_all_vector"] = @benchmarkable substitute_all(
     [$a, $c, $e_var], $rules_medium
 )
+SUITE["substitution"]["substitute_all_no_deriv"] = @benchmarkable substitute_all(
+    $(a^2 + b * c), $(Dict(a => b)); include_derivatives=false
+)
+SUITE["substitution"]["substitute_all_with_deriv"] = @benchmarkable substitute_all(
+    $(D(x) + a * x), $(Dict(x => 2x, a => b))
+)
 
-# --- Construction ---
+# ==========================================================================
+# Construction and rearrangement
+# ==========================================================================
 SUITE["construction"] = BenchmarkGroup()
 
 SUITE["construction"]["DifferentialEquation_single"] = @benchmarkable DifferentialEquation(
@@ -167,8 +201,23 @@ SUITE["construction"]["DifferentialEquation_coupled"] = @benchmarkable Different
     [$x, $y],
 )
 
-# --- Harmonic checks ---
+# Rearrangement benchmark
+diff_eq_for_rearrange = DifferentialEquation(
+    [d(x, t, 2) + ω0^2 * x - k * y ~ F * cos(ω * t),
+     d(y, t, 2) + ω0^2 * y - k * x ~ 0],
+    [x, y],
+)
+SUITE["construction"]["rearrange_standard"] = @benchmarkable rearrange_standard!(
+    eom
+) setup = (eom = deepcopy($diff_eq_for_rearrange))
+
+# ==========================================================================
+# Harmonic checks
+# ==========================================================================
 SUITE["harmonic"] = BenchmarkGroup()
 
 SUITE["harmonic"]["is_harmonic_true"] = @benchmarkable is_harmonic($(cos(f * t)), $t)
 SUITE["harmonic"]["is_harmonic_false"] = @benchmarkable is_harmonic($(cos(f * t^2 + a)), $t)
+SUITE["harmonic"]["is_harmonic_complex"] = @benchmarkable is_harmonic(
+    $(a * cos(f * t) + b * sin(2f * t) + c), $t
+)