Changeset 16270 for trunk

Timestamp:

11/01/18 19:59:49 (6 years ago)

Author:

bburlacu

Message:

#2950: Fix compilation error in SymbolicDataAnalysisExpressionDiversityPreservingCrossover

File:

• trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs

@@ -81 +81 @@
       if (proportionalSampling) {
         var p = internalCrossoverPointProbability;
-        var weights0 = nodes0.Select(x => x.IsChild ? 1 - p : p);
+        var weights0 = nodes0.Select(x => x.IsLeaf ? 1 - p : p);
         sampled0 = nodes0.SampleProportionalWithoutRepetition(random, nodes0.Length, weights0, windowing: windowing).ToArray();
 
-        var weights1 = nodes1.Select(x => x.IsChild ? 1 - p : p);
+        var weights1 = nodes1.Select(x => x.IsLeaf ? 1 - p : p);
         sampled1 = nodes1.SampleProportionalWithoutRepetition(random, nodes1.Length, weights1, windowing: windowing).ToArray();
       } else {
@@ -133 +133 @@
 
       if (chooseInternal) {
-        list.AddRange(nodes.Where(x => !x.IsChild && x.Data.Parent != null));
+        list.AddRange(nodes.Where(x => !x.IsLeaf && x.Data.Parent != null));
       }
       if (!chooseInternal || list.Count == 0) {
-        list.AddRange(nodes.Where(x => x.IsChild && x.Data.Parent != null));
+        list.AddRange(nodes.Where(x => x.IsLeaf && x.Data.Parent != null));
       }