Changeset 10011 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Tank.cs

Timestamp:

10/01/13 12:08:25 (11 years ago)

Author:

jkarder

Message:

#2069:

• refactored grammar and symbols
• fixed cloning and storable ctors
• fixed plugin dependencies

File:

• branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Tank.cs (modified) (4 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Tank.cs

@@ -20 +20 @@
 #endregion
 
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -28 +30 @@
   [StorableClass]
   public class Tank : CodeNode {
-    public override int MinimumArity { get { return 7; } }
+    public override int MinimumArity { get { return 2; } }
     public override int MaximumArity { get { return 7; } }
 
@@ -38 +40 @@
 
     [StorableConstructor]
-    private Tank(bool deserializing) : base(deserializing) { }
-    private Tank(Tank original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected Tank(bool deserializing) : base(deserializing) { }
+    protected Tank(Tank original, Cloner cloner) : base(original, cloner) { }
 
     public Tank()
       : base("Tank", "The root of a Robocode Tank program.") {
-      this.Prefix = "package Evaluation;" +
-                    "\r\nimport robocode.*;" +
-                    "\r\nimport robocode.Robot;" +
-                    "\r\nimport robocode.util.*;" +
-                    "\r\nimport static robocode.util.Utils.normalRelativeAngleDegrees;" +
-                    "\r\nimport java.awt.*;" +
-                    "\r\n\r\n" +
-                    "\r\npublic class output extends AdvancedRobot {\r\n";
-      this.Suffix = "\r\n}";
+      Prefix =
+@"package Evaluation;
+import robocode.*;
+import robocode.Robot;
+import robocode.util.*;
+import static robocode.util.Utils.normalRelativeAngleDegrees;
+import java.awt.*;
+
+public class output extends AdvancedRobot {";
+      Suffix = "}";
     }
 
@@ -60 +61 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      string result = "";
-      foreach (ISymbolicExpressionTreeNode c in children)
-        result += "\r\n" + ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-      return this.Prefix + "\r\n" + result + "\r\n" + this.Suffix;
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      string result = children.Aggregate(string.Empty, (current, c) => current + (Environment.NewLine + ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Environment.NewLine + Suffix;
     }
   }