Changeset 17090 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers

Timestamp:

07/05/19 15:44:04 (6 years ago)

Author:

abeham

Message:

#2950: merged revisions 16218, 16252, 16255, 16258, 16259, 16260, 16261, 16263, 16267, 16270, 16271, 16272, 16273, 16284, 16290, 16291, 16302, 16305, 16382, 16478 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers/SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs) (4 diffs)

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

@@ -20 +20 @@
     private const string WindowingParameterName = "Windowing";
     private const string ProportionalSamplingParameterName = "ProportionalSampling";
+
+    private static readonly Func<byte[], ulong> hashFunction = HashUtil.JSHash;
 
     #region Parameter Properties
@@ -73 +75 @@
       var leafCrossoverPointProbability = 1 - internalCrossoverPointProbability;
 
-      var nodes0 = ActualRoot(parent0).MakeNodes().Sort();
-      var nodes1 = ActualRoot(parent1).MakeNodes().Sort();
+      var nodes0 = ActualRoot(parent0).MakeNodes().Sort(hashFunction);
+      var nodes1 = ActualRoot(parent1).MakeNodes().Sort(hashFunction);
 
       IList<HashNode<ISymbolicExpressionTreeNode>> sampled0;
@@ -81 +83 @@
       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 +135 @@
 
       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));
       }