Adapt to the new robocode csv format

lunduniversity · May 27, 2021 · e72adc8 · e72adc8
1 parent 962bdfb
commit e72adc8
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 17 deletions.
diff --git a/project-rumble/best-bot-program/backup/20210527/bestbot.jar b/project-rumble/best-bot-program/backup/20210527/bestbot.jar
diff --git a/...umble/best-bot-program/example/match1.csv → ...st-bot-program/backup/20210527/match1.csv b/...umble/best-bot-program/example/match1.csv → ...st-bot-program/backup/20210527/match1.csv
diff --git a/...mble/best-bot-program/example/match10.csv → ...t-bot-program/backup/20210527/match10.csv b/...mble/best-bot-program/example/match10.csv → ...t-bot-program/backup/20210527/match10.csv
diff --git a/...mble/best-bot-program/example/match11.csv → ...t-bot-program/backup/20210527/match11.csv b/...mble/best-bot-program/example/match11.csv → ...t-bot-program/backup/20210527/match11.csv
diff --git a/...mble/best-bot-program/example/match12.csv → ...t-bot-program/backup/20210527/match12.csv b/...mble/best-bot-program/example/match12.csv → ...t-bot-program/backup/20210527/match12.csv
diff --git a/...mble/best-bot-program/example/match13.csv → ...t-bot-program/backup/20210527/match13.csv b/...mble/best-bot-program/example/match13.csv → ...t-bot-program/backup/20210527/match13.csv
diff --git a/...mble/best-bot-program/example/match14.csv → ...t-bot-program/backup/20210527/match14.csv b/...mble/best-bot-program/example/match14.csv → ...t-bot-program/backup/20210527/match14.csv
diff --git a/...mble/best-bot-program/example/match15.csv → ...t-bot-program/backup/20210527/match15.csv b/...mble/best-bot-program/example/match15.csv → ...t-bot-program/backup/20210527/match15.csv
diff --git a/...mble/best-bot-program/example/match16.csv → ...t-bot-program/backup/20210527/match16.csv b/...mble/best-bot-program/example/match16.csv → ...t-bot-program/backup/20210527/match16.csv
diff --git a/...umble/best-bot-program/example/match2.csv → ...st-bot-program/backup/20210527/match2.csv b/...umble/best-bot-program/example/match2.csv → ...st-bot-program/backup/20210527/match2.csv
diff --git a/...umble/best-bot-program/example/match3.csv → ...st-bot-program/backup/20210527/match3.csv b/...umble/best-bot-program/example/match3.csv → ...st-bot-program/backup/20210527/match3.csv
diff --git a/...umble/best-bot-program/example/match4.csv → ...st-bot-program/backup/20210527/match4.csv b/...umble/best-bot-program/example/match4.csv → ...st-bot-program/backup/20210527/match4.csv
diff --git a/...umble/best-bot-program/example/match5.csv → ...st-bot-program/backup/20210527/match5.csv b/...umble/best-bot-program/example/match5.csv → ...st-bot-program/backup/20210527/match5.csv
diff --git a/...umble/best-bot-program/example/match6.csv → ...st-bot-program/backup/20210527/match6.csv b/...umble/best-bot-program/example/match6.csv → ...st-bot-program/backup/20210527/match6.csv
diff --git a/...umble/best-bot-program/example/match7.csv → ...st-bot-program/backup/20210527/match7.csv b/...umble/best-bot-program/example/match7.csv → ...st-bot-program/backup/20210527/match7.csv
diff --git a/...umble/best-bot-program/example/match8.csv → ...st-bot-program/backup/20210527/match8.csv b/...umble/best-bot-program/example/match8.csv → ...st-bot-program/backup/20210527/match8.csv
diff --git a/...umble/best-bot-program/example/match9.csv → ...st-bot-program/backup/20210527/match9.csv b/...umble/best-bot-program/example/match9.csv → ...st-bot-program/backup/20210527/match9.csv
diff --git a/project-rumble/best-bot-program/backup/20210527/teams.txt b/project-rumble/best-bot-program/backup/20210527/teams.txt
@@ -0,0 +1,16 @@
+LURumble.UnihorseForce_g01 1;Bob;MrRobot;MrRobot;MrRobot;MrRobot
+LURumble.BananaSplit_g02 1;Bob;DopeBot;X-Terminator;X-Terminator;X-Terminator
+LURumble.Alligators_g03 1;Bob;Rut;Rut;Rut;Dexterbot
+LURumble.SHARP_g04 1.0;Markov;MrRobot;MrRobot;MrRobot;MrRobot
+LURumble.Monochrome_g05 ;Hannibal;Wolftank;Wolftank;Wolftank;Wolftank
+LURumble.LOA3_g06 1.0;Markov;Coborode;Coborode;Coborode;Coborode
+LURumble.fsociety_g07 ;Hannibal;TRACIE;Wolftank;Wolftank;Wolftank
+LURumble.Trubbel_g08 ;BasicLeaderBot;Rainbow;Rainbow;MrRobot;MrRobot
+LURumble.Dementors_g09 ;BasicLeaderBot;Rut;Rut;Wolftank;Wolftank
+LURumble.DopeGang_g10 1;Bob;Rut;Rut;Rut;Rut
+LURumble.R2D2_g11 1;Bob;Rut;Rut;Rut;Rut
+LURumble.SpicyBoys_g12 ;Hannibal;Rainbow;Rainbow;Rainbow;Rainbow
+LURumble.Imperiet_g13 1;Bob;MrRobot;MrRobot;MrRobot;MrRobot
+LURumble.SjonsjonsNudistklubb_g14 ;Hannibal;Sharp;MrRobot;MrRobot;MrRobot
+LURumble.SpiritOfMorgan_g15 1.0;Markov;Wolftank;Wolftank;Wolftank;Wolftank
+LURumble.YouWontBelieve_g16 ;Hannibal;Rut;Rut;Rut;Rut
diff --git a/project-rumble/best-bot-program/bestbot.jar b/project-rumble/best-bot-program/bestbot.jar
diff --git a/project-rumble/best-bot-program/example/match.csv b/project-rumble/best-bot-program/example/match.csv
@@ -0,0 +1,6 @@
+May 27, 2021, 8:35:16 AM
+Results for 2 rounds
+Rank,Robot Name,    Total Score    ,Survival,Surv Bonus,Bullet Dmg,Bullet Bonus,Ram Dmg * 2,Ram Bonus, 1sts , 2nds , 3rds 
+1st,sample.FireTeam  (1),1670 (100%),600,120,792,158,0,0,2,0,0
+2nd,sample.SittingDuckTeam  (2),0 (0%),0,0,0,0,0,0,0,2,0
+$
diff --git a/project-rumble/best-bot-program/example/teams.txt b/project-rumble/best-bot-program/example/teams.txt
@@ -1,16 +1,2 @@
-LURumble.UnihorseForce_g01 1;Bob;MrRobot;MrRobot;MrRobot;MrRobot
-LURumble.BananaSplit_g02 1;Bob;DopeBot;X-Terminator;X-Terminator;X-Terminator
-LURumble.Alligators_g03 1;Bob;Rut;Rut;Rut;Dexterbot
-LURumble.SHARP_g04 1.0;Markov;MrRobot;MrRobot;MrRobot;MrRobot
-LURumble.Monochrome_g05 ;Hannibal;Wolftank;Wolftank;Wolftank;Wolftank
-LURumble.LOA3_g06 1.0;Markov;Coborode;Coborode;Coborode;Coborode
-LURumble.fsociety_g07 ;Hannibal;TRACIE;Wolftank;Wolftank;Wolftank
-LURumble.Trubbel_g08 ;BasicLeaderBot;Rainbow;Rainbow;MrRobot;MrRobot
-LURumble.Dementors_g09 ;BasicLeaderBot;Rut;Rut;Wolftank;Wolftank
-LURumble.DopeGang_g10 1;Bob;Rut;Rut;Rut;Rut
-LURumble.R2D2_g11 1;Bob;Rut;Rut;Rut;Rut
-LURumble.SpicyBoys_g12 ;Hannibal;Rainbow;Rainbow;Rainbow;Rainbow
-LURumble.Imperiet_g13 1;Bob;MrRobot;MrRobot;MrRobot;MrRobot
-LURumble.SjonsjonsNudistklubb_g14 ;Hannibal;Sharp;MrRobot;MrRobot;MrRobot
-LURumble.SpiritOfMorgan_g15 1.0;Markov;Wolftank;Wolftank;Wolftank;Wolftank
-LURumble.YouWontBelieve_g16 ;Hannibal;Rut;Rut;Rut;Rut
+sample.FireTeam;Fire;Fire
+sample.SittingDuckTeam;SittingDuck;SittingDuck;SittingDuck
diff --git a/project-rumble/best-bot-program/src/BattleResultReader.java b/project-rumble/best-bot-program/src/BattleResultReader.java
@@ -51,7 +51,7 @@ public void parseBattle(Map<String, Collection<BattleResult>> teamResults, Strin
 		int nRounds = Integer.parseInt(lines[1].replaceAll("[\\D]", ""));
 		for (int i = 3; i < lines.length; i++) {
 			String[] fields = lines[i].split(",");
-			String teamName = fields[1];
+			String teamName = fields[1].split("\\s+")[0];
 			String scoreText = fields[2];
 			Scanner sc = new Scanner(scoreText);
 			int score = sc.nextInt();