Changeset 11318

Timestamp:

08/31/14 18:28:25 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed bug and improved handling of elite individuals in the genealogy analyzer. Fixed minor bug in the tracing code. Other minor cosmetic improvements to the GenealogyGraph and FragmentGraphView.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs (modified) (7 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionTracing.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

@@ -272 +272 @@
           var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
-          var w = (IGenealogyGraphNode<T>)prevVertex.Clone();
-          var v = new GenealogyGraphNode<T>(prevVertex.Data) {
+          var v = new GenealogyGraphNode<T>((IDeepCloneable)prevVertex.Data.Clone()) {
             Rank = generation,
             Quality = prevVertex.Quality,
             IsElite = false
           };
-
-          object data = null;
-          if (prevVertex.InArcs.Any())
-            data = prevVertex.InArcs.Last().Data;
-          var children = prevVertex.Children.ToList();
-          var parents = prevVertex.Parents.ToList();
-
-          GenealogyGraph.RemoveVertex(prevVertex);
-          GenealogyGraph.AddVertex(w);
           GenealogyGraph.AddVertex(v);
-          GenealogyGraph.AddArc(w, v); // connect current elite with previous elite
-
-          // recreate connections after prevVertex was replaced with w
-          foreach (var c in children) GenealogyGraph.AddArc(w, c);
-          foreach (var p in parents) GenealogyGraph.AddArc(p, w);
-
-          v.InArcs.Last().Data = data;
-
-          if (w.InArcs.Any())
-            w.InArcs.Last().Data = data;
+          GenealogyGraph.AddArc(prevVertex, v);
 
           // inject the graph node unique id to the scope
+          ExecutionContext.Scope.SubScopes[index].Variables[BeforeManipulatorOperator.ChildParameter.ActualName].Value = v.Data;
           ExecutionContext.Scope.SubScopes[index].Variables["Id"].Value = new StringValue(v.Id);
         }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -38 +38 @@
 
     [Storable]
-    private Dictionary<double, List<IGenealogyGraphNode>> ranks; // use a linked list for fast insertion/removal
+    private Dictionary<double, List<IGenealogyGraphNode>> ranks;
+
     public Dictionary<double, List<IGenealogyGraphNode>> Ranks {
       get { return ranks; }
@@ -56 +57 @@
 
     [StorableConstructor]
-    protected GenealogyGraph(bool deserializing) : base(deserializing) { }
+    protected GenealogyGraph(bool deserializing)
+      : base(deserializing) {
+    }
+
     public GenealogyGraph() {
       Ranks = new Dictionary<double, List<IGenealogyGraphNode>>();
@@ -85 +89 @@
 
       if (idMap.ContainsKey(node.Id))
-        throw new InvalidOperationException("Duplicate content is not allowed in the genealogy graph.");
+        throw new InvalidOperationException("Duplicate ids are not allowed in the genealogy graph.");
       idMap[node.Id] = node;
     }
@@ -118 +122 @@
 
     public event EventHandler GraphUpdated;
+
     private void OnGraphUpdated(object sender, EventArgs args) {
       var updated = GraphUpdated;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
-using HeuristicLab.EvolutionTracking;
 using HeuristicLab.MainForm;
 using HeuristicLab.Visualization;
@@ -38 +37 @@
     private const int PreferredVerticalSpacing = 25;
 
-    private ReingoldTilfordLayoutEngine<TileLayoutNode> layoutEngine;
-    private ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> symbolicExpressionEngine;
-
-    private Dictionary<FragmentNode, TileLayoutNode> tileDictionary;
+    private readonly ReingoldTilfordLayoutEngine<TileLayoutNode> layoutEngine;
+    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> symbolicExpressionEngine;
+
+    private readonly Dictionary<FragmentNode, TileLayoutNode> nodeToTileMap;
 
     private SymbolicExpressionTreeTile Root { get; set; }
@@ -63 +62 @@
         NodeHeight = 40
       };
-      tileDictionary = new Dictionary<FragmentNode, TileLayoutNode>();
+      nodeToTileMap = new Dictionary<FragmentNode, TileLayoutNode>();
     }
 
     private void MakeTiles() {
       var chart = symbolicExpressionChartControl.Chart;
-      tileDictionary.Clear();
+      nodeToTileMap.Clear();
       foreach (var node in Content.Vertices) {
-        var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)node.Data;
         var tile = new SymbolicExpressionTreeTile(chart);
         tile.LayoutEngine = symbolicExpressionEngine;
         tile.Label = "Generation " + node.Data.Rank + Environment.NewLine +
                      "Quality " + String.Format("{0:0.000}", node.Data.Quality);
-        tile.Root = graphNode.Data.Root;
+        tile.Root = node.Data.Data.Root;
         var tileNode = new TileLayoutNode { Tile = tile };
-        tileDictionary.Add(node, tileNode);
+        nodeToTileMap.Add(node, tileNode);
       }
       foreach (var node in Content.Vertices.Where(n => n.OutArcs.Any())) {
-        var layoutNode = tileDictionary[node];
-        layoutNode.Children = new List<TileLayoutNode>(node.OutArcs.Select(a => tileDictionary[(FragmentNode)a.Target]));
+        var layoutNode = nodeToTileMap[node];
+        layoutNode.Children = new List<TileLayoutNode>(node.OutArcs.Select(a => nodeToTileMap[(FragmentNode)a.Target]));
       }
     }
