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

Timestamp:

03/12/17 13:16:56 (7 years ago)

Author:

pkimmesw

Message:

#2665 fixed enable/disable issue for single instruction in selection view

File:

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

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

@@ -9 +9 @@
   using HeuristicLab.Problems.Instances;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators;
@@ -147 +146 @@
       var instance = new BenchmarkSuiteInstanceProvider();
       var data = instance.LoadData(descriptor);
-      var provider = new ManagedPoolProvider<PushProgram>(1024);
-      provider.InitDummyPartition(() => new PushProgram());
 
       Parallel.For(0, iterations, i => {
         var execCounter = 0;
-
-        var pushProgramPool = provider.CreatePool();
-        var program = CodeGenerator.RandomProgram(pushProgramPool, maxProgramSizeLimit, random);
-
         var results = new double[data.OriginalTrainingCount];
+        PushProgram program;
 
         using (var interpreter = pool.GetInstance(random)) {
-          interpreter.PushProgramPool = pushProgramPool;
+          program = CodeGenerator.RandomProgram(interpreter.PushProgramPool, maxProgramSizeLimit, random);
 
           for (var j = 0; j < data.OriginalTrainingCount; j++) {
@@ -169 +163 @@
 
             interpreter.Run(program);
-            pushProgramPool.Dispose();
 
             var diff = GetDiff(example.OutputInt, interpreter.IntegerStack)
@@ -179 +172 @@
             execCounter += interpreter.ExecCounter;
             interpreter.Clear();
-            pushProgramPool = provider.CreatePool();
           }
         }