Changeset 11288

Timestamp:

08/19/14 16:05:16 (10 years ago)

Author:

bburlacu

Message:

#1772: Fix calculation of successful offspring ratios in the GenealogyAnalyzer. Simplify cloning in the BeforeManipulatorOperator.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (3 diffs)
• Operators/BeforeManipulatorOperator.cs (modified) (1 diff)

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

@@ -346 +346 @@
       foreach (var ind in population) {
         var v = GenealogyGraph.GetByContent(ind);
-        foreach (var p in v.Parents)
-          p.Weight++;
+        if (v.Parents.Count() == 1) {
+          var p = v.Parents.First();
+          foreach (var pp in p.Parents)
+            pp.Weight++;
+        } else {
+          foreach (var p in v.Parents) {
+            p.Weight++;
+          }
+        }
       }
 
@@ -364 +371 @@
       }
       var successfulOffspringRatioTable = new DataTable();
-      var successfulOffspringRatioRow = new DataRow("Successful Offspring Ratio") { VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true } };
+      var successfulOffspringRatioRow = new DataRow("Successful Offspring Ratio") {
+        VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true }
+      };
       successfulOffspringRatioRow.Values.Replace(GenealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.OutDegree > 0 ? x.Weight / x.OutDegree : 0));
       successfulOffspringRatioTable.Rows.Add(successfulOffspringRatioRow);
@@ -385 +394 @@
 
       var successfulOffspringValuesTable = new DataTable();
-      var successfulOffspringValuesRow = new DataRow("Successful Offspring Ratio") {
+      var successfulOffspringValuesRow = new DataRow("Successful Offspring Values") {
         VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true }
       };

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

@@ -54 +54 @@
       // since mutation always takes place after crossover, the vertex for the current child is already in the tree
       var v = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(ChildParameter.ActualValue);
-      var clone = (T)ChildParameter.ActualValue.Clone();
-      var c = new GenealogyGraphNode<T>(clone) { Rank = v.Rank - 0.5 };
+      var c = (IGenealogyGraphNode<T>)v.Clone();
+      c.Rank = v.Rank - 0.5;
       GenealogyGraph.AddVertex(c);