Changeset 9835 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/LineageExplorerView.cs

Timestamp:

08/01/13 13:01:40 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged remaining trunk changes into the EvolutionaryTracking branch.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• . (modified) (3 props)
• HeuristicLab.EvolutionaryTracking.Views/3.4/LineageExplorerView.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionaryTracking

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/LineageExplorerView.cs

@@ -59 +59 @@
         }
       }
+
+      karyograph1.Trees = Content.Trees.OrderByDescending(x => x.Item2).Select(x => x.Item1).ToList();
     }
 
@@ -155 +157 @@
       var trees = Content.GenealogyGraph.Nodes.Where(x => x.Rank.IsAlmost(graphNode.Rank)).Select(x => x.SymbolicExpressionTree).ToList();
 
-      var fragments = graphNode.SymbolicExpressionTree.IterateNodesBreadth().Select(n => new Fragment(n));
+      var fragments = graphNode.SymbolicExpressionTree.IterateNodesBreadth().Select(n => new Fragment { Root = n });
 
       var similarityComparer = new SymbolicExpressionTreeNodeSimilarityComparer {
@@ -241 +243 @@
       };
 
-      var fragments = bestTrees.SelectMany(t => t.IterateNodesBreadth()).Where(n => n.GetLength() >= 3).Distinct(similarityComparer).Select(n => new Fragment(n));
+      var fragments = bestTrees.SelectMany(t => t.IterateNodesBreadth()).Where(n => n.GetLength() >= 3).Distinct(similarityComparer).Select(n => new Fragment { Root = n });
 
       double bestNQuality = tuples.Take(bestN).Sum(x => x.Quality); // average quality of best N individuals in the population

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin