Changeset 10674

Timestamp:

03/26/14 17:14:14 (10 years ago)

Author:

bburlacu

Message:

#1772: Found bug in GenealogyGraph creation, attempted fix by injecting vertex guid's in the individual scopes.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymboldDataAnalysisGenealogyView.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs (modified) (2 diffs)

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

@@ -211 +211 @@
         ConfigureTrackingOperators();
 
-        foreach (var individual in population) {
+        for (int i = 0; i < population.Count; ++i) {
+          var individual = population[i];
           var vertex = new GenealogyGraphNode<T> { Content = individual, Rank = Generations.Value, };
           GenealogyGraph.AddVertex(vertex);
+          // save the vertex id in the individual scope (so that we can identify graph indices)
+          ExecutionContext.Scope.SubScopes[i].Variables.Add(new Variable("Id", new StringValue(vertex.Id)));
         }
       } else {

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -63 +64 @@
       if (CurrentGeneration == null) throw new Exception();
       // we get the parents by parsing the scope name because the individuals in the execution scope are clones of the ones saved in the graph
-      var parentVertices = ExecutionContext.Scope.SubScopes.Select(s => CurrentGeneration[int.Parse(s.Name)]).ToList();
+      //      var parentVertices = ExecutionContext.Scope.SubScopes.Select(s => CurrentGeneration.Find(x => x.Id == ((StringValue)s.Variables["Id"].Value)).ToList();
+      var parentVertices = (from s in ExecutionContext.Scope.SubScopes
+                            let id = ((StringValue)s.Variables["Id"].Value).Value
+                            select CurrentGeneration.First(x => x.Id == id)).ToList(); // the id is unique
 
       var parents = ParentsParameter.ActualValue.ToList();
@@ -77 +81 @@
         v.AddForwardArc(childVertex);
       }
+      ExecutionContext.Scope.Variables.Add(new Variable("Id", new StringValue(childVertex.Id)));
 
       return base.Apply();

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SymboldDataAnalysisGenealogyView.cs

@@ -177 +177 @@
       // the subtree must belong to the currently displayed tree which in turn must belong to the currently selected graph node
       var tree = graphNode.Content;
-      var index = tree.IterateNodesPrefix().ToList().IndexOf(subtree);
-      var length = subtree.GetLength();
+      var subtreeIndex = tree.IterateNodesPrefix().ToList().IndexOf(subtree);
+      var subtreeLength = subtree.GetLength();
 
       var fragment = (IFragment<ISymbolicExpressionTreeNode>)graphNode.InArcs.Last().Data;
@@ -184 +184 @@
       var fragmentLength = fragment.Root.GetLength();
 
+      FragmentNode node = new FragmentNode { Content = new Fragment<ISymbolicExpressionTreeNode> { Root = subtree }, Rank = graphNode.Rank };
+      if (parentNode != null) {
+        AddChild(parentNode, node);
+      }
+      fragmentGraph.AddVertex(node);
 
       // below, we consider three cases:
@@ -190 +195 @@
       // 3) the fragment is contained by the selected subtree
       // In each case, the idea is to isolate and individually track the fragment and the rest of the subtree (for cases 2 and 3)
