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

Timestamp:

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

Author:

ascheibe

Message:

#2069 simplified Interpret methods of symbols

File:

• branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/NumericalExpression.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -48 +50 @@
 
     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 (children.Count() != 1)
+        throw new ArgumentException("Expected 1 child in NumericalExpression.", "children");
 
-      var symbol = enumerator.Current.Symbol;
+      var exprTree = children.Single();
+      var symbol = exprTree.Symbol;
       if (!(symbol is Number || symbol is INumericalMethod || symbol is INumericalOperator))
         throw new System.Exception("NumericalExpression was given a child of type " + symbol.GetType() +
@@ -58 +61 @@
                                            + " 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 result;
+      return Prefix + ((CodeNode)symbol).Interpret(exprTree, exprTree.Subtrees) + Suffix;
     }
   }