A club analysis in the statistics: the season as charts; larger trophies
The engine counts the manager's club's running season from the almanac (read "analysis"): matches, the points course beside the league's pace, records by venue, what the first goal decided, goals by quarter of an hour, scorers and goal kinds. The statistics open with it; the archive tables keep their place with larger type and trophies. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
1 parent
9006b7a05d
commit
8f607a9d89
13 files changed
+444
-9
No files matched your search
@@ -0,0 +1,166 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// The club's running season as charts, counted by the engine from the almanac
|
||||
// (read "analysis", modern::club_analysis). Bars are plain boxes so that every figure is
|
||||
// type; only the points course is a drawing.
|
||||
std::string App::render_statistics_analysis() {
|
||||
const auto tabs = [&](const std::string ¤t) {
|
||||
std::string out = "<nav class=\"bank-tabs an-tabs\" aria-label=\"Statistikansicht\">";
|
||||
for (const auto &[id, label] : std::array<std::pair<const char *, const char *>, 2>{{{"analysis", "Vereinsanalyse"}, {"archive", "Archiv"}}})
|
||||
out += btn("statistics-mode", label, std::string("bank-tab") + (current == id ? " selected" : ""),
|
||||
"id=\"statistics-mode-" + std::string(id) + "\" data-id=\"" + id + "\" aria-pressed=\"" + (current == id ? "true" : "false") + "\"");
|
||||
return out + "</nav>";
|
||||
};
|
||||
std::string out = "<section class=\"statistics-native an-screen\"><div class=\"an-head\"><div class=\"bank-brand\"><strong>Statistiken</strong><span>Vereinsanalyse</span></div>" + tabs("analysis") + "</div>";
|
||||
const auto &data = engine_analysis_value_;
|
||||
if (!data.is_object() || !data.value("available", false))
|
||||
return out + "<p class=\"an-empty\">" + std::string(engine_busy_ ? "Die Auswertung wird geladen …" : "In dieser Saison ist noch kein Spiel aufgezeichnet.") + "</p></section>";
|
||||
const auto one = [](double value) {
|
||||
std::ostringstream text;
|
||||
text << std::fixed << std::setprecision(1) << value;
|
||||
auto result = text.str();
|
||||
std::replace(result.begin(), result.end(), '.', ',');
|
||||
return result;
|
||||
};
|
||||
const auto two = [](double value) {
|
||||
std::ostringstream text;
|
||||
text << std::fixed << std::setprecision(2) << value;
|
||||
auto result = text.str();
|
||||
std::replace(result.begin(), result.end(), '.', ',');
|
||||
return result;
|
||||
};
|
||||
const auto card = [](const std::string &css, double x, double y, double w, double h, const std::string &title, const std::string &body) {
|
||||
return "<div class=\"an-card " + css + "\" style=\"" + rect(x, y, w, h) + "\"><h3>" + title + "</h3>" + body + "</div>";
|
||||
};
|
||||
const auto &matches = data.at("matches"), &points = data.at("points"), &league = data.at("league");
|
||||
const int played = int(matches.size()), league_played = int(points.size());
|
||||
const int goals_for = data.at("goals").at("for"), goals_against = data.at("goals").at("against");
|
||||
const int chances_for = data.at("chances").at("for"), chances_against = data.at("chances").at("against");
|
||||
const double pace = league_played ? points.back().get<double>() / league_played : 0;
|
||||
const double league_pace = league.at("matches").get<int64_t>() ? league.at("points").get<double>() / (2.0 * league.at("matches").get<double>()) : 0;
|
||||
const double conversion = chances_for ? goals_for * 100.0 / chances_for : 0;
|
||||
const double league_conversion = league.at("chances").get<int64_t>() ? league.at("goals").get<double>() * 100.0 / league.at("chances").get<double>() : 0;
|
||||
const int year = data.value("year", 0);
|
||||
out += "<p class=\"an-sub\">Saison " + std::to_string(year) + "/" + (year % 100 + 1 < 10 ? "0" : "") + std::to_string((year + 1) % 100) +
|
||||
(data.value("leagueName", std::string()).empty() ? "" : " · " + esc(data.at("leagueName").get<std::string>())) + " · alle Pflicht- und Testspiele aus dem Spielarchiv</p>";
|
||||
|
||||
// the figures a manager asks for first
|
||||
const std::array<std::array<std::string, 3>, 6> tiles{{
|
||||
{std::to_string(played), "Spiele", std::to_string(league_played) + " in der Liga"},
|
||||
{two(pace), "Punkte je Ligaspiel", "Liga-Schnitt " + two(league_pace)},
|
||||
{std::to_string(goals_for), "Tore", played ? one(double(goals_for) / played) + " je Spiel" : ""},
|
||||
{std::to_string(goals_against), "Gegentore", played ? one(double(goals_against) / played) + " je Spiel" : ""},
|
||||
{one(conversion) + " %", "Chancenverwertung", "Liga-Schnitt " + one(league_conversion) + " %"},
|
||||
{std::to_string(data.at("cards").at("yellow").get<int>()) + " / " + std::to_string(data.at("cards").at("red").get<int>()), "Gelbe / Rote Karten",
|
||||
"Gegner " + std::to_string(data.at("cards").at("yellowAgainst").get<int>()) + " / " + std::to_string(data.at("cards").at("redAgainst").get<int>())}}};
|
||||
for (size_t i = 0; i < tiles.size(); ++i)
|
||||
out += "<div class=\"an-tile\" style=\"" + rect(30 + double(i) * 428.666, 230, 408.666, 230) + "\"><strong>" + tiles[i][0] + "</strong><span>" + tiles[i][1] + "</span><small>" + tiles[i][2] + "</small></div>";
|
||||
|
||||
// points after each league match beside the league's average pace; below it every match
|
||||
{
|
||||
std::string body;
|
||||
if (league_played > 1) {
|
||||
const double top = std::max({points.back().get<double>(), league_pace * league_played, 3.0}) * 1.12;
|
||||
const auto px = [&](double match) { return 20 + match * 1400.0 / league_played; };
|
||||
const auto py = [&](double value) { return 300 - value / top * 280; };
|
||||
const std::string line = theme_ == "silver" ? "#25617a" : "#9ac7d8", gold = theme_ == "silver" ? "#9a7a3a" : "#d9bd7c", faint = theme_ == "silver" ? "#4a433430" : "#dfeaf530";
|
||||
std::string svg = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 1440 320\"><defs><linearGradient id=\"under\" x1=\"0\" y1=\"0\" x2=\"0\" y2=\"1\"><stop offset=\"0\" stop-color=\"" + line +
|
||||
"\" stop-opacity=\".30\"/><stop offset=\"1\" stop-color=\"" + line + "\" stop-opacity=\".02\"/></linearGradient></defs>";
|
||||
for (int row = 0; row < 4; ++row) svg += "<line x1=\"20\" y1=\"" + scalar(20 + row * 93.3) + "\" x2=\"1420\" y2=\"" + scalar(20 + row * 93.3) + "\" stroke=\"" + faint + "\" stroke-width=\"2\"/>";
|
||||
std::string course = scalar(px(0)) + "," + scalar(py(0)) + " ";
|
||||
for (int i = 0; i < league_played; ++i) course += scalar(px(i + 1)) + "," + scalar(py(points[size_t(i)].get<double>())) + " ";
|
||||
svg += "<polygon points=\"" + course + scalar(px(league_played)) + ",300\" fill=\"url(#under)\"/><line x1=\"" + scalar(px(0)) + "\" y1=\"" + scalar(py(0)) + "\" x2=\"" + scalar(px(league_played)) + "\" y2=\"" +
|
||||
scalar(py(league_pace * league_played)) + "\" stroke=\"" + gold + "\" stroke-width=\"5\" stroke-dasharray=\"16 12\"/><polyline points=\"" + course + "\" fill=\"none\" stroke=\"" + line +
|
||||
"\" stroke-width=\"7\" stroke-linejoin=\"round\" stroke-linecap=\"round\"/><circle cx=\"" + scalar(px(league_played)) + "\" cy=\"" + scalar(py(points.back().get<double>())) + "\" r=\"11\" fill=\"" + line + "\"/></svg>";
|
||||
body += "<div class=\"an-course\">" + picture(renderer_.diagram("analysis-course", svg, 2880), 1440, 320) + "</div><div class=\"an-axis\"><span>1. Spieltag</span><div class=\"an-legend\"><span class=\"key own\"></span><span>" +
|
||||
std::to_string(points.back().get<int>()) + " Punkte</span><span class=\"key pace\"></span><span>Liga-Schnitt " + std::to_string(int(std::lround(league_pace * league_played))) + "</span></div><span>" +
|
||||
std::to_string(league_played) + ". Spieltag</span></div>";
|
||||
} else body += "<p class=\"an-none\">Der Punkteverlauf beginnt mit dem zweiten Ligaspiel.</p>";
|
||||
body += "<h4>Alle Spiele · Höhe nach Tordifferenz</h4><div class=\"an-strip\">";
|
||||
const size_t shown = std::min<size_t>(matches.size(), 40), start = matches.size() - shown;
|
||||
for (size_t i = start; i < matches.size(); ++i) {
|
||||
const auto &m = matches[i];
|
||||
const int balance = m.at("goalsFor").get<int>() - m.at("goalsAgainst").get<int>();
|
||||
const double height = std::min(std::abs(balance), 4) * 22.0;
|
||||
const auto label = esc(std::string(m.at("home").get<bool>() ? "Heim" : "Auswärts") + " gegen " + m.at("opponent").get<std::string>() + " " + std::to_string(m.at("goalsFor").get<int>()) + ":" + std::to_string(m.at("goalsAgainst").get<int>()));
|
||||
body += "<div class=\"an-strip-column\" title=\"" + label + "\"><div class=\"rise\">" + (balance > 0 ? "<div class=\"bar won\" style=\"height:" + scalar(height) + "dp;\"></div>" : std::string()) +
|
||||
"</div><div class=\"mid " + (balance ? "" : "drawn") + "\"></div><div class=\"fall\">" + (balance < 0 ? "<div class=\"bar lost\" style=\"height:" + scalar(height) + "dp;\"></div>" : std::string()) + "</div></div>";
|
||||
}
|
||||
out += card("an-points", 30, 490, 1500, 710, "Punkteverlauf", body + "</div>");
|
||||
}
|
||||
|
||||
// home and away, and what the first goal decided
|
||||
{
|
||||
const auto bar = [&](const std::string &label, const Json &r, const std::string &extra) {
|
||||
const int games = r.at("played");
|
||||
std::string row = "<div class=\"an-record\"><div class=\"an-record-head\"><span>" + label + "</span><strong>" + extra + "</strong></div><div class=\"an-stack\">";
|
||||
for (const auto &[key, css, letter] : std::array<std::tuple<const char *, const char *, const char *>, 3>{{{"won", "won", "S"}, {"drawn", "drawn", "U"}, {"lost", "lost", "N"}}}) {
|
||||
const int count = r.at(key);
|
||||
if (count) row += "<div class=\"" + std::string(css) + "\" style=\"width:" + scalar(count * 100.0 / std::max(1, games)) + "%;\"><span>" + std::to_string(count) + " " + letter + "</span></div>";
|
||||
}
|
||||
if (!games) row += "<div class=\"none\" style=\"width:100%;\"><span>kein Spiel</span></div>";
|
||||
return row + "</div></div>";
|
||||
};
|
||||
const auto ppg = [&](const Json &r) { return r.at("played").get<int>() ? two(r.at("points").get<double>() / r.at("played").get<double>()) + " Punkte je Spiel · " + std::to_string(r.at("goalsFor").get<int>()) + ":" + std::to_string(r.at("goalsAgainst").get<int>()) + " Tore" : std::string("—"); };
|
||||
const auto share = [&](const Json &r) { return r.at("played").get<int>() ? std::to_string(int(std::lround(r.at("won").get<double>() * 100 / r.at("played").get<double>()))) + " % gewonnen" : std::string("—"); };
|
||||
out += card("an-records", 1550, 490, 1032, 710, "Heim und Auswärts",
|
||||
bar("Heim", data.at("home"), ppg(data.at("home"))) + bar("Auswärts", data.at("away"), ppg(data.at("away"))) +
|
||||
"<h4>Das erste Tor</h4>" + bar("Selbst zuerst getroffen", data.at("firstFor"), share(data.at("firstFor"))) +
|
||||
bar("Gegner trifft zuerst", data.at("firstAgainst"), share(data.at("firstAgainst"))));
|
||||
}
|
||||
|
||||
// goals by quarter of an hour: scored upwards, conceded downwards
|
||||
int best_bucket = 0, worst_bucket = 0;
|
||||
{
|
||||
const auto &buckets = data.at("buckets");
|
||||
int greatest = 1;
|
||||
for (const auto &b : buckets) greatest = std::max({greatest, b.at("for").get<int>(), b.at("against").get<int>()});
|
||||
std::string body = "<div class=\"an-minutes\">";
|
||||
for (size_t i = 0; i < buckets.size(); ++i) {
|
||||
const int scored = buckets[i].at("for"), conceded = buckets[i].at("against");
|
||||
if (scored > buckets[size_t(best_bucket)].at("for").get<int>()) best_bucket = int(i);
|
||||
if (conceded > buckets[size_t(worst_bucket)].at("against").get<int>()) worst_bucket = int(i);
|
||||
const int from = buckets[i].at("from");
|
||||
body += "<div class=\"an-minute\"><div class=\"rise\"><span>" + std::to_string(scored) + "</span><div class=\"bar won\" style=\"height:" + scalar(scored * 190.0 / greatest) + "dp;\"></div></div><strong>" +
|
||||
std::to_string(from) + "–" + (i + 1 == buckets.size() ? "Ende" : std::to_string(from + 14)) + "</strong><div class=\"fall\"><div class=\"bar lost\" style=\"height:" + scalar(conceded * 190.0 / greatest) +
|
||||
"dp;\"></div><span>" + std::to_string(conceded) + "</span></div></div>";
|
||||
}
|
||||
out += card("an-minutes-card", 30, 1230, 960, 620, "Tore nach Spielminute", body + "</div><div class=\"an-axis\"><div class=\"an-legend\"><span class=\"key won\"></span><span>erzielt</span><span class=\"key lost\"></span><span>kassiert</span></div></div>");
|
||||
}
|
||||
|
||||
// the club's scorers: goals solid, assists light
|
||||
{
|
||||
const auto &scorers = data.at("scorers");
|
||||
int greatest = 1;
|
||||
for (const auto &row : scorers) greatest = std::max(greatest, row.at("goals").get<int>() + row.at("assists").get<int>());
|
||||
std::string body;
|
||||
for (size_t i = 0; i < scorers.size() && i < 7; ++i) {
|
||||
const auto &row = scorers[i];
|
||||
const int goals = row.at("goals"), assists = row.at("assists");
|
||||
body += "<div class=\"an-scorer\"><span class=\"name\">" + esc(row.at("name").get<std::string>()) + "</span><div class=\"an-scorer-bar\"><div class=\"goals\" style=\"width:" + scalar(goals * 100.0 / greatest) +
|
||||
"%;\"></div><div class=\"assists\" style=\"width:" + scalar(assists * 100.0 / greatest) + "%;\"></div></div><span class=\"sum\">" + std::to_string(goals) + " T · " + std::to_string(assists) + " V</span></div>";
|
||||
}
|
||||
if (scorers.empty()) body = "<p class=\"an-none\">Noch kein Tor erzielt.</p>";
|
||||
out += card("an-scorers", 1010, 1230, 800, 620, "Tore und Vorlagen", body);
|
||||
}
|
||||
|
||||
// how the goals came about, and a reading of the season
|
||||
{
|
||||
const auto &kinds = data.at("kinds");
|
||||
constexpr std::array<const char *, 4> names{"Aus dem Spiel", "Elfmeter / Freistoß", "Nachschuss", "Nach Ecke"};
|
||||
int greatest = 1;
|
||||
for (const auto &k : kinds) greatest = std::max(greatest, k.at("for").get<int>());
|
||||
std::string body;
|
||||
for (size_t i = 0; i < kinds.size() && i < 4; ++i)
|
||||
body += "<div class=\"an-kind\"><span class=\"name\">" + std::string(names[i]) + "</span><div class=\"bank-part-track\"><div style=\"width:" + scalar(kinds[i].at("for").get<int>() * 100.0 / greatest) +
|
||||
"%;\"></div></div><span class=\"sum\">" + std::to_string(kinds[i].at("for").get<int>()) + "</span></div>";
|
||||
const auto &buckets = data.at("buckets");
|
||||
const auto span = [&](int index) { const int from = buckets[size_t(index)].at("from"); return std::to_string(from) + ". bis " + (index == 5 ? std::string("letzten") : std::to_string(from + 14) + ".") + " Minute"; };
|
||||
std::string reading = league_played ? (pace > league_pace + .15 ? "Die Mannschaft punktet über dem Liga-Schnitt (" : pace < league_pace - .15 ? "Die Mannschaft punktet unter dem Liga-Schnitt (" : "Die Mannschaft punktet im Liga-Schnitt (") +
|
||||
two(pace) + " gegen " + two(league_pace) + " je Spiel). " : std::string();
|
||||
if (chances_for) reading += "Aus " + std::to_string(chances_for) + " Chancen wurden " + std::to_string(goals_for) + " Tore; der Gegner kam zu " + std::to_string(chances_against) + " Chancen. ";
|
||||
if (goals_for) reading += "Die meisten Tore fielen von der " + span(best_bucket) + ". ";
|
||||
if (goals_against) reading += "Die meisten Gegentore fielen von der " + span(worst_bucket) + ".";
|
||||
out += card("an-kinds", 1830, 1230, 752, 620, "Torarten", body + "<div class=\"an-reading\"><h4>Analyse</h4><p>" + reading + "</p></div>");
|
||||
}
|
||||
return out + "</section>";
|
||||
}
|
||||
Reference in new issue
Block a user