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

Timestamp:

03/29/15 23:40:57 (9 years ago)

Author:

bburlacu

Message:

#1772: Some more work on subtree sample counting.

Location:

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

Files:

• Analyzers/SymbolicDataAnalysisSubtreeSampleCountAnalyzer.cs (copied) (copied from branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/Analyzers/SymbolicDataAnalysisSubtreeSampleCountAnalyzer.cs) (4 diffs)
• TraceCalculator.cs (modified) (3 diffs)

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

@@ -1 @@
-#region License Information
+#region License information
 /* HeuristicLab
  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -26 +26 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.EvolutionTracking;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +33 @@
   [StorableClass]
   public class SymbolicDataAnalysisSubtreeSampleCountAnalyzer : EvolutionTrackingAnalyzer<ISymbolicExpressionTree> {
+    private const string CacheTraceNodesParameterName = "CacheTraceNodes";
     private readonly TraceCalculator traceCalculator = new TraceCalculator { UpdateVertexWeights = true, UpdateSubtreeWeights = true, CacheTraceNodes = true };
 
+    #region parameters
+    public IFixedValueParameter<BoolValue> CacheTraceNodesParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters[CacheTraceNodesParameterName]; }
+    }
+    #endregion
+
+    #region parameter properties
+    public bool CacheTraceNodes {
+      get { return CacheTraceNodesParameter.Value.Value; }
+      set { CacheTraceNodesParameter.Value.Value = value; }
+    }
+    #endregion
+
     public SymbolicDataAnalysisSubtreeSampleCountAnalyzer() {
-      UpdateCounterParameter.ActualName = "TraceOverlapAnalyzerUpdateCounter";
+      UpdateCounterParameter.ActualName = "SubtreeSampleCountAnalyzerUpdateCounter";
+
+      Parameters.Add(new FixedValueParameter<BoolValue>(CacheTraceNodesParameterName, new BoolValue(true)));
     }
 
@@ -77 +94 @@
         return base.Apply();
 
-      double avgTraceOverlap = 0;
-
+      traceCalculator.CacheTraceNodes = CacheTraceNodes;
       if (Generation.Value > 0) {
         var rank = PopulationGraph.GetByRank(Generation.Value).Cast<IGenealogyGraphNode<ISymbolicExpressionTree>>().ToList();
-        foreach (var n in rank) {
-          // during the trace the SymbolicExpressionTreeNode weights will be updated behind the scenes
-          // the weights represent the sample count of each subtree
-          var trace = traceCalculator.Trace(n, 2, false);
-          foreach (var v in trace.Vertices) {
-            var g = PopulationGraph.GetByContent(v.Data);
-            g.Weight = v.Weight;
-          }
+        foreach (var n in rank)
+          traceCalculator.Trace(n, 2, false); // during this call weights will be updated
+
+        foreach (var v in traceCalculator.TraceGraph.Vertices) {
+          var g = PopulationGraph.GetByContent(v.Data);
+          g.Weight = v.Weight;
         }
       }

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

@@ -155 +155 @@
                 traceCache.Add(t1);
               }
-              // gather statistics about sampled individuals and sampled subtrees
-              if (UpdateVertexWeights)
-                n.Weight++;
-              if (UpdateSubtreeWeights) {
-                var arcs = (List<IArc>)((IVertex)n).InArcs; // at this moment n will have been added as a child to the next trace node
-
-                // TODO: try to simplify the code below
-                for (int i = 0; i < arcs.Count; ++i) {
-                  var td = (TraceData)((IArc<IDeepCloneable>)arcs[i]).Data;
-                  var p = (IGenealogyGraphNode<ISymbolicExpressionTree>)arcs[i].Source;
-                  var s = NodeAt(p.Data, td.SubtreeIndex);
-                  if (td.LastFragmentIndex == td.SubtreeIndex && fragment.Root.Difference(s) == null) {
-                    foreach (var ss in s.IterateNodesPrefix()) ss.NodeWeight++; // the node weight will represent the total sample count for a given node
-                    arcs[i].Weight++; // the arc weights (since there are multiple arcs) will sum up to the same count but give more detail
-                    break;
-                  }
-                }
-              }
               break;
             } else {
@@ -197 +179 @@
               traceCache.Add(t);
             }
-            if (UpdateVertexWeights)
-              n.Weight++;
             break;
           } else {
@@ -257 +237 @@
     /// <param name="si">The index of the traced subtree</param>
     /// <param name="fi">The index of the fragment</param>
-    private void ConnectLast(IGenealogyGraphNode<ISymbolicExpressionTree> current,
-      IGenealogyGraphNode<ISymbolicExpressionTree> last, int si, int fi) {
+    private void ConnectLast(IGenealogyGraphNode<ISymbolicExpressionTree> current, IGenealogyGraphNode<ISymbolicExpressionTree> last, int si, int fi) {
       var lastTraceData = traceMap[last];
       int lastSi = lastTraceData.SubtreeIndex; // last subtree index (index of the traced subtree in the previous trace node)
       int lastFi = lastTraceData.FragmentIndex; // last fragment index (index of the fragment in the previous trace node)
       var td = new TraceData(si, fi, lastSi, lastFi); // trace data
-      // using the inArcs seems to be slightly more efficient than using the outArcs
+
       // TODO: more testing
-      var inArcs = (List<IArc>)((IVertex)last).InArcs;
+      var inArcs = (List<IArc>)((IVertex)last).InArcs; // using the InArcs seems to be slightly more efficient than using the OutArcs
       var arc = inArcs.FirstOrDefault(a => a.Source == current && ((IArc<IDeepCloneable>)a).Data.Equals(td));
       if (arc == null) {
         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++;
+        }
       }
     }