Changeset 10014 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols

Timestamp:

10/01/13 16:39:35 (11 years ago)

Author:

jkarder

Message:

#2069:

• refactored grammar and symbols
• changed RobocodeProblem to use the ProbabilisticTreeCreator by default

Location:

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols

Files:

• Event Methods/Events/EmptyEvent.cs (modified) (1 diff)
• Stat.cs (modified) (2 diffs)
• Statements/ElseStat.cs (modified) (2 diffs)
• Statements/IfStat.cs (modified) (2 diffs)
• Statements/WhileStat.cs (modified) (2 diffs)
• Void Methods/Ahead.cs (modified) (1 diff)
• Void Methods/Back.cs (modified) (1 diff)
• Void Methods/DoNothing.cs (modified) (1 diff)
• Void Methods/Fire.cs (modified) (1 diff)
• Void Methods/TurnGunLeft.cs (modified) (1 diff)
• Void Methods/TurnGunRight.cs (modified) (1 diff)
• Void Methods/TurnLeft.cs (modified) (1 diff)
• Void Methods/TurnRadarLeft.cs (modified) (1 diff)
• Void Methods/TurnRadarRight.cs (modified) (1 diff)
• Void Methods/TurnRight.cs (modified) (1 diff)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Event Methods/Events/EmptyEvent.cs

@@ -48 +48 @@
 
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return ";";
+      return string.Empty;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Stat.cs

@@ -43 +43 @@
     protected Stat(Stat original, Cloner cloner) : base(original, cloner) { }
 
-    public Stat() : base("Statement", "A statement.") { }
+    public Stat()
+      : base("Statement", "A statement.") {
+      Suffix = ";";
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -50 +53 @@
 
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return children.Aggregate(string.Empty, (current, c) => current + (Environment.NewLine + ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
+      return children.Aggregate(string.Empty, (current, c) => current + (Environment.NewLine + ((CodeNode)c.Symbol).Interpret(c, c.Subtrees))) + Suffix;
     }
   }

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

@@ -44 +44 @@
 
     public ElseStat()
-      : base("ElseStatement", "An ElseStatement.") {
-      Prefix = "else";
-      Suffix = "";
+      : base("ElseStat", "An else branch.") {
+      Prefix = " else {";
+      Suffix = "}";
     }
 
@@ -55 +55 @@
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       string result = children.Aggregate(string.Empty, (current, c) => current + (Environment.NewLine + ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));
-      return string.IsNullOrEmpty(result)
-        ? string.Empty
-        : Prefix + Environment.NewLine + result + Environment.NewLine + Suffix;
+      return string.IsNullOrEmpty(result) ? string.Empty : Prefix + Environment.NewLine + result + Environment.NewLine + Suffix;
     }
   }

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

@@ -43 +43 @@
 
     public IfStat()
-      : base("IfStatement", "An if statement.") {
+      : base("IfStat", "An if statement.") {
       Prefix = "if (";
-      Suffix = ")";
+      Suffix = ") {";
     }
 
@@ -63 +63 @@
         else throw new ArgumentException("Unexpected children.", "children");
       }
-      return Prefix + condition + Suffix + Environment.NewLine + ifTrue + Environment.NewLine + ifElse + Environment.NewLine;
+      string result = Prefix + condition + Suffix + Environment.NewLine + ifTrue + Environment.NewLine + "}";
+      result += string.IsNullOrEmpty(ifElse) ? Environment.NewLine : ifElse;
+      return result;
     }
   }

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

@@ -45 +45 @@
       : base("WhileStat", "A while statement.") {
       Prefix = "while (";
-      Suffix = ")";
+      Suffix = ") {";
     }
 
@@ -61 +61 @@
         else throw new ArgumentException("Unexpected children.", "children");
       }
-      return Prefix + condition + Suffix + Environment.NewLine + ifTrue + Environment.NewLine;
+      return Prefix + condition + Suffix + Environment.NewLine + ifTrue + Environment.NewLine + "}" + Environment.NewLine;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/Ahead.cs

@@ -44 +44 @@
       : base("Ahead", "Immediately moves your robot ahead (forward) by distance measured in pixels.") {
       Prefix = "setAhead(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/Back.cs

@@ -44 +44 @@
       : base("Back", "Immediately moves your robot backward by distance measured in pixels.") {
       Prefix = "setBack(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/DoNothing.cs

@@ -48 +48 @@
 
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
-      return ";";
+      return string.Empty;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/Fire.cs

@@ -44 +44 @@
       : base("Fire", "Immediately fires a bullet.") {
       Prefix = "setFire(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/TurnGunLeft.cs

@@ -44 +44 @@
       : base("TurnGunLeft", "Immediately turns the robot's gun to the left by degrees.") {
       Prefix = "setTurnGunLeft(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/TurnGunRight.cs

@@ -44 +44 @@
       : base("TurnGunRight", "Immediately turns the robot's gun to the right by degrees.") {
       Prefix = "setTurnGunRight(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/TurnLeft.cs

@@ -44 +44 @@
       : base("TurnLeft", "Immediately turns the robot's body to the left by degrees.") {
       Prefix = "setTurnLeft(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/TurnRadarLeft.cs

@@ -44 +44 @@
       : base("TurnRadarLeft", "Immediately turns the robot's radar to the left by degrees.") {
       Prefix = "setTurnRadarLeft(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/TurnRadarRight.cs

@@ -44 +44 @@
       : base("TurnRadarRight", "Immediately turns the robot's radar to the right by degrees.") {
       Prefix = "setTurnRadarRight(";
-      Suffix = ");";
+      Suffix = ")";
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Void Methods/TurnRight.cs

@@ -44 +44 @@
       : base("TurnRight", "Immediately turns the robot's body to the right by degrees.") {
       Prefix = "setTurnRight(";
-      Suffix = ");";
+      Suffix = ")";
     }