Changeset 9247

Timestamp:

02/27/13 13:21:08 (11 years ago)

Author:

bburlacu

Message:

#1772: Fixed serialization bug of DirectedGraph/Vertex.cs. Modifier behavior of the SymbolicExpressionTreeGenealogyGraphBuilder so that now instances of an elite individual are connected in the graph, which makes it easier to deal with lineages.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4

Files:

• DirectedGraph/Vertex.cs (modified) (1 diff)
• HeuristicLab.EvolutionaryTracking-3.4.csproj (modified) (1 diff)
• Operators/LineageAggregator.cs (modified) (1 diff)
• Operators/SymbolicExpressionTreeGenealogyGraphBuilder.cs (modified) (1 diff)
• SymbolicExpressionTreeGenealogyGraph.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/DirectedGraph/Vertex.cs

@@ -41 +41 @@
       }
     }
+
+    [StorableConstructor]
+    public Vertex(bool deserializing) { }
 
     public Vertex() {

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/HeuristicLab.EvolutionaryTracking-3.4.csproj

@@ -91 +91 @@
     <Compile Include="Analyzers\Fragments\SymbolicExpressionTreeRelativeFragmentDepthAnalyzer.cs" />
     <Compile Include="Analyzers\Fragments\SymbolicExpressionTreeFragmentLengthsAnalyzer.cs" />
-    <Compile Include="Analyzers\GeneticOperatorsAverageImprovementAnalyzer.cs" />
+    <Compile Include="Analyzers\GeneticOperatorImprovementAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicExpressionTreeFrequentPatternsAnalyzer.cs" />
     <Compile Include="Analyzers\Fragments\SymbolicExpressionTreeFragmentsAnalyzer.cs" />

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Operators/LineageAggregator.cs

@@ -94 +94 @@
       if (!Results.ContainsKey(LineageExplorerParameterName))
         Results.Add(new Result(LineageExplorerParameterName, lineageExplorer));
-      else Results[LineageExplorerParameterName].Value = lineageExplorer; 
+      else Results[LineageExplorerParameterName].Value = lineageExplorer;
 
       return base.Apply();

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Operators/SymbolicExpressionTreeGenealogyGraphBuilder.cs

@@ -252 +252 @@
         var tree = node.SymbolicExpressionTree;
         if (!GlobalTraceMap.ContainsKey(tree)) {
+          var nodes = graph.GetGraphNodes(tree);
+          if (nodes.Count > 1) {
+            // link elites from previous generation
+            var last = nodes[nodes.Count - 2];
+            var arc = new Arc { Source = last, Target = node, Data = new Fragment(null) };
+            last.AddForwardArc(arc);
+            node.AddReverseArc(arc);
+          }
           continue;
         }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/SymbolicExpressionTreeGenealogyGraph.cs

@@ -83 +83 @@
   }
 
+  [StorableClass]
   public class SymbolicExpressionGenealogyGraphNode : Vertex {
     public ISymbolicExpressionTree SymbolicExpressionTree {
@@ -91 +92 @@
     public bool IsElite { get; set; }
     public double Rank { get; set; }
+
+    [StorableConstructor]
+    public SymbolicExpressionGenealogyGraphNode(bool deserializing) : base(deserializing) { }
 
     public SymbolicExpressionGenealogyGraphNode() { }