Merge pull request #8 from jsTron/develop

Refactor to use three period logs

Author: jsTron

ReboundLogParser/ReboundLogParser/MainForm.cs

@@ -27,7 +27,6 @@ public partial class MainForm : Form
         private List<ComboBox> _homePlayerBoxes;
         private List<ComboBox> _awayPlayerBoxes;
         private List<Match> _parsedLogs = new List<Match>();
-        private Match _match;
 
         public MainForm()
         {
@@ -124,6 +123,7 @@ private bool LoadAndParseLogFiles(List<string> fileNames = null)
         {
             bool success = false;
             fileNames = fileNames ?? new List<string>();
+            _parsedLogs.Clear();
             foreach (var fileName in fileNames)
             {
                 success = ParseJson(fileName);
@@ -184,10 +184,10 @@ private void PopulateDataGrid()
 
         private bool ParseJson(string fileName)
         {
-            _match = null;
+            Match parsedPeriod = null;
             try
             {
-                _match = JsonConvert.DeserializeObject<Match>(File.ReadAllText(fileName));
+                parsedPeriod = JsonConvert.DeserializeObject<Match>(File.ReadAllText(fileName));
             }
             catch (JsonReaderException jex)
             {
@@ -200,43 +200,70 @@ private bool ParseJson(string fileName)
                 return false;
             }
 
-            _parsedLogs.Add(_match);
+            _parsedLogs.Add(parsedPeriod);
 
             return true;
         }
 
         private bool TabulateSelectedLogs()
         {
             _parsedLogs.Sort(delegate (Match m1, Match m2) { return m1.CurrentPeriod.CompareTo(m2.CurrentPeriod); });
-            foreach (Match o1 in _parsedLogs)
+            Match period3 = _parsedLogs.Last();
+            
+            foreach (Player player in period3.Players)
             {
-                _overTime = CheckOvertime(o1);
-                _homeScore += o1.Score.Home;
-                _awayScore += o1.Score.Away;
-                _period = int.Parse(o1.CurrentPeriod);
-                _currentPeriod = o1.CurrentPeriod;
-                foreach (Player player in o1.Players)
+                // Get and store period player stat sums
+                var sums = new List<PlayerStatSums>();
+                foreach (Match m in _parsedLogs)
                 {
-                    var isHomeTeam = player.Team == "home";
-                    var teamToBuild = isHomeTeam ? _homeTeamPlayers : _awayTeamPlayers;
-                    if (PlayerExists(player, teamToBuild))
+                    var playerSum = new PlayerStatSums();
+                    playerSum.GameUserId = player.GameUserId;
+                    playerSum.CurrentPeriod = m.CurrentPeriod;
+                    try
                     {
-                        for (int p = 0; p < teamToBuild.Count; p++)
-                        {
-                            if (teamToBuild[p].PlayerName == player.Username)
-                            {
-                                teamToBuild[p].addValues(player);
-                            }
-                        }
+                        playerSum.StatSum = SumPlayerStats(m.Players.Single(p => p.GameUserId.Equals(player.GameUserId)));
+                    }
+                    catch
+                    {
+                        continue;
                     }
-                    else
+
+                    sums.Add(playerSum);
+                }
+
+                int periodsPlayed = 1;
+                if (sums.Count > 1)
+                {
+                    for (int i = 1; i < sums.Count; i++)
                     {
-                        teamToBuild.Add(new stats(player));
+                        if (!sums[i].StatSum.Equals(sums[i - 1].StatSum))
+                        {
+                            periodsPlayed++;
+                        }
                     }
                 }
-                _homeTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
-                _awayTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
+                else
+                {
+                    periodsPlayed = 1;
+                }
+
+                // Save player periods played
+                player.Stats.GamesPlayed = periodsPlayed;
+            }
+
+            _overTime = CheckOvertime(period3);
+            _homeScore += period3.Score.Home;
+            _awayScore += period3.Score.Away;
+            _period = int.Parse(period3.CurrentPeriod);
+            _currentPeriod = period3.CurrentPeriod;
+            foreach (Player player in period3.Players)
+            {
+                var isHomeTeam = player.Team == "home";
+                var teamToBuild = isHomeTeam ? _homeTeamPlayers : _awayTeamPlayers;
+                    teamToBuild.Add(new stats(player));
             }
+            _homeTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
+            _awayTeamPlayers.Sort(delegate (stats c1, stats c2) { return c1.PlayerName.CompareTo(c2.PlayerName); });
 
             return true;
         }
@@ -289,17 +316,34 @@ private bool CheckOvertime(Match statsObject)
             return returnBool;
         }
 
-        static bool PlayerExists(Player passedPlayer, List<stats> playerArray)
+        public double SumPlayerStats(Player player)
         {
-            bool returnValue = false;
-            for (int j = 0; j < playerArray.Count; j++)
-            {
-                if (playerArray[j].PlayerName == passedPlayer.Username)
-                {
-                    returnValue = true;
-                }
-            }
-            return returnValue;
+            double sum = player.Stats.Assists +
+                player.Stats.Blocks +
+                player.Stats.ConcededGoals +
+                player.Stats.ContributedGoals +
+                player.Stats.FaceoffsLost +
+                player.Stats.FaceoffsWon +
+                player.Stats.GamesPlayed +
+                player.Stats.GameWinningGoals +
+                player.Stats.Goals +
+                player.Stats.Losses +
+                player.Stats.OvertimeLosses +
+                player.Stats.OvertimeWins +
+                player.Stats.Passes +
+                player.Stats.PossessionTimeSec +
+                player.Stats.PostHits +
+                player.Stats.PrimaryAssists +
+                player.Stats.Saves +
+                player.Stats.Score +
+                player.Stats.SecondaryAssists +
+                player.Stats.Shots +
+                player.Stats.Shutouts +
+                player.Stats.ShutoutsAgainst +
+                player.Stats.Takeaways +
+                player.Stats.Turnovers +
+                player.Stats.Wins;
+            return sum;
         }
 
         private async void TeamPlayersLoadButton_Click(object sender, EventArgs e)

ReboundLogParser/ReboundLogParser/Match.cs

@@ -82,4 +82,11 @@ public class Stats
         [JsonProperty("overtime_losses")]
         public double OvertimeLosses { get; set; }
     }
+
+    public class PlayerStatSums
+    {
+        public string GameUserId { get; set; }
+        public string CurrentPeriod { get; set; }
+        public double StatSum { get; set; }
+    }
 }

