Changeset 7089 for branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionContextAwareCrossover.cs

Timestamp:

11/28/11 17:18:49 (13 years ago)

Author:

bburlacu

Message:

#1682: Fixed a bug affecting the new crossovers

File:

• branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionContextAwareCrossover.cs (modified) (6 diffs)

branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionContextAwareCrossover.cs

@@ -33 +33 @@
 
   [Item("ContextAwareCrossover", "An operator which performs subtree swapping in a deterministic way: it checks all possible cross points in the second parent with the aim of creating the best possible offspring.")]
-  public sealed class SymbolicDataAnalysisExpressionContextAwareCrossover<T> : SymbolicDataAnalysisExpressionCrossover<T> where T : class, IDataAnalysisProblemData 
-  {
+  public sealed class SymbolicDataAnalysisExpressionContextAwareCrossover<T> : SymbolicDataAnalysisExpressionCrossover<T> where T : class, IDataAnalysisProblemData {
     [StorableConstructor]
     private SymbolicDataAnalysisExpressionContextAwareCrossover(bool deserializing) : base(deserializing) { }
@@ -45 +44 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SymbolicDataAnalysisExpressionContextAwareCrossover<T>(this, cloner);
-    } 
+    }
     protected override ISymbolicExpressionTree Cross(IRandom random, ISymbolicExpressionTree parent0, ISymbolicExpressionTree parent1) {
       if (this.ExecutionContext == null)
@@ -63 +62 @@
       List<CutPoint> crossoverPoints0 = new List<CutPoint>();
       parent0.Root.ForEachNodePostfix((n) => {
-        if (n.Subtrees.Any() && n != parent0.Root) 
-          foreach (var child in n.Subtrees) 
+        if (n.Subtrees.Any() && n != parent0.Root)
+          foreach (var child in n.Subtrees)
             crossoverPoints0.Add(new CutPoint(n, child));
       });
@@ -73 +72 @@
       List<ISymbolicExpressionTreeNode> allowedBranches = new List<ISymbolicExpressionTreeNode>();
       parent1.Root.ForEachNodePostfix((n) => {
-        if (n.Subtrees.Any() && n != parent1.Root) 
+        if (n.Subtrees.Any() && n != parent1.Root)
           foreach (var child in n.Subtrees)
             if (crossoverPoint0.IsMatchingPointType(child) && (child.GetDepth() + level <= maxDepth) && (child.GetLength() + length <= maxLength))
-              allowedBranches.Add(n);
+              allowedBranches.Add(child);
       });
 
@@ -82 +81 @@
       if (crossoverPoint0.IsMatchingPointType(null)) allowedBranches.Add(null);
 
-      if (allowedBranches.Count == 0) 
+      if (allowedBranches.Count == 0)
         return parent0;
 
@@ -90 +89 @@
       ISymbolicExpressionTreeNode selectedBranch = null;
 
-      var nodeQualities = new List<Tuple<ISymbolicExpressionTreeNode,double>>();
+      var nodeQualities = new List<Tuple<ISymbolicExpressionTreeNode, double>>();
 
       foreach (var node in allowedBranches) {