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

Timestamp:

04/02/15 16:35:59 (9 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

Files:

• Analyzers/BuildingBlockAnalyzers/SymbolicDataAnalysisPoly10Analyzer.cs (modified) (5 diffs)
• Tracking/Analyzers/SymbolicDataAnalysisSubtreeSampleCountAnalyzer.cs (modified) (1 diff)
• Tracking/TraceCalculator.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/BuildingBlockAnalyzers/SymbolicDataAnalysisPoly10Analyzer.cs

@@ -45 +45 @@
     private const string BuildingBlocksFrequenciesTableName = "Building blocks frequencies";
 
-
     // store evaluations of building blocks for phenotypic matching
     private readonly Dictionary<string, List<double>> evaluationMap = new Dictionary<string, List<double>>();
@@ -141 +140 @@
       var dataset = ProblemDataParameter.ActualValue.Dataset;
       var rows = ProblemDataParameter.ActualValue.TrainingIndices.ToList();
-      OnlineCalculatorError error;
-      Dictionary<string, int> bbFrequencies = evaluationMap.Keys.ToDictionary(x => x, x => 0);
+      var bbFrequencies = evaluationMap.Keys.ToDictionary(x => x, x => 0);
 
       foreach (var key in evaluationMap.Keys) {
@@ -154 +152 @@
             var s = nodes[i];
             var values = interpreter.GetValues(s, dataset, rows);
+            OnlineCalculatorError error;
             var r2 = OnlinePearsonsRSquaredCalculator.Calculate(values, evaluationMap[key], out error);
             if (error == OnlineCalculatorError.None && r2 >= PhenotypicSimilarityThreshold) {
@@ -163 +162 @@
       }
       var table = (DataTable)results[BuildingBlocksFrequenciesTableName].Value;
+      double max = bbFrequencies.Max(x => x.Value);
       foreach (var pair in bbFrequencies) {
+        var formatter = new SymbolicExpressionTreeStringFormatter();
+        //        var label = formatter.Format(fragmentMap[pair.Key]) + "(" + prettyLabels[pair.Key] + ")";
         var label = prettyLabels[pair.Key];
-        table.Rows[label].Values.Add(pair.Value);
+        if (table.Rows.ContainsKey(label)) {
+          var row = table.Rows[label];
+          // scale previous values according to the new max
+          //          if (row.Values.Count > 0) {
+          //            var values = new List<double>(row.Values);
+          //            var m = values.Max();
+          //            row.Values.Replace(values.Select(x => x * m / max));
+          //          }
+          row.Values.Add(max > 0 ? pair.Value / max : 0);
+        }
       }
 
@@ -227 +238 @@
       table.Rows.Clear();
       foreach (var key in evaluationMap.Keys) {
-        table.Rows.Add(new DataRow(prettyLabels[key]));
+        table.Rows.Add(new DataRow(prettyLabels[key]) { VisualProperties = { StartIndexZero = true } });
       }
     }

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++;
       }
     }