- Timestamp:
- 09/20/11 11:12:10 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:ignore
-
old new 13 13 *.vsp 14 14 *.docstates 15 bin 16 HeuristicLab 3.3.6.0.ReSharper.user
-
- Property svn:mergeinfo changed
/branches/GP.Grammar.Editor (added) merged: 6284-6285,6296,6299,6335,6337,6377,6379,6387,6403,6409,6415,6493-6494,6497,6618,6620,6622,6626,6647,6675,6782,6784,6786,6795
- Property svn:ignore
-
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
-
Property
svn:ignore
set to
bin
-
Property
svn:ignore
set to
-
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs
r6233 r6803 179 179 ReplaceWithMinimalTree(random, root, parent, argumentIndex); 180 180 } else { 181 var allowedSymbols = (from s in parent.Grammar. Symbols181 var allowedSymbols = (from s in parent.Grammar.GetAllowedChildSymbols(parent.Symbol, argumentIndex) 182 182 where s.InitialFrequency > 0.0 183 where parent.Grammar.IsAllowedChildSymbol(parent.Symbol, s, argumentIndex)184 183 where parent.Grammar.GetMinimumExpressionDepth(s) < maxDepth - extensionDepth + 1 185 184 where parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength … … 271 270 where s.InitialFrequency > 0.0 272 271 select node.Grammar.GetMaximumExpressionLength(s)).Max(); 273 if ( aggregatedLongestExpressionLength < targetLength) minArity = i + 1;272 if (i > minArity && aggregatedLongestExpressionLength < targetLength) minArity = i + 1; 274 273 else break; 275 274 }
Note: See TracChangeset
for help on using the changeset viewer.