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

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/Statements/IfThenElseStat.cs (modified) (2 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Statements/IfThenElseStat.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -51 +52 @@
       ISymbolicExpressionTreeNode condition = null, truePart = null, falsePart = null;
       string[] parts = new string[3];
-      var enumerator = children.GetEnumerator();
-      int childCount = 0;
-      while (enumerator.MoveNext()) {
-        childCount++;
-        switch (childCount) {
-          case 1: condition = enumerator.Current; break;
-          case 2: truePart = enumerator.Current; break;
-          case 3: falsePart = enumerator.Current; break;
-          default: throw new ArgumentException("Unexpected number of children. Expected a maximum of 3 children.");
-        }
-      }
-      if (childCount < 2) throw new ArgumentException("Unexpected number of children. Expected at least 2 children.");
+
+      if (children.Count() < 2 || children.Count() > 3)
+        throw new Exception("Unexpected number of children. Expected 2 or 3 children.");
+
+      var childLst = children.ToList();
+      condition = childLst[0];
+      truePart = childLst[1];
+      if (childLst.Count == 3)
+        falsePart = childLst[2];
 
       parts[0] = ((CodeNode)condition.Symbol).Interpret(condition, condition.Subtrees);
       parts[1] = ((CodeNode)truePart.Symbol).Interpret(truePart, truePart.Subtrees);
-      if (childCount == 3) parts[2] = ((CodeNode)falsePart.Symbol).Interpret(falsePart, falsePart.Subtrees);
+      if (childLst.Count == 3) parts[2] = ((CodeNode)falsePart.Symbol).Interpret(falsePart, falsePart.Subtrees);
 
       string result = "if (" + parts[0] + ") {" + parts[1] + "}";