Changeset 9609

Timestamp:

06/12/13 05:29:43 (12 years ago)

Author:

melkaref

Message:

#2069

• Added EmptyEvent.cs
• Modified Grammar.cs to allow EmptyEvent as a child in place of all Event Methods except for Run and OnScannedEvent

Location:

branches/Robocode/HeuristicLab.Problems.Robocode

Files:

• Grammar.cs (modified) (3 diffs)
• HeuristicLab.Problems.Robocode.csproj (modified) (1 diff)
• Symbols/Event Methods/Events/EmptyEvent.cs (added)

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

@@ -94 +94 @@
             var onHitWall = new OnHitWall();
             var onScannedRobot = new OnScannedRobot();
+            var emptyEvent = new EmptyEvent();
             
             var run = new Run();
@@ -145 +146 @@
             var eventSymbols = new List<ISymbol>()
             {
-                run, onBulletHit, onBulletMissed, onHitByBullet, onHitRobot, onHitWall, onScannedRobot, block
+                run, onBulletHit, onBulletMissed, onHitByBullet, 
+                onHitRobot, onHitWall, onScannedRobot, block, emptyEvent
             };
             #endregion
@@ -246 +248 @@
             }
 
+            // Add all Event Methods to Tank. Run and OnScannedEvent are not optional,
+            // so EmptyEvent cannot take their places
+
             AddAllowedChildSymbol(tank, run, 0);
-            AddAllowedChildSymbol(tank, onBulletHit, 1);
+            AddAllowedChildSymbol(tank, onScannedRobot, 1);
             AddAllowedChildSymbol(tank, onBulletMissed, 2);
             AddAllowedChildSymbol(tank, onHitByBullet, 3);
             AddAllowedChildSymbol(tank, onHitRobot, 4);
             AddAllowedChildSymbol(tank, onHitWall, 5);
-            AddAllowedChildSymbol(tank, onScannedRobot, 6);
+            AddAllowedChildSymbol(tank, onBulletHit, 6);
+            for (int i = 2; i < tank.MaximumArity; i++)
+                AddAllowedChildSymbol(tank, emptyEvent, i);
 
             AddAllowedChildSymbol(StartSymbol, tank, 0);

branches/Robocode/HeuristicLab.Problems.Robocode/HeuristicLab.Problems.Robocode.csproj

@@ -109 +109 @@
     </Compile>
     <Compile Include="SolutionProgramView.Designer.cs" />
+    <Compile Include="Symbols\Event Methods\Events\EmptyEvent.cs" />
     <Compile Include="Symbols\Numerical Methods\INumericalMethod.cs" />
     <Compile Include="Symbols\Void Methods\Ahead.cs" />