Changeset 3257 for trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntExpressionGrammar.cs

Timestamp:

04/02/10 16:49:20 (14 years ago)

Author:

gkronber

Message:

Moved general set of symbols and evaluator into Encodings.SymbolicExpressionTreeEncoding. #937 (Data types and operators for symbolic expression tree encoding)

File:

• trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntExpressionGrammar.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntExpressionGrammar.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
 namespace HeuristicLab.Problems.ArtificialAnt {
   [StorableClass]
   public class ArtificialAntExpressionGrammar : Item, ISymbolicExpressionGrammar {
-
-    private class EmptySymbol : Symbol { }
 
     public ArtificialAntExpressionGrammar()
@@ -39 +38 @@
 
     [Storable]
-    private EmptySymbol startSymbol = new EmptySymbol();
+    private StartSymbol startSymbol = new StartSymbol();
     public Symbol StartSymbol {
       get { return startSymbol; }
@@ -56 +55 @@
     private Dictionary<Type, Dictionary<int, IEnumerable<Symbol>>> allowedSymbols = new Dictionary<Type, Dictionary<int, IEnumerable<Symbol>>>() {
       {
-        typeof(EmptySymbol),
+        typeof(StartSymbol),
         new Dictionary<int, IEnumerable<Symbol>>() 
         {
@@ -93 +92 @@
     [Storable]
     private Dictionary<Type, int> minLength = new Dictionary<Type, int>() {
-      {typeof(EmptySymbol), 1}, 
+      {typeof(StartSymbol), 1}, 
       {typeof(IfFoodAhead), 3},
       {typeof(Prog2), 3},
@@ -107 +106 @@
     [Storable]
     private Dictionary<Type, int> maxLength = new Dictionary<Type, int>() {
-      {typeof(EmptySymbol), int.MaxValue}, 
+      {typeof(StartSymbol), int.MaxValue}, 
       {typeof(IfFoodAhead), int.MaxValue},
       {typeof(Prog2), int.MaxValue},
@@ -121 +120 @@
     [Storable]
     private Dictionary<Type, int> minDepth = new Dictionary<Type, int>() {
-      {typeof(EmptySymbol), 1}, 
+      {typeof(StartSymbol), 1}, 
       {typeof(IfFoodAhead), 1},
       {typeof(Prog2), 1},
@@ -136 +135 @@
     [Storable]
     private Dictionary<Type, int> subTrees = new Dictionary<Type, int>() {
-      {typeof(EmptySymbol), 1}, 
+      {typeof(StartSymbol), 1}, 
       {typeof(IfFoodAhead), 2},
       {typeof(Prog2), 2},