diff --git a/project-rumble/best-bot-program/backup/20210527/bestbot.jar b/project-rumble/best-bot-program/backup/20210527/bestbot.jar new file mode 100644 index 0000000..98f422c Binary files /dev/null and b/project-rumble/best-bot-program/backup/20210527/bestbot.jar differ diff --git a/project-rumble/best-bot-program/example/match1.csv b/project-rumble/best-bot-program/backup/20210527/match1.csv similarity index 100% rename from project-rumble/best-bot-program/example/match1.csv rename to project-rumble/best-bot-program/backup/20210527/match1.csv diff --git a/project-rumble/best-bot-program/example/match10.csv b/project-rumble/best-bot-program/backup/20210527/match10.csv similarity index 100% rename from project-rumble/best-bot-program/example/match10.csv rename to project-rumble/best-bot-program/backup/20210527/match10.csv diff --git a/project-rumble/best-bot-program/example/match11.csv b/project-rumble/best-bot-program/backup/20210527/match11.csv similarity index 100% rename from project-rumble/best-bot-program/example/match11.csv rename to project-rumble/best-bot-program/backup/20210527/match11.csv diff --git a/project-rumble/best-bot-program/example/match12.csv b/project-rumble/best-bot-program/backup/20210527/match12.csv similarity index 100% rename from project-rumble/best-bot-program/example/match12.csv rename to project-rumble/best-bot-program/backup/20210527/match12.csv diff --git a/project-rumble/best-bot-program/example/match13.csv b/project-rumble/best-bot-program/backup/20210527/match13.csv similarity index 100% rename from project-rumble/best-bot-program/example/match13.csv rename to project-rumble/best-bot-program/backup/20210527/match13.csv diff --git a/project-rumble/best-bot-program/example/match14.csv b/project-rumble/best-bot-program/backup/20210527/match14.csv similarity index 100% rename from project-rumble/best-bot-program/example/match14.csv rename to project-rumble/best-bot-program/backup/20210527/match14.csv diff --git a/project-rumble/best-bot-program/example/match15.csv b/project-rumble/best-bot-program/backup/20210527/match15.csv similarity index 100% rename from project-rumble/best-bot-program/example/match15.csv rename to project-rumble/best-bot-program/backup/20210527/match15.csv diff --git a/project-rumble/best-bot-program/example/match16.csv b/project-rumble/best-bot-program/backup/20210527/match16.csv similarity index 100% rename from project-rumble/best-bot-program/example/match16.csv rename to project-rumble/best-bot-program/backup/20210527/match16.csv diff --git a/project-rumble/best-bot-program/example/match2.csv b/project-rumble/best-bot-program/backup/20210527/match2.csv similarity index 100% rename from project-rumble/best-bot-program/example/match2.csv rename to project-rumble/best-bot-program/backup/20210527/match2.csv diff --git a/project-rumble/best-bot-program/example/match3.csv b/project-rumble/best-bot-program/backup/20210527/match3.csv similarity index 100% rename from project-rumble/best-bot-program/example/match3.csv rename to project-rumble/best-bot-program/backup/20210527/match3.csv diff --git a/project-rumble/best-bot-program/example/match4.csv b/project-rumble/best-bot-program/backup/20210527/match4.csv similarity index 100% rename from project-rumble/best-bot-program/example/match4.csv rename to project-rumble/best-bot-program/backup/20210527/match4.csv diff --git a/project-rumble/best-bot-program/example/match5.csv b/project-rumble/best-bot-program/backup/20210527/match5.csv similarity index 100% rename from project-rumble/best-bot-program/example/match5.csv rename to project-rumble/best-bot-program/backup/20210527/match5.csv diff --git a/project-rumble/best-bot-program/example/match6.csv b/project-rumble/best-bot-program/backup/20210527/match6.csv similarity index 100% rename from project-rumble/best-bot-program/example/match6.csv rename to project-rumble/best-bot-program/backup/20210527/match6.csv diff --git a/project-rumble/best-bot-program/example/match7.csv b/project-rumble/best-bot-program/backup/20210527/match7.csv similarity index 100% rename from project-rumble/best-bot-program/example/match7.csv rename to project-rumble/best-bot-program/backup/20210527/match7.csv diff --git a/project-rumble/best-bot-program/example/match8.csv b/project-rumble/best-bot-program/backup/20210527/match8.csv similarity index 100% rename from project-rumble/best-bot-program/example/match8.csv rename to project-rumble/best-bot-program/backup/20210527/match8.csv diff --git a/project-rumble/best-bot-program/example/match9.csv b/project-rumble/best-bot-program/backup/20210527/match9.csv similarity index 100% rename from project-rumble/best-bot-program/example/match9.csv rename to project-rumble/best-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 new file mode 100644 index 0000000..d85c3eb --- /dev/null +++ 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 \ No newline at end of file diff --git a/project-rumble/best-bot-program/bestbot.jar b/project-rumble/best-bot-program/bestbot.jar index 98f422c..a8c136d 100644 Binary files a/project-rumble/best-bot-program/bestbot.jar and b/project-rumble/best-bot-program/bestbot.jar differ diff --git a/project-rumble/best-bot-program/example/match.csv b/project-rumble/best-bot-program/example/match.csv new file mode 100644 index 0000000..fde1c42 --- /dev/null +++ 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 index d85c3eb..68e3d81 100644 --- 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 \ No newline at end of file +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 index 3ba5407..7cbe34f 100644 --- 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> 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();