-      if (fragment.Index == index) {
+      if (fragment.Index == subtreeIndex) {
         // the selected subtree is the actual fragment
-        if (fragmentLength != length) throw new Exception("Fragment and subtree lengths should be the same!");
-
-        var node = new FragmentNode { Content = fragment, Rank = graphNode.Rank };
-
-        if (parentNode != null) {
-          AddChild(parentNode, node);
-        }
-
-        fragmentGraph.AddVertex(node);
+        if (fragmentLength != subtreeLength) throw new Exception("Fragment and subtree lengths should be the same!");
 
         var g = (IGenealogyGraphNode<ISymbolicExpressionTree>)graphNode.InArcs.Last().Source;
         var s = g.Content.IterateNodesPrefix().ToList()[fragment.OldIndex];
         Trace(g, s, fragmentGraph, node);
-      } else if (fragment.Index < index && index < fragment.Index + fragmentLength) {
+
+      } else if (fragment.Index < subtreeIndex && subtreeIndex < fragment.Index + fragmentLength) {
         // the fragment contains the selected subtree 
-        if (length >= fragmentLength) throw new Exception("Fragment contains subtree, so subtree length should be less than the fragment length.");
-
-        var node = new FragmentNode { Content = fragment, Rank = graphNode.Rank };
-        if (parentNode != null) {
-          AddChild(parentNode, node);
-        }
-
-        fragmentGraph.AddVertex(node);
+        if (subtreeLength >= fragmentLength) throw new Exception("Fragment contains subtree, so subtree length should be less than the fragment length.");
 
         var g = (IGenealogyGraphNode<ISymbolicExpressionTree>)graphNode.InArcs.Last().Source;
-        var i = fragment.Root.IterateNodesPrefix().ToList().IndexOf(subtree);
+        var i = fragment.Root.IterateNodesPrefix().ToList().IndexOf(subtree); // get the index of the selected subtree, relative to the fragment root
         var s = g.Content.IterateNodesPrefix().ToList()[fragment.OldIndex + i];
         Trace(g, s, fragmentGraph, node);
 
-      } else if (index < fragment.Index && fragment.Index < index + length) {
+      } else if (subtreeIndex < fragment.Index && fragment.Index < subtreeIndex + subtreeLength) {
         // the selected subtree contains the fragment
-        if (fragmentLength >= length)
-          throw new Exception("Subtree contains fragment, so fragment length should be less than the subtree length.");
-
-        var node = new FragmentNode {
-          Content = new Fragment<ISymbolicExpressionTreeNode> { Root = subtree },
-          Rank = graphNode.Rank
-        };
-
-        if (parentNode != null) {
-          AddChild(parentNode, node);
-        }
-        fragmentGraph.AddVertex(node);
+        if (fragmentLength >= subtreeLength) throw new Exception("Subtree contains fragment, so fragment length should be less than the subtree length.");
 
         var g0 = (IGenealogyGraphNode<ISymbolicExpressionTree>)graphNode.InArcs[0].Source;
-        var s0 = g0.Content.IterateNodesPrefix().ToList()[index];
+        var s0 = g0.Content.IterateNodesPrefix().ToList()[subtreeIndex];
         Trace(g0, s0, fragmentGraph, node);
 
@@ -247 +227 @@
       } else {
         // fragment and subtree are completely distinct, therefore we will track the subtree
-        var node = new FragmentNode {
-          Content = new Fragment<ISymbolicExpressionTreeNode> { Root = subtree },
-          Rank = graphNode.Rank
-        };
-
-        if (parentNode != null) {
-          AddChild(parentNode, node);
-        }
-        fragmentGraph.AddVertex(node);
         var g = (IGenealogyGraphNode<ISymbolicExpressionTree>)graphNode.InArcs[0].Source;
-        var s = graphNode.Content.IterateNodesPrefix().ToList()[index];
+        var s = graphNode.Content.IterateNodesPrefix().ToList()[subtreeIndex];
         Trace(g, s, fragmentGraph, node);
       }

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

@@ -1 @@
-using System.Linq;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
+using System.Linq;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -9 +31 @@
       var result = base.Apply(); // the child will be added to the graph before the crossover
       var parents = ParentsParameter.ActualValue.ToList();
-      var childVertex = GenealogyGraph[parents[0]].Last(); // use the parent since it is actually the child before crossover (and the ChildParameter doesn't have a value yet)
-      //      var parentVertices = ExecutionContext.Scope.SubScopes.Select(s => CurrentGeneration[int.Parse(s.Name)]).ToList();
+      var childVertex = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph[parents[0]].Last(); // use the parent since it is actually the child before crossover (and the ChildParameter doesn't have a value yet)
 
-      // we add the breadth list of nodes of each parent as the data element of the arc from the parent to the child
       for (int i = 0; i < parents.Count; ++i) {
         var nodes = parents[i].IterateNodesPrefix().ToList();
-        var arc = (IGenealogyGraphArc)childVertex.InArcs[i];
+        var arc = childVertex.InArcs[i];
         arc.Data = nodes;
+      }
+      var parentVertices = childVertex.InArcs.Select(x => (IGenealogyGraphNode<ISymbolicExpressionTree>)x.Source).ToList();
+      if (parents[0].Length != parentVertices[0].Content.Length || parents[1].Length != parentVertices[1].Content.Length) {
+        throw new Exception("Inconsistency detected in GenealogyGraph.");
       }