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

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Logical Expressions/Logical Comparators/GreaterThanOrEqual.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +27 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class GreaterThanOrEqual : CodeNode {
-    public override int MinimumArity { get { return 0; } }
-    public override int MaximumArity { get { return 0; } }
+  public class GreaterThanOrEqual : CodeNode, ILogicalComparator {
+    public override int MinimumArity { get { return 2; } }
+    public override int MaximumArity { get { return 2; } }
 
     [Storable]
@@ -37 +38 @@
 
     [StorableConstructor]
-    private GreaterThanOrEqual(bool deserializing) : base(deserializing) { }
-    private GreaterThanOrEqual(GreaterThanOrEqual original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected GreaterThanOrEqual(bool deserializing) : base(deserializing) { }
+    protected GreaterThanOrEqual(GreaterThanOrEqual original, Cloner cloner) : base(original, cloner) { }
 
-    public GreaterThanOrEqual()
-      : base("GreaterThanOrEqual", "GreaterThanOrEqual comparator.") {
-      this.Prefix = ">=";
-      this.Suffix = "";
-    }
+    public GreaterThanOrEqual() : base("GreaterThanOrEqual", "GreaterThanOrEqual comparator.") { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -52 +47 @@
     }
 
-    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) {
+      ISymbolicExpressionTreeNode lhs = null, rhs = null;
+      var enumerator = children.GetEnumerator();
+      int childCount = 0;
+      while (enumerator.MoveNext()) {
+        childCount++;
+        switch (childCount) {
+          case 1: lhs = enumerator.Current; break;
+          case 2: rhs = enumerator.Current; break;
+          default: throw new System.Exception("Unexpected number of children. Expected 2 children.");
+        }
+      }
+      if (childCount < 2) throw new System.Exception("Unexpected number of children. Expected 2 children.");
+
+      var result = new[] {
+        ((CodeNode)lhs.Symbol).Interpret(lhs, lhs.Subtrees),
+        ((CodeNode)rhs.Symbol).Interpret(rhs, rhs.Subtrees)
+      };
+
+      return result[0] + " >= " + result[1];
     }
   }