ReboundLogParser/ReboundLogParser/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ReboundLogParser")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.1.0.0")]
-[assembly: AssemblyFileVersion("6.1.0.0")]
+[assembly: AssemblyVersion("6.3.0.0")]
+[assembly: AssemblyFileVersion("6.3.0.0")]

ReboundLogParser/ReboundLogParser/stats.cs

@@ -164,135 +164,6 @@ public stats(Player player)
             }
         }
 
-        public void addValues(Player player)
-        {
-            try
-            {
-                Goals += player.Stats.Goals;
-            }
-            catch
-            {
-                Goals += 0;
-            }
-
-            try
-            {
-                Primary_assists += player.Stats.PrimaryAssists;
-            }
-            catch
-            {
-                Primary_assists += 0;
-            }
-
-            try
-            {
-                Sec_assists += player.Stats.SecondaryAssists;
-            }
-            catch
-            {
-                Sec_assists += 0;
-            }
-
-            try
-            {
-                Shots += player.Stats.Shots;
-            }
-            catch
-            {
-                Shots += 0;
-            }
-
-            try
-            {
-                Saves += player.Stats.Saves;
-            }
-            catch
-            {
-                Saves += 0;
-            }
-
-            try
-            {
-                Faceoffs_won += player.Stats.FaceoffsWon;
-            }
-            catch
-            {
-                Faceoffs_won += 0;
-            }
-
-            try
-            {
-                Faceoffs_lost += player.Stats.FaceoffsLost;
-            }
-            catch
-            {
-                Faceoffs_lost += 0;
-            }
-
-            try
-            {
-                Takeaways += player.Stats.Takeaways;
-            }
-            catch
-            {
-                Takeaways += 0;
-            }
-
-            try
-            {
-                Turnovers += player.Stats.Turnovers;
-            }
-            catch
-            {
-                Turnovers += 0;
-            }
-
-            try
-            {
-                Post_hits += player.Stats.PostHits;
-            }
-            catch
-            {
-                Post_hits += 0;
-            }
-
-            try
-            {
-                Passes += player.Stats.Passes;
-            }
-            catch
-            {
-                Passes += 0;
-            }
-
-            try
-            {
-                Blocks += player.Stats.Blocks;
-            }
-            catch
-            {
-                Blocks += 0;
-            }
-
-            try
-            {
-                GW_Goals += player.Stats.GameWinningGoals;
-            }
-            catch
-            {
-                GW_Goals += 0;
-            }
-
-            try
-            {
-                Possession_Time += player.Stats.PossessionTimeSec;
-            }
-            catch
-            {
-                Possession_Time += 0;
-            }
-        }
-
         public double GetPropertyValueByEnum(StatsEnum enumValue)
         {
             Dictionary<StatsEnum, object> kvp = new Dictionary<StatsEnum, object>()