Changeset 10011 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Block.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/Block.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
-
+using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -29 +30 @@
   public class Block : CodeNode {
     public override int MinimumArity { get { return 1; } }
-    public override int MaximumArity { get { return 10; } }
+    public override int MaximumArity { get { return byte.MaxValue; } }
 
     [Storable]
@@ -38 +39 @@
 
     [StorableConstructor]
-    private Block(bool deserializing) : base(deserializing) { }
-    private Block(Block original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected Block(bool deserializing) : base(deserializing) { }
+    protected Block(Block original, Cloner cloner) : base(original, cloner) { }
 
     public Block()
       : base("Block", "A group of statements.") {
-      this.Prefix = "{\r\n\t";
-      this.Suffix = "\r\nexecute();\r\n}\r\n";
+      Prefix = "{";
+      Suffix = "}";
     }
 
@@ -54 +53 @@
 
     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;
+      string result = children.Aggregate(string.Empty, (current, c) => current + (Environment.NewLine + ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Environment.NewLine + Suffix;
     }
   }