Changeset 10043 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Grammar.cs

Timestamp:

10/16/13 15:47:25 (11 years ago)

Author:

ascheibe

Message:

#2069

• use groups for defining allowed child symbols in grammar
• split functions group into functions and actions in grammar
• moved run symbol to event group in grammar
• fixed a bug in the ifthenelse symbol
• enemy collection now marks one enemy per default

File:

• branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Grammar.cs (modified) (10 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +33 @@
     private const string ControlStatementsName = "Control Statements";
     private const string RobocodeFunctionsName = "Robocode Functions";
+    private const string RobocodeActionsName = "Robocode Actions";
     private const string RelationalOperatorsName = "Relational Operators";
     private const string LogicalOperators = "Logical Operators";
@@ -94 +94 @@
       var getY = new GetY();
 
-      //var setAdjustGunForRobotTurn = new SetAdjustGunForRobotTurn();
-      //var setAdjustRadarForGunTurn = new SetAdjustRadarForGunTurn();
-      //var setAdjustRadarForRobotTurn = new SetAdjustRadarForRobotTurn();
-      //var independent = new Independent();
-
       var turnLeft = new TurnLeft();
       var turnRight = new TurnRight();
@@ -124 +119 @@
       var actionSymbols = new ISymbol[] {
         ahead, back, fire, turnGunLeft, turnGunRight, turnLeft, turnRadarLeft, turnRadarRight, turnRight
-        //setAdjustGunForRobotTurn, setAdjustRadarForGunTurn, setAdjustRadarForRobotTurn, 
       };
       var functionSymbols = new ISymbol[] {
@@ -130 +124 @@
       };
 
-      var events = new GroupSymbol(EventsName, new ISymbol[] { onScannedRobot, onBulletHit, onBulletMissed, onHitByBullet, onHitRobot, onHitWall });
+      var events = new GroupSymbol(EventsName, new ISymbol[] { run, onScannedRobot, onBulletHit, onBulletMissed, onHitByBullet, onHitRobot, onHitWall });
       var controlStatements = new GroupSymbol(ControlStatementsName, controlSymbols);
       var expressions = new GroupSymbol(ExpressionsName, new ISymbol[] { logicalExpr, numericalExpr });
-      var robocodeFunctions = new GroupSymbol(RobocodeFunctionsName, actionSymbols.Concat(functionSymbols));
+      var robocodeFunctions = new GroupSymbol(RobocodeFunctionsName, functionSymbols);
+      var robocodeActions = new GroupSymbol(RobocodeActionsName, actionSymbols);
       var relationalOperators = new GroupSymbol(RelationalOperatorsName, new ISymbol[] { equal, lessThan, lessThanOrEqual, greaterThan, greaterThanOrEqual });
       var logicalOperators = new GroupSymbol(LogicalOperators, new ISymbol[] { conjunction, disjunction, negation });
@@ -141 +136 @@
       #region Adding Symbols
       AddSymbol(tank);
-      AddSymbol(run);
       AddSymbol(stat);
       AddSymbol(block);
@@ -151 +145 @@
       AddSymbol(controlStatements);
       AddSymbol(robocodeFunctions);
+      AddSymbol(robocodeActions);
       AddSymbol(relationalOperators);
       AddSymbol(logicalOperators);
@@ -171 +166 @@
       AddAllowedChildSymbol(tank, onHitWall, 6);
 
-      // Run
-      AddAllowedChildSymbol(run, stat);
-
-      // Event
-      foreach (var s in events.Symbols)
-        AddAllowedChildSymbol(s, stat);
+      // Events
+      AddAllowedChildSymbol(events, stat);
 
       // Block
@@ -184 +175 @@
       AddAllowedChildSymbol(stat, stat);
       AddAllowedChildSymbol(stat, block);
-      foreach (var s in controlSymbols)
-        AddAllowedChildSymbol(stat, s);
-      foreach (var s in robocodeFunctions.Symbols)
-        AddAllowedChildSymbol(stat, s);
+      AddAllowedChildSymbol(stat, controlStatements);
+      AddAllowedChildSymbol(stat, robocodeFunctions);
+      AddAllowedChildSymbol(stat, robocodeActions);
       AddAllowedChildSymbol(stat, emptyEvent);
       AddAllowedChildSymbol(stat, doNothing);
@@ -207 +197 @@
 
       // Numerical Expressions
-      foreach (var s in functionSymbols.Concat(new[] { number }))
-        AddAllowedChildSymbol(numericalExpr, s);
-      foreach (var s in numericalOperators.Symbols) {
-        AddAllowedChildSymbol(numericalExpr, s);
-        foreach (var ne in functionSymbols.Concat(new[] { number }))
-          AddAllowedChildSymbol(s, ne);
-        foreach (var no in numericalOperators.Symbols) {
-          AddAllowedChildSymbol(s, no);
-        }
-      }
+      AddAllowedChildSymbol(numericalExpr, number);
+      AddAllowedChildSymbol(numericalExpr, robocodeFunctions);
+      AddAllowedChildSymbol(numericalExpr, numericalOperators);
+      AddAllowedChildSymbol(numericalOperators, number);
+      AddAllowedChildSymbol(numericalOperators, robocodeFunctions);
+      AddAllowedChildSymbol(numericalOperators, numericalOperators);
 
       // Logical Expressions
       AddAllowedChildSymbol(logicalExpr, logicalVal);
-      foreach (var s in logicalOperators.Symbols) {
-        AddAllowedChildSymbol(logicalExpr, s);
-        AddAllowedChildSymbol(s, logicalVal);
-        foreach (var lo in logicalOperators.Symbols)
-          AddAllowedChildSymbol(s, lo);
-        foreach (var ro in relationalOperators.Symbols)
-          AddAllowedChildSymbol(s, ro);
-      }
-      foreach (var s in relationalOperators.Symbols)
-        AddAllowedChildSymbol(s, numericalExpr);
-
-      // Functions
-      foreach (var f in robocodeFunctions.Symbols) {
-        if (f is Fire) AddAllowedChildSymbol(f, shotPower);
-        else AddAllowedChildSymbol(f, numericalExpr);
+      AddAllowedChildSymbol(logicalExpr, logicalOperators);
+      AddAllowedChildSymbol(logicalOperators, logicalVal);
+      AddAllowedChildSymbol(logicalOperators, logicalOperators);
+      AddAllowedChildSymbol(logicalOperators, relationalOperators);
+      AddAllowedChildSymbol(relationalOperators, numericalExpr);
+
+      // Functions and Actions
+      AddAllowedChildSymbol(robocodeFunctions, numericalExpr);
+      foreach (var a in robocodeActions.Symbols) {
+        if (a is Fire) AddAllowedChildSymbol(a, shotPower);
+        else AddAllowedChildSymbol(a, numericalExpr);
       }
       #endregion