Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Benchmark/ProblemTests.cs

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

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

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

@@ -10 +10 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Generators;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
@@ -136 +135 @@
       var iterations = 100;
       var best = double.MaxValue;
-      var globalExecCounter = 0;
+      var globalExecCounter = 0L;
       var lockObj = new object();
       var lockCount = new object();
@@ -148 +147 @@
       var data = instance.LoadData(descriptor);
 
-      Parallel.For(0, iterations, i => {
-        var execCounter = 0;
-        var results = new double[data.OriginalTrainingCount];
+      Parallel.For(0u, iterations, i => {
+        var execCounter = 0L;
+        var results = new double[data.TrainingCount];
         PushProgram program;
 
@@ -156 +155 @@
           program = RecursiveCodeGenerator.RandomProgram(maxProgramSizeLimit, random);
 
-          for (var j = 0; j < data.OriginalTrainingCount; j++) {
+          for (var j = 0; j < data.TrainingCount; j++) {
             var example = data.Examples[i];
 
             interpreter.BooleanStack.Push(example.InputBoolean);
-            interpreter.IntegerStack.Push(example.InputInt);
+            interpreter.IntegerStack.Push(example.InputInteger);
             interpreter.FloatStack.Push(example.InputFloat);
 
             interpreter.Run(program);
 
-            var diff = GetDiff(example.OutputInt, interpreter.IntegerStack)
+            var diff = GetDiff(example.OutputInteger, interpreter.IntegerStack)
                        + GetDiff(example.OutputFloat, interpreter.FloatStack)
                        + GetDiff(example.OutputBoolean, interpreter.BooleanStack);
@@ -192 +191 @@
       });
 
-      var resultsTest = new double[data.OriginalTestCount];
-      Parallel.For(data.OriginalTestCount, data.OriginalTestCount, i => {
+      var resultsTest = new double[data.TestCount];
+      Parallel.For(data.TestCount, data.TestCount, i => {
         using (var interpreter = pool.Create()) {
           var example = data.Examples[i];
 
           interpreter.BooleanStack.Push(example.InputBoolean);
-          interpreter.IntegerStack.Push(example.InputInt);
+          interpreter.IntegerStack.Push(example.InputInteger);
           interpreter.FloatStack.Push(example.InputFloat);
 
           interpreter.Run(bestProgram);
 
-          var diff = GetDiff(example.OutputInt, interpreter.IntegerStack) +
+          var diff = GetDiff(example.OutputInteger, interpreter.IntegerStack) +
                      GetDiff(example.OutputFloat, interpreter.FloatStack) +
                      GetDiff(example.OutputBoolean, interpreter.BooleanStack);