Changeset 12706 for stable/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/AllArchitectureAlteringOperatorsTest.cs

Timestamp:

07/10/15 12:02:20 (9 years ago)

Author:

mkommend

Message:

#2320: Merged r12422, r12423, r12424, r12480, r12481 and r12482 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/AllArchitectureAlteringOperatorsTest.cs (modified) (2 diffs)

stable/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/AllArchitectureAlteringOperatorsTest.cs

@@ -61 +61 @@
             // manipulate
             stopwatch.Start();
-            var selectedTree = (ISymbolicExpressionTree)trees.SelectRandom(random).Clone();
+            var selectedTree = (ISymbolicExpressionTree)trees.SampleRandom(random).Clone();
             var oldTree = (ISymbolicExpressionTree)selectedTree.Clone();
             bool success = false;
@@ -83 +83 @@
             SymbolicExpressionTree par1 = null;
             do {
-              par0 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
-              par1 = (SymbolicExpressionTree)trees.SelectRandom(random).Clone();
+              par0 = (SymbolicExpressionTree)trees.SampleRandom(random).Clone();
+              par1 = (SymbolicExpressionTree)trees.SampleRandom(random).Clone();
             } while (par0.Length > MAX_TREE_LENGTH || par1.Length > MAX_TREE_LENGTH);
             var newTree = SubtreeCrossover.Cross(random, par0, par1, 0.9, MAX_TREE_LENGTH, MAX_TREE_DEPTH);