Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K-Infrastructure

Author: Licho1

Zero-K.info/Views/Clans/ClansIndex.cshtml

@@ -14,10 +14,12 @@
     }
     grid.AddCol("Commanders", x => x.Accounts.Count()).SetSort(x => x.Accounts.Count());
     grid.AddCol("Level", x => (int?)x.Accounts.Average(y => (double?)y.Level)).SetSort(x => x.Accounts.Average(y => (double?)y.Level));
-    grid.AddCol("Elo", x => (int?)x.Accounts.Average(y => (double?)y.Elo)).SetSort(x => x.Accounts.Average(y => (double?)y.Elo));
+    grid.AddCol("Elo", x => (int?)x.Accounts.SelectMany(r => r.AccountRatings).Where(r => r.RatingCategory == Ratings.RatingCategory.Casual).Average(y => (double?)y.RealElo))
+            .SetSort(x => x.Accounts.SelectMany(r => r.AccountRatings).Where(r => r.RatingCategory == Ratings.RatingCategory.Casual).Average(y => (double?)y.RealElo));
     if (GlobalConst.PlanetWarsMode != PlanetWarsModes.AllOffline)
     {
-        grid.AddCol("PlanetWars Elo", x => (int?)x.Accounts.Average(y => (double?)y.EloPw)).SetSort(x => x.Accounts.Average(y => (double?)y.EloPw));
+        grid.AddCol("PlanetWars Elo", x => (int?)x.Accounts.SelectMany(r => r.AccountRatings).Where(r => r.RatingCategory == Ratings.RatingCategory.Planetwars).Average(y => (double?)y.RealElo))
+            .SetSort(x => x.Accounts.SelectMany(r => r.AccountRatings).Where(r => r.RatingCategory == Ratings.RatingCategory.Planetwars).Average(y => (double?)y.RealElo));
     }
     if (Global.Clan == null)
     {

ZkData/Ef/WHR/RatingSystems.cs

@@ -67,7 +67,7 @@ public static IRatingSystem GetRatingSystem(RatingCategory category)
         {
             if (!whr.ContainsKey(category))
             {
-                Trace.TraceError("WHR: Unknown category " + category);
+                Trace.TraceWarning("WHR: Unknown category " + category + " " + new StackTrace());
                 return whr[RatingCategory.MatchMaking];
             }
             return whr[category];

ZkData/Ef/WHR/WholeHistoryRating.cs

@@ -171,7 +171,6 @@ public void UpdateRatings()
                         runIterations(50);
                         UpdateRankings(players.Values);
                         playerOldRatings = new Dictionary<int, PlayerRating>(playerRatings);
-                        SaveToDB();
                     });
                 }
                 else if (DateTime.UtcNow.Subtract(lastUpdateTime).TotalHours >= GlobalConst.LadderUpdatePeriod)
@@ -181,7 +180,6 @@ public void UpdateRatings()
                         Trace.TraceInformation("Updating all WHR " + category +" ratings");
                         runIterations(1);
                         UpdateRankings(players.Values);
-                        SaveToDB();
                     });
                     lastUpdateTime = DateTime.UtcNow;
                 }
@@ -194,7 +192,6 @@ public void UpdateRatings()
                         players.ForEach(p => p.runOneNewtonIteration());
                         players.ForEach(p => p.updateUncertainty());
                         UpdateRankings(players);
-                        SaveToDB(players.Select(x => x.id));
                     });
                 }
                 else
@@ -380,6 +377,14 @@ private void UpdateRankings(IEnumerable<Player> players)
                 topPlayers = newTopPlayers;
                 Trace.TraceInformation("WHR " + category +" Ladders updated with " + topPlayers.Count + "/" + this.players.Count + " entries, max uncertainty selected: " + DynamicMaxUncertainty);
 
+                var playerIds = players.Select(x => x.id).ToList();
+                if (playerIds.Count() < 100)
+                {
+                    SaveToDB(playerIds);
+                }else
+                {
+                    SaveToDB();
+                }
 
                 //check for topX updates
                 foreach (var listener in topPlayersUpdateListeners)

ZkData/Migrations/Configuration.cs

@@ -36,8 +36,8 @@ private static void InitializeBattleRatings(ZkDataContext db)
         }
 
         protected override void Seed(ZkDataContext db) {
-            InitializeBattleRatings(db); //remove this after execution
-            db.SaveChanges();
+            /*InitializeBattleRatings(db); //remove this after execution
+            db.SaveChanges();*/
 
             //  This method will be called after migrating to the latest version.
             if (GlobalConst.Mode == ModeType.Local)