Changeset 5917

Timestamp:

03/31/11 19:23:18 (14 years ago)

Author:

gkronber

Message:

#1418 minor bug fix in all architecture altering operators test.

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/AllArchitectureAlteringOperatorsTest.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/AllArchitectureAlteringOperatorsTest.cs

@@ -75 +75 @@
             var selectedTree = (ISymbolicExpressionTree)trees.SelectRandom(random).Clone();
             var oldTree = (ISymbolicExpressionTree)selectedTree.Clone();
-            var oldFormatedTree = formatter.Format(oldTree);
             bool success = false;
             int sw = random.Next(6);
@@ -88 +87 @@
             stopwatch.Stop();
             if (!success) failedEvents++;
-            var newFormatedTree = formatter.Format(selectedTree);
             Util.IsValid(selectedTree);
             newTrees.Add(selectedTree);
@@ -107 +105 @@
         newTrees.Clear();
       }
-      var msPerOperation = stopwatch.ElapsedMilliseconds / (double)POPULATION_SIZE / (double)N_ITERATIONS;
+      var msPerOperation = stopwatch.ElapsedMilliseconds / ((double)POPULATION_SIZE * (double)N_ITERATIONS);
       Console.WriteLine("AllArchitectureAlteringOperators: " + Environment.NewLine +
         "Operations / s: ~" + Math.Round(1000.0 / (msPerOperation)) + "operations / s)" + Environment.NewLine +
-        "Failed events: " + failedEvents * 100.0 / (double)(POPULATION_SIZE * N_ITERATIONS * 2.0) + "%" + Environment.NewLine +
+        "Failed events: " + failedEvents * 100.0 / (double)(POPULATION_SIZE * N_ITERATIONS / 2.0) + "%" + Environment.NewLine +
         Util.GetSizeDistributionString(trees, 200, 5) + Environment.NewLine +
         Util.GetFunctionDistributionString(trees) + Environment.NewLine +
@@ -117 +115 @@
         );
 
-      Assert.IsTrue(failedEvents * 100.0 / (POPULATION_SIZE * N_ITERATIONS * 2.0) < 25.0); // 75% of architecture operations must succeed
+      Assert.IsTrue(failedEvents * 100.0 / (POPULATION_SIZE * N_ITERATIONS / 2.0) < 25.0); // 75% of architecture operations must succeed
       Assert.IsTrue(Math.Round(1000.0 / (msPerOperation)) > 1000); // must achieve more than 1000 ops per second
     }