Changeset 12702 for stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs
- Timestamp:
- 07/10/15 11:51:51 (9 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
-
stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs
r12009 r12702 330 330 List<string> temp; 331 331 if (allowedChildSymbols.TryGetValue(parent.Name, out temp)) { 332 if (temp.SelectMany(s => GetSymbol(s).Flatten()).Any(s => s.Name == child.Name)) { 333 cachedIsAllowedChildSymbol.Add(key, true); 334 return true; 332 for (int i = 0; i < temp.Count; i++) { 333 var symbol = GetSymbol(temp[i]); 334 foreach (var s in symbol.Flatten()) 335 if (s.Name == child.Name) { 336 cachedIsAllowedChildSymbol.Add(key, true); 337 return true; 338 } 335 339 } 336 340 } … … 357 361 List<string> temp; 358 362 if (allowedChildSymbolsPerIndex.TryGetValue(Tuple.Create(parent.Name, argumentIndex), out temp)) { 359 if (temp.SelectMany(s => GetSymbol(s).Flatten()).Any(s => s.Name == child.Name)) { 360 cachedIsAllowedChildSymbolIndex.Add(key, true); 361 return true; 363 for (int i = 0; i < temp.Count; i++) { 364 var symbol = GetSymbol(temp[i]); 365 foreach (var s in symbol.Flatten()) 366 if (s.Name == child.Name) { 367 cachedIsAllowedChildSymbolIndex.Add(key, true); 368 return true; 369 } 362 370 } 363 371 }
Note: See TracChangeset
for help on using the changeset viewer.