Merge pull request #3 from CnCNet/feature/improved-duplicates

Feature/improved duplicates

Author: Sneer-ra2

CMakeLists.txt

@@ -1,6 +1,6 @@
 
 cmake_minimum_required(VERSION 3.14)
-project(CnCNet_ELO VERSION 1.0.3 LANGUAGES CXX)
+project(CnCNet_ELO VERSION 1.0.4 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

README.md

@@ -298,3 +298,25 @@ In short:
   - **Games against unknown players have little to no effect.**
 
 If you want to climb, you’ll need to prove your skill against a variety of active, stable opponents.
+
+# Version history
+
+### 1.0.0
+
+- Initial version
+
+### 1.0.1
+
+- Sets day change to UTC+9
+
+### 1.0.2
+
+- Minor timezone fix
+
+### 1.0.3
+
+- Write ratings to database (user_ratings)
+
+### 1.0.4
+
+- Uses confirmed duplicates from CnCNet by default, can still use old algorithm to detect duplicates or ignore duplicates at all

databaseconnection.cpp

@@ -341,7 +341,7 @@ uint32_t DatabaseConnection::loadPlayerFromAlias(const std::string &alias, Playe
     // Nicks for all ladders. Not used. Processing one ladder at once.
     std::unique_ptr<sql::PreparedStatement> statement(
         _connection->prepareStatement(
-            "SELECT players.user_id, users.alias, players.username, users.name, ladders.abbreviation "
+            "SELECT players.user_id, users.primary_user_id, users.alias, players.username, users.name, ladders.abbreviation "
             "FROM players "
             "JOIN ladders ON players.ladder_id = ladders.id "
             "JOIN users ON users.id = players.user_id "
@@ -362,7 +362,8 @@ uint32_t DatabaseConnection::loadPlayerFromAlias(const std::string &alias, Playe
         if (userId == 0)
         {
             userId = result->getInt("user_id");
-            player = Player(userId, result->getString("name"), _gameMode);
+            uint32_t primaryUserId = result->getInt("primary_user_id");
+            player = Player(userId, primaryUserId, result->getString("name"), _gameMode);
             player->setAlias(alias);
         }
 
@@ -411,7 +412,7 @@ uint32_t DatabaseConnection::loadPlayer(
 
     std::unique_ptr<sql::PreparedStatement> statement(
         _connection->prepareStatement(
-            "SELECT players.user_id, players.username, ladders.abbreviation, users.alias, users.name "
+            "SELECT players.user_id, players.username, ladders.abbreviation, users.alias, users.name, users.primary_user_id "
             "FROM players "
             "JOIN ladders ON players.ladder_id = ladders.id "
             "JOIN users ON players.user_id = users.id "
@@ -445,7 +446,8 @@ uint32_t DatabaseConnection::loadPlayer(
         if (userId == 0)
         {
             userId = result->getInt("user_id");
-            player = Player(userId, result->getString("name"), _gameMode);
+            uint32_t primaryUserId = result->getInt("primary_user_id");
+            player = Player(userId, primaryUserId, result->getString("name"), _gameMode);
         }
         else if (userId != result->getInt("user_id") || player->account() != result->getString("name"))
         {
@@ -483,9 +485,10 @@ bool DatabaseConnection::loadPlayerWithNoUser(
 {
     std::unique_ptr<sql::PreparedStatement> stmt(
         _connection->prepareStatement(
-            "SELECT players.user_id, players.username, ladders.abbreviation "
+            "SELECT players.user_id, players.username, ladders.abbreviation, users.alias, users.primary_user_id "
             "FROM players "
             "JOIN ladders ON players.ladder_id = ladders.id "
+            "JOIN users ON players.user_id = users.id "
             "WHERE players.user_id = ? "
             // "AND ladders.abbreviation = ? " <= User might not have played the current ladder.
             "ORDER BY players.username;"
@@ -503,7 +506,14 @@ bool DatabaseConnection::loadPlayerWithNoUser(
     {
         if (!player.has_value())
         {
-            player = Player(userId, "", _gameMode);
+            uint32_t primaryUserId = result->getInt("primary_user_id");
+            player = Player(userId, primaryUserId, "", _gameMode);
+
+            std::string alias = result->getString("alias");
+            if (!alias.empty())
+            {
+                player->setAlias(alias);
+            }
         }
 
         player->addName(result->getString("username"), result->getString("abbreviation"));
@@ -526,7 +536,7 @@ bool DatabaseConnection::loadPlayer(
 {
     std::unique_ptr<sql::PreparedStatement> stmt(
         _connection->prepareStatement(
-            "SELECT players.user_id, players.username, ladders.abbreviation, users.alias, users.name "
+            "SELECT players.user_id, players.username, ladders.abbreviation, users.alias, users.name, users.primary_user_id "
             "FROM players "
             "JOIN ladders ON players.ladder_id = ladders.id "
             "JOIN users ON players.user_id = users.id "
@@ -548,7 +558,8 @@ bool DatabaseConnection::loadPlayer(
         if (!player.has_value())
         {
             std::string accountName = result->getString("name");
-            player = Player(userId, accountName, _gameMode);
+            uint32_t primaryUserId = result->getInt("primary_user_id");
+            player = Player(userId, primaryUserId, accountName, _gameMode);
 
             std::string alias = result->getString("alias");
             if (!alias.empty())
@@ -581,6 +592,7 @@ std::map<uint32_t, Game> DatabaseConnection::fetchGames()
         SELECT
             games.id AS gameId,
             players.username AS playerUsername,
+            players.user_id AS playerUserId,
             ladders.abbreviation AS ladderAbbreviation,
             player_game_reports.won AS playerWon,
             player_game_reports.points,
@@ -611,6 +623,7 @@ std::map<uint32_t, Game> DatabaseConnection::fetchGames()
         SELECT
             games.id AS gameId,
             players.username AS playerUsername,
+            players.user_id AS playerUserId,
             ladders.abbreviation AS ladderAbbreviation,
             player_game_reports.won AS playerWon,
             player_game_reports.points,
@@ -643,6 +656,7 @@ std::map<uint32_t, Game> DatabaseConnection::fetchGames()
             "SELECT "
             "  games.id AS gameId, "
             "  players.username AS playerUsername, "
+            "  players.user_id AS playerUserId, "
             "  ladders.abbreviation AS ladderAbbreviation, "
             "  player_game_reports.won AS playerWon, "
             "  player_game_reports.points, "
@@ -682,6 +696,7 @@ std::map<uint32_t, Game> DatabaseConnection::fetchGames()
         "SELECT "
         "  games.id AS gameId, "
         "  players.username AS playerUsername, "
+        "  players.user_id AS playerUserId, "
         "  ladders.abbreviation AS ladderAbbreviation, "
         "  player_game_reports.won AS playerWon, "
         "  player_game_reports.points, "
@@ -766,6 +781,7 @@ std::map<uint32_t, Game> DatabaseConnection::fetchGames()
         std::string playerName = result->getString("playerUsername");
 
         int32_t points = result->getInt("points");
+        uint32_t userId = result->getInt("playerUserId");
         bool won = result->getBoolean("playerWon");
         std::string playerCountry = result->getString("playerCountry");
 
@@ -776,7 +792,7 @@ std::map<uint32_t, Game> DatabaseConnection::fetchGames()
             continue;
         }
 
-        game->addPlayer(0, playerName, faction, won, points, 0.0, 0.0);
+        game->addPlayer(userId, playerName, faction, won, points, 0.0, 0.0);
     }
 
     return games;
@@ -855,7 +871,7 @@ void DatabaseConnection::writePlayerRatings(
     {
         // Check if expected columns exist.
         std::set<std::string> requiredColumns = {
-            "user_id", "ladder_id", "rating", "elo_rank",
+            "user_id", "ladder_id", "rating", "deviation", "elo_rank",
             "alltime_rank", "rated_games", "active", "created_at", "updated_at"
         };
 
@@ -884,13 +900,6 @@ void DatabaseConnection::writePlayerRatings(
             }
         }
 
-        // Clear table.
-        std::unique_ptr<sql::PreparedStatement> truncateStmt(
-            _connection->prepareStatement("TRUNCATE TABLE user_ratings")
-        );
-        truncateStmt->execute();
-        Log::info() << "Table 'user_ratings' truncated.";
-
         // Get ladder id.
         uint32_t ladderId = 0;
         std::unique_ptr<sql::PreparedStatement> ladderStmt(
@@ -909,35 +918,60 @@ void DatabaseConnection::writePlayerRatings(
             return;
         }
 
-        // Prepare statement to save user data.
-        std::unique_ptr<sql::PreparedStatement> insertStmt(
-            _connection->prepareStatement(R"SQL(
-                INSERT INTO user_ratings
-                (user_id, ladder_id, rating, elo_rank, alltime_rank, rated_games, active, created_at, updated_at)
-                VALUES (?, ?, ?, ?, ?, ?, ?, NOW(), NOW())
-            )SQL")
-        );
+        _connection->setAutoCommit(false);
 
-        for (uint32_t userId : players.userIds())
+        try
         {
-            const Player &player = players[userId];
-            uint32_t gameCount = player.gameCount();
-            double elo = (gameMode == gamemodes::Blitz2v2) ? player.elo(factions::Combined) : player.maxRating(!player.isActive());
-            if (elo < 0.0)
+            // Remove old entries.
+            std::unique_ptr<sql::PreparedStatement> removeStmt(
+                _connection->prepareStatement("DELETE FROM user_ratings WHERE ladder_id = ?")
+            );
+            removeStmt->setUInt(1, ladderId);
+            removeStmt->execute();
+            Log::info() << "Removed old entries from 'user_ratings'.";
+
+            // Prepare statement to save user data.
+            std::unique_ptr<sql::PreparedStatement> insertStmt(
+                _connection->prepareStatement(R"SQL(
+                    INSERT INTO user_ratings
+                    (user_id, ladder_id, rating, deviation, elo_rank, alltime_rank, rated_games, active, created_at, updated_at)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW())
+                )SQL")
+            );
+
+            for (uint32_t userId : players.userIds())
             {
-                // Try to get any rating, even if the player was never active.
-                elo = player.elo(factions::Combined);
+                const Player &player = players[userId];
+                uint32_t gameCount = player.gameCount();
+                factions::Faction faction = player.getBestFaction(false);
+
+                if (!player.isActive(faction) || gameMode == gamemodes::Blitz2v2)
+                {
+                    // Try to get any rating.
+                    faction = factions::Combined;
+                }
+
+                insertStmt->setUInt(1, userId);
+                insertStmt->setUInt(2, ladderId);
+                insertStmt->setInt(3, static_cast<int>(std::round(player.elo(faction))));
+                insertStmt->setInt(4, static_cast<int>(std::round(player.deviation(faction))));
+                insertStmt->setUInt(5, activeRanks.contains(userId) ? activeRanks[userId] : 0);
+                insertStmt->setUInt(6, allTimeRanks.contains(userId) ? allTimeRanks[userId] : 0);
+                insertStmt->setUInt(7, gameCount);
+                insertStmt->setBoolean(8, player.isActive());
+
+                insertStmt->execute();
             }
-            insertStmt->setUInt(1, userId);
-            insertStmt->setUInt(2, ladderId);
-            insertStmt->setInt(3, static_cast<int>(std::round(elo)));
-            insertStmt->setUInt(4, activeRanks.contains(userId) ? activeRanks[userId] : 0);
-            insertStmt->setUInt(5, allTimeRanks.contains(userId) ? allTimeRanks[userId] : 0);
-            insertStmt->setUInt(6, gameCount);
-            insertStmt->setBoolean(7, player.isActive());
-
-            insertStmt->execute();
+
+            _connection->commit();
         }
+        catch (sql::SQLException &e)
+        {
+            _connection->rollback();
+            Log::fatal() << "Error while writing user ratings: " << e.what();
+        }
+
+        _connection->setAutoCommit(true);
 
         Log::info() << "Player ratings written to 'user_ratings'.";
     }

gameoverlay.cpp

@@ -98,7 +98,7 @@ void GameOverlay::loadTournamentGames(
                 {
                     // Need to create a player with a fake id.
                     userId1 = currentFakeUserId++;
-                    Player player(userId1, "?", gameMode);
+                    Player player(userId1, 0, "?", gameMode);
                     Log::info() << "Manually created player " << userId1 << " with alias " << playerAlias1 << ".";
                     player.setAlias(playerAlias1);
                     players.add(player, ladderAbbreviation);
@@ -115,7 +115,7 @@ void GameOverlay::loadTournamentGames(
                 {
                     // Need to create a player with a fake id.
                     userId2 = currentFakeUserId++;
-                    Player player(userId2, "?", gameMode);
+                    Player player(userId2, 0, "?", gameMode);
                     player.setAlias(playerAlias2);
                     Log::info() << "Manually created player " << userId2 << " with alias " << playerAlias2 << ".";
                     players.add(player, ladderAbbreviation);