Context Navigation

Changeset 10677 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

03/28/14 16:23:40 (10 years ago)

Author:

bburlacu

Message:

#1772: Improved usage of GenealogyGraph and GenealogyGraphNode classes. Made some progress on building block tracing.

Location:

Files:

-                      r10654
+                      r10677
     public override IOperation Apply() {
       var child = ChildParameter.ActualValue;
+      var childVertex = GenealogyGraph[child].Last();
+      var arc0 = (IGenealogyGraphArc)childVertex.InArcs[0];
+      var arc1 = (IGenealogyGraphArc)childVertex.InArcs[1];
+      var nodes0 = (List<ISymbolicExpressionTreeNode>)arc0.Data;
+      var nodes1 = (List<ISymbolicExpressionTreeNode>)arc1.Data;
+      var childVertex = (IGenealogyGraphNode)GenealogyGraph[child].Last();
+      var arcs = childVertex.InArcs.ToList();
+      var nodes0 = (List<ISymbolicExpressionTreeNode>)arcs[0].Data;
+      var nodes1 = (List<ISymbolicExpressionTreeNode>)arcs[1].Data;
       var childNodes = child.IterateNodesPrefix().ToList();
       IFragment<ISymbolicExpressionTreeNode> fragment = null;
 …
       if (fragment == null) throw new Exception("Could not determine fragment!");
       arc0.Data = null;
       arc1.Data = fragment;
+      arcs[0].Data = null;
+      arcs[1].Data = fragment;
       return base.Apply();

-                      r10650
+                      r10677
     public override IOperation Apply() {
       var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph[ChildParameter.ActualValue].First();
       var nodesBefore = (List<ISymbolicExpressionTreeNode>)vChild.InArcs[0].Data;
+      var nodesBefore = (List<ISymbolicExpressionTreeNode>)vChild.InArcs.First().Data;
       var nodesAfter = ChildParameter.ActualValue.IterateNodesBreadth().ToList();
       IFragment<ISymbolicExpressionTreeNode> fragment = null;
 …
+      }
       vChild.InArcs[0].Data = fragment;
+      vChild.InArcs.First().Data = fragment;
       return base.Apply();
+    }

-                      r10674
+                      r10677
       var parents = ParentsParameter.ActualValue.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)
+      var arcs = childVertex.InArcs.ToList();
       for (int i = 0; i < parents.Count; ++i) {
         var nodes = parents[i].IterateNodesPrefix().ToList();
+        var arc = childVertex.InArcs[i];
+        arc.Data = nodes;
+        arcs[i].Data = nodes;
+      }
       var parentVertices = childVertex.InArcs.Select(x => (IGenealogyGraphNode<ISymbolicExpressionTree>)x.Source).ToList();

r10347	r10677
10	10
11	11	var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph[ChildParameter.ActualValue].Last();
12		vChild.InArcs~~[0]~~.Data = vChild.Content.IterateNodesBreadth().ToList();
	12	vChild.InArcs.First().Data = vChild.Content.IterateNodesBreadth().ToList();
13	13
14	14	return result;

Note: See TracChangeset for help on using the changeset viewer.