Split CalculateAll into smaller specific methods

Author: davidcpp

SportsAnalyzer/Controllers/Common.cs

@@ -162,16 +162,8 @@ public static void CalcStats(this Statistics statistics,
     {
       statistics.SetMatches(xmlSocDB.LeagueMatches.ToList());
       statistics.SetRoundsRange(startRound, endRound);
-      statistics.CalculateAll();
-    }
-
-    public static void CalcStatsForRounds(this Statistics stats,
-      XmlSocDB xmlSocDB,
-      IEnumerable<int> selectedRounds)
-    {
-      stats.SetMatches(xmlSocDB.LeagueMatches.ToList());
-      stats.SetRounds(selectedRounds);
-      stats.CalculateAll();
+      statistics.CalculateBasicStats();
+      statistics.CalculateGoalsInIntervals();
     }
   }
 }

SportsAnalyzer/Controllers/StatsController.cs

@@ -46,7 +46,9 @@ public IHttpActionResult GoalsIntervals(StatsRequestModel statsRequest)
       var stats = new Statistics(statsRequest.SeasonYear,
         statsRequest.LeagueName,
         statsRequest.TeamName);
-      stats.CalcStatsForRounds(db, statsRequest.Rounds.ToList());
+      stats.SetMatches(db.LeagueMatches.ToList());
+      stats.SetRounds(statsRequest.Rounds.ToList());
+      stats.CalculateGoalsInIntervals();
 
       return Ok(stats.GoalsInIntervalsPercent);
     }
@@ -64,7 +66,9 @@ public IHttpActionResult MatchGoals(StatsRequestModel statsRequest)
       var stats = new Statistics(statsRequest.SeasonYear,
         statsRequest.LeagueName,
         statsRequest.TeamName);
-      stats.CalcStatsForRounds(db, statsRequest.Rounds.ToList());
+      stats.SetMatches(db.LeagueMatches.ToList());
+      stats.SetRounds(statsRequest.Rounds.ToList());
+      stats.CalculateMatchGoals();
 
       return Ok(stats.MatchGoalsPct);
     }

SportsAnalyzer/Models/Statistics.cs

@@ -131,7 +131,7 @@ public static IDictionary<string, Dictionary<int, int>> TablePositions
 
     /* Methods */
 
-    public void CalculateAll()
+    public void CalculateBasicStats()
     {
       if (SelectedMatches == null || SelectedMatches.Count == 0)
       {
@@ -144,6 +144,14 @@ public void CalculateAll()
       GoalsAvg = Round(GoalsSum / MatchesNumber, 2);
       GoalsAvgHome = Round(SelectedMatches.Average((match) => match.HomeGoals ?? 0), 2);
       GoalsAvgAway = Round(SelectedMatches.Average((match) => match.AwayGoals ?? 0), 2);
+    }
+
+    public void CalculateGoalsInIntervals()
+    {
+      if (SelectedMatches == null || SelectedMatches.Count == 0)
+      {
+        return;
+      }
 
       var regexGoalTime = new Regex("\\d{1,}");
       double scoredGoalsSum = 0;
@@ -179,26 +187,37 @@ public void CalculateAll()
             }
           }
         }
+      }
+
+      for (int i = 0; i < NumberOfMatchIntervals; i++)
+      {
+        GoalsInIntervalsPercent[i] = Round((GoalsInIntervals[i] / scoredGoalsSum) * 100, 2);
+      }
+    }
 
+    public void CalculateMatchGoals()
+    {
+      if (SelectedMatches == null || SelectedMatches.Count == 0)
+      {
+        return;
+      }
+
+      foreach (var match in SelectedMatches)
+      {
         int matchGoals = match.HomeGoals ?? 0;
         matchGoals += match.AwayGoals ?? 0;
         if (!MatchGoals.ContainsKey(matchGoals))
           MatchGoals.Add(matchGoals, 0);
         MatchGoals[matchGoals]++;
       }
 
-      for (int i = 0; i < NumberOfMatchIntervals; i++)
-      {
-        GoalsInIntervalsPercent[i] = Round((GoalsInIntervals[i] / scoredGoalsSum) * 100, 2);
-      }
-
       int numberOfGoals = 0;
       double numberOfMatches = 0;
       foreach (var item in MatchGoals)
       {
         numberOfGoals = item.Key;
         numberOfMatches = item.Value;
-        MatchGoalsPct[numberOfGoals] = Round((numberOfMatches / MatchesNumber) * 100, 2);
+        MatchGoalsPct[numberOfGoals] = Round((numberOfMatches / SelectedMatches.Count) * 100, 2);
       }
     }