Changeset 14900 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests

Timestamp:

04/30/17 19:16:09 (7 years ago)

Author:

pkimmesw

Message:

#2665 Improved random walk tests

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Benchmark/RandomWalkTests.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Benchmark/RandomWalkTests.cs

@@ -1 +1 @@
 namespace HeuristicLab.Tests.Benchmark {
   using System;
-  using System.Threading.Tasks;
+  using System.Linq;
   using BenchmarkSuite;
 
@@ -8 +8 @@
   using Microsoft.VisualStudio.TestTools.UnitTesting;
   using Problems.ProgramSynthesis.Push.Configuration;
-  using Problems.ProgramSynthesis.Push.Expressions;
   using Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
   using Problems.ProgramSynthesis.Push.Interpreter;
   using Problems.ProgramSynthesis.Push.Problem.BenchmarkSuite;
-  using Problems.ProgramSynthesis.Push.Simplifier;
   using Problems.ProgramSynthesis.Push.Stack;
   using Random;
@@ -21 +19 @@
       var iterations = 2;
       var best = double.MaxValue;
-      var lockObj = new object();
       var random = new MersenneTwister(1337);
 
@@ -37 +34 @@
 
       var pool = new PushInterpreterPool(config);
-      PushProgram bestProgram = null;
-
-      Parallel.For(0u, iterations, i => {
-        var program = RecursiveCodeGenerator.RandomProgram(data.MaxSize, random, config);
-        var avg = evaluator.EvaluateTraining(pool, program, random);
-
-        lock (lockObj) {
-          if (avg.TotalQuality < best) {
-            best = avg.TotalQuality;
-            bestProgram = program;
-          }
-        }
-      });
+      var bestProgram = Enumerable
+        .Range(0, iterations)
+        .AsParallel()
+        .Select(_ => {
+          var program = LinearCodeGenerator.RandomProgram(data.MaxSize, random, config);
+          var result = evaluator.EvaluateTraining(pool, program, random);
+
+          return new {
+            Quality = result.TotalQuality,
+            Program = program
+          };
+        })
+        .OrderBy(x => x.Quality)
+        .Select(x => x.Program)
+        .First();
+      //  var program = RecursiveCodeGenerator.RandomProgram(data.MaxSize, random, config);
+      //  var avg = evaluator.EvaluateTraining(pool, program, random);
+
+      //  lock (lockObj) {
+      //    if (avg.TotalQuality < best) {
+      //      best = avg.TotalQuality;
+      //      bestProgram = program;
+      //    }
+      //  }
+      //});
 
       var averageTestResult = evaluator.EvaluateTest(pool, bestProgram, random);
-      var simplifiedProgram = Simplifier.Simplify(
-        bestProgram,
-        p => evaluator.EvaluateTraining(pool, p, random).TotalQuality);
+      //var simplifiedProgram = Simplifier.Simplify(
+      //  bestProgram,
+      //  p => evaluator.EvaluateTraining(pool, p, random).TotalQuality);
 
       Console.WriteLine("Training: {0}", best);
       Console.WriteLine("RandomWalk: {0}", averageTestResult.TotalQuality);
-      Console.WriteLine("Best program (simplified): {0}", simplifiedProgram);
+      //Console.WriteLine("Best program (simplified): {0}", simplifiedProgram);
     }