Changeset 9892

Timestamp:

08/21/13 16:24:41 (11 years ago)

Author:

ascheibe

Message:

#2069 use directory values instead of string values for the robocode path

Location:

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

Files:

• BestSolutionAnalyzer.cs (modified) (2 diffs)
• Interpreter.cs (modified) (3 diffs)
• RobocodeEvaluator.cs (modified) (2 diffs)
• RobocodeProblem.cs (modified) (2 diffs)

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

@@ -57 +57 @@
       get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
     }
-    public ILookupParameter<StringValue> RobocodePathParameter {
-      get { return (ILookupParameter<StringValue>)Parameters[RobocodePathParamaterName]; }
+    public ILookupParameter<DirectoryValue> RobocodePathParameter {
+      get { return (ILookupParameter<DirectoryValue>)Parameters[RobocodePathParamaterName]; }
     }
     #endregion
@@ -72 +72 @@
       Parameters.Add(new LookupParameter<Solution>(BestSolutionParameterName, "The best tank program."));
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection of the algorithm."));
-      Parameters.Add(new LookupParameter<StringValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
+      Parameters.Add(new LookupParameter<DirectoryValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
     }
 

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

@@ -35 +35 @@
 
       string interpretedProgram = InterpretProgramTree(tree.Root, robotName);
-      string formattedPath = path.Replace("/", "\\");
       string battleRunnerPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
@@ -47 +46 @@
       ProcessStartInfo javaCompileInfo = new ProcessStartInfo();
       javaCompileInfo.FileName = "cmd.exe";
-      javaCompileInfo.Arguments = "/C javac -cp " + formattedPath + "\\libs\\robocode.jar " +
-                                  formattedPath + "\\robots\\Evaluation\\" + robotName + ".java";
+      javaCompileInfo.Arguments = "/C javac -cp " + path + "\\libs\\robocode.jar " +
+                                  path + "\\robots\\Evaluation\\" + robotName + ".java";
       javaCompileInfo.RedirectStandardOutput = true;
       javaCompileInfo.RedirectStandardError = true;
@@ -74 +73 @@
 
       evaluateCodeInfo.FileName = "cmd.exe";
-      evaluateCodeInfo.Arguments = "/C java -classpath " + battleRunnerPath + ";" + formattedPath + "\\libs\\robocode.core-1.8.1.0.jar;" + formattedPath + "\\libs\\robocode.jar;" +
-                                   formattedPath + "\\libs\\picocontainer-2.14.2.jar BattleRunner Evaluation." +
-                                   robotName + "* " + formattedPath;
+      evaluateCodeInfo.Arguments = "/C java -classpath " + battleRunnerPath + ";" + path + "\\libs\\robocode.core-1.8.1.0.jar;" + path + "\\libs\\robocode.jar;" +
+                                   path + "\\libs\\picocontainer-2.14.2.jar BattleRunner Evaluation." +
+                                   robotName + "* " + path;
       if (showUI)
         evaluateCodeInfo.Arguments += " true";

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

@@ -44 +44 @@
       get { return (ILookupParameter<ISymbolicExpressionTree>)Parameters[TankProgramParameterName]; }
     }
-    public ILookupParameter<StringValue> RobocodePathParameter {
-      get { return (ILookupParameter<StringValue>)Parameters[RobocodePathParamaterName]; }
+    public ILookupParameter<DirectoryValue> RobocodePathParameter {
+      get { return (ILookupParameter<DirectoryValue>)Parameters[RobocodePathParamaterName]; }
     }
     #endregion
@@ -57 +57 @@
       Parameters.Add(new LookupParameter<DoubleValue>(QualityParameterName, "The solution quality of the Robocode tank program."));
       Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(TankProgramParameterName, "The Robocode tank program to evaluate represented as a symbolic expression tree."));
-      Parameters.Add(new LookupParameter<StringValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
+      Parameters.Add(new LookupParameter<DirectoryValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
     }
 

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

@@ -55 +55 @@
       get { return (IValueParameter<Grammar>)Parameters[TankGrammarParameterName]; }
     }
-    public IFixedValueParameter<StringValue> RobocodePathParameter {
-      get { return (IFixedValueParameter<StringValue>)Parameters[RobocodePathParamaterName]; }
+    public IFixedValueParameter<DirectoryValue> RobocodePathParameter {
+      get { return (IFixedValueParameter<DirectoryValue>)Parameters[RobocodePathParamaterName]; }
     }
     #endregion
@@ -70 +70 @@
     public RobocodeProblem()
       : base(new RobocodeEvaluator(), new RampedHalfAndHalfTreeCreator()) {
+      DirectoryValue robocodeDir = new DirectoryValue();
+      robocodeDir.Value = @"C:\robocode";
+
       Parameters.Add(new FixedValueParameter<IntValue>(MaxTankProgramDepthParameterName, "Maximal depth of the Robocode tank program.", new IntValue(6)));
       Parameters.Add(new FixedValueParameter<IntValue>(MaxTankProgramLengthParameterName, "Maximal length of the tank program.", new IntValue(1000)));
       Parameters.Add(new ValueParameter<Grammar>(TankGrammarParameterName, "Grammar for the tank program.", new Grammar()));
-      Parameters.Add(new FixedValueParameter<StringValue>(RobocodePathParamaterName, "Path of the Robocode installation.", new StringValue("C:/robocode")));
+      Parameters.Add(new FixedValueParameter<DirectoryValue>(RobocodePathParamaterName, "Path of the Robocode installation.", robocodeDir));
 
       Maximization.Value = true;