Changeset 5686 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt

Timestamp:

03/15/11 13:34:38 (14 years ago)

Author:

mkommend

Message:

#1418: Finally added results from the grammar refactoring.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4

Files:

• ArtificialAntExpressionGrammar.cs (modified) (2 diffs)
• ArtificialAntProblem.cs (modified) (5 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.ArtificialAnt {
   [StorableClass]
-  public class ArtificialAntExpressionGrammar : DefaultSymbolicExpressionGrammar {
+  public class ArtificialAntExpressionGrammar : SymbolicExpressionGrammar {
 
     public ArtificialAntExpressionGrammar()
@@ -53 +53 @@
 
       allSymbols.ForEach(s => AddSymbol(s));
-      SetMinSubtreeCount(ifFoodAhead, 2);
-      SetMaxSubtreeCount(ifFoodAhead, 2);
-      SetMinSubtreeCount(prog2, 2);
-      SetMaxSubtreeCount(prog2, 2);
-      SetMinSubtreeCount(prog3, 3);
-      SetMaxSubtreeCount(prog3, 3);
-      SetMinSubtreeCount(move, 0);
-      SetMaxSubtreeCount(move, 0);
-      SetMinSubtreeCount(left, 0);
-      SetMaxSubtreeCount(left, 0);
-      SetMinSubtreeCount(right, 0);
-      SetMaxSubtreeCount(right, 0);
+      SetSubtreeCount(ifFoodAhead, 2, 3);
+      SetSubtreeCount(prog2, 2, 2);
+      SetSubtreeCount(prog3, 3, 3);
+      SetSubtreeCount(move, 0, 0);
+      SetSubtreeCount(left, 0, 0);
+      SetSubtreeCount(right, 0, 0);
 
       // each symbols is allowed as child of the start symbol
-      allSymbols.ForEach(s => SetAllowedChild(StartSymbol, s, 0));
+      allSymbols.ForEach(s => AddAllowedChildSymbol(StartSymbol, s));
+      allSymbols.ForEach(s => AddAllowedChildSymbol(DefunSymbol, s));
 
       // each symbol is allowed as child of all other symbols (except for terminals that have MaxSubtreeCount == 0
-      foreach (var parent in allSymbols) {
-        for (int argIndex = 0; argIndex < GetMaxSubtreeCount(parent); argIndex++) {
-          foreach (var child in allSymbols) {
-            SetAllowedChild(parent, child, argIndex);
-          }
+      foreach (var parent in nonTerminalSymbols) {
+        foreach (var child in allSymbols) {
+          AddAllowedChildSymbol(parent, child);
         }
       }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs

@@ -101 +101 @@
       get { return EvaluatorParameter; }
     }
-    public IValueParameter<ISymbolicExpressionTreeGrammar> ArtificialAntExpressionGrammarParameter {
-      get { return (IValueParameter<ISymbolicExpressionTreeGrammar>)Parameters["ArtificialAntExpressionGrammar"]; }
+    public IValueParameter<ISymbolicExpressionGrammar> ArtificialAntExpressionGrammarParameter {
+      get { return (IValueParameter<ISymbolicExpressionGrammar>)Parameters["ArtificialAntExpressionGrammar"]; }
     }
     public IValueParameter<IntValue> MaxExpressionLengthParameter {
@@ -173 +173 @@
       get { return EvaluatorParameter.Value; }
     }
-    public GlobalSymbolicExpressionGrammar ArtificialAntExpressionGrammar {
-      get { return (GlobalSymbolicExpressionGrammar)ArtificialAntExpressionGrammarParameter.Value; }
+    public ArtificialAntExpressionGrammar ArtificialAntExpressionGrammar {
+      get { return (ArtificialAntExpressionGrammar)ArtificialAntExpressionGrammarParameter.Value; }
     }
     public DoubleValue BestKnownQuality {
@@ -211 +211 @@
       Evaluator evaluator = new Evaluator();
       BoolMatrix world = new BoolMatrix(santaFeAntTrail);
-      ISymbolicExpressionTreeGrammar grammar = new GlobalSymbolicExpressionGrammar(new ArtificialAntExpressionGrammar());
       Parameters.Add(new ValueParameter<BoolValue>("Maximization", "Set to true as the Artificial Ant Problem is a maximization problem.", new BoolValue(true)));
       Parameters.Add(new ValueParameter<ISymbolicExpressionTreeCreator>("SolutionCreator", "The operator which should be used to create new artificial ant solutions.", creator));
@@ -220 +219 @@
       Parameters.Add(new ValueParameter<IntValue>("MaxFunctionDefinitions", "Maximal number of automatically defined functions in the expression to control the artificial ant.", new IntValue(3)));
       Parameters.Add(new ValueParameter<IntValue>("MaxFunctionArguments", "Maximal number of arguments of automatically defined functions in the expression to control the artificial ant.", new IntValue(3)));
-      Parameters.Add(new ValueParameter<ISymbolicExpressionTreeGrammar>("ArtificialAntExpressionGrammar", "The grammar that should be used for artificial ant expressions.", grammar));
+      Parameters.Add(new ValueParameter<ISymbolicExpressionGrammar>("ArtificialAntExpressionGrammar", "The grammar that should be used for artificial ant expressions.", new ArtificialAntExpressionGrammar()));
       Parameters.Add(new ValueParameter<BoolMatrix>("World", "The world for the artificial ant with scattered food items.", world));
       Parameters.Add(new ValueParameter<IntValue>("MaxTimeSteps", "The number of time steps the artificial ant has available to collect all food items.", new IntValue(600)));
@@ -294 +293 @@
 
     private void MaxFunctionDefinitionsParameter_ValueChanged(object sender, EventArgs e) {
-      ArtificialAntExpressionGrammar.MaxFunctionDefinitions = MaxFunctionDefinitions.Value;
+      ArtificialAntExpressionGrammar.MaximumFunctionDefinitions = MaxFunctionDefinitions.Value;
       ParameterizeOperators();
       ParameterizeAnalyzers();
     }
     private void MaxFunctionArgumentsParameter_ValueChanged(object sender, EventArgs e) {
-      ArtificialAntExpressionGrammar.MaxFunctionArguments = MaxFunctionArguments.Value;
+      ArtificialAntExpressionGrammar.MaximumFunctionArguments = MaxFunctionArguments.Value;
       ParameterizeOperators();
       ParameterizeAnalyzers();