get rankings directly from db

Author: DeinFreund

ZkData/Ef/WHR/RatingSystems.cs

@@ -156,13 +156,10 @@ private static bool IsCategory(SpringBattle battle, RatingCategory category)
                 {
                     case RatingCategory.Casual:
                         return battle.ApplicableRatings.HasFlag(RatingCategoryFlags.Casual);
-                        return !(battle.IsMission || battle.HasBots || (battle.PlayerCount < 2) || (battle.ResourceByMapResourceID?.MapIsSpecial == true) || battle.Duration < GlobalConst.MinDurationForElo);
                     case RatingCategory.MatchMaking:
                         return battle.ApplicableRatings.HasFlag(RatingCategoryFlags.MatchMaking);
-                        return battle.IsMatchMaker;
                     case RatingCategory.Planetwars:
                         return battle.ApplicableRatings.HasFlag(RatingCategoryFlags.Planetwars);
-                        return battle.Mode == PlasmaShared.AutohostMode.Planetwars; //how?
                 }
             }
             catch (Exception ex)

ZkData/Ef/WHR/WholeHistoryRating.cs

@@ -107,13 +107,9 @@ public void ProcessBattle(SpringBattle battle)
 
         public List<Account> GetTopPlayers(int count)
         {
-            return GetTopPlayers(count, x => true);
-            //TODO use db query once accountrating is implemented
-            /*
             ZkDataContext db = new ZkDataContext();
             List<int> retIDs = topPlayers.Take(count).ToList();
-            return db.Accounts.Where(a => retIDs.Contains(a.AccountID)).ToList(); 
-            */
+            return db.Accounts.Where(a => retIDs.Contains(a.AccountID)).OrderByDescending(x => x.AccountRatings.Where(r => r.RatingCategory == category).Select(r => r.Elo).DefaultIfEmpty(-1).FirstOrDefault()).ToList(); 
         }
 
         public List<Account> GetTopPlayers(int count, Func<Account, bool> selector)
@@ -196,6 +192,7 @@ public void UpdateRatings()
                         players.ForEach(p => p.runOneNewtonIteration());
                         players.ForEach(p => p.updateUncertainty());
                         UpdateRankings(players);
+                        SaveToDB(players.Select(x => x.id));
                     });
                 }
                 else
@@ -226,6 +223,30 @@ public void UpdateRatings()
 
         }
 
+        public void SaveToDB(IEnumerable<int> players)
+        {
+            lock (dbLock)
+            {
+
+                var db = new ZkDataContext();
+                foreach (int player in players)
+                {
+                    var accountRating = db.AccountRatings.Where(x => x.RatingCategory == category && x.AccountID == player).FirstOrDefault();
+                    if (accountRating == null)
+                    {
+                        accountRating = new AccountRating(player, category);
+                        accountRating.UpdateFromRatingSystem(playerRatings[player]);
+                        db.AccountRatings.InsertOnSubmit(accountRating);
+                    }
+                    else
+                    {
+                        accountRating.UpdateFromRatingSystem(playerRatings[player]);
+                    }
+                }
+                db.SaveChanges();
+            }
+        }
+
         public void SaveToDB()
         {
             lock (dbLock)
@@ -244,7 +265,7 @@ public void SaveToDB()
                         continue;
                     }
                     processedPlayers.Add(accountRating.AccountID);
-                    if (Math.Abs(playerRatings[accountRating.AccountID].Elo - accountRating.Elo) > 10)
+                    if (Math.Abs(playerRatings[accountRating.AccountID].Elo - accountRating.Elo) > 1)
                     {
                         accountRating.UpdateFromRatingSystem(playerRatings[accountRating.AccountID]);
                     }