Changeset 11257 for branches

Timestamp:

08/02/14 20:25:20 (10 years ago)

Author:

bburlacu

Message:

#1772:

• GenealogyAnalyzer: compute relative success ratios per individual and save them in a DataTableHistory chart and as a heat map
• GenealogyGraph: remove rank if it contains no vertices
• BeforeManipulatorOperator: avoid "collection was modified" exception

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (4 diffs)
• GenealogyGraph/GenealogyGraph.cs (modified) (1 diff)
• Operators/BeforeManipulatorOperator.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

@@ -260 +260 @@
         T elite = null;
 
-        int psum1 = GenealogyGraph.Ranks[generation].Sum(x => x.Parents.Count());
-
         for (int i = 0; i < population.Length; ++i) {
           if (GenealogyGraph.GetByContent(population[i]).Rank.Equals(generation - 1)) {
@@ -305 +303 @@
         }
         #endregion
-        int psum2 = GenealogyGraph.Ranks[generation].Sum(x => x.Parents.Count());
-
-        if (psum1 != psum2 - 1) // -1 because we have added an additional arc from the previous elite to the current one
-          throw new InvalidOperationException("Parent sum should remain the same.");
 
         ComputeSuccessRatios();
@@ -319 +313 @@
 
       // remove extra graph nodes (added by the instrumented operators in the case of offspring selection)
-      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population).ToList();
+      RemoveUnsuccessfulOffspring();
+
+      return base.Apply();
+    }
+
+    private void RemoveUnsuccessfulOffspring() {
+      int generation = GenerationsParameter.ActualValue.Value;
+      var population = PopulationParameter.ActualValue;
+      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population);
       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))
+            throw new InvalidOperationException("Parent must be an intermediate vertex");
+          GenealogyGraph.RemoveVertex(p);
+        }
         GenealogyGraph.RemoveVertex(vertex);
       }
-
-      return base.Apply();
     }
 
     private void ComputeSuccessRatios() {
+      const string successfulOffspringRatioTableHistoryName = "Successful offspring ratio";
+      const string successfulOffspringRatioHeatMapName = "Successful offspring ratio heatmap";
+
       var population = PopulationParameter.ActualValue;
       var generation = GenerationsParameter.ActualValue.Value;
@@ -342 +351 @@
 
       var results = ResultsParameter.ActualValue;
-      DataTable table;
-      if (!results.ContainsKey("Successful offspring ratio")) {
-        table = new DataTable("Successful offspring ratio");
-        results.Add(new Result("Successful offspring ratio", table));
-        table.Rows.Add(new DataRow("Successful offspring ratio") { VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true } });
+
+      DataTableHistory history;
+      if (!results.ContainsKey(successfulOffspringRatioTableHistoryName)) {
+        history = new DataTableHistory();
+        results.Add(new Result(successfulOffspringRatioTableHistoryName, history));
       } else {
-        table = (DataTable)results["Successful offspring ratio"].Value;
-      }
-      var row = table.Rows["Successful offspring ratio"];
+        history = (DataTableHistory)results[successfulOffspringRatioTableHistoryName].Value;
+      }
+      var table = new DataTable();
+      var row = new DataRow("Successful Offspring") {
+        VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true }
+      };
       row.Values.Replace(GenealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.Weight));
+      table.Rows.Add(row);
+      history.Add(table);
+      double[,] elements = new double[population.Length, history.Count];
+      var col = history.AsReadOnly().ToList();
+      for (int i = 0; i < col.Count; ++i) {
+        var values = col[i].Rows.First().Values;
+        for (int j = 0; j < values.Count; ++j) {
+          elements[j, i] = values[j];
+        }
+      }
+
+      var heatmap = new HeatMap(elements);
+      if (!results.ContainsKey(successfulOffspringRatioHeatMapName)) {
+        results.Add(new Result(successfulOffspringRatioHeatMapName, heatmap));
+      } else {
+        results[successfulOffspringRatioHeatMapName].Value = heatmap;
+      }
     }
   }

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

@@ -95 +95 @@
       if (Ranks.ContainsKey(node.Rank)) {
         Ranks[node.Rank].Remove(node);
+        if (!Ranks[node.Rank].Any())
+          Ranks.Remove(node.Rank);
       }
       base.RemoveVertex(vertex);

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -57 +58 @@
       GenealogyGraph.AddVertex(c);
 
-      var arcs = v.InArcs;
+      var arcs = v.InArcs.ToList();
       foreach (var arc in arcs) {
         var p = arc.Source;