Rebuilt2026

Alliance Optimizer.ipynb

@@ -1007,8 +1007,7 @@
      "user_tz": 240
     },
     "id": "_GnvO48YhtE3",
-    "outputId": "5f166933-06ea-4067-9295-36166669b81e",
-    "scrolled": false
+    "outputId": "5f166933-06ea-4067-9295-36166669b81e"
    },
    "outputs": [
     {
@@ -2071,9 +2070,9 @@
    "provenance": []
   },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python [conda env:base] *",
    "language": "python",
-   "name": "python3"
+   "name": "conda-base-py"
   },
   "language_info": {
    "codemirror_mode": {
@@ -2085,9 +2084,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.12"
+   "version": "3.13.9"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }

app/src/main/java/com/example/roboticsscoutingmatchapp/ActivityCompetitionSelection.java

@@ -48,7 +48,6 @@ protected void onCreate(Bundle savedInstanceState) {
         Toast unfilledMessage = new Toast(this);
         unfilledMessage.setDuration(Toast.LENGTH_SHORT);
 
-
         String scoutName;
         boolean changeCompetition = false;
         Bundle extras = getIntent().getExtras();

app/src/main/java/com/example/roboticsscoutingmatchapp/U.java

@@ -2,10 +2,12 @@
 
 
 import android.util.Log;
+import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.RadioGroup;
 import android.widget.RadioButton;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -153,7 +155,6 @@ public String nextCommaOn(String text, int commaNum){
         if(commaNum <= 1){ return text.substring(text.indexOf(",")+1);}
         else{return nextCommaOn(text.substring(text.indexOf(",")+1), commaNum-1);}
     }
-
     /**
      * Returns a copy of {@code text} from the beginning of {@code text} to the next comma.</br>
      * Pre-Condition: {@code text} must contain at least one comma.
@@ -235,4 +236,8 @@ public int searchArrCol(ArrayList<Object[]> arr, int col, Object obj){
         }
         return -1;
     }
+
+    public String getSelectedItem(View options) {
+        return options.toString();
+    }
 }

app/src/main/java/com/example/roboticsscoutingmatchapp/activityAfterMatch.java

@@ -39,8 +39,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // *---Defines all the components on the current page as variables---*
 
-        CheckBox floorIntake = findViewById(R.id.floor_intake);
-        CheckBox humanPlayerStation = findViewById(R.id.human_player_intake);
+        CheckBox overBump = findViewById(R.id.over_bump);
+        CheckBox underTrench = findViewById(R.id.under_trench);
+        CheckBox playedDefense = findViewById(R.id.played_defense);
+        CheckBox collectedFuel = findViewById(R.id.collected_fuel);
+        CheckBox passedFuel = findViewById(R.id.passed_fuel);
+        CheckBox inactive = findViewById(R.id.inactive);
+        CheckBox other = findViewById(R.id.other);
 
         RadioGroup stopReasonGroup = findViewById(R.id.why_robot_stopped);
         RadioButton diedButton = findViewById(R.id.died);
@@ -81,12 +86,20 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         if(!postMatchSaveString.isEmpty()){ // Sets all the components to the values within the savestring
-            // Coral floor pickup able | Coral Source pickup able | Defense received |
-            // Stop reason | team rank among alliance | other comments questions or concerns ||
-            floorIntake.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString))); // Sets the value to the parsed value in the savestring
+            overBump.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString))); // Sets the value to the parsed value in the savestring
             postMatchSaveString = u.nextCommaOn(postMatchSaveString); // removes the value from the savestring
             // So on an so forth
-            humanPlayerStation.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
+            underTrench.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
+            postMatchSaveString = u.nextCommaOn(postMatchSaveString);
+            playedDefense.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
+            postMatchSaveString = u.nextCommaOn(postMatchSaveString);
+            collectedFuel.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
+            postMatchSaveString = u.nextCommaOn(postMatchSaveString);
+            passedFuel.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
+            postMatchSaveString = u.nextCommaOn(postMatchSaveString);
+            inactive.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
+            postMatchSaveString = u.nextCommaOn(postMatchSaveString);
+            other.setChecked(Boolean.parseBoolean(u.untilNextComma(postMatchSaveString)));
             postMatchSaveString = u.nextCommaOn(postMatchSaveString);
 
             if(u.untilNextComma(postMatchSaveString).equals("No Defense")){
@@ -138,12 +151,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         backButton.setOnClickListener((l)->{ // Sets current savestring to current values of components
             // Because it's the back button, these values can have no value
-            // Coral floor pickup able | Coral Source pickup able | Defense received |
-            // Stop reason | team rank among alliance | other comments questions or concerns ||
             String afterMatchInfo = "";
 
-            afterMatchInfo += u.getData(floorIntake) + ",";
-            afterMatchInfo += u.getData(humanPlayerStation) + ",";
+            afterMatchInfo += u.getData(underTrench) + ",";
+            afterMatchInfo += u.getData(overBump) + ",";
+            afterMatchInfo += u.getData(playedDefense) + ",";
+            afterMatchInfo += u.getData(collectedFuel) + ",";
+            afterMatchInfo += u.getData(passedFuel) + ",";
+            afterMatchInfo += u.getData(inactive) + ",";
+            afterMatchInfo += u.getData(other) + ",";
             afterMatchInfo += u.getData(defenseReceivedGroup) + ",";
             afterMatchInfo += u.getData(stopReasonGroup) + ",";
             afterMatchInfo += u.getData(rankGroup) + ",";
@@ -168,11 +184,14 @@ else if(u.getData(rankGroup).isEmpty())
             else if(u.getData(stopReasonGroup).isEmpty())
                 response = "Please fill in stop reason";
             else{ // If nothing is wrong, keep filling everything in
-                // Coral floor pickup able | Coral Source pickup able | Defense received |
-                // Stop reason | team rank among alliance | other comments questions or concerns ||
                 String postMatchInfo = "";
-                postMatchInfo += u.getData(floorIntake) + ",";
-                postMatchInfo += u.getData(humanPlayerStation) + ",";
+                postMatchInfo += u.getData(overBump) + ",";
+                postMatchInfo += u.getData(underTrench) + ",";
+                postMatchInfo += u.getData(playedDefense) + ",";
+                postMatchInfo += u.getData(collectedFuel) + ",";
+                postMatchInfo += u.getData(passedFuel) + ",";
+                postMatchInfo += u.getData(inactive) + ",";
+                postMatchInfo += u.getData(other) + ",";
                 postMatchInfo += u.getData(defenseReceivedGroup) + ",";
                 postMatchInfo += u.getData(stopReasonGroup) + ",";
                 postMatchInfo += u.getData(rankGroup) + ",";