Changeset 12515 for branches/HiveStatistics/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4

Timestamp:

06/25/15 18:21:19 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Tests

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionCrossoverTest.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/Util.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionCrossoverTest.cs

@@ -125 +125 @@
       stopwatch.Start();
       for (int i = 0; i != PopulationSize; ++i) {
-        var parent0 = (ISymbolicExpressionTree)trees.SelectRandom(twister).Clone();
+        var parent0 = (ISymbolicExpressionTree)trees.SampleRandom(twister).Clone();
         var scopeParent0 = new Scope();
         scopeParent0.Variables.Add(new Core.Variable(crossover.ParentsParameter.ActualName, parent0));
         context.Scope.SubScopes.Add(scopeParent0);
 
-        var parent1 = (ISymbolicExpressionTree)trees.SelectRandom(twister).Clone();
+        var parent1 = (ISymbolicExpressionTree)trees.SampleRandom(twister).Clone();
         var scopeParent1 = new Scope();
         scopeParent1.Variables.Add(new Core.Variable(crossover.ParentsParameter.ActualName, parent1));

branches/HiveStatistics/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/Util.cs

@@ -79 +79 @@
     public static double CalculateEvaluatedNodesPerSec(ISymbolicExpressionTree[] trees, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, Dataset dataset, int repetitions) {
       // warm up
-      IEnumerable<int> rows = Enumerable.Range(0, dataset.Rows);
+      IEnumerable<int> rows = Enumerable.Range(0, dataset.Rows).ToList();
       long nNodes = 0;
       double c = 0;