Changeset 14627 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification

Timestamp:

01/31/17 16:53:34 (8 years ago)

Author:

bburlacu

Message:

#1772: Add option when generating schemas to only consider parents that have produced a minimum number of offspring.

File:

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

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaCreator.cs

@@ -201 +201 @@
                      select v;
 
-      var schemas = GenerateSchemas(vertices, MinimumSchemaLength, StrictSchemaMatching).ToList();
+      var schemas = GenerateSchemas(vertices, MinimumSchemaLength, 0, StrictSchemaMatching).ToList();
 
       #region create schemas and add subscopes representing the individuals
@@ -223 +223 @@
     }
 
-    public static IEnumerable<ISymbolicExpressionTree> GenerateSchemas(IEnumerable<IGenealogyGraphNode<ISymbolicExpressionTree>> vertices, int minimumSchemaLength, bool strict = true) {
+    public static IEnumerable<ISymbolicExpressionTree> GenerateSchemas(IEnumerable<IGenealogyGraphNode<ISymbolicExpressionTree>> vertices, int minimumSchemaLength, int minOffspringCount = 1, bool strict = true) {
       var anySubtreeSymbol = new AnySubtreeSymbol();
-      var groups = vertices.GroupBy(x => x.Parents.First()).OrderByDescending(g => g.Count());
+      var groups = vertices.GroupBy(x => x.Parents.First()).Where(g => g.Count() >= minOffspringCount).OrderByDescending(g => g.Count());
       var hash = new HashSet<string>();
       foreach (var g in groups) {
@@ -249 +249 @@
           }
           SchemaUtil.ReplaceSubtree(node, replacement, true);
+          //          var replacement = anySubtreeSymbol.CreateTreeNode();
           //          var replacement = new AnyNodeSymbol(node.Symbol.MinimumArity, node.Symbol.MinimumArity).CreateTreeNode();
           //          ReplaceSubtree(node, replacement, true);
+          //          SchemaUtil.ReplaceSubtree(node, replacement, false);
           replaced = true;
         }