Changeset 14626 for branches/HeuristicLab.EvolutionTracking

Timestamp:

01/31/17 16:50:45 (7 years ago)

Author:

bburlacu

Message:

#1772: Exclude intermediate individuals from schema matching.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/Analyzers/SymbolicDataAnalysisSchemaFrequencyAnalyzer.cs (modified) (3 diffs)

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

@@ -156 +156 @@
       var generation = Generation.Value;
 
-      var population = PopulationGraph.Vertices.Where(x => x.InDegree == 2 && x.Rank > generation - 1).ToList();
-      var vertices = population.Where(x => x.InDegree == 2).OrderByDescending(x => x.Quality).ToList();
+      // use all offspring produced by crossover (including those in the intermediate rank)
+      var vertices = PopulationGraph.Vertices.Where(x => x.InDegree == 2 && x.Rank > generation - 1).OrderByDescending(x => x.Quality).ToList();
+
       ResultCollection resultCollection;
       if (Results.ContainsKey("Schema Frequencies")) {
@@ -169 +170 @@
       var mostFrequentPerGeneration = new List<Tuple<string, double[]>>();
 
+      // match the obtained schemas against the whole population
+      var population = PopulationGraph.Vertices.Where(x => x.Rank.IsAlmost(generation)).ToList();
       var trees = population.Select(x => x.Data).ToList();
       var qualities = population.Select(x => x.Quality).ToList();
+      // cache similarity measures to speed up calculations
       var genSimMatrix = new double[trees.Count, trees.Count];
       var phenSimMatrix = new double[trees.Count, trees.Count];
@@ -180 +184 @@
         }
       }
-      var schemas = SchemaCreator.GenerateSchemas(vertices, MinimumSchemaLength, StrictSchemaMatching).ToList();
+
+      var schemas = SchemaCreator.GenerateSchemas(vertices, MinimumSchemaLength, 0, StrictSchemaMatching).ToList();
       var schemaStrings = schemas.Select(x => x.Root.GetSubtree(0).GetSubtree(0).FormatToString(StrictSchemaMatching)).ToList();
       int[][] matchingIndices;