Changeset 9630 for branches/Robocode/HeuristicLab.Problems.Robocode/Symbols/Branches

Timestamp:

06/14/13 11:03:13 (11 years ago)

Author:

ascheibe

Message:

#2069 fixed cloning constructors and formatting

Location:

branches/Robocode/HeuristicLab.Problems.Robocode/Symbols/Branches

Files:

• ElseStatement.cs (modified) (1 diff)
• IfStatement.cs (modified) (1 diff)
• WhileLoop.cs (modified) (1 diff)

branches/Robocode/HeuristicLab.Problems.Robocode/Symbols/Branches/ElseStatement.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Robocode
-{
-    [StorableClass]
-    public class ElseStatement : CodeNode
-    {
-        public override int MinimumArity { get { return 1; } }
-        public override int MaximumArity { get { return 1; } }
+namespace HeuristicLab.Problems.Robocode {
+  [StorableClass]
+  public class ElseStatement : CodeNode {
+    public override int MinimumArity { get { return 1; } }
+    public override int MaximumArity { get { return 1; } }
 
-        [Storable]
-        public override string Prefix { get; set; }
+    [Storable]
+    public override string Prefix { get; set; }
 
-        [Storable]
-        public override string Suffix { get; set; }
+    [Storable]
+    public override string Suffix { get; set; }
 
-        [StorableConstructor]
-        private ElseStatement(bool deserializing) : base(deserializing) { }
-        private ElseStatement(ElseStatement original, Cloner cloner)
-            : base(original, cloner)
-        {
-            this.Prefix = "else";
-            this.Suffix = "";
-        }
+    [StorableConstructor]
+    private ElseStatement(bool deserializing) : base(deserializing) { }
+    private ElseStatement(ElseStatement original, Cloner cloner)
+      : base(original, cloner) {
 
-        public ElseStatement()
-            : base("ElseStatement", "An ElseStatement.")
-        {
-            this.Prefix = "else";
-            this.Suffix = "";
-        }
+    }
 
-        public override IDeepCloneable Clone(Cloner cloner)
-        {
-            return new ElseStatement(this, cloner);
-        }
+    public ElseStatement()
+      : base("ElseStatement", "An ElseStatement.") {
+      this.Prefix = "else";
+      this.Suffix = "";
+    }
 
-        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 (result == "")? "" : this.Prefix + "\r\n" + result + "\r\n" + this.Suffix;
-        }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ElseStatement(this, cloner);
     }
+
+    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 (result == "") ? "" : this.Prefix + "\r\n" + result + "\r\n" + this.Suffix;
+    }
+  }
 }

branches/Robocode/HeuristicLab.Problems.Robocode/Symbols/Branches/IfStatement.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Robocode
-{
-    [StorableClass]
-    public class IfStatement : CodeNode
-    {
-        public override int MinimumArity { get { return 2; } }
-        public override int MaximumArity { get { return 3; } }
+namespace HeuristicLab.Problems.Robocode {
+  [StorableClass]
+  public class IfStatement : CodeNode {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return 3; } }
 
-        [Storable]
-        public override string Prefix { get; set; }
+    [Storable]
+    public override string Prefix { get; set; }
 
-        [Storable]
-        public override string Suffix { get; set; }
+    [Storable]
+    public override string Suffix { get; set; }
 
-        [StorableConstructor]
-        private IfStatement(bool deserializing) : base(deserializing) { }
-        private IfStatement(IfStatement original, Cloner cloner)
-            : base(original, cloner)
-        {
-            this.Prefix = "if(";
-            this.Suffix = ")";
-        }
+    [StorableConstructor]
+    private IfStatement(bool deserializing) : base(deserializing) { }
+    private IfStatement(IfStatement original, Cloner cloner)
+      : base(original, cloner) {
+    }
 
-        public IfStatement()
-            : base("IfStatement", "An IfStatement.")
-        {
-            this.Prefix = "if(";
-            this.Suffix = ")";
-        }
+    public IfStatement()
+      : base("IfStatement", "An IfStatement.") {
+      this.Prefix = "if(";
+      this.Suffix = ")";
+    }
 
-        public override IDeepCloneable Clone(Cloner cloner)
-        {
-            return new IfStatement(this, cloner);
-        }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new IfStatement(this, cloner);
+    }
 
-        public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children)
-        {
-            string condition = "", ifTrue = "", ifElse = "";
-            foreach (ISymbolicExpressionTreeNode c in children)
-            {
-                if(c.Symbol is LogicalExpression)
-                    condition = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-                else if(c.Symbol is Block)
-                    ifTrue = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-                else if(c.Symbol is ElseStatement || c.Symbol is DoNothing)
-                    ifElse = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-                else
-                    throw new System.Exception("Unexpected Child node.");
-            }
-            return this.Prefix + " " + condition + " " + this.Suffix +
-                "\r\n" + ifTrue + "\r\n" + ifElse + "\r\n";
-        }
+    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
+      string condition = "", ifTrue = "", ifElse = "";
+      foreach (ISymbolicExpressionTreeNode c in children) {
+        if (c.Symbol is LogicalExpression)
+          condition = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
+        else if (c.Symbol is Block)
+          ifTrue = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
+        else if (c.Symbol is ElseStatement || c.Symbol is DoNothing)
+          ifElse = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
+        else
+          throw new System.Exception("Unexpected Child node.");
+      }
+      return this.Prefix + " " + condition + " " + this.Suffix +
+          "\r\n" + ifTrue + "\r\n" + ifElse + "\r\n";
     }
