Changeset 7303 for branches/gp-crossover/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDepthConstrainedCrossover.cs

Timestamp:

01/10/12 15:23:39 (12 years ago)

Author:

bburlacu

Message:

#1682: Override of the CanChangeName property, added friendly names for the crossover operators.

File:

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

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

@@ -60 +60 @@
       DepthRangeParameter.ValidValues.Add(new StringValue(Enum.GetName(typeof(Ranges), Ranges.Standard)));
       DepthRangeParameter.ValidValues.Add(new StringValue(Enum.GetName(typeof(Ranges), Ranges.Lowlevel)));
+      Name = "DepthConstrainedCrossover";
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new SymbolicDataAnalysisExpressionDepthConstrainedCrossover<T>(this, cloner); }
@@ -88 +89 @@
       int depth = parent0.Root.GetDepth();
       var depthRange = new DoubleRange();
+      const int depthOffset = 2; // skip the first 2 levels (root + startNode)
       switch ((int)Enum.Parse(typeof(Ranges), mode)) {
         case (int)Ranges.HighLevel:
-          depthRange.Start = 0;
-          depthRange.End = Math.Round(depth * 0.25);
+          depthRange.Start = depthOffset; // skip the first 2 levels (root + startNode)
+          depthRange.End = depthRange.Start + Math.Round(depth * 0.25);
           break;
         case (int)Ranges.Standard:
-          depthRange.Start = Math.Round(depth * 0.25);
-          depthRange.End = Math.Round(depth * 0.75);
+          depthRange.Start = depthOffset + Math.Round(depth * 0.25);
+          depthRange.End = depthRange.Start + Math.Round(depth * 0.5);
           break;
         case (int)Ranges.Lowlevel:
-          depthRange.Start = Math.Round(depth * 0.75);
-          depthRange.End = depth;
+          depthRange.Start = depthOffset + Math.Round(depth * 0.75);
+          depthRange.End = Math.Max(depthRange.Start, depth);
           break;
       }
@@ -110 +112 @@
                                     select new CutPoint(n, s));
       });
+
+      if (crossoverPoints0.Count == 0)
+        throw new Exception("No crossover points available in the first parent");
+
       CutPoint crossoverPoint0 = crossoverPoints0.SelectRandom(random);
       int level = parent0.Root.GetBranchLevel(crossoverPoint0.Child);