Changeset 10075 for branches

Timestamp:

10/21/13 11:29:55 (11 years ago)

Author:

sawinkle

Message:

#2109:

• For each newly created node, ResetLocalParameters() has to be called, if possible. Otherwise 'Variable' symbols won't be initialized correctly. (E.g. internal ValueName is null and causes exceptions.)
• Method MapDepthFirstRecursively() of DepthFirstMapper.cs checks subtree boundaries by using the MinimumArity instead of the MaximumArity. Otherwise e.g. adding the 'Addition' symbol will cause very short trees, because this symbol has got a MaximumArity of 255! This would cause, that the tree is immediately full, after insertion of one 'Addition' symbol, if the genotype length is e.g. just 100.
• Several bug fixes.
• Unresolved issues:
  • Changes in the selected grammar are not taken into account during a run (e.g. 'Addition' symbols will be inserted into the tree, although its checkbox was unchecked previously).
  • Exception, if a division by zero is tried.
  • Wrapping mechanism.

Location:

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution

Files:

• Mappers/DepthFirstMapper.cs (modified) (5 diffs)
• Mappers/GenotypeToPhenotypeMapper.cs (modified) (2 diffs)
• Symbolic/GESymbolicDataAnalysisProblem.cs (modified) (5 diffs)
• Symbolic/GESymbolicDataAnalysisSingleObjectiveProblem.cs (modified) (1 diff)
• Symbolic/GESymbolicRegressionSingleObjectiveEvaluator.cs (modified) (1 diff)
• Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs (modified) (1 diff)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/DepthFirstMapper.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.GrammaticalEvolution {
@@ -56 +57 @@
       SymbolicExpressionTree tree = new SymbolicExpressionTree();
       var rootNode = (SymbolicExpressionTreeTopLevelNode)grammar.ProgramRootSymbol.CreateTreeNode();
+      if (rootNode.HasLocalParameters) rootNode.ResetLocalParameters(new MersenneTwister());
       var startNode = (SymbolicExpressionTreeTopLevelNode)grammar.StartSymbol.CreateTreeNode();
+      if (startNode.HasLocalParameters) startNode.ResetLocalParameters(new MersenneTwister());
       rootNode.AddSubtree(startNode);
       tree.Root = rootNode;
@@ -96 +99 @@
         var newNode = GetNewChildNode(currentNode, genotype, grammar, genotypeIndex);
 
-        if ((currSubtreeCount + newNode.Symbol.MaximumArity) > maxSubtreeCount) {
+        if ((currSubtreeCount + newNode.Symbol.MinimumArity) > maxSubtreeCount) {
           // TODO: maybe check, if there is any node, which fits in the tree yet
           currentNode.AddSubtree(GetRandomTerminalNode(currentNode, grammar));
@@ -102 +105 @@
           currentNode.AddSubtree(newNode);
           genotypeIndex++;
-          currSubtreeCount += newNode.Symbol.MaximumArity;
+          currSubtreeCount += newNode.Symbol.MinimumArity;
 
-          while (newNode.Symbol.MaximumArity > newNode.SubtreeCount) {
+          while (newNode.Symbol.MinimumArity > newNode.SubtreeCount) {
             MapDepthFirstRecursively(newNode, genotype,
                                      grammar, maxSubtreeCount,
@@ -112 +115 @@
 
       } else {
-        while (currentNode.Symbol.MaximumArity > currentNode.SubtreeCount) {
+        while (currentNode.Symbol.MinimumArity > currentNode.SubtreeCount) {
           var newNode = GetNewChildNode(currentNode, genotype, grammar, genotypeIndex);
           currentNode.AddSubtree(newNode);
           genotypeIndex++;
-          while (newNode.Symbol.MaximumArity > newNode.SubtreeCount) {
+          while (newNode.Symbol.MinimumArity > newNode.SubtreeCount) {
             newNode.AddSubtree(GetRandomTerminalNode(newNode, grammar));
           }

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/GenotypeToPhenotypeMapper.cs

@@ -52 +52 @@
     protected ISymbolicExpressionTreeNode GetRandomTerminalNode(ISymbolicExpressionTreeNode parentNode,
                                                               ISymbolicExpressionGrammar grammar) {
-      var possibleSymbolsList = from s in grammar.GetAllowedChildSymbols(parentNode.Symbol)
-                                where s.MaximumArity == 0
-                                where s.MinimumArity == 0
-                                select s;
-      // TODO: Check, if symbol list is empty (no terminal nodes found) - what should happen? 
-      return possibleSymbolsList.SelectRandom(new MersenneTwister()).CreateTreeNode();
+      // only select specific symbols, which can be interpreted ...
+      var possibleSymbolsList = (from s in grammar.GetAllowedChildSymbols(parentNode.Symbol)
+                                 where s.InitialFrequency > 0.0
+                                 where s.MaximumArity == 0
+                                 where s.MinimumArity == 0
+                                 select s).ToList();
+      // TODO: Check, if symbol list is empty (no terminal nodes found) - what should happen?
+      var newNode = possibleSymbolsList.SelectRandom(new MersenneTwister()).CreateTreeNode();
+      if (newNode.HasLocalParameters) newNode.ResetLocalParameters(new MersenneTwister());
+      return newNode;
     }
 
@@ -74 +78 @@
                                                           int genotypeIndex) {
 
-      IEnumerable<ISymbol> symbolList = grammar.GetAllowedChildSymbols(parentNode.Symbol);
+      // only select specific symbols, which can be interpreted ...
+      IEnumerable<ISymbol> symbolList = (from s in grammar.GetAllowedChildSymbols(parentNode.Symbol)
+                                         where s.InitialFrequency > 0.0
+                                         select s).ToList();
       int prodRuleCount = symbolList.Count();
       int prodRuleIndex = genotype[genotypeIndex % genotype.Length] % prodRuleCount;
 
-      return symbolList.ElementAt(prodRuleIndex).CreateTreeNode();
+      var newNode = symbolList.ElementAt(prodRuleIndex).CreateTreeNode();
+      if (newNode.HasLocalParameters) newNode.ResetLocalParameters(new MersenneTwister());
+      return newNode;
     }
   }

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicDataAnalysisProblem.cs

@@ -41 +41 @@
   [StorableClass]
   // TODO: ISymbolicDataAnalysisProblem -> IGESymbolicDataAnalysisProblem
-  public abstract class GESymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>, ISymbolicDataAnalysisProblem, IStorableContent,
-    IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
+  public abstract class GESymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>,
+                                                                 ISymbolicDataAnalysisProblem, IStorableContent,
+                                                                 IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
     where T : class, IDataAnalysisProblemData
     where U : class, IGESymbolicDataAnalysisEvaluator<T>
@@ -244 +245 @@
     private void InitializeOperators() {
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IIntegerVectorOperator>().OfType<IOperator>());
-      Operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicDataAnalysisExpressionCrossover<T>>());
+      // Operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicDataAnalysisExpressionCrossover<T>>());
       Operators.Add(new SymbolicExpressionSymbolFrequencyAnalyzer());
       Operators.Add(new SymbolicDataAnalysisVariableFrequencyAnalyzer());
@@ -338 +339 @@
         op.RelativeNumberOfEvaluatedSamplesParameter.ActualName = RelativeNumberOfEvaluatedSamplesParameter.Name;
         op.ApplyLinearScalingParameter.ActualName = ApplyLinearScalingParameter.Name;
+        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.Name;
+        op.GenotypeToPhenotypeMapperParameter.ActualName = GenotypeToPhenotypeMapperParameter.Name;
+        op.SymbolicExpressionTreeGrammarParameter.ActualName = SymbolicExpressionTreeGrammarParameter.Name;
       }
       foreach (var op in operators.OfType<IIntegerVectorCrossover>()) {
-        op.ParentsParameter.ActualName = Evaluator.SymbolicExpressionTreeParameter.ActualName;
-        op.ChildParameter.ActualName = Evaluator.SymbolicExpressionTreeParameter.ActualName;
+        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
       }
       foreach (var op in operators.OfType<IIntegerVectorManipulator>()) {
@@ -369 +373 @@
         op.SymbolicDataAnalysisTreeInterpreterParameter.ActualName = SymbolicExpressionTreeInterpreterParameter.Name;
       }
+      /*
       foreach (var op in operators.OfType<ISymbolicDataAnalysisExpressionCrossover<T>>()) {
         op.EvaluationPartitionParameter.ActualName = FitnessCalculationPartitionParameter.Name;
@@ -376 +381 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
+      */
     }
 

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicDataAnalysisSingleObjectiveProblem.cs

@@ -34 +34 @@
 namespace HeuristicLab.Problems.GrammaticalEvolution {
   [StorableClass]
-  public abstract class GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> : GESymbolicDataAnalysisProblem<T, U, V>, ISymbolicDataAnalysisSingleObjectiveProblem
-    where T : class,IDataAnalysisProblemData
+  public abstract class GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> : GESymbolicDataAnalysisProblem<T, U, V>,
+                                                                                ISymbolicDataAnalysisSingleObjectiveProblem
+    where T : class, IDataAnalysisProblemData
     where U : class, IGESymbolicDataAnalysisSingleObjectiveEvaluator<T>
     where V : class, IIntegerVectorCreator {

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicRegressionSingleObjectiveEvaluator.cs

@@ -27 +27 @@
 namespace HeuristicLab.Problems.GrammaticalEvolution {
   [StorableClass]
-  public abstract class GESymbolicRegressionSingleObjectiveEvaluator : GESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>, IGESymbolicRegressionSingleObjectiveEvaluator {
+  public abstract class GESymbolicRegressionSingleObjectiveEvaluator : GESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>,
+                                                                       IGESymbolicRegressionSingleObjectiveEvaluator {
     [StorableConstructor]
     protected GESymbolicRegressionSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs

@@ -34 +34 @@
   [StorableClass]
   [Creatable("Problems")]
-  public class GESymbolicRegressionSingleObjectiveProblem : GESymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, IGESymbolicRegressionSingleObjectiveEvaluator, IIntegerVectorCreator>, IRegressionProblem {
+  public class GESymbolicRegressionSingleObjectiveProblem : GESymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, IGESymbolicRegressionSingleObjectiveEvaluator, IIntegerVectorCreator>,
+                                                            IRegressionProblem {
     private const double PunishmentFactor = 10;
     private const int InitialMaximumTreeDepth = 8;