Ignore:
Timestamp:
09/13/13 14:42:38 (8 years ago)
Author:
bburlacu
Message:

#1772: Merged changes from the trunk and other branches. Added new ExtendedSymbolicExpressionTreeCanvas control for the visual exploration of tree genealogies. Reorganized some files and folders.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Analyzers/SymbolicExpressionTreeEvolvabilityAnalyzer.cs

    r9835 r9963  
    159159                               where graphNode.InEdges.Count == 1
    160160                               // mutation
    161                                let source = (SymbolicExpressionGenealogyGraphNode)graphNode.InEdges[0].Source
     161                               let source = (SymbolicExpressionTreeGenealogyGraphNode)graphNode.InEdges[0].Source
    162162                               where graphNode.SymbolicExpressionTree != source.SymbolicExpressionTree // skip elites
    163163                               select source).ToList();
     
    177177          switch (graphNode.InEdges.Count) {
    178178            case 2: {
    179                 parentQuality = graphNode.InEdges.Max(e => ((SymbolicExpressionGenealogyGraphNode)e.Source).Quality);
     179                parentQuality = graphNode.InEdges.Max(e => ((SymbolicExpressionTreeGenealogyGraphNode)e.Source).Quality);
    180180                crossoverImprovements.Add(quality - parentQuality);
    181181                break;
    182182              }
    183183            case 1: {
    184                 parentQuality = graphNode.InEdges.Max(e => ((SymbolicExpressionGenealogyGraphNode)e.Source).Quality);
     184                parentQuality = graphNode.InEdges.Max(e => ((SymbolicExpressionTreeGenealogyGraphNode)e.Source).Quality);
    185185                if (ConstantOptimizationIntermediateParents.Value && ConstantOptimizationEvaluator != null) {
    186186
    187187                  //Get the optimized fitness of the intermediate parent (without actually updating the constants in the tree)
    188                   var intermediateParent = ((SymbolicExpressionGenealogyGraphNode)graphNode.InEdges[0].Source).SymbolicExpressionTree;
     188                  var intermediateParent = ((SymbolicExpressionTreeGenealogyGraphNode)graphNode.InEdges[0].Source).SymbolicExpressionTree;
    189189                  parentQuality = Evaluate(intermediateParent, ConstantOptimizationEvaluator);
    190190                }
Note: See TracChangeset for help on using the changeset viewer.