Changeset 12283 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking

Timestamp:

04/02/15 16:35:59 (10 years ago)

Author:

bburlacu

Message:

#1772: Updated genealogy graph view and worked on subtree sample count.

Location:

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

Files:

• Analyzers/SymbolicDataAnalysisSubtreeSampleCountAnalyzer.cs (modified) (1 diff)
• TraceCalculator.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/Analyzers/SymbolicDataAnalysisSubtreeSampleCountAnalyzer.cs

@@ -104 +104 @@
           g.Weight = v.Weight;
         }
+
+        // analyze subtree frequencies
+        foreach (var v in PopulationGraph.GetByRank(Generation.Value)) {
+          var g = (IGenealogyGraphNode<ISymbolicExpressionTree>)v;
+          var t = g.Data;
+
+
+        }
       }
+
       return base.Apply();
     }

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

@@ -249 +249 @@
         arc = new GenealogyGraphArc(current, last) { Data = td };
         TraceGraph.AddArc(arc);
-      } else {
-        if (UpdateVertexWeights) {
-          arc.Weight++;
-          current.Weight++;
-        }
-        if (UpdateSubtreeWeights) {
-          var subtree = NodeAt(current.Data, td.SubtreeIndex);
-          foreach (var s in subtree.IterateNodesPrefix())
-            s.NodeWeight++;
-        }
+      }
+      if (UpdateVertexWeights) {
+        arc.Weight++;
+        current.Weight++;
+      }
+      if (UpdateSubtreeWeights) {
+        var subtree = NodeAt(current.Data, td.SubtreeIndex);
+        foreach (var s in subtree.IterateNodesPrefix())
+          s.NodeWeight++;
       }
     }