Changeset 9879

Timestamp:

08/13/13 10:56:05 (11 years ago)

Author:

ascheibe

Message:

#2069 removed unused symbols and cleaned up code

Location:

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

Files:

• Crossover/RobocodeCrossover.cs (deleted)
• Evaluator.cs (deleted)
• Grammar.cs (modified) (3 diffs)
• HeuristicLab.Problems.Robocode-3.3.csproj (modified) (3 diffs)
• Interpreter.cs (modified) (2 diffs)
• Problem.cs (deleted)
• RobocodeEvaluator.cs (added)
• RobocodeProblem.cs (added)
• Solution.cs (modified) (2 diffs)
• Symbols/Abandoned (deleted)

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

@@ -79 +79 @@
       var ahead = new Ahead();
       var back = new Back();
-      var constant = new Constant();
       var doNothing = new DoNothing();
       var fire = new Fire();
@@ -156 +155 @@
       var constantSymbols = new List<ISymbol>()
             {
-                shotPower, /*independent,*/ constant
+                shotPower
             };
 
@@ -247 +246 @@
       // Add the appropriate parameters as children of their respective functions
       foreach (var f in functionSymbols) {
-        if (f is SetAdjustGunForRobotTurn ||
-            f is SetAdjustRadarForGunTurn ||
-            f is SetAdjustRadarForRobotTurn)
-          AddAllowedChildSymbol(f, logicExpr);
-        else if (f is Fire)
+        if (f is Fire)
           AddAllowedChildSymbol(f, shotPower);
         else

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

@@ -95 +95 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
-    <Compile Include="Crossover\RobocodeCrossover.cs" />
     <Compile Include="Crossover\RobocodeMethodCrossover.cs" />
-    <Compile Include="Evaluator.cs" />
+    <Compile Include="RobocodeEvaluator.cs" />
     <Compile Include="Grammar.cs" />
     <Compile Include="Interpreter.cs" />
-    <Compile Include="Problem.cs" />
+    <Compile Include="RobocodeProblem.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <Compile Include="Solution.cs" />
@@ -112 +111 @@
     <Compile Include="Symbols\Branches\WhileLoop.cs" />
     <Compile Include="Symbols\Logical Expressions\BooleanTreeNode.cs" />
-    <Compile Include="Symbols\Abandoned\Constant.cs" />
-    <Compile Include="Symbols\Abandoned\ConstantTreeNode.cs" />
     <Compile Include="Symbols\Logical Expressions\Logical Comparators\Conjunction.cs" />
     <Compile Include="Symbols\Logical Expressions\Logical Comparators\Disjunction.cs" />
@@ -153 +150 @@
     <Compile Include="Symbols\Numerical Methods\GetX.cs" />
     <Compile Include="Symbols\Numerical Methods\GetY.cs" />
-    <Compile Include="Symbols\Abandoned\Independent.cs" />
     <Compile Include="Symbols\Program.cs" />
     <Compile Include="Symbols\Event Methods\Run.cs" />
-    <Compile Include="Symbols\Abandoned\SetAdjustGunForRobotTurn.cs" />
-    <Compile Include="Symbols\Abandoned\SetAdjustRadarForGunTurn.cs" />
-    <Compile Include="Symbols\Abandoned\SetAdjustRadarForRobotTurn.cs" />
     <Compile Include="Symbols\Numerical Expressions\ShotPower.cs" />
     <Compile Include="Symbols\Numerical Expressions\ShotPowerTreeNode.cs" />

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

@@ -295 +295 @@
           tankStats = EvaluateTankProgram(node.GetSubtree(0), ref docNode, null);
       else*/
-      if (node.Symbol is Constant)
-        docNode[method]["code"].InnerText += " " + ((ConstantTreeNode)node).Value + " ";
-      else if (node.Symbol is ShotPower)
+      if (node.Symbol is ShotPower)
         docNode[method]["code"].InnerText += " " + ((ShotPowerTreeNode)node).Value + " ";
       else if (node.Symbol is LogicalValue)
@@ -329 +327 @@
       } else if (node.Symbol is Back) {
         docNode[method]["code"].InnerText += "setBack(";
-        EvaluateTankProgram(node.GetSubtree(0), docNode, method);
-        docNode[method]["code"].InnerText += ");\r\n";
-        tankStats.moves = 1;
-      } else if (node.Symbol is SetAdjustGunForRobotTurn) {
-        docNode[method]["code"].InnerText += "setAdjustGunForRobotTurn(";
-        EvaluateTankProgram(node.GetSubtree(0), docNode, method);
-        docNode[method]["code"].InnerText += ");\r\n";
-        tankStats.moves = 1;
-      } else if (node.Symbol is SetAdjustRadarForGunTurn) {
-        docNode[method]["code"].InnerText += "setAdjustRadarForGunTurn(";
-        EvaluateTankProgram(node.GetSubtree(0), docNode, method);
-        docNode[method]["code"].InnerText += ");\r\n";
-        tankStats.moves = 1;
-      } else if (node.Symbol is SetAdjustRadarForRobotTurn) {
-        docNode[method]["code"].InnerText += "setAdjustRadarForRobotTurn(";
         EvaluateTankProgram(node.GetSubtree(0), docNode, method);
         docNode[method]["code"].InnerText += ");\r\n";

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

@@ -28 +28 @@
   [StorableClass]
   public sealed class Solution : NamedItem {
-    //private int moves;
-    //[Storable]
-    //public int Moves
-    //{
-    //    get { return moves; }
-    //    private set { this.moves = value; }
-    //}
-    //private int shots;
-    //[Storable]
-    //public int Shots
-    //{
-    //    get { return shots; }
-    //    private set { this.shots = value; }
-    //}
     [Storable]
     public ISymbolicExpressionTree Tree { get; set; }
@@ -52 +38 @@
     private Solution(Solution original, Cloner cloner)
       : base(original, cloner) {
-
       Tree = cloner.Clone(original.Tree);
       Path = original.Path;
     }
 
-    public Solution(ISymbolicExpressionTree tree, string path)// int moves, int shots)
-      : base("Solution", "A tank program.") {
+    public Solution(ISymbolicExpressionTree tree, string path)
+      : base("Solution", "A Robocode program.") {
       this.Tree = tree;
       this.Path = path;
-      //this.moves = moves;
-      //this.shots = shots;
     }