Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions

Timestamp:

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

Author:

pkimmesw

Message:

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

Location:

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

Files:

• CommonTests.cs (modified) (11 diffs)
• ExecExpressionTests.cs (modified) (2 diffs)

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

@@ -108 +108 @@
       this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".SWAP"));
 
-      Assert.AreEqual(values[0], this.Stack[0]);
+      Assert.AreEqual(values[0], this.Stack[2]);
+      Assert.AreEqual(values[1], this.Stack[0]);
       Assert.AreEqual(values[2], this.Stack[1]);
-      Assert.AreEqual(values[1], this.Stack[2]);
 
       this.CheckOtherStacksAreEmpty();
@@ -128 +128 @@
     [TestCategory("CommonExpressionTest")]
     public virtual void TestRotate() {
-      var values = this.GetValues(4);
-      this.Stack.Push(values);
-
-      this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".ROT"));
-
-      Assert.AreEqual(values[0], this.Stack[0]);
-      Assert.AreEqual(values[3], this.Stack[1]);
-      Assert.AreEqual(values[1], this.Stack[2]);
-      Assert.AreEqual(values[2], this.Stack[3]);
+      var values = GetValues(4);
+      Stack.Push(values);
+
+      Test(ExpressionTable.GetStatelessExpression(TypeName + ".ROT"));
+
+      Assert.AreEqual(values[0], Stack[3]);
+      Assert.AreEqual(values[3], Stack[2]);
+      Assert.AreEqual(values[1], Stack[1]);
+      Assert.AreEqual(values[2], Stack[0]);
 
       this.CheckOtherStacksAreEmpty();
@@ -160 +160 @@
       this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".SHOVE"));
 
-      Assert.AreEqual(values[0], this.Stack[0]);
-      Assert.AreEqual(values[2], this.Stack[1]);
-      Assert.AreEqual(values[1], this.Stack[2]);
+      Assert.AreEqual(values[0], Stack[2]);
+      Assert.AreEqual(values[1], Stack[0]);
+      Assert.AreEqual(values[2], Stack[1]);
 
       this.CheckOtherStacksAreEmpty();
@@ -180 +180 @@
     [TestCategory("CommonExpressionTest")]
     public virtual void TestShoveWithNegativeIndex() {
-      this.TestWithNegativeIndex("SHOVE");
+      var values = this.GetValues(3);
+      this.Stack.Push(values);
+
+      this.interpreter.IntegerStack.Push(-1);
+      this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".SHOVE"));
+
+      Assert.AreEqual(values[0], Stack[2]);
+      Assert.AreEqual(values[1], Stack[0]);
+      Assert.AreEqual(values[2], Stack[1]);
+
+      this.CheckOtherStacksAreEmpty();
     }
 
@@ -194 +204 @@
       this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".YANK"));
 
-      Assert.AreEqual(values[0], this.Stack[0]);
-      Assert.AreEqual(values[2], this.Stack[1]);
-      Assert.AreEqual(values[1], this.Stack[2]);
+      Assert.AreEqual(values[0], Stack[2]);
+      Assert.AreEqual(values[1], Stack[0]);
+      Assert.AreEqual(values[2], Stack[1]);
 
       this.CheckOtherStacksAreEmpty();
@@ -214 +224 @@
     [TestCategory("CommonExpressionTest")]
     public virtual void TestYankWithNegativeIndex() {
-      this.TestWithNegativeIndex("YANK");
+      var values = this.GetValues(3);
+      this.Stack.Push(values);
+
+      this.interpreter.IntegerStack.Push(-1);
+      this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".YANK"));
+
+      Assert.AreEqual(values[0], Stack[2]);
+      Assert.AreEqual(values[1], Stack[0]);
+      Assert.AreEqual(values[2], Stack[1]);
+
+      this.CheckOtherStacksAreEmpty();
     }
 
@@ -228 +248 @@
       this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".YANKDUP"));
 
-      Assert.AreEqual(values[0], this.Stack[0]);
-      Assert.AreEqual(values[1], this.Stack[1]);
-      Assert.AreEqual(values[2], this.Stack[2]);
-      Assert.AreEqual(values[1], this.Stack[3]);
+      Assert.AreEqual(values[0], this.Stack[3]);
+      Assert.AreEqual(values[1], this.Stack[2]);
+      Assert.AreEqual(values[2], this.Stack[1]);
+      Assert.AreEqual(values[1], this.Stack[0]);
 
       this.CheckOtherStacksAreEmpty();
@@ -249 +269 @@
     [TestCategory("CommonExpressionTest")]
     public virtual void TestYankDuplicateWithNegativeIndex() {
-      this.TestWithNegativeIndex("YANKDUP");
+      var values = this.GetValues(3);
+      this.Stack.Push(values);
+
+      this.interpreter.IntegerStack.Push(-1);
+      this.Test(ExpressionTable.GetStatelessExpression(this.TypeName + ".YANKDUP"));
+
+      Assert.AreEqual(values[0], this.Stack[3]);
+      Assert.AreEqual(values[1], this.Stack[2]);
+      Assert.AreEqual(values[2], this.Stack[1]);
+      Assert.AreEqual(values[1], this.Stack[0]);
+
+      this.CheckOtherStacksAreEmpty();
     }
 
@@ -277 +308 @@
         this.Stack.Push(values);
 
-        var fullInstructionname = string.Format(FullInstructionNameFormat, this.TypeName, instructionName);
-        this.Test(ExpressionTable.GetStatelessExpression(fullInstructionname));
-
-        for (var j = 0; j < i; j++) Assert.AreEqual(values[j], this.Stack[j]);
+        var fullInstructionName = string.Format(FullInstructionNameFormat, this.TypeName, instructionName);
+        this.Test(ExpressionTable.GetStatelessExpression(fullInstructionName));
+
+        for (var j = 0; j < i; j++) Assert.AreEqual(values[j], this.Stack.ReverseElementAt(j));
 
         this.CheckOtherStacksAreEmpty();
@@ -288 +319 @@
 
     protected void TestWithNegativeIndex(string instructionName) {
-      var values = this.GetValues(1);
+      var values = this.GetValues(3);
       this.Stack.Push(values);
 
@@ -296 +327 @@
       this.Test(ExpressionTable.GetStatelessExpression(fullInstructionname));
 
-      Assert.AreEqual(values[0], this.Stack[0]);
+      Assert.AreEqual(values[0], Stack[2]);
+      Assert.AreEqual(values[1], Stack[0]);
+      Assert.AreEqual(values[2], Stack[1]);
     }
   }

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

@@ -83 +83 @@
       this.Test(new ExecSExpression());
 
-      Assert.AreEqual(result, this.interpreter.ExecStack.ReverseElementAt(2));
-      Assert.AreEqual(third, this.interpreter.ExecStack.ReverseElementAt(1));
+      Assert.AreEqual(result, this.interpreter.ExecStack[2]);
+      Assert.AreEqual(third, this.interpreter.ExecStack[1]);
       Assert.AreEqual(first, this.interpreter.ExecStack.Top);
       this.TestStackCounts(3);
@@ -101 +101 @@
 
       Assert.AreEqual(first, this.interpreter.ExecStack.Top);
-      Assert.AreEqual(result, this.interpreter.ExecStack.ReverseElementAt(1));
+      Assert.AreEqual(result, this.interpreter.ExecStack[1]);
       this.TestStackCounts(2);
     }