+  }
 }

branches/Robocode/HeuristicLab.Problems.Robocode/Symbols/Branches/WhileLoop.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Robocode
-{
-    [StorableClass]
-    public class WhileLoop : CodeNode
-    {
-        public override int MinimumArity { get { return 2; } }
-        public override int MaximumArity { get { return 2; } }
+namespace HeuristicLab.Problems.Robocode {
+  [StorableClass]
+  public class WhileLoop : CodeNode {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return 2; } }
 
-        [Storable]
-        public override string Prefix { get; set; }
+    [Storable]
+    public override string Prefix { get; set; }
 
-        [Storable]
-        public override string Suffix { get; set; }
+    [Storable]
+    public override string Suffix { get; set; }
 
-        [StorableConstructor]
-        private WhileLoop(bool deserializing) : base(deserializing) { }
-        private WhileLoop(WhileLoop original, Cloner cloner)
-            : base(original, cloner)
-        {
-            this.Prefix = "while(";
-            this.Suffix = ")";
-        }
+    [StorableConstructor]
+    private WhileLoop(bool deserializing) : base(deserializing) { }
+    private WhileLoop(WhileLoop original, Cloner cloner)
+      : base(original, cloner) {
 
-        public WhileLoop()
-            : base("WhileLoop", "A WhileLoop.")
-        {
-            this.Prefix = "while(";
-            this.Suffix = ")";
-        }
+    }
 
-        public override IDeepCloneable Clone(Cloner cloner)
-        {
-            return new WhileLoop(this, cloner);
-        }
+    public WhileLoop()
+      : base("WhileLoop", "A WhileLoop.") {
+      this.Prefix = "while(";
+      this.Suffix = ")";
+    }
 
-        public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children)
-        {
-            string condition = "", ifTrue = "";
-            foreach (ISymbolicExpressionTreeNode c in children)
-            {
-                if (c.Symbol is LogicalExpression)
-                    condition = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-                else if (c.Symbol is Block)
-                    ifTrue = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-                else
-                    throw new System.Exception("Unexpected Child node.");
-            }
-            return this.Prefix + " " + condition + " " + this.Suffix +
-                "\r\n" + ifTrue + "\r\n";
-        }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new WhileLoop(this, cloner);
     }
+
+    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
+      string condition = "", ifTrue = "";
+      foreach (ISymbolicExpressionTreeNode c in children) {
+        if (c.Symbol is LogicalExpression)
+          condition = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
+        else if (c.Symbol is Block)
+          ifTrue = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
+        else
+          throw new System.Exception("Unexpected Child node.");
+      }
+      return this.Prefix + " " + condition + " " + this.Suffix +
+          "\r\n" + ifTrue + "\r\n";
+    }
+  }
 }