X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=events.cpp;h=e6ed5796340ff3521ab051512f25920d1d04c022;hb=9247d1fb5b5f00214899b115b3a021b4498de5c3;hp=0e3a62def6ffaa0248bfc24f4af79d254c9caf62;hpb=32927e6c7a628fa9a3bb06c7d806601103a44e34;p=pkanalytics

diff --git a/events.cpp b/events.cpp
index 0e3a62d..e6ed579 100644
--- a/events.cpp
+++ b/events.cpp
@@ -10,7 +10,7 @@ using namespace std;
 
 string format_timestamp(uint64_t pos);
 
-EventsModel::EventsModel(sqlite3 *db) : db(db)
+EventsModel::EventsModel(sqlite3 *db, int match_id) : db(db), match_id(match_id)
 {
 	load_data();
 }
@@ -60,13 +60,14 @@ void EventsModel::load_data()
 	players.clear();
 	events.clear();
 
-	// Read the players.
+	// Read the players. (The ordering is used to build the order map.)
 	sqlite3_stmt *stmt;
-	int ret = sqlite3_prepare_v2(db, "SELECT player, number, name FROM player", -1, &stmt, 0);
+	int ret = sqlite3_prepare_v2(db, "SELECT player, number, name FROM player ORDER BY gender, (number+0), number", -1, &stmt, 0);
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "SELECT prepare: %s\n", sqlite3_errmsg(db));
 		abort();
 	}
+	int order = 0;
 	for ( ;; ) {
 		ret = sqlite3_step(stmt);
 		if (ret == SQLITE_ROW) {
@@ -75,6 +76,7 @@ void EventsModel::load_data()
 			p.number = (const char *)sqlite3_column_text(stmt, 1);
 			p.name = (const char *) sqlite3_column_text(stmt, 2);
 			players[p.player_id] = std::move(p);
+			player_ordering[p.player_id] = order++;
 		} else if (ret == SQLITE_DONE) {
 			break;
 		} else {
@@ -89,11 +91,12 @@ void EventsModel::load_data()
 	}
 
 	// Read the events.
-	ret = sqlite3_prepare_v2(db, "SELECT event, t, player, type FROM event ORDER BY t", -1, &stmt, 0);
+	ret = sqlite3_prepare_v2(db, "SELECT event, t, player, type FROM event WHERE match=? ORDER BY t", -1, &stmt, 0);
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "SELECT prepare: %s\n", sqlite3_errmsg(db));
 		abort();
 	}
