Changeset 13876 for branches/HeuristicLab.EvolutionTracking

Timestamp:

06/06/16 19:37:20 (9 years ago)

Author:

bburlacu

Message:

#1772: SchemaCreator: Replace cutpoints with wildcards from the bottom up when generating schemas. Add temporary workaround to restore parent links in child nodes if they become corrupted.

Location:

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

Files:

• SchemaCreator.cs (modified) (1 diff)
• UpdateQualityOperator.cs (modified) (3 diffs)

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

@@ -241 +241 @@
                        let fragment = (IFragment<ISymbolicExpressionTreeNode>)arc.Data
                        select fragment.Index1).Distinct().ToArray();
-        Array.Sort(indices);
+        var levels = indices.Select(x => schema.Root.GetBranchLevel(nodes[x])).ToArray();
+        Array.Sort(levels, indices);
+        // order nodes by their depth so that cutpoints are replaced with wildcards from the bottom up
         var nodesToReplace = indices.Select(x => nodes[x]).ToList();
         for (int i = nodesToReplace.Count - 1; i >= 0; --i) {

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -76 +76 @@
     public override IOperation Apply() {
       var tree = SymbolicExpressionTreeParameter.ActualValue;
+      FixParentLinks(tree);
       var problemData = ProblemDataParameter.ActualValue;
       var estimationLimits = EstimationLimitsParameter.ActualValue;
@@ -123 +124 @@
       return base.Apply();
     }
+
+    private static void FixParentLinks(ISymbolicExpressionTree tree) {
+      foreach (var node in tree.IterateNodesPrefix().Where(x => x.SubtreeCount > 0)) {
+        foreach (var s in node.Subtrees) {
+          if (s.Parent != node)
+            s.Parent = node;
+        }
+      }
+    }
   }
 }