Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/FeatureTests/Program.cs

Timestamp:

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

Author:

pkimmesw

Message:

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

File:

• branches/PushGP/HeuristicLab.PushGP/FeatureTests/Program.cs (modified) (7 diffs)

branches/PushGP/HeuristicLab.PushGP/FeatureTests/Program.cs

@@ -8 +8 @@
   using System.Threading;
   using DirtyList;
+
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Erc;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
@@ -32 +33 @@
       //Test3();
 
-      TestCollectionPooling();
+      //TestCollectionPooling();
 
       //DirtyListTest();
@@ -45 +46 @@
       //PerformanceParallelTestInterpreter();
       //PerformanceTestLinearCodeGenerator();
-      //TestRobustness();
+      TestRobustness();
       //TestPool();
       //TestPoolPerformance();
@@ -380 +381 @@
         ErcOptions = {
           ErcProbability = 0.2,
-          FloatErcOptions = new FloatErcOptions(-100.5, 100.5, 1000.5, 2000.5),
-          IntegerErcOptions = new IntegerErcOptions(-10, 10, 100, 200),
+          FloatErcOptions = new FloatErcOptions(-100.5, 100.5, new [] { 1000.5, 2000.5 }),
+          IntegerErcOptions = new IntegerErcOptions(-10, 10, new [] { 100, 200 }),
           StringErcOptions =
-            new StringErcOptions { AllowSpace = true, SpaceProbability = 0.2 },
-          BooleanErcOptions = new BooleanErcOptions(),
-          CharErcOptions = new CharErcOptions(Convert.ToInt32('a'), Convert.ToInt32('Z'))
+            new StringErcOptions
+              {
+                IsEnabled = true,
+                AllowSpace = true,
+                SpaceProbability = 0.2
+              },
+          BooleanErcOptions = new BooleanErcOptions(true, true),
+          CharErcOptions = new CharErcOptions('a', 'Z')
         }
       };
@@ -401 +407 @@
       var maxProgramSizeLimit = 1024;
       var partitionSize = 100000;
-      var execCounters = new int[parallelism];
+      var execCounters = new long[parallelism];
 
       var config = new PushConfiguration {
@@ -408 +414 @@
       };
 
+      config.DisableStack(StackTypes.Exec, true);
+      config.DisableStack(StackTypes.Code, true);
+      config.DisableStack(StackTypes.Float, true);
+
       config.DisableExpression<ExecYExpression>();
 
@@ -422 +432 @@
 
             execCounters[i] += interpreter.ExecCounter;
-            interpreter.Clear();
+            interpreter.Reset();
           }
         }