Update data object models; clean up team report generation code

RaiderRobotix · Feb 15, 2019 · 9cadd7e · 9cadd7e
1 parent ef9e8b2
commit 9cadd7e
Show file tree

Hide file tree

Showing 9 changed files with 220 additions and 156 deletions.
diff --git a/.idea/artifacts/release.xml b/.idea/artifacts/release.xml
diff --git a/.idea/libraries/TBA_APIv3_Java_Library.xml b/.idea/libraries/TBA_APIv3_Java_Library.xml
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/data/EventReport.java b/src/main/java/org/usfirst/frc/team25/scouting/data/EventReport.java
@@ -122,9 +122,9 @@ public void fixInaccuraciesTBA() {
                                     "Climbing");
                         }
 
-                        if (actualAutoRun != entry.getAutonomous().isReachHabLine()) {
+                        if (actualAutoRun != entry.getAutonomous().isCrossHabLine()) {
                             inaccuracies += "auto run, ";
-                            entry.getAutonomous().setReachHabLine(actualAutoRun);
+                            entry.getAutonomous().setCrossHabLine(actualAutoRun);
                         }
 
 

diff --git a/src/main/java/org/usfirst/frc/team25/scouting/data/TeamReport.java b/src/main/java/org/usfirst/frc/team25/scouting/data/TeamReport.java
@@ -10,7 +10,6 @@
 import java.util.HashMap;
 
 import static org.usfirst.frc.team25.scouting.data.Statistics.average;
-import static org.usfirst.frc.team25.scouting.data.Statistics.sum;
 
 /**
  * Object model containing individual reports of teams in events and methods to process data
@@ -22,11 +21,13 @@ public class TeamReport {
 
     private final transient ArrayList<ScoutEntry> entries;
     private final int teamNum;
-    private String teamName = "", frequentRobotCommentStr, allComments;
+    private String teamName, frequentRobotCommentStr, allComments;
 
     public TeamReport(int teamNum) {
         this.teamNum = teamNum;
         entries = new ArrayList<>();
+        teamName = "";
+        frequentRobotCommentStr = "";
 
     }
 
@@ -43,42 +44,43 @@ public String getQuickStatus() {
             statusString += " - " + getTeamName();
         }
 
-        statusString += "\n\nAutonomous:\n";
+        statusString += "\n\nSandstorm:";
 
 
         ArrayList<Object> autoList = SortersFilters.filterDataObject(entries, Autonomous.class);
 
-        statusString += "\nAvg. cargo ship cargo: " + Statistics.round(average(autoList, "cargoShipCargo"), 2);
-        statusString += "\nAvg. cargo ship hatches: " + Statistics.round(average(autoList, "cargoShipHatches"), 2);
-        statusString += "\nAvg. rocket cargo: " + Statistics.round(average(autoList, "rocketCargo"), 2);
-        statusString += "\nAvg. rocket hatches: " + Statistics.round(average(autoList, "rocketHatches"),2);
-        statusString += "\nAvg. cargo dropped: " + Statistics.round(average(autoList, "cargoDropped"), 2);
-        statusString += "\nAvg. hatches dropped: " + Statistics.round(average(autoList, "hatchesDropped"), 2);
 
-        statusString += "\n\nTele-Op:\n";
+        String[] autoMetricNames = new String[]{"cargoShipHatches", "rocketHatches", "cargoShipCargo", "rocketCargo",
+                "hatchesDropped", "cargoDropped"};
+
+        for (String metric : autoMetricNames) {
+            statusString += "\nAvg. " + StringProcessing.convertCamelToSentenceCase(metric) + ": " + Statistics.round(average(autoList, metric), 2);
+        }
+
+
+        statusString += "\n\nTele-Op:";
 
         ArrayList<Object> teleList = SortersFilters.filterDataObject(entries, TeleOp.class);
 
-        statusString += "\nAvg. cargo ship cargo: " + Statistics.round(average(teleList, "cargoShipCargo"),2);
-        statusString += "\nAvg. cargo ship hatches: " + Statistics.round(average(teleList, "cargoShipHatches"),2);
-        statusString += "\nAvg. rocket level 1 cargo: " +  Statistics.round(average(teleList, "rocketLevelOneCargo"),2);
-        statusString += "\nAvg. rocket level 2 cargo: " +  Statistics.round(average(teleList, "rocketLevelTwoCargo"),2);
-        statusString += "\nAvg. rocket level 3 cargo: " +  Statistics.round(average(teleList, "rocketLevelThreeCargo"),2);
-        statusString += "\nAvg. rocket level 1 hatches: " +  Statistics.round(average(teleList, "rocketLevelOneHatches"),2);
-        statusString += "\nAvg. rocket level 2 hatches: " +  Statistics.round(average(teleList, "rocketLevelTwoHatches"),2);
-        statusString += "\nAvg. rocket level 3 hatches: " +  Statistics.round(average(teleList, "rocketLevelThreeHatches"),2);
-        statusString += "\nAvg. cargo dropped: " +  Statistics.round(average(teleList, "cargoDropped"),2);
-        statusString += "\nAvg. hatches dropped: " +  Statistics.round(average(teleList, "hatchesDropped"),2);
-
-        statusString += "\n\nEndgame:\n";
 
-        ArrayList<Object> postList = SortersFilters.filterDataObject(entries,PostMatch.class);
+        String[] teleMetricNames = new String[]{"cargoShipHatches", "rocketLevelOneHatches", "rocketLevelTwoHatches",
+                "rocketLevelThreeHatches", "cargoShipCargo", "rocketLevelOneCargo", "rocketLevelTwoCargo",
+                "rocketLevelThreeCargo", "hatchesDropped", "cargoDropped"};
+
+
+        for (String metric : teleMetricNames) {
+            statusString += "\nAvg. " + StringProcessing.convertCamelToSentenceCase(metric) + ": " + Statistics.round(average(teleList, metric), 2);
+        }
+
+
+        statusString += "\n\nEndgame:\n";
 
-        statusString += "\n Avg. total points: ";
+        ArrayList<Object> postList = SortersFilters.filterDataObject(entries, PostMatch.class);
 
-        statusString += "\n\nOverall:\n";
+        statusString += "\n\nOverall:";
+        statusString += "\nAvg. calculated total point contribution: ";
 
-        statusString += "\n Common Quick Comments: " + "\n"  + frequentRobotCommentStr;
+        statusString += "\n\nCommon quick comments:\n" + frequentRobotCommentStr;
 
 
         return statusString;
@@ -130,6 +132,7 @@ public void findFrequentComments() {
         }
 
         for (String comment : frequentRobotComment) {
+            System.out.println(comment);
             frequentRobotCommentStr += StringProcessing.removeCommasBreaks(comment) + " \n";
         }
 

diff --git a/src/main/java/org/usfirst/frc/team25/scouting/data/models/Autonomous.java b/src/main/java/org/usfirst/frc/team25/scouting/data/models/Autonomous.java
@@ -6,24 +6,32 @@
  */
 public class Autonomous {
 
-    private int rocketCargo;
-    private int rocketHatches;
+
+    private boolean crossHabLine;
+
     private int cargoShipHatches;
+    private int rocketHatches;
+
     private int cargoShipCargo;
+    private int rocketCargo;
+
+    private boolean frontCargoShipHatchCapable;
+    private boolean sideCargoShipHatchCapable;
+
     private int hatchesDropped;
     private int cargoDropped;
-    private boolean reachHabLine;
-    private boolean opponentCargoShipLineFoul;
-    private boolean sideCargoShipHatchCapable;
-    private boolean frontCargoShipHatchCapable;
+
+    private boolean hatchesDroppedCargoShip;
+    private boolean hatchesDroppedRocket;
     private boolean cargoDroppedCargoShip;
     private boolean cargoDroppedRocket;
-    private boolean hatchesDroppedRocket;
-    private boolean hatchesDroppedCargoShip;
+
+    private boolean opponentCargoShipLineFoul;
+
 
     public Autonomous(int rocketCargo, int rocketHatches, int cargoShipHatches,
                       int cargoShipCargo, int hatchesDropped, int cargoDropped,
-                      boolean reachHabLine, boolean opponentCargoShipLineFoul,
+                      boolean crossHabLine, boolean opponentCargoShipLineFoul,
                       boolean sideCargoShipHatchCapable, boolean frontCargoShipHatchCapable,
                       boolean cargoDroppedCargoShip, boolean cargoDroppedRocket,
                       boolean hatchesDroppedRocket, boolean hatchesDroppedCargoShip) {
@@ -33,7 +41,7 @@ public Autonomous(int rocketCargo, int rocketHatches, int cargoShipHatches,
         this.cargoShipCargo = cargoShipCargo;
         this.hatchesDropped = hatchesDropped;
         this.cargoDropped = cargoDropped;
-        this.reachHabLine = reachHabLine;
+        this.crossHabLine = crossHabLine;
         this.opponentCargoShipLineFoul = opponentCargoShipLineFoul;
         this.sideCargoShipHatchCapable = sideCargoShipHatchCapable;
         this.frontCargoShipHatchCapable = frontCargoShipHatchCapable;
@@ -43,40 +51,44 @@ public Autonomous(int rocketCargo, int rocketHatches, int cargoShipHatches,
         this.hatchesDroppedCargoShip = hatchesDroppedCargoShip;
     }
 
-    public void setRocketCargo(int rocketCargo) {
-        this.rocketCargo = rocketCargo;
+    public int getRocketCargo() {
+        return rocketCargo;
     }
 
-    public void setRocketHatches(int rocketHatches) {
-        this.rocketHatches = rocketHatches;
+    public int getRocketHatches() {
+        return rocketHatches;
     }
 
-    public void setCargoShipHatches(int cargoShipHatches) {
-        this.cargoShipHatches = cargoShipHatches;
+    public int getCargoShipHatches() {
+        return cargoShipHatches;
     }
 
-    public void setHatchesDropped(int hatchesDropped) {
-        this.hatchesDropped = hatchesDropped;
+    public int getCargoShipCargo() {
+        return cargoShipCargo;
     }
 
-    public void setCargoDropped(int cargoDropped) {
-        this.cargoDropped = cargoDropped;
+    public int getHatchesDropped() {
+        return hatchesDropped;
     }
 
-    public void setReachHabLine(boolean reachHabLine) {
-        this.reachHabLine = reachHabLine;
+    public int getCargoDropped() {
+        return cargoDropped;
     }
 
-    public void setOpponentCargoShipLineFoul(boolean opponentCargoShipLineFoul) {
-        this.opponentCargoShipLineFoul = opponentCargoShipLineFoul;
+    public boolean isCrossHabLine() {
+        return crossHabLine;
     }
 
-    public void setCargoShipCargo(int cargoShipCargo) {
-        this.cargoShipCargo = cargoShipCargo;
+    public boolean isOpponentCargoShipLineFoul() {
+        return opponentCargoShipLineFoul;
     }
 
-    public void setFrontCargoShipHatchCapable(boolean frontCargoShipHatchCapable) {
-        this.frontCargoShipHatchCapable = frontCargoShipHatchCapable;
+    public void setCrossHabLine(boolean crossHabLine) {
+        this.crossHabLine = crossHabLine;
+    }
+
+    public boolean isFrontCargoShipHatchCapable() {
+        return frontCargoShipHatchCapable;
     }
 
     public boolean isSideCargoShipHatchCapable() {
@@ -87,71 +99,68 @@ public void setSideCargoShipHatchCapable(boolean sideCargoShipHatchCapable) {
         this.sideCargoShipHatchCapable = sideCargoShipHatchCapable;
     }
 
-    public boolean isCargoDroppedCargoShip() {
-        return cargoDroppedCargoShip;
+    public boolean isHatchesDroppedRocket() {
+        return hatchesDroppedRocket;
     }
 
-    public void setCargoDroppedCargoShip(boolean cargoDroppedCargoShip) {
-        this.cargoDroppedCargoShip = cargoDroppedCargoShip;
+    public boolean isHatchesDroppedCargoShip() {
+        return hatchesDroppedCargoShip;
     }
 
-    public int getRocketCargo() {
-        return rocketCargo;
+    public boolean isCargoDroppedCargoShip() {
+        return cargoDroppedCargoShip;
     }
 
-    public int getRocketHatches() {
-        return rocketHatches;
+    public void setCargoDroppedCargoShip(boolean cargoDroppedCargoShip) {
+        this.cargoDroppedCargoShip = cargoDroppedCargoShip;
     }
 
-    public int getCargoShipHatches() {
-        return cargoShipHatches;
+    public boolean isCargoDroppedRocket() {
+        return cargoDroppedRocket;
     }
 
-    public int getCargoShipCargo() {
-        return cargoShipCargo;
+    public void setCargoDroppedRocket(boolean cargoDroppedRocket) {
+        this.cargoDroppedRocket = cargoDroppedRocket;
     }
 
-    public int getHatchesDropped() {
-        return hatchesDropped;
+    public void setCargoShipHatches(int cargoShipHatches) {
+        this.cargoShipHatches = cargoShipHatches;
     }
 
-    public int getCargoDropped() {
-        return cargoDropped;
+    public void setRocketHatches(int rocketHatches) {
+        this.rocketHatches = rocketHatches;
     }
 
-    public boolean isReachHabLine() {
-        return reachHabLine;
+    public void setCargoShipCargo(int cargoShipCargo) {
+        this.cargoShipCargo = cargoShipCargo;
     }
 
-    public boolean isOpponentCargoShipLineFoul() {
-        return opponentCargoShipLineFoul;
+    public void setRocketCargo(int rocketCargo) {
+        this.rocketCargo = rocketCargo;
     }
 
-    public boolean isCargoDroppedRocket() {
-        return cargoDroppedRocket;
+    public void setFrontCargoShipHatchCapable(boolean frontCargoShipHatchCapable) {
+        this.frontCargoShipHatchCapable = frontCargoShipHatchCapable;
     }
 
-    public boolean isFrontCargoShipHatchCapable() {
-        return frontCargoShipHatchCapable;
+    public void setHatchesDroppedCargoShip(boolean hatchesDroppedCargoShip) {
+        this.hatchesDroppedCargoShip = hatchesDroppedCargoShip;
     }
 
-    public void setCargoDroppedRocket(boolean cargoDroppedRocket) {
-        this.cargoDroppedRocket = cargoDroppedRocket;
+    public void setHatchesDropped(int hatchesDropped) {
+        this.hatchesDropped = hatchesDropped;
     }
 
-    public boolean isHatchesDroppedRocket() {
-        return hatchesDroppedRocket;
+    public void setCargoDropped(int cargoDropped) {
+        this.cargoDropped = cargoDropped;
     }
 
     public void setHatchesDroppedRocket(boolean hatchesDroppedRocket) {
         this.hatchesDroppedRocket = hatchesDroppedRocket;
     }
 
-    public boolean isHatchesDroppedCargoShip() {
-        return hatchesDroppedCargoShip;
+    public void setOpponentCargoShipLineFoul(boolean opponentCargoShipLineFoul) {
+        this.opponentCargoShipLineFoul = opponentCargoShipLineFoul;
     }
 
-    public void setHatchesDroppedCargoShip(boolean hatchesDroppedCargoShip) {
-        this.hatchesDroppedCargoShip = hatchesDroppedCargoShip;
-    }
 }