Changeset 9891 for branches

Timestamp:

08/21/13 16:14:02 (11 years ago)

Author:

ascheibe

Message:

#2069 moved battle runner from Robocode directory to HL bin

Location:

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

Files:

• BattleObserver.class (added)
• BattleRunner.class (added)
• External Evaluator/BattleRunner.java (modified) (1 diff)
• HeuristicLab.Problems.Robocode-3.3.csproj (modified) (1 diff)
• Interpreter.cs (modified) (3 diffs)

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

@@ -24 +24 @@
 //
 // Add this file to the HL bin folder. Compile it with the following command:
-// javac -cp c:\robocode\;robocode.jar BattleRunner.java
+// javac -cp c:\robocode\libs\robocode.jar BattleRunner.java
 //
 public class BattleRunner {

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

@@ -93 +93 @@
   <ItemGroup>
     <Compile Include="BestSolutionAnalyzer.cs" />
+    <None Include="BattleObserver.class">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="BattleRunner.class">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

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

@@ -25 +25 @@
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 
@@ -35 +36 @@
       string interpretedProgram = InterpretProgramTree(tree.Root, robotName);
       string formattedPath = path.Replace("/", "\\");
+      string battleRunnerPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
       try {
@@ -70 +72 @@
 
       ProcessStartInfo evaluateCodeInfo = new ProcessStartInfo();
+
       evaluateCodeInfo.FileName = "cmd.exe";
-      evaluateCodeInfo.Arguments = "/C java -classpath " + formattedPath + "\\libs;" + formattedPath +
-                                   "\\libs\\robocode.core-1.8.1.0.jar;" + formattedPath + "\\libs\\robocode.jar;" +
+      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;