Changeset 11925

Timestamp:

02/05/15 19:35:34 (9 years ago)

Author:

bburlacu

Message:

#1772:

• Removed unused code
• Adapted genealogy graph according to the trunk changes to the directed graph
• Adapted trace calculator and before/after operators
• Introduced a CloneableCollection to help save node lists

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking.Views/3.4/AncestryLayoutAdapter.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/Primitives/LabeledEllipse.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/Primitives/LabeledRectangle.cs (deleted)
• HeuristicLab.EvolutionTracking.Views/3.4/Primitives/PrimitiveGroup.cs (deleted)
• HeuristicLab.EvolutionTracking/3.4/Collections (added)
• HeuristicLab.EvolutionTracking/3.4/Collections/CloneableCollection.cs (added)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs (modified) (4 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphArc.cs (modified) (3 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraphArc.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/Interfaces/IGenealogyGraphNode.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolGraph (deleted)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs (modified) (3 diffs)

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

@@ -37 +37 @@
     private Dictionary<string, IGenealogyGraphNode> idMap;
 
-    private readonly Comparison<IArc> compareArcs = (a, b) => {
+    private readonly Comparison<IArc<IDeepCloneable>> compareArcs = (a, b) => {
       if (a.Data == b.Data)
         return 0;
@@ -56 +56 @@
       RebuildDictionaries();
 
-      foreach (var arcs in Vertices.Select(v => (List<IArc>)((IVertex)v).InArcs)) { arcs.Sort(compareArcs); }
+      foreach (var arcs in Vertices.Select(v => v.InArcs.ToList())) { arcs.Sort(compareArcs); }
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -69 +69 @@
     private void AfterDeserialization() {
       RebuildDictionaries();
-      foreach (var arcs in Vertices.Select(v => (List<IArc>)((Vertex)v).InArcs)) { arcs.Sort(compareArcs); }
+      foreach (var arcs in Vertices.Select(v => v.InArcs.ToList())) { arcs.Sort(compareArcs); }
     }
     public GenealogyGraph() {
@@ -169 +169 @@
       return ColorGradient.Colors[colorIndex];
     }
-
-    public override void AddVertices(IEnumerable<IVertex> vertexList) {
-      base.AddVertices(vertexList);
-      RebuildDictionaries();
-    }
   }
 

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

@@ -27 +27 @@
   [StorableClass]
   [Item("GenealogyGraphArc", "A graph arc connecting two GenealogyGraphNodes and holding some data.")]
-  public class GenealogyGraphArc : Arc, IGenealogyGraphArc {
+  public class GenealogyGraphArc : Arc<IDeepCloneable>, IGenealogyGraphArc {
     [StorableConstructor]
     protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
@@ -55 +55 @@
     [StorableConstructor]
     protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
+
     protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)
       : base(original, cloner) {
@@ -62 +63 @@
       return new GenealogyGraphArc<T>(this, cloner);
     }
+
     public new T Data {
       get { return (T)base.Data; }

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

@@ -30 +30 @@
   [StorableClass]
   [Item("GenealogGraphNode", "A class representing a node in the GenealogyGraph")]
-  public class GenealogyGraphNode : Vertex, IGenealogyGraphNode {
+  public class GenealogyGraphNode : Vertex<IDeepCloneable>, IGenealogyGraphNode {
     [StorableConstructor]
     protected GenealogyGraphNode(bool deserializing) : base(deserializing) { }
@@ -46 +46 @@
     }
 
+    public GenealogyGraphNode() {
+      Id = Guid.NewGuid().ToString();
+    }
+
     public GenealogyGraphNode(IDeepCloneable data)
-      : base(data) {
-      Id = Guid.NewGuid().ToString();
+      : this() {
+      Data = data;
     }
 

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.EvolutionTracking {
-  public interface IGenealogyGraphArc : IArc {
+  public interface IGenealogyGraphArc : IArc<IDeepCloneable> {
     new IGenealogyGraphNode Source { get; }
     new IGenealogyGraphNode Target { get; }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.EvolutionTracking {
-  public interface IGenealogyGraphNode : IVertex, IComparable<IGenealogyGraphNode> {
+  public interface IGenealogyGraphNode : IVertex<IDeepCloneable>, IComparable<IGenealogyGraphNode> {
     double Rank { get; set; }
     double Quality { get; set; }
@@ -39 +40 @@
   }
 
-  public interface IGenealogyGraphNode<T> : IGenealogyGraphNode, IVertex<T> where T : class {
+  public interface IGenealogyGraphNode<T> : IGenealogyGraphNode where T : class {
     new IEnumerable<IGenealogyGraphNode<T>> Parents { get; }
     new IEnumerable<IGenealogyGraphNode<T>> Children { get; }
-
     new IEnumerable<IGenealogyGraphNode<T>> Ancestors { get; }
     new IEnumerable<IGenealogyGraphNode<T>> Descendants { get; }
+
+    new T Data { get; set; }
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj

@@ -110 +110 @@
   <ItemGroup>
     <Compile Include="Analyzers\GenealogyAnalyzer.cs" />
+    <Compile Include="Collections\CloneableCollection.cs" />
     <Compile Include="Fragment.cs" />
     <Compile Include="Interfaces\IFragment.cs" />

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

@@ -278 +278 @@
       <DependentUpon>VariableView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Tracking\FragmentGraphView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tracking\FragmentGraphView.Designer.cs">
-      <DependentUpon>FragmentGraphView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Tracking\SymbolicDataAnalysisGenealogyGraphView.cs">
       <SubType>UserControl</SubType>
@@ -289 +283 @@
     <Compile Include="Tracking\SymbolicDataAnalysisGenealogyGraphView.Designer.cs">
       <DependentUpon>SymbolicDataAnalysisGenealogyGraphView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tracking\SymbolicDataAnalysisExpressionLineageExplorerView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tracking\SymbolicDataAnalysisExpressionLineageExplorerView.Designer.cs">
-      <DependentUpon>SymbolicDataAnalysisExpressionLineageExplorerView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tracking\SymbolicExpressionChartControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tracking\SymbolicExpressionChartControl.Designer.cs">
-      <DependentUpon>SymbolicExpressionChartControl.cs</DependentUpon>
     </Compile>
     <Compile Include="TreeEditDialogs\SymbolicExpressionTreeConstantNodeEditDialog.cs">
@@ -384 +366 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tracking\SymbolicDataAnalysisGenealogyGraphView.resx">
-      <DependentUpon>SymbolicDataAnalysisGenealogyGraphView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -85 +85 @@
         // that will include just the individual and its ancestors
         var graph = new GenealogyGraph<ISymbolicExpressionTree>();
-        var ancestors = new[] { graphNode }.Concat(graphNode.Ancestors);
-        var cloned = ancestors.ToDictionary(x => x, x => cloner.Clone(x));
-        graph.AddVertices(cloned.Values);
-        foreach (var arc in cloned.Keys.SelectMany(x => x.InArcs)) {
-          graph.AddArc(cloner.Clone(arc));
-        }
+        var ancestors = new[] { graphNode }.Concat(graphNode.Ancestors).ToList();
+        graph.AddVertices(ancestors.Select(cloner.Clone));
+        graph.AddArcs(ancestors.SelectMany(x => x.InArcs).Select(cloner.Clone));
         MainFormManager.MainForm.ShowContent(graph);
       }
@@ -185 +182 @@
     private void navigateRightButton_Click(object sender, EventArgs e) {
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
-      var inArcs = (List<IArc>)((IVertex)graphNode).InArcs;
+      var inArcs = graphNode.InArcs.ToList();
       if (inArcs.Count > 0) {
         var data = inArcs.Last().Data;
@@ -205 +202 @@
           for (int i = 1; i < inArcs.Count; ++i) {
             td = (TraceData)inArcs[i].Data;
-            var f2 = ((ISymbolicExpressionTree)inArcs[i].Source.Data).NodeAt(td.SubtreeIndex);
+            var f2 = ((IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[i].Source).Data.NodeAt(td.SubtreeIndex);
             // if the subtrees are the same we have found a match
             // note: this is not necessarily 100% correct if in the trace graph we have identical fragments on different arcs
@@ -218 +215 @@
     }
   }
-
   public class SymbolicDataAnalysisGenealogyGraphViewDesignable : GenealogyGraphView<ISymbolicExpressionTree> { }
+
+  internal static class Util {
+    internal static ISymbolicExpressionTreeNode NodeAt(this ISymbolicExpressionTree tree, int position) {
+      return NodeAt(tree.Root, position);
+    }
+    internal static ISymbolicExpressionTreeNode NodeAt(this ISymbolicExpressionTreeNode root, int position) {
+      return root.IterateNodesPrefix().ElementAt(position);
+    }
+  }
 }

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

@@ -321 +321 @@
     <Compile Include="Tracking\TraceCalculator.cs" />
     <Compile Include="TransformationToSymbolicTreeMapper.cs" />
-    <Compile Include="Tracking\FragmentGraph\FragmentGraph.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionBeforeCrossoverOperator.cs" />

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

@@ -49 +49 @@
 
       for (int i = 0; i < parents.Count; ++i) {
-        arcs[i].Data = parents[i].IterateNodesPrefix().ToList();
+        arcs[i].Data = parents[i].IterateNodesPrefix().ToCloneableCollection();
       }
 

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

@@ -95 +95 @@
         Debug.Assert(si < g.Data.Length);
         var inArcs = (List<IArc>)((IVertex)g).InArcs;
-        var fragment = (IFragment<ISymbolicExpressionTreeNode>)inArcs.Last().Data;
+        var fragment = (IFragment<ISymbolicExpressionTreeNode>)((IGenealogyGraphArc)inArcs.Last()).Data;
         if (fragment == null) {
           // TODO: think about what the correct behavior should be here (seems good so far)
@@ -225 +225 @@
   }
   // this class is here to help clarify the semantics
-  public class TraceData : Tuple<int, int, int, int> {
+  public class TraceData : Tuple<int, int, int, int>, IDeepCloneable {
     public TraceData(int currentSubtreeIndex, int currentFragmentIndex, int lastSubtreeIndex, int lastFragmentIndex)
       : base(currentSubtreeIndex, currentFragmentIndex, lastSubtreeIndex, lastFragmentIndex) {
@@ -234 +234 @@
     public int LastSubtreeIndex { get { return Item3; } }
     public int LastFragmentIndex { get { return Item4; } }
+    public object Clone() {
+      return new TraceData(SubtreeIndex, FragmentIndex, LastSubtreeIndex, LastFragmentIndex);
+    }
+
+    public IDeepCloneable Clone(Cloner cloner) {
+      return cloner.Clone(this);
+    }
   }