From 58be3612823936f85258241528d2973adf213011 Mon Sep 17 00:00:00 2001 From: Gloria Mundi Date: Fri, 14 Nov 2025 14:41:29 +0100 Subject: rename calc_binom() to binom() --- content/math/binomial0.cpp | 2 +- content/math/binomial1.cpp | 2 +- content/math/binomial2.cpp | 2 +- content/math/binomial3.cpp | 2 +- test/math/binomial0.cpp | 5 ++--- test/math/binomial1.cpp | 4 ++-- test/math/binomial2.cpp | 4 ++-- test/math/binomial3.cpp | 4 ++-- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/content/math/binomial0.cpp b/content/math/binomial0.cpp index f37aea5..8b436a2 100644 --- a/content/math/binomial0.cpp +++ b/content/math/binomial0.cpp @@ -8,7 +8,7 @@ void precalc() { for (int i = lim - 1; i > 0; i--) inv[i-1] = inv[i] * i % mod; } -ll calc_binom(ll n, ll k) { +ll binom(ll n, ll k) { if (n < 0 || n < k || k < 0) return 0; return (fac[n] * inv[n-k] % mod) * inv[k] % mod; } diff --git a/content/math/binomial1.cpp b/content/math/binomial1.cpp index d0fce18..34f13ed 100644 --- a/content/math/binomial1.cpp +++ b/content/math/binomial1.cpp @@ -1,4 +1,4 @@ -ll calc_binom(ll n, ll k) { +ll binom(ll n, ll k) { if (k > n) return 0; ll r = 1; for (ll d = 1; d <= k; d++) { // Reihenfolge => Teilbarkeit diff --git a/content/math/binomial2.cpp b/content/math/binomial2.cpp index 4531505..bb6a035 100644 --- a/content/math/binomial2.cpp +++ b/content/math/binomial2.cpp @@ -20,7 +20,7 @@ ll binomPPow(ll n, ll k, ll p) { return res; } -ll calc_binom(ll n, ll k) { +ll binom(ll n, ll k) { if (k > n) return 0; ll res = 1; k = min(k, n - k); diff --git a/content/math/binomial3.cpp b/content/math/binomial3.cpp index 7a6ab4e..8a51dac 100644 --- a/content/math/binomial3.cpp +++ b/content/math/binomial3.cpp @@ -1,4 +1,4 @@ -ll calc_binom(ll n, ll k, ll p) { +ll binom(ll n, ll k, ll p) { assert(n < p); //wichtig: sonst falsch! if (k > n) return 0; ll x = k % 2 != 0 ? p-1 : 1; diff --git a/test/math/binomial0.cpp b/test/math/binomial0.cpp index 25ee344..17a5f91 100644 --- a/test/math/binomial0.cpp +++ b/test/math/binomial0.cpp @@ -4,15 +4,14 @@ constexpr ll mod = 1'394'633'899; #include - void stress_test() { vector last = {1}; ll queries = 0; for (ll i = 0; i < 10'000; i++) { for (ll j = 0; j <= i; j++) { - ll got = calc_binom(i, j); + ll got = binom(i, j); ll expected = last[j]; - if (got != expected) cerr << "calc_binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; + if (got != expected) cerr << "binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; } queries += ssize(last); diff --git a/test/math/binomial1.cpp b/test/math/binomial1.cpp index f7d06dd..3a7b291 100644 --- a/test/math/binomial1.cpp +++ b/test/math/binomial1.cpp @@ -7,9 +7,9 @@ void stress_test() { ll queries = 0; for (ll i = 0; i <= 61; i++) { for (ll j = 0; j <= i; j++) { - ll got = calc_binom(i, j); + ll got = binom(i, j); ll expected = last[j]; - if (got != expected) cerr << "calc_binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; + if (got != expected) cerr << "binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; } queries += ssize(last); diff --git a/test/math/binomial2.cpp b/test/math/binomial2.cpp index 0b6178e..ce6a07c 100644 --- a/test/math/binomial2.cpp +++ b/test/math/binomial2.cpp @@ -8,9 +8,9 @@ void stress_test() { ll queries = 0; for (ll i = 0; i <= 1000; i++) { for (ll j = 0; j <= i; j++) { - ll got = calc_binom(i, j); + ll got = binom(i, j); ll expected = last[j]; - if (got != expected) cerr << "calc_binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; + if (got != expected) cerr << "binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; } queries += ssize(last); diff --git a/test/math/binomial3.cpp b/test/math/binomial3.cpp index c4791d0..eaca24e 100644 --- a/test/math/binomial3.cpp +++ b/test/math/binomial3.cpp @@ -11,9 +11,9 @@ void stress_test() { ll queries = 0; for (ll i = 0; i < mod; i++) { for (ll j = 0; j <= i; j++) { - ll got = calc_binom(i, j, mod); + ll got = binom(i, j, mod); ll expected = last[j]; - if (got != expected) cerr << "calc_binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; + if (got != expected) cerr << "binom(" << i << ", " << j << "), got: " << got << ", expected: " << expected << FAIL; } queries += ssize(last); -- cgit v1.2.3