Changeset 16272 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Crossovers

Timestamp:

11/02/18 16:20:33 (5 years ago)

Author:

bburlacu

Message:

#2950: Refactor hash extensions and utility methods: hashes are computed from byte[] arrays, simplification accepts an argument specifying which hash function to use. Update SymbolicDataAnalysisBuildingBlockAnalyzer and 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

@@ -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;