@@ -89 +87 @@
       var nodes = Content.Vertices.ToList();
       var root = nodes[0];
-      var fragmentRoot = tileDictionary[root];
+      var fragmentRoot = nodeToTileMap[root];
       int maxTileWidth = 0, maxTileHeight = 0;
-      var tiles = nodes.Select(x => tileDictionary[x].Tile).ToList();
+      var tiles = nodes.Select(x => nodeToTileMap[x].Tile).ToList();
 
       foreach (var tile in tiles) {
@@ -114 +112 @@
       // add connections between the tiles
       foreach (var node in nodes) {
-        var aTile = tileDictionary[node].Tile;
+        var aTile = nodeToTileMap[node].Tile;
         var aSize = aTile.Size;
         var aPos = aTile.Position;
@@ -158 +156 @@
 
         foreach (var child in node.OutArcs.Select(x => (FragmentNode)x.Target)) {
-          var bTile = tileDictionary[child].Tile;
+          var bTile = nodeToTileMap[child].Tile;
           var bSize = bTile.Size;
           var bPos = bTile.Position;
@@ -169 +167 @@
       }
       // center display on the root of the fragment graph
-      symbolicExpressionChartControl.Chart.Move(tileDictionary[root].Tile.Position.X, tileDictionary[root].Tile.Position.Y);
+      symbolicExpressionChartControl.Chart.Move(nodeToTileMap[root].Tile.Position.X, nodeToTileMap[root].Tile.Position.Y);
       symbolicExpressionChartControl.UpdateEnabled = true;
       symbolicExpressionChartControl.EnforceUpdate();

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -173 +173 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs" />
+    <Compile Include="Analyzers\SymbolicDataAnalysisPhenotypicDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectivePruningAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisGenealogyAnalyzer.cs" />
@@ -198 +200 @@
     <Compile Include="SimilarityCalculators\BottomUpSimilarityCalculator.cs" />
     <Compile Include="SimilarityCalculators\MaxCommonSubtreeSimilarityCalculator.cs" />
+    <Compile Include="SimilarityCalculators\PhenotypicSimilarityCalculator.cs" />
     <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />
     <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" />

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs

@@ -46 +46 @@
       }
 
+      if (fragment == null)
+        throw new InvalidOperationException("Could not identify crossover fragment.");
+
       arcs[0].Data = null;
       arcs[1].Data = fragment;

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionTracing.cs

@@ -32 +32 @@
     public static FragmentGraph TraceSubtree(IGenealogyGraphNode<ISymbolicExpressionTree> graphNode, int subtreeIndex) {
       var graph = new FragmentGraph();
-      var nodes = Trace(graphNode, subtreeIndex);
-      foreach (var n in nodes) {
-        graph.AddVertex(n);
-      }
+      var vertices = Trace(graphNode, subtreeIndex).ToList();
+      graph.AddVertices(vertices);
       return graph;
     }
@@ -52 +50 @@
       while (true) {
         if (!node.Parents.Any()) {
-          var fragmentNode = new FragmentNode(node) {
-            SubtreeIndex = index,
-          };
+          // no tracing if there are no parents, return a fragment node representing the current trace
+          var fragmentNode = new FragmentNode(node) { SubtreeIndex = index };
           if (parent != null) {
             var arc = new Arc(parent, fragmentNode);
             parent.AddArc(arc);
             fragmentNode.AddArc(arc);
-
-            //            parent.AddForwardArc(arc);
-            //            fragmentNode.AddReverseArc(arc);
           }
-          yield return fragmentNode; // no tracing if there are no parents
+          yield return fragmentNode;
           break;
         }
         var parents = node.Parents.ToList();
-        var fragment = (IFragment<ISymbolicExpressionTreeNode>)node.InArcs.Last().Data;
-
-        if (node.IsElite || fragment == null) {
+        if (node.IsElite) {
           // skip elite, go up the graph to original individual
           node = parents[0];
           continue;
         }
+        var fragment = (IFragment<ISymbolicExpressionTreeNode>)node.InArcs.Last().Data;
+
+        if (node.Rank > 1 && fragment == null)
+          throw new ArgumentNullException("Fragment cannot be null");
+
         var fragmentLength = fragment.Root.GetLength();
         var tree = node.Data;
@@ -139 +136 @@
           if (fragment.Index1 > index) {
             if (fragment.Index1 < index + subtreeLength) {
-              // subtree contains fragment => bifurcation point in the fragment graph
+              // subtree contains fragment => branching point in the fragment graph
               var fragmentNode = new FragmentNode(node) {
                 SubtreeIndex = index,