Changeset 11262

Timestamp:

08/04/14 14:50:52 (10 years ago)

Author:

bburlacu

Message:

#1772: Added missing Storable constructor to GenealogyGraphNode<T> class. Prefer cloning vertices in the GenealogyAnalyzer. Add In/Out Degree in node tooltip in the GenealogyGraphChart.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs (modified) (1 diff)
• HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphChart.cs

@@ -117 +117 @@
             ToolTipText = "Rank: " + node.Rank + nl +
                           "Quality: " + String.Format("{0:0.0000}", node.Quality) + nl +
-                          "IsElite: " + node.IsElite
+                          "IsElite: " + node.IsElite + nl +
+                          "In/Out Degree: " + node.InDegree + " " + node.OutDegree
           };
           Chart.Group.Add(visualNode);

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

@@ -97 +97 @@
       <DependentUpon>FrequentFragmentsDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="GenealogyGraphChart.cs" />
+    <Compile Include="GenealogyGraphChart.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="GenealogyGraphChart.Designer.cs">
       <DependentUpon>GenealogyGraphChart.cs</DependentUpon>

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 = new GenealogyGraphNode<T>(prevVertex); //shallow copy, arcs are not copied
+          var w = (IGenealogyGraphNode<T>)prevVertex.Clone();
           var v = new GenealogyGraphNode<T>(prevVertex.Data) {
             Rank = generation,
@@ -321 +321 @@
       int generation = GenerationsParameter.ActualValue.Value;
       var population = PopulationParameter.ActualValue;
-      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population);
+      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population).ToList();
       foreach (var vertex in discardedOffspring.Select(individual => GenealogyGraph.GetByContent(individual))) {
         if (vertex.InDegree == 1) {
           var p = vertex.Parents.First();
-          if (p.Rank.Equals(generation - 1))
+          if (!p.Rank.Equals(generation - 0.5))
             throw new InvalidOperationException("Parent must be an intermediate vertex");
           GenealogyGraph.RemoveVertex(p);

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

@@ -36 +36 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new GenealogyGraphNode(this, cloner);
-    }
-
-    // this constructor emulates the behavior of a copy constructor
-    // it returns a shallow copy in which the arcs are not cloned
-    protected GenealogyGraphNode(IGenealogyGraphNode original)
-      : base((IDeepCloneable)original.Data.Clone()) {
-      Quality = original.Quality;
-      Rank = original.Rank;
-      IsElite = original.IsElite;
-      Id = Guid.NewGuid().ToString();
     }
 
@@ -146 +136 @@
     }
 
-    public GenealogyGraphNode(IGenealogyGraphNode<T> original) : base(original) { }
+    [StorableConstructor]
+    protected GenealogyGraphNode(bool deserializing) : base(deserializing) { }
 
     public GenealogyGraphNode(IDeepCloneable content) : base(content) { }