Changeset 5925

Timestamp:

04/01/11 13:45:24 (14 years ago)

Author:

gkronber

Message:

#1418 fixed bugs in symbolic expression tree operators.

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs (modified) (4 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

@@ -153 +153 @@
         } else {
           var allowedSymbols = (from s in parent.Grammar.Symbols
+                                where s.InitialFrequency > 0.0
                                 where parent.Grammar.IsAllowedChildSymbol(parent.Symbol, s, argumentIndex)
                                 where parent.Grammar.GetMinimumExpressionDepth(s) + extensionDepth - 1 < maxDepth
@@ -200 +201 @@
       // determine possible symbols that will lead to the smallest possible tree
       var possibleSymbols = (from s in parent.Grammar.GetAllowedChildSymbols(parent.Symbol, childIndex)
+                             where s.InitialFrequency > 0.0
                              group s by parent.Grammar.GetMinimumExpressionLength(s) into g
                              orderby g.Key
@@ -239 +241 @@
       for (int i = 0; i < maxArity; i++) {
         aggregatedLongestExpressionLength += (from s in node.Grammar.GetAllowedChildSymbols(node.Symbol, i)
+                                              where s.InitialFrequency > 0.0
                                               select node.Grammar.GetMaximumExpressionLength(s)).Max();
-        if (aggregatedLongestExpressionLength < targetLength) minArity = i;
+        if (aggregatedLongestExpressionLength < targetLength) minArity = i + 1;
         else break;
       }
@@ -249 +252 @@
       for (int i = 0; i < maxArity; i++) {
         aggregatedShortestExpressionLength += (from s in node.Grammar.GetAllowedChildSymbols(node.Symbol, i)
+                                               where s.InitialFrequency > 0.0
                                                select node.Grammar.GetMinimumExpressionLength(s)).Min();
         if (aggregatedShortestExpressionLength > targetLength) {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.cs

@@ -53 +53 @@
                                                       // do not replace the existing symbol with itself
                                                       where symbol.Name != subtree.Symbol.Name
+                                                      where symbol.InitialFrequency > 0
                                                       where existingSubtreeCount <= parent.Grammar.GetMaximumSubtreeCount(symbol)
                                                       where existingSubtreeCount >= parent.Grammar.GetMinimumSubtreeCount(symbol)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.cs

@@ -78 +78 @@
                                                       // do not replace symbol with the same symbol
                                                       where symbol.Name != subtree.Symbol.Name
+                                                      where symbol.InitialFrequency > 0
                                                       where parent.Grammar.GetMinimumExpressionDepth(symbol) <= maxDepth
                                                       where parent.Grammar.GetMinimumExpressionLength(symbol) <= maxLength

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -364 +364 @@
         case OpCodes.Derivative: {
             int savedPc = state.ProgramCounter;
-            double f_0 = Evaluate(dataset, ref row, state); ; row--;
+            double f_0 = Evaluate(dataset, ref row, state); row--;
             state.ProgramCounter = savedPc;
-            double f_1 = Evaluate(dataset, ref row, state); ; row -= 2;
+            double f_1 = Evaluate(dataset, ref row, state); row -= 2;
             state.ProgramCounter = savedPc;
-            double f_3 = Evaluate(dataset, ref row, state); ; row--;
+            double f_3 = Evaluate(dataset, ref row, state); row--;
             state.ProgramCounter = savedPc;
-            double f_4 = Evaluate(dataset, ref row, state); ;
+            double f_4 = Evaluate(dataset, ref row, state); 
             row += 4;