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

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

Files:

• Number.cs (modified) (3 diffs)
• NumberTreeNode.cs (modified) (1 diff)
• Numerical Operators/Addition.cs (modified) (4 diffs)
• Numerical Operators/Division.cs (modified) (4 diffs)
• Numerical Operators/INumericalOperator.cs (added)
• Numerical Operators/Modulus.cs (modified) (4 diffs)
• Numerical Operators/Multiplication.cs (modified) (4 diffs)
• Numerical Operators/Subtraction.cs (modified) (4 diffs)
• NumericalExpression.cs (modified) (3 diffs)
• NumericalOperation.cs (deleted)
• ShotPower.cs (modified) (3 diffs)
• ShotPowerTreeNode.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -37 +38 @@
 
     [StorableConstructor]
-    private Number(bool deserializing) : base(deserializing) { }
-    private Number(Number original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected Number(bool deserializing) : base(deserializing) { }
+    protected Number(Number original, Cloner cloner) : base(original, cloner) { }
 
-    public Number()
-      : base("Number", "A Number.") {
-      this.Prefix = "";
-      this.Suffix = "";
-    }
+    public Number() : base("Number", "A number.") { }
 
     public override ISymbolicExpressionTreeNode CreateTreeNode() {
-
       return new NumberTreeNode();
     }
@@ -57 +51 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return " " + ((NumberTreeNode)node).Value + " ";
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      return ((NumberTreeNode)node).Value.ToString();
     }
   }

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

@@ -36 +36 @@
 
     [StorableConstructor]
-    private NumberTreeNode(bool deserializing) : base(deserializing) { }
-    private NumberTreeNode(NumberTreeNode original, Cloner cloner)
+    protected NumberTreeNode(bool deserializing) : base(deserializing) { }
+    protected NumberTreeNode(NumberTreeNode original, Cloner cloner)
       : base(original, cloner) {
       this.value = original.value;
     }
 
-    public NumberTreeNode()
-      : base(new Number()) {
-    }
+    public NumberTreeNode() : base(new Number()) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

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;
     }
   }

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -37 +38 @@
 
     [StorableConstructor]
-    private NumericalExpression(bool deserializing) : base(deserializing) { }
-    private NumericalExpression(NumericalExpression original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected NumericalExpression(bool deserializing) : base(deserializing) { }
+    protected NumericalExpression(NumericalExpression original, Cloner cloner) : base(original, cloner) { }
 
-    public NumericalExpression()
-      : base("NumericalExpression", "A NumericalExpression.") {
-      this.Prefix = "";
-      this.Suffix = "";
-    }
+    public NumericalExpression() : base("NumericalExpression", "A numerical expression.") { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -52 +47 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       var enumerator = children.GetEnumerator();
+      if (!enumerator.MoveNext()) throw new System.Exception("NumericalExpression was not given a child.");
 
-      if (!enumerator.MoveNext()) throw new System.Exception("NumericalExpression was not given a child.");
       var symbol = enumerator.Current.Symbol;
-
-      if (!(symbol is Number || symbol is NumericalOperation || symbol.GetType().GetInterface(typeof(INumericalMethod).FullName) != null))
-        throw new System.Exception("NumericalExpression was given a child of type " + symbol.GetType().ToString() +
-            ". The expected child must be of type " + typeof(Number).ToString() + " or " +
-            typeof(NumericalOperation).ToString() + " or " +
-            typeof(INumericalMethod).ToString() + ".");
+      if (!(symbol is Number || symbol is INumericalMethod || symbol is INumericalOperator))
+        throw new System.Exception("NumericalExpression was given a child of type " + symbol.GetType() +
+            ". The expected child must be of type " + typeof(Number)
+                                           + " or " + typeof(INumericalMethod)
+                                           + " or " + typeof(INumericalOperator) + ".");
 
       string result = ((CodeNode)symbol).Interpret(enumerator.Current, enumerator.Current.Subtrees);
       if (enumerator.MoveNext()) throw new System.Exception("NumericalExpression was given more than one child.");
 
-      return this.Prefix + result + this.Suffix;
+      return result;
     }
   }

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -37 +38 @@
 
     [StorableConstructor]
-    private ShotPower(bool deserializing) : base(deserializing) { }
-    private ShotPower(ShotPower original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected ShotPower(bool deserializing) : base(deserializing) { }
+    protected ShotPower(ShotPower original, Cloner cloner) : base(original, cloner) { }
 
-    public ShotPower()
-      : base("ShotPower", "The power of a shot between 0.1 and 3.") {
-    }
+    public ShotPower() : base("ShotPower", "The power of a shot between 0.1 and 3.") { }
 
     public override ISymbolicExpressionTreeNode CreateTreeNode() {
@@ -54 +51 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return " " + ((ShotPowerTreeNode)node).Value + " ";
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      return ((ShotPowerTreeNode)node).Value.ToString();
     }
   }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -36 +37 @@
 
     [StorableConstructor]
-    private ShotPowerTreeNode(bool deserializing) : base(deserializing) { }
-    private ShotPowerTreeNode(ShotPowerTreeNode original, Cloner cloner)
+    protected ShotPowerTreeNode(bool deserializing) : base(deserializing) { }
+    protected ShotPowerTreeNode(ShotPowerTreeNode original, Cloner cloner)
       : base(original, cloner) {
       this.value = original.value;
     }
 
-    public ShotPowerTreeNode()
-      : base(new ShotPower()) {
-    }
+    public ShotPowerTreeNode() : base(new ShotPower()) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -55 +54 @@
 
     public override void ResetLocalParameters(IRandom random) {
-      value = (double)random.Next(1, 3);
+      value = Math.Max(0.1, random.NextDouble() * 3);
     }
   }