Changeset 11769

Timestamp:

01/15/15 17:25:52 (9 years ago)

Author:

bburlacu

Message:

#1772: Changed the GenealogyAnalyzer according to the changes in IGenealogyGraph.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (4 diffs)

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

@@ -278 +278 @@
         #endregion
 
-        ComputeSuccessRatios(genealogyGraph);
+        //        ComputeSuccessRatios(genealogyGraph);
       }
       // update qualities
@@ -288 +288 @@
       // remove extra graph nodes (added by the instrumented operators in the case of offspring selection)
       var pop = new HashSet<T>(population);
-      var discarded = genealogyGraph.Ranks[generation].Where(x => !pop.Contains(x.Data)).ToList();
+      var discarded = genealogyGraph.GetByRank(generation).Where(x => !pop.Contains(x.Data)).ToList();
       for (int i = 0; i < discarded.Count; ++i) {
         var v = discarded[i];
@@ -344 +344 @@
         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));
+      successfulOffspringRatioRow.Values.Replace(genealogyGraph.GetByRank(generation).OrderByDescending(x => x.Quality).Select(x => x.OutDegree > 0 ? x.Weight / x.OutDegree : 0));
       successfulOffspringRatioTable.Rows.Add(successfulOffspringRatioRow);
       successfulOffspringRatioHistory.Add(successfulOffspringRatioTable);
@@ -367 +367 @@
         VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.Columns, StartIndexZero = true }
       };
-      successfulOffspringValuesRow.Values.Replace(genealogyGraph.Ranks[generation - 1].OrderByDescending(x => x.Quality).Select(x => x.Weight));
+      successfulOffspringValuesRow.Values.Replace(genealogyGraph.GetByRank(generation).OrderByDescending(x => x.Quality).Select(x => x.Weight));
       successfulOffspringValuesTable.Rows.Add(successfulOffspringValuesRow);
       successfulOffspringAbsoluteHistory.Add(successfulOffspringValuesTable);