diff options
| author | Gloria Mundi <gloria@gloria-mundi.eu> | 2024-11-05 21:51:20 +0100 |
|---|---|---|
| committer | Gloria Mundi <gloria@gloria-mundi.eu> | 2024-11-05 21:51:20 +0100 |
| commit | ad3856a6b766087df0036de0b556f4700a6498c9 (patch) | |
| tree | 78037d83b823feee3f73d6594d6039442d7ca525 /math | |
| parent | cfb19a7085895cdbcf09c123c37735586dbe7695 (diff) | |
| parent | 8c33b4e0d3030cfed17fc64b4fe41133339f6d87 (diff) | |
merge mzuenni changes
Diffstat (limited to 'math')
| -rw-r--r-- | math/discreteNthRoot.cpp | 2 | ||||
| -rw-r--r-- | math/inversions.cpp | 2 | ||||
| -rw-r--r-- | math/lgsFp.cpp | 2 | ||||
| -rw-r--r-- | math/math.tex | 3 | ||||
| -rw-r--r-- | math/tables/prime-composite.tex | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/math/discreteNthRoot.cpp b/math/discreteNthRoot.cpp index 9249f73..7201b2b 100644 --- a/math/discreteNthRoot.cpp +++ b/math/discreteNthRoot.cpp @@ -1,5 +1,5 @@ ll root(ll a, ll b, ll m) { ll g = findPrimitive(m); - ll c = dlog(powMod(g, a, m), b, m); //diskreter logarithmus + ll c = dlog(powMod(g, a, m), b, m); //dLog @\sourceref{math/discreteLogarithm.cpp}@ return c < 0 ? -1 : powMod(g, c, m); } diff --git a/math/inversions.cpp b/math/inversions.cpp index 051408c..9e47f9b 100644 --- a/math/inversions.cpp +++ b/math/inversions.cpp @@ -1,5 +1,5 @@ ll inversions(const vector<ll>& v) { - Tree<pair<ll, ll>> t; //ordered statistics tree + Tree<pair<ll, ll>> t; //ordered statistics tree @\sourceref{datastructures/pbds.cpp}@ ll res = 0; for (ll i = 0; i < sz(v); i++) { res += i - t.order_of_key({v[i], i}); diff --git a/math/lgsFp.cpp b/math/lgsFp.cpp index 7dcd354..7081fea 100644 --- a/math/lgsFp.cpp +++ b/math/lgsFp.cpp @@ -23,4 +23,4 @@ void gauss(int n, ll mod) { takeAll(n, i, mod); done[i] = true; }} -// für Eindeutigkeit, Existenz etc. siehe LGS +// für Eindeutigkeit, Existenz etc. siehe LGS über R diff --git a/math/math.tex b/math/math.tex index a4cbde8..f5fbdca 100644 --- a/math/math.tex +++ b/math/math.tex @@ -261,6 +261,7 @@ sich alle Lösungen von $x^2-ny^2=c$ berechnen durch: %\textcolor{safeOrange}{$\blacksquare$} NTT code, %\textcolor{safeGreen}{$\blacksquare$} FFT code
\sourcecode{math/transforms/fft.cpp}
\sourcecode{math/transforms/ntt.cpp}
+ \vfill\null
\columnbreak
\sourcecode{math/transforms/bitwiseTransforms.cpp}
Multiplikation mit 2 transforms statt 3: (nur benutzten wenn nötig!)
@@ -335,7 +336,7 @@ sich alle Lösungen von $x^2-ny^2=c$ berechnen durch: c_{n-1} & c_{n-2} & \smash{\cdots} & \smash{\cdots} & c_0 \\
1 & 0 & \smash{\cdots} & \smash{\cdots} & 0 \\
0 & \smash{\ddots} & \smash{\ddots} & & \smash{\vdots} \\
- 0 & \smash{\ddots} & \smash{\ddots} & \smash{\ddots} & \smash{\vdots} \\
+ \smash{\vdots} & \smash{\ddots} & \smash{\ddots} & \smash{\ddots} & \smash{\vdots} \\
0 & \smash{\cdots} & 0 & 1 & 0 \\
\end{pmatrix}^k
\times~~
diff --git a/math/tables/prime-composite.tex b/math/tables/prime-composite.tex index 5274cbe..4c32c7d 100644 --- a/math/tables/prime-composite.tex +++ b/math/tables/prime-composite.tex @@ -2,7 +2,7 @@ \hline \multicolumn{7}{|c|}{Important Numbers} \\ \hline - $10^x$ & Highly Composite & \# Divs & $<$ Prime & $>$ Prime & \# Primes & \\ + $10^x$ & Highly Composite & \# Divs & $<$ Prime & $>$ Prime & \# Primes & \\ \hline 1 & 6 & 4 & $-3$ & $+1$ & 4 & \\ 2 & 60 & 12 & $-3$ & $+1$ & 25 & \\ |