Changeset 10046 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Logical Expressions/Logical Comparators

Timestamp:

10/17/13 12:07:20 (11 years ago)

Author:

ascheibe

Message:

#2069 simplified Interpret methods of symbols

Location:

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

Files:

• Equal.cs (modified) (2 diffs)
• GreaterThan.cs (modified) (2 diffs)
• GreaterThanOrEqual.cs (modified) (2 diffs)
• LessThan.cs (modified) (2 diffs)
• LessThanOrEqual.cs (modified) (2 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -49 +51 @@
     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.");
+      if (children.Count() != 2)
+        throw new Exception("Unexpected number of children. Expected 2 children.");
+
+      lhs = children.First();
+      rhs = children.Last();
 
       var result = new[] {

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -49 +51 @@
     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.");
+      if (children.Count() != 2)
+        throw new Exception("Unexpected number of children. Expected 2 children.");
+
+      lhs = children.First();
+      rhs = children.Last();
 
       var result = new[] {

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -49 +51 @@
     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.");
+      if (children.Count() != 2)
+        throw new Exception("Unexpected number of children. Expected 2 children.");
+
+      lhs = children.First();
+      rhs = children.Last();
 
       var result = new[] {

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -49 +51 @@
     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.");
+      if (children.Count() != 2)
+        throw new Exception("Unexpected number of children. Expected 2 children.");
+
+      lhs = children.First();
+      rhs = children.Last();
 
       var result = new[] {

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -49 +51 @@
     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.");
+      if (children.Count() != 2)
+        throw new Exception("Unexpected number of children. Expected 2 children.");
+
+      lhs = children.First();
+      rhs = children.Last();
 
       var result = new[] {