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

Timestamp:

04/10/17 00:27:31 (7 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/HeuristicLab.Tests

Files:

• Benchmark/Data (added)
• Benchmark/Problem (added)
• Benchmark/ProblemTests.cs (modified) (2 diffs)
• Interpreter/Expressions/BooleanExpressionTests.cs (modified) (1 diff)
• Interpreter/Expressions/CodeExpressionTests.cs (modified) (1 diff)
• Interpreter/Expressions/CommonTests.cs (modified) (1 diff)
• Interpreter/Expressions/ExecExpressionTests.cs (modified) (3 diffs)
• Interpreter/Expressions/FloatExpressionTests.cs (modified) (1 diff)
• Interpreter/Expressions/IntegerExpressionTests.cs (modified) (1 diff)
• Interpreter/Expressions/NameExpressionTests.cs (modified) (9 diffs)

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

@@ -11 +11 @@
   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.Stack;
@@ -218 +219 @@
     }
 
-    private static double GetDiff<T>(IReadOnlyList<T> estimated, IStack<T> resultStack)
+    private static double GetDiff<T>(IReadOnlyList<T> estimated, IPushStack<T> resultStack)
       where T : IComparable {
       var count = Math.Min(estimated.Count, resultStack.Count);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/BooleanExpressionTests.cs

@@ -15 +15 @@
     }
 
-    protected override IStack<bool> Stack
+    protected override IPushStack<bool> Stack
     {
       get

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/CodeExpressionTests.cs

@@ -16 +16 @@
     }
 
-    protected override IStack<Expression> Stack
+    protected override IPushStack<Expression> Stack
     {
       get

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/CommonTests.cs

@@ -10 +10 @@
     protected abstract string TypeName { get; }
 
-    protected abstract IStack<T> Stack { get; }
+    protected abstract IPushStack<T> Stack { get; }
 
     protected abstract T[] GetValues(int count);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/ExecExpressionTests.cs

@@ -16 +16 @@
     }
 
-    protected override IStack<Expression> Stack
+    protected override IPushStack<Expression> Stack
     {
       get
@@ -25 +25 @@
 
     protected override void Test(Expression expression) {
-      this.interpreter.RunAsync(expression, true).Wait();
+      this.interpreter.Run(expression, true);
+      this.interpreter.Step();
     }
 
@@ -61 +62 @@
       var third = PushParser.Parse("C");
 
-      this.interpreter.ExecStack.Push(third, second, first);
-      this.Test(new ExecKExpression());
+      interpreter.ExecStack.Push(third, second, first);
+      Test(new ExecKExpression());
 
-      Assert.AreEqual(first, this.interpreter.ExecStack.Top);
-      Assert.AreEqual(third, this.interpreter.ExecStack.Bottom);
-      this.TestStackCounts(2);
+      Assert.AreEqual(first, interpreter.ExecStack.Top);
+      Assert.AreEqual(third, interpreter.ExecStack.Bottom);
+      TestStackCounts(2);
     }
 

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/FloatExpressionTests.cs

@@ -21 +21 @@
     }
 
-    protected override IStack<double> Stack
+    protected override IPushStack<double> Stack
     {
       get

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/IntegerExpressionTests.cs

@@ -17 +17 @@
     }
 
-    protected override IStack<long> Stack
+    protected override IPushStack<long> Stack
     {
       get

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/NameExpressionTests.cs

@@ -1 @@
-namespace HeuristicLab.Tests.Interpreter.Expressions
-{
+namespace HeuristicLab.Tests.Interpreter.Expressions {
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators;
@@ -8 +7 @@
 
   [TestClass]
-  public class NameExpressionTests : CommonTests<string>
-  {
+  public class NameExpressionTests : CommonTests<string> {
     protected override string TypeName
     {
@@ -18 +16 @@
     }
 
-    protected override IStack<string> Stack
+    protected override IPushStack<string> Stack
     {
       get
@@ -30 +28 @@
     [TestCategory("ExpressionTest")]
     [TestCategory("NameExpressionTest")]
-    public void TestRand()
-    {
+    public void TestRand() {
+      this.interpreter.Configuration.ErcOptions.NameErcOptions.IsEnabled = true;
       this.interpreter.Run(new NameRandExpression());
 
@@ -43 +41 @@
     [TestCategory("ExpressionTest")]
     [TestCategory("NameExpressionTest")]
-    public void TestRandomBound()
-    {
+    public void TestRandomBound() {
       this.interpreter.CustomExpressions.Add("c1", new CodeNoopExpression());
       this.interpreter.CustomExpressions.Add("c2", new CodeNoopExpression());
@@ -60 +57 @@
     [TestCategory("ExpressionTest")]
     [TestCategory("NameExpressionTest")]
-    public void TestRandomBoundWithInsufficientArguments()
-    {
+    public void TestRandomBoundWithInsufficientArguments() {
       this.TestWithInsufficientArguments("RANDBOUNDNAME");
     }
@@ -69 +65 @@
     [TestCategory("ExpressionTest")]
     [TestCategory("NameExpressionTest")]
-    public void TestQuote()
-    {
+    public void TestQuote() {
       this.interpreter.Run(new NameQuoteExpression());
 
@@ -78 +73 @@
     }
 
-    protected override string[] GetValues(int count)
-    {
-      var ng = new NameGenerator();
+    protected override string[] GetValues(int count) {
+      var ng = new StringGenerator();
       var values = new string[count];
 
@@ -88 +82 @@
     }
 
-    protected override void CheckOtherStacksAreEmpty()
-    {
+    protected override void CheckOtherStacksAreEmpty() {
       this.TestStackCounts(nameStack: null);
     }