Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/FeatureTests

Timestamp:

04/10/17 00:27:31 (8 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

Location:

branches/PushGP/HeuristicLab.PushGP/FeatureTests

Files:

• FeatureTests.csproj (modified) (2 diffs)
• Pool (deleted)
• Program.cs (modified) (9 diffs)

branches/PushGP/HeuristicLab.PushGP/FeatureTests/FeatureTests.csproj

@@ -40 +40 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Random-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
@@ -57 +61 @@
     <Compile Include="DirtyList\PushStack3.cs" />
     <Compile Include="DirtyList\PushStack.cs" />
-    <Compile Include="Pool\IPooledObject.cs" />
-    <Compile Include="Pool\ManagedPool.cs" />
-    <Compile Include="Pool\ManagedPoolProvider.cs" />
-    <Compile Include="Pool\ObjectPool.cs" />
-    <Compile Include="Pool\PooledList.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -8 +8 @@
   using System.Threading;
   using DirtyList;
-
   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;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Parser;
@@ -18 +19 @@
   using HeuristicLab.Random;
 
-  using TestPooling.Pool;
-
   class Program {
     private const int PartitionSize = 512;
@@ -33 +32 @@
       //Test3();
 
-      //TestCollectionPooling();
+      TestCollectionPooling();
 
       //DirtyListTest();
@@ -46 +45 @@
       //PerformanceParallelTestInterpreter();
       //PerformanceTestLinearCodeGenerator();
-      TestRobustness();
+      //TestRobustness();
       //TestPool();
       //TestPoolPerformance();
@@ -58 +57 @@
 
     private static void TestExpressionDependencies() {
-      var enabledExpressions = ExpressionTable.GetEnabledExpressionsByStackTypes(StackTypes.Boolean | StackTypes.Integer);
+      var enabledExpressions = ExpressionTable.GetExpressionsByStackTypes(StackTypes.Boolean | StackTypes.Integer);
     }
 
@@ -234 +233 @@
 
       Console.WriteLine("Collection Pooling - Duration: {0} - {1} for {2}/{3} instances", sw.ElapsedTicks, sw.Elapsed.TotalSeconds, provider.InstanceCount, TotalInstanceCount);
-    }
-
-
-    private static void Test1() {
-      var sw = new Stopwatch();
-
-      sw.Start();
-      Parallel.For(0, PopulationCount, pc => {
-        for (var e = 0; e < ExampleCount; e++) {
-          using (var pool = new ManagedPool<Person>(PartitionSize, () => new Person())) {
-            for (var i = 0; i < InstanceCount; i++) {
-              var person = pool.Get();
-              person.Age = pc + e + i;
-              person.Name = string.Format("{0} - {1} - {2}", pc, e, i);
-            }
-          }
-        }
-      });
-      sw.Stop();
-
-      Console.WriteLine("1 - Duration: {0} - {1} for {2}/{3} instances", sw.ElapsedTicks, sw.Elapsed.TotalSeconds, ManagedPool<Person>.InstanceCount, TotalInstanceCount);
     }
 
@@ -328 +306 @@
       var interpreter = new PushInterpreter();
 
-      interpreter.RunAsync("( 0 2 CODE.QUOTE ( 1 INTEGER.+ 0 3 CODE.QUOTE ( 1 INTEGER.+ INTEGER.* ) CODE.DO*RANGE INTEGER.+ ) CODE.DO*RANGE )", true).Wait();
+      interpreter.Run("( 0 2 CODE.QUOTE ( 1 INTEGER.+ 0 3 CODE.QUOTE ( 1 INTEGER.+ INTEGER.* ) CODE.DO*RANGE INTEGER.+ ) CODE.DO*RANGE )");
 
       while (!interpreter.IsCompleted) {
@@ -399 +377 @@
       var sw = new Stopwatch();
       var random = new FastRandom(1337);
-      var poolProvider = new ManagedPoolProvider<PooledList<Expression>>(65636, () => new PooledList<Expression>());
-
-      sw.Start();
-      var expressions = LinearCodeGenerator.RandomCode(60000000, null, random).ToList();
+      var config = new PushConfiguration {
+        ErcOptions = {
+          ErcProbability = 0.2,
+          FloatErcOptions = new FloatErcOptions(-100.5, 100.5, 1000.5, 2000.5),
+          IntegerErcOptions = new IntegerErcOptions(-10, 10, 100, 200),
+          StringErcOptions =
+            new StringErcOptions { AllowSpace = true, SpaceProbability = 0.2 },
+          BooleanErcOptions = new BooleanErcOptions(),
+          CharErcOptions = new CharErcOptions(Convert.ToInt32('a'), Convert.ToInt32('Z'))
+        }
+      };
+
+      sw.Start();
+      var expressions = LinearCodeGenerator.RandomCode(60000000, null, random, config).ToList();
       sw.Stop();
 
@@ -417 +405 @@
       var config = new PushConfiguration {
         EvalPushLimit = 1024,
-        MaxPointsInProgram = 1024,
-        IsCodeStackEnabled = false,
-        IsExecStackEnabled = false,
-        IsBooleanStackEnabled = false,
-        IsFloatStackEnabled = false,
-        IsIntegerStackEnabled = false,
-        IsNameStackEnabled = false,
+        MaxPointsInProgram = 1024
       };