From e95f59debd69ee7d45d5c966ce466d23264e1c3c Mon Sep 17 00:00:00 2001 From: Gloria Mundi Date: Sat, 16 Nov 2024 18:12:15 +0100 Subject: rename maxCarBiMatch.cpp to kuhn.cpp --- content/graph/graph.tex | 2 +- content/graph/kuhn.cpp | 25 ++++++++++++++ content/graph/maxCarBiMatch.cpp | 25 -------------- test/graph/hopcroftKarp.cpp | 2 +- test/graph/kuhn.cpp | 74 +++++++++++++++++++++++++++++++++++++++++ test/graph/maxCarBiMatch.cpp | 74 ----------------------------------------- 6 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 content/graph/kuhn.cpp delete mode 100644 content/graph/maxCarBiMatch.cpp create mode 100644 test/graph/kuhn.cpp delete mode 100644 test/graph/maxCarBiMatch.cpp diff --git a/content/graph/graph.tex b/content/graph/graph.tex index b38e96e..6e8e20b 100644 --- a/content/graph/graph.tex +++ b/content/graph/graph.tex @@ -188,7 +188,7 @@ Sei $a_{ij}$ die Adjazenzmatrix von $G$ \textcolor{gray}{(mit $a_{ii} = 1$)}, da \begin{itemize} \item die ersten [0..l) Knoten in \code{adj} sind die linke Seite des Graphen \end{itemize} - \sourcecode{graph/maxCarBiMatch.cpp} + \sourcecode{graph/kuhn.cpp} \begin{methods} \method{hopcroft\_karp}{berechnet Matching}{\sqrt{\abs{V}}\*\abs{E}} \end{methods} diff --git a/content/graph/kuhn.cpp b/content/graph/kuhn.cpp new file mode 100644 index 0000000..e928387 --- /dev/null +++ b/content/graph/kuhn.cpp @@ -0,0 +1,25 @@ +vector> adj; +vector pairs; // Der gematchte Knoten oder -1. +vector visited; + +bool dfs(int v) { + if (visited[v]) return false; + visited[v] = true; + for (int u : adj[v]) if (pairs[u] < 0 || dfs(pairs[u])) { + pairs[u] = v; pairs[v] = u; return true; + } + return false; +} + +int kuhn(int l) { // l = #Knoten links. + pairs.assign(sz(adj), -1); + int ans = 0; + // Greedy Matching. Optionale Beschleunigung. + for (int v = 0; v < l; v++) for (int u : adj[v]) + if (pairs[u] < 0) {pairs[u] = v; pairs[v] = u; ans++; break;} + for (int v = 0; v < l; v++) if (pairs[v] < 0) { + visited.assign(l, false); + ans += dfs(v); + } + return ans; // Größe des Matchings. +} diff --git a/content/graph/maxCarBiMatch.cpp b/content/graph/maxCarBiMatch.cpp deleted file mode 100644 index e928387..0000000 --- a/content/graph/maxCarBiMatch.cpp +++ /dev/null @@ -1,25 +0,0 @@ -vector> adj; -vector pairs; // Der gematchte Knoten oder -1. -vector visited; - -bool dfs(int v) { - if (visited[v]) return false; - visited[v] = true; - for (int u : adj[v]) if (pairs[u] < 0 || dfs(pairs[u])) { - pairs[u] = v; pairs[v] = u; return true; - } - return false; -} - -int kuhn(int l) { // l = #Knoten links. - pairs.assign(sz(adj), -1); - int ans = 0; - // Greedy Matching. Optionale Beschleunigung. - for (int v = 0; v < l; v++) for (int u : adj[v]) - if (pairs[u] < 0) {pairs[u] = v; pairs[v] = u; ans++; break;} - for (int v = 0; v < l; v++) if (pairs[v] < 0) { - visited.assign(l, false); - ans += dfs(v); - } - return ans; // Größe des Matchings. -} diff --git a/test/graph/hopcroftKarp.cpp b/test/graph/hopcroftKarp.cpp index 05599dd..df2cec2 100644 --- a/test/graph/hopcroftKarp.cpp +++ b/test/graph/hopcroftKarp.cpp @@ -1,6 +1,6 @@ #include "../util.h" namespace kuhn { -#include +#include } namespace hk { #include diff --git a/test/graph/kuhn.cpp b/test/graph/kuhn.cpp new file mode 100644 index 0000000..8b7e13b --- /dev/null +++ b/test/graph/kuhn.cpp @@ -0,0 +1,74 @@ +#include "../util.h" +namespace kuhn { +#include +} +namespace hk { +#include +} + +void stress_test() { + ll queries = 0; + for (int tries = 0; tries < 50'000; tries++) { + int n = Random::integer(1, 30); + int m = Random::integer(0, max(1, n*(n-1) / 2 + 1)); + + kuhn::adj.assign(2*n, {}); + hk::adj.assign(2*n, {}); + + Graph g(n); + g.erdosRenyi(m); + g.forEdges([&](int a, int b){ + kuhn::adj[a].push_back(n+b); + kuhn::adj[b+n].push_back(a); + + hk::adj[a].push_back(n+b); + hk::adj[b+n].push_back(a); + }); + + ll got = kuhn::kuhn(n); + ll expected = hk::hopcroft_karp(n); + + vector seen(2*n); + ll got2 = 0; + for (int i = 0; i < n; i++) { + int j = kuhn::pairs[i]; + if (j < 0) continue; + if (kuhn::pairs[j] != i) cerr << "error: inconsitent" << FAIL; + if (j == i) cerr << "error: invalid" << FAIL; + if (j < i) continue; + if (seen[i] || seen[j]) cerr << "error: invalid" << FAIL; + seen[i] = seen[j] = true; + got2++; + } + + if (got != got2) cerr << "got: " << got << ", got2: " << got2 << FAIL; + if (got != expected) cerr << "got: " << got << ", expected: " << expected << FAIL; + queries += n; + } + cerr << "tested random queries: " << queries << endl; +} + +//this is an easy graph... +constexpr int N = 10'000; +constexpr int M = 100'000; +void performance_test() { + timer t; + Graph g(N); + g.erdosRenyi(M); + kuhn::adj.assign(2*N, {}); + g.forEdges([&](int a, int b){ + kuhn::adj[a].push_back(N+b); + kuhn::adj[b+N].push_back(a); + }); + + t.start(); + hash_t hash = kuhn::kuhn(N); + t.stop(); + if (t.time > 200) cerr << "too slow: " << t.time << FAIL; + cerr << "tested performance: " << t.time << "ms (hash: " << hash << ")" << endl; +} + +int main() { + stress_test(); + performance_test(); +} diff --git a/test/graph/maxCarBiMatch.cpp b/test/graph/maxCarBiMatch.cpp deleted file mode 100644 index 6d7fad0..0000000 --- a/test/graph/maxCarBiMatch.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "../util.h" -namespace kuhn { -#include -} -namespace hk { -#include -} - -void stress_test() { - ll queries = 0; - for (int tries = 0; tries < 50'000; tries++) { - int n = Random::integer(1, 30); - int m = Random::integer(0, max(1, n*(n-1) / 2 + 1)); - - kuhn::adj.assign(2*n, {}); - hk::adj.assign(2*n, {}); - - Graph g(n); - g.erdosRenyi(m); - g.forEdges([&](int a, int b){ - kuhn::adj[a].push_back(n+b); - kuhn::adj[b+n].push_back(a); - - hk::adj[a].push_back(n+b); - hk::adj[b+n].push_back(a); - }); - - ll got = kuhn::kuhn(n); - ll expected = hk::hopcroft_karp(n); - - vector seen(2*n); - ll got2 = 0; - for (int i = 0; i < n; i++) { - int j = kuhn::pairs[i]; - if (j < 0) continue; - if (kuhn::pairs[j] != i) cerr << "error: inconsitent" << FAIL; - if (j == i) cerr << "error: invalid" << FAIL; - if (j < i) continue; - if (seen[i] || seen[j]) cerr << "error: invalid" << FAIL; - seen[i] = seen[j] = true; - got2++; - } - - if (got != got2) cerr << "got: " << got << ", got2: " << got2 << FAIL; - if (got != expected) cerr << "got: " << got << ", expected: " << expected << FAIL; - queries += n; - } - cerr << "tested random queries: " << queries << endl; -} - -//this is an easy graph... -constexpr int N = 10'000; -constexpr int M = 100'000; -void performance_test() { - timer t; - Graph g(N); - g.erdosRenyi(M); - kuhn::adj.assign(2*N, {}); - g.forEdges([&](int a, int b){ - kuhn::adj[a].push_back(N+b); - kuhn::adj[b+N].push_back(a); - }); - - t.start(); - hash_t hash = kuhn::kuhn(N); - t.stop(); - if (t.time > 200) cerr << "too slow: " << t.time << FAIL; - cerr << "tested performance: " << t.time << "ms (hash: " << hash << ")" << endl; -} - -int main() { - stress_test(); - performance_test(); -} -- cgit v1.2.3