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.Views/3.4/LineageExplorerView.cs

    r9835 r9963  
    1616  public sealed partial class LineageExplorerView : ItemView {
    1717    private Dictionary<TreeNode, ISymbolicExpressionTree> treeMap;
    18     private List<SymbolicExpressionGenealogyGraphNode> lineage;
     18    private List<SymbolicExpressionTreeGenealogyGraphNode> lineage;
    1919
    2020    private Dictionary<ISymbolicExpressionTree, Dictionary<ISymbolicExpressionTreeNode, double>> fragmentFrequencies;
     
    5959        }
    6060      }
    61 
    62       karyograph1.Trees = Content.Trees.OrderByDescending(x => x.Item2).Select(x => x.Item1).ToList();
    6361    }
    6462
     
    9492
    9593      var graphNode = Content.GenealogyGraph.GetGraphNodes(symbExprTree).Last();
    96       lineage = lineage ?? new List<SymbolicExpressionGenealogyGraphNode>();
     94      lineage = lineage ?? new List<SymbolicExpressionTreeGenealogyGraphNode>();
    9795      lineage.Clear();
    9896      lineage.Add(graphNode);
     
    10098      var gn = graphNode;
    10199      while (gn.InEdges != null && gn.InEdges.Count != 0) {
    102         gn = (SymbolicExpressionGenealogyGraphNode)gn.InEdges[0].Source;
     100        gn = (SymbolicExpressionTreeGenealogyGraphNode)gn.InEdges[0].Source;
    103101        lineage.Add(gn);
    104102      }
     
    127125      symbolicExpressionTreeChart.Tree = symbExprTree;
    128126      var matchingNodes = Content.GenealogyGraph.GetGraphNodes(symbExprTree);
    129       SymbolicExpressionGenealogyGraphNode graphNode = matchingNodes.First();
     127      SymbolicExpressionTreeGenealogyGraphNode graphNode = matchingNodes.First();
    130128      if (graphNode.InEdges == null) {
    131129        symbolicExpressionTreeChart.SuspendRepaint = false;
Note: See TracChangeset for help on using the changeset viewer.