Create delegates for not found methods

RaiderRobotix · Feb 23, 2020 · 437d40c · 437d40c
1 parent 7e99743
commit 437d40c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/MatchPredictionController.java b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/MatchPredictionController.java
@@ -69,19 +69,19 @@ public void initialize(AllianceReport redAlliance, AllianceReport blueAlliance)
                     Integer.toString(alliance.getTeamReports()[i].getTeamNum()));
 
                 setText(color, "team" + numStrNames[i] + "Hatches",
-                    displayDouble(currentTeam.getStatistics().get("totalHatches").getMean()));
+                    displayDouble(currentTeam.getStats().get("totalHatches").getMean()));
                 setText(color, "team" + numStrNames[i] + "Cargo",
-                    displayDouble(currentTeam.getStatistics().get("totalCargo").getMean()));
+                    displayDouble(currentTeam.getStats().get("totalCargo").getMean()));
 
                 // Generate display string for starting position and HAB crossing percentage
                 var startString = "";
                 val assignedGamePiece = alliance.getBestSandstormGamePieceCombo().charAt(i);
                 startString += alliance.getBestStartingLevels()[i] + Character.toString(assignedGamePiece) + " (";
 
                 if (assignedGamePiece == 'H') {
-                    startString += (int) Math.round(100 * currentTeam.getStatistics().get("hatchAutoSuccess").getMean());
+                    startString += (int) Math.round(100 * currentTeam.getStats().get("hatchAutoSuccess").getMean());
                 } else {
-                    startString += (int) Math.round(100 * currentTeam.getStatistics().get("cargoAutoSuccess").getMean());
+                    startString += (int) Math.round(100 * currentTeam.getStats().get("cargoAutoSuccess").getMean());
                 }
                 startString += "%)";
 

diff --git a/src/main/java/org/usfirst/frc/team25/scouting/data/PicklistGenerator.java b/src/main/java/org/usfirst/frc/team25/scouting/data/PicklistGenerator.java
@@ -286,7 +286,7 @@ public void generateCalculatedPickAbilityList(ArrayList<TeamReport> knownPartner
             potentialAllianceTeams.add(currentTeamReport);
 
             double dysfunctionalPercent =
-                (double) currentTeamReport.getCounts().get("dysfunctional") / (currentTeamReport.getCounts().get(
+                (double) currentTeamReport.getCount("dysfunctional") / (currentTeamReport.getCount(
                     "noShow") + currentTeamReport.getEntries().size());
 
             double pointValue =

diff --git a/src/main/java/org/usfirst/frc/team25/scouting/data/TeamReport.kt b/src/main/java/org/usfirst/frc/team25/scouting/data/TeamReport.kt
@@ -70,6 +70,9 @@ class TeamReport(val teamNum: Int) {
 		statistics
 	}
 
+	val stats
+		get() = statistics
+
 	/**
 	 * Processes the scout entries within the team report by filtering out no shows, calculating stats, and finding
 	 * abilities and frequent comments
@@ -190,6 +193,9 @@ class TeamReport(val teamNum: Int) {
 		}
 	}
 
+	fun getCount(name: String): Int = counts[name] ?: error("No such count")
+
+
 	/**
 	 * Retrieves the value of the specified ability metric
 	 *