Changeset 12958 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs

Timestamp:

09/21/15 01:03:12 (9 years ago)

Author:

bburlacu

Message:

#1772: Properly remove older generations in the genealogy graph. Fix namespaces in the schema diversification operators.

File:

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

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

@@ -31 +31 @@
 using HeuristicLab.Random;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tracking {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [Item("SchemaEvaluator", "An operator that builds schemas based on the heredity relationship in the genealogy graph.")]
   [StorableClass]
@@ -95 +95 @@
       get { return (LookupParameter<IntValue>)Parameters[ChangedTreesParameterName]; }
     }
-
     #endregion
 
@@ -180 +179 @@
 
       var s = SchemaParameter.ActualValue;
-      var matchingIndividuals = new ScopeList(from ind in individuals
-                                              let t = (ISymbolicExpressionTree)ind.Variables["SymbolicExpressionTree"].Value
-                                              where qm.Match(t, s)
-                                              select ind);
+      var matchingIndividuals = new ScopeList();
+      foreach (var ind in individuals) {
+        var t = (ISymbolicExpressionTree)ind.Variables["SymbolicExpressionTree"].Value;
+        if (t.Length >= s.Length && qm.Match(t, s))
+          matchingIndividuals.Add(ind);
+      }
 
       if (matchingIndividuals.Count < MinimumSchemaFrequency.Value * individuals.Count) {