Changeset 9962

Timestamp:

09/13/13 14:05:13 (11 years ago)

Author:

ascheibe

Message:

#2069 some minor fixes in the enemy detection

Location:

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

Files:

• Interpreter.cs (modified) (1 diff)
• RobocodeProblem.cs (modified) (3 diffs)

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

@@ -79 +79 @@
 
       if (showUI) {
-        evaluateCodeInfo.Arguments += " true " + nrOfRounds;
+        evaluateCodeInfo.Arguments += " true " + nrOfRounds + " ";
       } else {
-        evaluateCodeInfo.Arguments += " false " + nrOfRounds;
+        evaluateCodeInfo.Arguments += " false " + nrOfRounds + " ";
       }
 
-      foreach (var enemy in enemies)
+      foreach (var enemy in enemies.CheckedItems)
         evaluateCodeInfo.Arguments += enemy.Value + "* ";
 

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

@@ -40 +40 @@
   public class RobocodeProblem : SingleObjectiveHeuristicOptimizationProblem<RobocodeEvaluator,
     ISymbolicExpressionTreeCreator> {
-    #region parameter names
+    #region Parameter Names
     private const string TankProgramParameterName = "TankProgram";
     private const string MaxTankProgramLengthParameterName = "MaxProgramLength";
@@ -84 +84 @@
       robocodeDir.Value = @"C:\robocode";
 
-      var robotsDir = new DirectoryInfo(Path.Combine(robocodeDir.Value, "robots"));
-      var robotFiles = robotsDir.GetFiles("*", SearchOption.AllDirectories)
-                                .Where(x => x.Extension == ".class" || x.Extension == ".jar");
-      var robotSet = new Dictionary<string, StringValue>();
-      foreach (var robot in robotFiles) {
-        string robotName = Path.Combine(robot.DirectoryName, Path.GetFileNameWithoutExtension(robot.FullName));
-        robotName = robotName.Remove(0, robotsDir.FullName.Length);
-        string[] nameParts = robotName.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
-        robotName = string.Join(".", nameParts);
-        robotSet[robot.FullName] = new StringValue(robotName);
-      }
-      var robotList = new CheckedItemList<StringValue>(robotSet.Values);
+      var robotList = ReloadEnemies(robocodeDir.Value);
 
       Parameters.Add(new FixedValueParameter<IntValue>(MaxTankProgramDepthParameterName, "Maximal depth of the Robocode tank program.", new IntValue(6)));
@@ -110 +99 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RobocodeProblem(this, cloner);
+    }
+
+    private ICheckedItemList<StringValue> ReloadEnemies(string robocodeDir) {
+      var robotsDir = new DirectoryInfo(Path.Combine(robocodeDir, "robots"));
+      var robotFiles = robotsDir.GetFiles("*", SearchOption.AllDirectories)
+                                .Where(x => x.Extension == ".class" || x.Extension == ".jar");
+      var robotSet = new Dictionary<string, StringValue>();
+      foreach (var robot in robotFiles) {
+        string robotName = Path.Combine(robot.DirectoryName, Path.GetFileNameWithoutExtension(robot.FullName));
+        robotName = robotName.Remove(0, robotsDir.FullName.Length);
+        string[] nameParts = robotName.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
+        robotName = string.Join(".", nameParts);
+        robotSet[robot.FullName] = new StringValue(robotName);
+      }
+      var robotList = new CheckedItemList<StringValue>(robotSet.Values);
+      foreach (var robot in robotList) {
+        robotList.SetItemCheckedState(robot, false);
+      }
+
+      return robotList;
     }