+	sqlite3_bind_int64(stmt, 1, match_id);
 	for ( ;; ) {
 		ret = sqlite3_step(stmt);
 		if (ret == SQLITE_ROW) {
@@ -136,19 +139,20 @@ unsigned EventsModel::insert_event(uint64_t t, optional<int> player_id, const st
 
 	// Insert the new row into the database.
 	sqlite3_stmt *stmt;
-	int ret = sqlite3_prepare_v2(db, "INSERT INTO event (t, player, type) VALUES (?, ?, ?)", -1, &stmt, 0);
+	int ret = sqlite3_prepare_v2(db, "INSERT INTO event (match, t, player, type) VALUES (?, ?, ?, ?)", -1, &stmt, 0);
 	if (ret != SQLITE_OK) {
 		fprintf(stderr, "INSERT prepare: %s\n", sqlite3_errmsg(db));
 		abort();
 	}
 
-	sqlite3_bind_int64(stmt, 1, t);
+	sqlite3_bind_int64(stmt, 1, match_id);
+	sqlite3_bind_int64(stmt, 2, t);
 	if (player_id) {
-		sqlite3_bind_int64(stmt, 2, *player_id);
+		sqlite3_bind_int64(stmt, 3, *player_id);
 	} else {
-		sqlite3_bind_null(stmt, 2);
+		sqlite3_bind_null(stmt, 3);
 	}
-	sqlite3_bind_text(stmt, 3, type.data(), type.size(), SQLITE_STATIC);
+	sqlite3_bind_text(stmt, 4, type.data(), type.size(), SQLITE_STATIC);
 
 	ret = sqlite3_step(stmt);
 	if (ret == SQLITE_ROW) {
@@ -225,22 +229,34 @@ void EventsModel::set_event_type(unsigned pos, const string &type)
 	}
 }
 
+unsigned EventsModel::get_last_event_pos(uint64_t t) const
+{
+	// upper_bound() gives first where e.t > t,
+	// and the one before that is the one we want.
+	auto it = upper_bound(events.begin(), events.end(), t,
+		[](uint64_t t, const Event &e) { return t < e.t; });
+	if (it == events.begin()) {
+		return 0;
+	} else {
+		return distance(events.begin(), it - 1);
+	}
+}
+
 EventsModel::Status EventsModel::get_status_at(uint64_t t)
 {
 	Status s;
 	s.our_score = 0;
 	s.their_score = 0;
-	s.offense = false;
-	s.defense = false;
+	s.attack_state = Status::NOT_STARTED;
 	s.stoppage = false;
-	s.should_pull = true;
+	s.pull_state = Status::SHOULD_PULL;
 	uint64_t last_gained_possession = 0;
 	uint64_t last_stoppage = 0;
 	uint64_t time_spent_in_stoppage = 0;
 	unsigned num_touches = 0;
 
-	auto set_offense = [&s] { s.offense = true; s.defense = false; };
-	auto set_defense = [&s] { s.offense = false; s.defense = true; };
+	auto set_offense = [&s] { s.attack_state = Status::OFFENSE; };
+	auto set_defense = [&s] { s.attack_state = Status::DEFENSE; };
 
 	for (const Event &e : events) {
 		if (e.t > t) {
@@ -248,11 +264,13 @@ EventsModel::Status EventsModel::get_status_at(uint64_t t)
 		}
 
 		if (e.type == "goal" || e.type == "their_goal") {
-			s.should_pull = true;
-		} else if (e.type == "in" || e.type == "out" || e.type == "stoppage" || e.type == "restart" || e.type == "unknown") {
+			s.pull_state = Status::SHOULD_PULL;
+		} else if (e.type == "in" || e.type == "out" || e.type == "stoppage" || e.type == "restart" || e.type == "unknown" || e.type == "set_defense" || e.type == "set_offense") {
 			// No effect on pull status.
+		} else if (e.type == "pull") {
+			s.pull_state = Status::PULL_IN_AIR;
 		} else {
-			s.should_pull = false;
+			s.pull_state = Status::NOT_PULLING;  // Includes pull_landed and pull_oob.
 		}
 
 		if (e.type == "set_offense") {
@@ -310,8 +328,8 @@ EventsModel::Status EventsModel::get_status_at(uint64_t t)
 	}
 
 	s.num_passes = (num_touches == 0) ? 0 : num_touches - 1;
-	s.possession_sec = (s.offense && last_gained_possession != 0 && num_touches != 0) ? (t - last_gained_possession - time_spent_in_stoppage) / 1000 : 0;
-	s.stoppage_sec = (s.offense && last_gained_possession != 0 && num_touches != 0) ? time_spent_in_stoppage / 1000 : 0;
+	s.possession_sec = (s.attack_state == Status::OFFENSE && last_gained_possession != 0 && num_touches != 0) ? (t - last_gained_possession - time_spent_in_stoppage) / 1000 : 0;
+	s.stoppage_sec = (s.attack_state == Status::OFFENSE && last_gained_possession != 0 && num_touches != 0) ? time_spent_in_stoppage / 1000 : 0;
 	return s;
 }
 
@@ -343,7 +361,7 @@ void EventsModel::set_team_at(uint64_t t, const set<int> &new_team)
 		if (e.t > t) {
 			break;
 		}
-		if (e.type == "goal" || e.type == "their_goal" || e.type == "stoppage" || e.type == "reset") {
+		if (e.type == "goal" || e.type == "their_goal" || e.type == "stoppage" || e.type == "reset" || e.type == "set_offense" || e.type == "set_defense") {
 			backdate_point = e.t + 1;
 		}
 		if (e.player_id.has_value() && !new_team.count(*e.player_id)) {
@@ -376,3 +394,12 @@ void EventsModel::set_team_at(uint64_t t, const set<int> &new_team)
 		}
 	}
 }
+
+vector<int> EventsModel::sort_team(const set<int> &team) const
+{
+	vector<int> ret(team.begin(), team.end());
+	std::sort(ret.begin(), ret.end(), [this](int a, int b) {
+		return player_ordering.find(a)->second < player_ordering.find(b)->second;
+	});
+	return ret;
+}