Changeset 9966

Timestamp:

09/16/13 10:31:18 (11 years ago)

Author:

ascheibe

Message:

#2069 improved robot detection in BattleRunner

Location:

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3

Files:

• BattleObserver.class (modified) (previous)
• BattleRunner.class (modified) (previous)
• External Evaluator/BattleRunner.java (modified) (1 diff)
• Interpreter.cs (modified) (2 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/External Evaluator/BattleRunner.java

@@ -56 +56 @@
         engine.addBattleListener(new BattleObserver());       
 
-     // setup the battle specification  
-        for (String s : robots)
-            bots += s + ", ";
-        bots = bots.substring(0, bots.length() - 1);
+    BattlefieldSpecification battlefield = new BattlefieldSpecification(800, 600);
+        RobotSpecification[] all = engine.getLocalRepository();
+    List<RobotSpecification> selectedRobots = new ArrayList<RobotSpecification>();
     
-        BattlefieldSpecification battlefield = new BattlefieldSpecification(800, 600);
-        RobotSpecification[] selectedRobots = engine.getLocalRepository(bots);
-
-        for (int i = 1; i < selectedRobots.length; i++) {
-            BattleSpecification battleSpec = new BattleSpecification(numberOfRounds, battlefield, 
-      new RobotSpecification[] { selectedRobots[0], selectedRobots[i] });
+    for(RobotSpecification rs : all) {
+      for(String r : robots) {
+        if(r.equals(rs.getClassName())) {
+          selectedRobots.add(rs);       
+        }     
+      }
+    }   
+    
+    for (int i = 1; i < selectedRobots.size(); i++) {
+      BattleSpecification battleSpec = new BattleSpecification(numberOfRounds, battlefield, 
+      new RobotSpecification[] { selectedRobots.get(0), selectedRobots.get(i) });
 
             // run our specified battle and wait till the battle finishes

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Interpreter.cs

@@ -76 +76 @@
       evaluateCodeInfo.FileName = "cmd.exe";
       evaluateCodeInfo.Arguments = "/C java -cp " + battleRunnerPath + ";" + robocodeCoreJar + ";" + robocodeJar +
-                                  ";" + picocontainerJar + ";" + " BattleRunner Evaluation." + robotName + "* " + path;
+                                  ";" + picocontainerJar + ";" + " BattleRunner Evaluation." + robotName + " " + path;
 
       if (showUI) {
@@ -85 +85 @@
 
       foreach (var enemy in enemies.CheckedItems)
-        evaluateCodeInfo.Arguments += enemy.Value + "* ";
+        evaluateCodeInfo.Arguments += enemy.Value + " ";
 
       evaluateCodeInfo.RedirectStandardOutput = true;