Changeset 10028 for branches

Timestamp:

10/07/13 08:49:34 (11 years ago)

Author:

jkarder

Message:

#2069:

• merged IfStat and ElseStat into IfThenElseStat
• changed the font of the suffixCode text box in the CodeNodeView

Location:

branches/Robocode.TrunkInt

Files:

• HeuristicLab.Problems.Robocode.Views/3.3/CodeNodeView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.Robocode/3.3/Grammar.cs (modified) (4 diffs)
• HeuristicLab.Problems.Robocode/3.3/HeuristicLab.Problems.Robocode-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Robocode/3.3/Symbols/Statements/ElseStat.cs (deleted)
• HeuristicLab.Problems.Robocode/3.3/Symbols/Statements/IfThenElseStat.cs (moved) (moved from branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Statements/IfStat.cs) (2 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode.Views/3.3/CodeNodeView.Designer.cs

@@ -72 +72 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.suffixCode.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
       this.suffixCode.Location = new System.Drawing.Point(6, 16);
       this.suffixCode.Multiline = true;

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Grammar.cs

@@ -57 +57 @@
       var block = new Block();
       var stat = new Stat();
-      var ifStat = new IfStat();
-      var elseStat = new ElseStat();
+      var ifThenElseStat = new IfThenElseStat();
       var whileStat = new WhileStat();
 
@@ -122 +121 @@
 
       #region Symbol Collections
-      var controlSymbols = new ISymbol[] { ifStat, whileStat };
+      var controlSymbols = new ISymbol[] { ifThenElseStat, whileStat };
       var actionSymbols = new ISymbol[] {
         ahead, back, fire, turnGunLeft, turnGunRight, turnLeft, turnRadarLeft, turnRadarRight, turnRight
@@ -132 +131 @@
 
       var events = new GroupSymbol(EventsName, new ISymbol[] { onScannedRobot, onBulletHit, onBulletMissed, onHitByBullet, onHitRobot, onHitWall });
-      var controlStatements = new GroupSymbol(ControlStatementsName, controlSymbols.Concat(new[] { elseStat }));
+      var controlStatements = new GroupSymbol(ControlStatementsName, controlSymbols);
       var expressions = new GroupSymbol(ExpressionsName, new ISymbol[] { logicalExpr, numericalExpr });
       var robocodeFunctions = new GroupSymbol(RobocodeFunctionsName, actionSymbols.Concat(functionSymbols));
@@ -193 +192 @@
 
       // IfStat
-      AddAllowedChildSymbol(ifStat, logicalExpr, 0);
-      AddAllowedChildSymbol(ifStat, stat, 1);
-      AddAllowedChildSymbol(ifStat, emptyEvent, 1);
-      AddAllowedChildSymbol(ifStat, doNothing, 1);
-      AddAllowedChildSymbol(ifStat, elseStat, 2);
-      AddAllowedChildSymbol(ifStat, emptyEvent, 2);
-      AddAllowedChildSymbol(ifStat, doNothing, 2);
-
-      // ElseStat
-      AddAllowedChildSymbol(elseStat, stat);
-      AddAllowedChildSymbol(elseStat, emptyEvent);
-      AddAllowedChildSymbol(elseStat, doNothing);
+      AddAllowedChildSymbol(ifThenElseStat, logicalExpr, 0);
+      AddAllowedChildSymbol(ifThenElseStat, stat, 1);
+      AddAllowedChildSymbol(ifThenElseStat, emptyEvent, 1);
+      AddAllowedChildSymbol(ifThenElseStat, doNothing, 1);
+      AddAllowedChildSymbol(ifThenElseStat, stat, 2);
+      AddAllowedChildSymbol(ifThenElseStat, emptyEvent, 2);
+      AddAllowedChildSymbol(ifThenElseStat, doNothing, 2);
 
       // WhileStat

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/HeuristicLab.Problems.Robocode-3.3.csproj

@@ -116 +116 @@
     <Compile Include="Symbols\Void Methods\Back.cs" />
     <Compile Include="Symbols\Block.cs" />
-    <Compile Include="Symbols\Statements\ElseStat.cs" />
-    <Compile Include="Symbols\Statements\IfStat.cs" />
+    <Compile Include="Symbols\Statements\IfThenElseStat.cs" />
     <Compile Include="Symbols\Statements\WhileStat.cs" />
     <Compile Include="Symbols\Logical Expressions\BooleanTreeNode.cs" />

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

@@ -28 +28 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class IfStat : CodeNode {
+  public class IfThenElseStat : CodeNode {
     public override int MinimumArity { get { return 2; } }
     public override int MaximumArity { get { return 3; } }
@@ -39 +39 @@
 
     [StorableConstructor]
-    protected IfStat(bool deserializing) : base(deserializing) { }
-    protected IfStat(IfStat original, Cloner cloner) : base(original, cloner) { }
+    protected IfThenElseStat(bool deserializing) : base(deserializing) { }
+    protected IfThenElseStat(IfThenElseStat original, Cloner cloner) : base(original, cloner) { }
 
-    public IfStat()
-      : base("IfStat", "An if statement.") {
-      Prefix = "if (";
-      Suffix = ") {";
-    }
+    public IfThenElseStat() : base("IfThenElseStat", "An if statement.") { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new IfStat(this, cloner);
+      return new IfThenElseStat(this, cloner);
     }
 
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
-      string condition = string.Empty, ifTrue = string.Empty, ifElse = string.Empty;
-      foreach (var c in children) {
-        if (c.Symbol is LogicalExpression)
-          condition = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-        else if (c.Symbol is Stat)
-          ifTrue = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-        else if (c.Symbol is ElseStat || c.Symbol is EmptyEvent || c.Symbol is DoNothing)
-          ifElse = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-        else throw new ArgumentException("Unexpected children.", "children");
+      ISymbolicExpressionTreeNode condition = null, truePart = null, falsePart = null;
+      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.");
+        }
       }
-      string result = Prefix + condition + Suffix + Environment.NewLine + ifTrue + Environment.NewLine + "}";
-      result += string.IsNullOrEmpty(ifElse) ? Environment.NewLine : ifElse;
+      if (childCount < 2) throw new ArgumentException("Unexpected number of children. Expected at least 2 children.");
+
+      var parts = new[] {
+        ((CodeNode)condition.Symbol).Interpret(condition, condition.Subtrees),
+        ((CodeNode)truePart.Symbol).Interpret(truePart, truePart.Subtrees),
+        ((CodeNode)falsePart.Symbol).Interpret(falsePart, falsePart.Subtrees)
+      };
+
+      string result = "if (" + parts[0] + ") {" + parts[1] + "}";
+      if (!string.IsNullOrEmpty(parts[2]))
+        result += " else {" + result[2] + "}";
       return result;
     }