Changeset 10011 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators

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

Location:

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators

Files:

• Addition.cs (modified) (4 diffs)
• Division.cs (modified) (4 diffs)
• INumericalOperator.cs (added)
• Modulus.cs (modified) (4 diffs)
• Multiplication.cs (modified) (4 diffs)
• Subtraction.cs (modified) (4 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Addition.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +29 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class Addition : CodeNode {
-    public override int MinimumArity { get { return 0; } }
-    public override int MaximumArity { get { return 0; } }
+  public class Addition : CodeNode, INumericalOperator {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return byte.MaxValue; } }
 
     [Storable]
@@ -37 +40 @@
 
     [StorableConstructor]
-    private Addition(bool deserializing) : base(deserializing) { }
-    private Addition(Addition original, Cloner cloner)
-      : base(original, cloner) {
-
-    }
+    protected Addition(bool deserializing) : base(deserializing) { }
+    protected Addition(Addition original, Cloner cloner) : base(original, cloner) { }
 
     public Addition()
       : base("Addition", "Addition operator.") {
-      this.Prefix = "+";
-      this.Suffix = "";
+      Prefix = "(";
+      Suffix = ")";
     }
 
@@ -53 +53 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return this.Prefix + this.Suffix;
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      if (children.Count() < 2)
+        throw new ArgumentException("Expected at leaset 2 children.", "children");
+
+      string result = string.Join(" + ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Suffix;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Division.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +29 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class Division : CodeNode {
-    public override int MinimumArity { get { return 0; } }
-    public override int MaximumArity { get { return 0; } }
+  public class Division : CodeNode, INumericalOperator {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return byte.MaxValue; } }
 
     [Storable]
@@ -37 +40 @@
 
     [StorableConstructor]
-    private Division(bool deserializing) : base(deserializing) { }
-    private Division(Division original, Cloner cloner)
-      : base(original, cloner) {
-
-    }
+    protected Division(bool deserializing) : base(deserializing) { }
+    protected Division(Division original, Cloner cloner) : base(original, cloner) { }
 
     public Division()
       : base("Division", "Division operator.") {
-      this.Prefix = "/";
-      this.Suffix = "";
+      Prefix = "(";
+      Suffix = ")";
     }
 
@@ -53 +53 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return this.Prefix + this.Suffix;
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      if (children.Count() < 2)
+        throw new ArgumentException("Expected at leaset 2 children.", "children");
+
+      string result = string.Join(" / ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Suffix;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Modulus.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +29 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class Modulus : CodeNode {
-    public override int MinimumArity { get { return 0; } }
-    public override int MaximumArity { get { return 0; } }
+  public class Modulus : CodeNode, INumericalOperator {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return byte.MaxValue; } }
 
     [Storable]
@@ -37 +40 @@
 
     [StorableConstructor]
-    private Modulus(bool deserializing) : base(deserializing) { }
-    private Modulus(Modulus original, Cloner cloner)
-      : base(original, cloner) {
-
-    }
+    protected Modulus(bool deserializing) : base(deserializing) { }
+    protected Modulus(Modulus original, Cloner cloner) : base(original, cloner) { }
 
     public Modulus()
       : base("Modulus", "Modulus operator.") {
-      this.Prefix = "%";
-      this.Suffix = "";
+      Prefix = "(";
+      Suffix = ")";
     }
 
@@ -53 +53 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return this.Prefix + this.Suffix;
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      if (children.Count() < 2)
+        throw new ArgumentException("Expected at leaset 2 children.", "children");
+
+      string result = string.Join(" % ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Suffix;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Multiplication.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +29 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class Multiplication : CodeNode {
-    public override int MinimumArity { get { return 0; } }
-    public override int MaximumArity { get { return 0; } }
+  public class Multiplication : CodeNode, INumericalOperator {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return byte.MaxValue; } }
 
     [Storable]
@@ -37 +40 @@
 
     [StorableConstructor]
-    private Multiplication(bool deserializing) : base(deserializing) { }
-    private Multiplication(Multiplication original, Cloner cloner)
-      : base(original, cloner) {
-
-    }
+    protected Multiplication(bool deserializing) : base(deserializing) { }
+    protected Multiplication(Multiplication original, Cloner cloner) : base(original, cloner) { }
 
     public Multiplication()
       : base("Multiplication", "Multiplication operator.") {
-      this.Prefix = "*";
-      this.Suffix = "";
+      Prefix = "(";
+      Suffix = ")";
     }
 
@@ -53 +53 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return this.Prefix + this.Suffix;
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      if (children.Count() < 2)
+        throw new ArgumentException("Expected at leaset 2 children.", "children");
+
+      string result = string.Join(" * ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Suffix;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Subtraction.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +29 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class Subtraction : CodeNode {
-    public override int MinimumArity { get { return 0; } }
-    public override int MaximumArity { get { return 0; } }
+  public class Subtraction : CodeNode, INumericalOperator {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return byte.MaxValue; } }
 
     [Storable]
@@ -37 +40 @@
 
     [StorableConstructor]
-    private Subtraction(bool deserializing) : base(deserializing) { }
-    private Subtraction(Subtraction original, Cloner cloner)
-      : base(original, cloner) {
-
-    }
+    protected Subtraction(bool deserializing) : base(deserializing) { }
+    protected Subtraction(Subtraction original, Cloner cloner) : base(original, cloner) { }
 
     public Subtraction()
       : base("Subtraction", "Subtraction operator.") {
-      this.Prefix = "-";
-      this.Suffix = "";
+      Prefix = "(";
+      Suffix = ")";
     }
 
@@ -53 +53 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return this.Prefix + this.Suffix;
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      if (children.Count() < 2)
+        throw new ArgumentException("Expected at leaset 2 children.", "children");
+
+      string result = string.Join(" - ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return Prefix + result + Suffix;
     }
   }