Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

Location:

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

Files:

• ExpressionTest.cs (modified) (2 diffs)
• Expressions/BooleanVectorExpressionsTests.cs (added)
• Expressions/CharExpressionTests.cs (added)
• Expressions/CodeExpressionTests.cs (modified) (3 diffs)
• Expressions/CommonTests.cs (modified) (1 diff)
• Expressions/ExampleTests.cs (modified) (2 diffs)
• Expressions/ExecExpressionTests.cs (modified) (2 diffs)
• Expressions/FloatVectorExpressionTests.cs (added)
• Expressions/IntegerExpressionTests.cs (modified) (1 diff)
• Expressions/IntegerVectorExpressionTests.cs (added)
• Expressions/PrintExpressionTests.cs (added)
• Expressions/PushProgramTests.cs (added)
• Expressions/StandardTests.cs (modified) (6 diffs)
• Expressions/StringExpressionTests.cs (added)
• Expressions/StringVectorExpressionTests.cs (added)
• Expressions/VectorExpressionTests.cs (added)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/ExpressionTest.cs

@@ -1 +1 @@
 namespace HeuristicLab.Tests.Interpreter {
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Boolean;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Float;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.FloatVector;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.IntegerVector;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.StringVector;
 
   using Microsoft.VisualStudio.TestTools.UnitTesting;
+  using Problems.ProgramSynthesis.Base.Erc;
+  using Problems.ProgramSynthesis.Base.Erc.Char;
+  using Problems.ProgramSynthesis.Base.Erc.Integer;
+  using Problems.ProgramSynthesis.Base.Erc.String;
+  using Problems.ProgramSynthesis.Push.Configuration;
+  using Problems.ProgramSynthesis.Push.Interpreter;
 
   public class ExpressionTest {
     protected PushInterpreter interpreter;
 
-    protected PushConfiguration configuration = new PushConfiguration { TopLevelPushCode = false };
+    protected PushConfiguration configuration = new PushConfiguration {
+      TopLevelPushCode = false,
+      ErcOptions = new ErcOptions {
+        ErcProbability = 0.05,
+        CharErcOptions = new CharErcOptions(new IntegerRangeErc(0x20, 0x7e)),
+        StringErcOptions = new StringErcOptions(new StringRandomErc {
+          IsEnabled = true,
+          AllowDigits = true,
+          NewStringProbability = 1,
+          AllowLowercaseLetters = true,
+          AllowUppercaseLetters = true
+        }),
+        IntegerErcOptions = new IntegerErcOptions(new IntegerRangeErc(-10000, 10000)),
+        FloatErcOptions = new FloatErcOptions(new FloatRangeErc(-10000, 10000)),
+        BooleanErcOptions = new BooleanErcOptions(new BooleanRandomErc(true, true, true)),
+        StringVectorErcOptions = new StringVectorErcOptions(
+          new StringVectorConstantsErc(new[] { "test", "123", "asdf", "a", "b" })),
+        IntegerVectorErcOptions = new IntegerVectorErcOptions(
+          new IntegerVectorConstantsErc(new[] { 0, -5, 10, 8, -3 })),
+        FloatVectorErcOptions = new FloatVectorErcOptions(
+          new FloatVectorConstantsErc(new[] { 0.0, -5.2, 10.3, 8.1, -3.4 }))
+      }
+    };
 
     [TestInitialize]
     public void BeforeTest() {
-      interpreter = new PushInterpreter(configuration);
+      interpreter = new PushInterpreter(1337, configuration);
     }
 
@@ -21 +52 @@
       int? booleanStack = 0,
       int? floatStack = 0,
-      int? integerStack = 0) {
+      int? integerStack = 0,
+      int? charStack = 0,
+      int? stringStack = 0,
+      int? integerVectorStack = 0,
+      int? floatVectorStack = 0,
+      int? booleanVectorStack = 0,
+      int? stringVectorStack = 0) {
       if (execStack.HasValue) Assert.AreEqual(execStack, interpreter.ExecStack.Count);
-
       if (codeStack.HasValue) Assert.AreEqual(codeStack, interpreter.CodeStack.Count);
-
       if (nameStack.HasValue) Assert.AreEqual(nameStack, interpreter.NameStack.Count);
-
       if (booleanStack.HasValue) Assert.AreEqual(booleanStack, interpreter.BooleanStack.Count);
-
       if (floatStack.HasValue) Assert.AreEqual(floatStack, interpreter.FloatStack.Count);
-
       if (integerStack.HasValue) Assert.AreEqual(integerStack, interpreter.IntegerStack.Count);
+      if (charStack.HasValue) Assert.AreEqual(charStack, interpreter.CharStack.Count);
+      if (stringStack.HasValue) Assert.AreEqual(stringStack, interpreter.StringStack.Count);
+      if (integerVectorStack.HasValue) Assert.AreEqual(integerVectorStack, interpreter.IntegerVectorStack.Count);
+      if (floatVectorStack.HasValue) Assert.AreEqual(floatVectorStack, interpreter.FloatVectorStack.Count);
+      if (booleanVectorStack.HasValue) Assert.AreEqual(booleanVectorStack, interpreter.BooleanVectorStack.Count);
+      if (stringVectorStack.HasValue) Assert.AreEqual(stringVectorStack, interpreter.StringVectorStack.Count);
     }
   }

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

@@ -430 +430 @@
 
       Assert.AreEqual(3, interpreter.IntegerStack.Top);
-      TestStackCounts(codeStack: 1, integerStack: 2);
+      TestStackCounts(integerStack: 1);
     }
 
@@ -455 +455 @@
       var prog = PushParser.Parse("( INTEGER.DUP INTEGER.+ )");
 
-      interpreter.IntegerStack.Push(2, 3);
+      interpreter.IntegerStack.Push(2, 4);
       interpreter.CodeStack.Push(prog);
       interpreter.Run(new CodeDoTimesExpression());
@@ -508 +508 @@
     public void TestNestedDoTimes() {
       interpreter.Run(
-        "( 3 CODE.QUOTE ( 2 3 CODE.QUOTE ( 2 INTEGER.* ) CODE.DO*TIMES INTEGER.+ ) CODE.DO*TIMES )");
+        "( 4 CODE.QUOTE ( 2 4 CODE.QUOTE ( 2 INTEGER.* ) CODE.DO*TIMES INTEGER.+ ) CODE.DO*TIMES )");
 
       Assert.AreEqual(128, interpreter.IntegerStack.Top);

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

@@ -35 +35 @@
 
       var isBooleanStack = interpreter.BooleanStack.Count == 2;
-
       Test(ExpressionTable.GetStatelessExpression(TypeName + ".="));
 

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

@@ -145 +145 @@
     public void Example10() {
       interpreter.IntegerStack.Push(5);
-      interpreter.Run("( 1 INTEGER.MAX 1 EXEC.DO*RANGE ( 2 INTEGER.* ) )");
-
-      Assert.AreEqual(2, interpreter.IntegerStack.Top);
+      interpreter.Run("( 1 INTEGER.MAX 1 EXEC.DO*RANGE ( 2 INTEGER.* INTEGER.* ) )");
+
+      Assert.AreEqual(3840, interpreter.IntegerStack.Top);
       Assert.IsTrue(interpreter.CodeStack.IsEmpty);
       Assert.IsTrue(interpreter.ExecStack.IsEmpty);
@@ -254 +254 @@
       interpreter.FloatStack.Push(2);
       interpreter.Run(@"( ARG FLOAT.DEFINE
-                                     EXEC.Y (
-                                       ARG FLOAT.*
-                                       1 INTEGER.-
-                                       INTEGER.DUP 1 INTEGER.>
-                                       EXEC.IF ( ) EXEC.POP
-                                     )
-                                   )");
+                          EXEC.Y (
+                            ARG FLOAT.*
+                            1 INTEGER.-
+                            INTEGER.DUP 1 INTEGER.>
+                            EXEC.IF ( ) EXEC.POP
+                          )
+                        )");
 
       Assert.AreEqual(1024, interpreter.FloatStack.Top, Delta);

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

@@ -111 +111 @@
     public void TestNestedDoRange() {
       interpreter.Run(
-        "( 0 2 EXEC.DO*RANGE ( 1 INTEGER.+ 0 3 EXEC.DO*RANGE ( 1 INTEGER.+ INTEGER.* ) INTEGER.+ )");
+        "( 1 0 2 EXEC.DO*RANGE ( INTEGER.POP 1 1 4 EXEC.DO*RANGE INTEGER.* INTEGER.* ) )");
 
-      Assert.AreEqual(144, interpreter.IntegerStack.Top);
+      Assert.AreEqual(13824, interpreter.IntegerStack.Top);
       TestStackCounts(integerStack: 1);
     }
@@ -134 +134 @@
     [TestCategory("ExecExpressionTest")]
     public void TestNestedDoTimes() {
-      interpreter.Run("( 3 EXEC.DO*TIMES ( 2 3 EXEC.DO*TIMES ( 2 INTEGER.* ) INTEGER.+ )");
+      interpreter.Run("( 4 EXEC.DO*TIMES ( 2 4 EXEC.DO*TIMES ( 2 INTEGER.* ) INTEGER.+ )");
 
       Assert.AreEqual(128, interpreter.IntegerStack.Top);

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

@@ -32 +32 @@
 
       Assert.AreEqual(10, interpreter.IntegerStack.Top);
-
       TestStackCounts(integerStack: 1);
     }

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

@@ -13 +13 @@
   public class StandardTests {
     [TestMethod]
+    [TestProperty("Time", "Short")]
+    [TestCategory("ExpressionTest")]
+    [TestCategory("StandartTests")]
     public void TestGetHashCode() {
       var expressionTypes = from domainAssembly in AppDomain.CurrentDomain.GetAssemblies()
@@ -22 +25 @@
 
       var expressions = expressionTypes.Select(et => Activator.CreateInstance(et) as Expression);
-      var ids = expressions.Select(e => new { Epxression = e, Id = e.GetHashCode() });
+      var ids = expressions.Select(e => new { Expression = e, Id = e.GetHashCode() });
 
-      var duplicates = ids.GroupBy(s => s).SelectMany(grp => grp.Skip(1));
+      var duplicateGroups = ids.GroupBy(s => s.Id).Where(grp => grp.Count() > 2).ToList();
 
-      if (!duplicates.Any())
+      if (!duplicateGroups.Any())
         return;
 
       Debug.WriteLine("Duplicates: ");
-      foreach (var duplicate in duplicates)
-        Debug.WriteLine("Id: {0}, Expression: {1}", duplicate.Id, duplicate.Epxression);
+      foreach (var group in duplicateGroups) {
+        foreach (var duplicate in group) {
+          string name;
+          if (!ExpressionTable.TypeToNameTable.TryGetValue(duplicate.Expression.GetType(), out name)) {
+            name = duplicate.Expression.ToString();
+          }
+
+          Debug.WriteLine("Id: {0}, Expression: {1}", duplicate.Id, name);
+        }
+
+        Debug.WriteLine("");
+      }
 
       Assert.Fail();
@@ -37 +50 @@
 
     [TestMethod]
+    [TestProperty("Time", "Short")]
+    [TestCategory("ExpressionTest")]
+    [TestCategory("StandartTests")]
     public void TestExpandGetHashCode() {
       var expand = PushParser.Parse("( A B C D E F )");
@@ -44 +60 @@
 
     [TestMethod]
+    [TestProperty("Time", "Short")]
+    [TestCategory("ExpressionTest")]
+    [TestCategory("StandartTests")]
     public void TestExecExpandCopy() {
       var expressions = new Expression[]
@@ -59 +78 @@
 
     [TestMethod]
+    [TestProperty("Time", "Short")]
+    [TestCategory("ExpressionTest")]
+    [TestCategory("StandartTests")]
     public void TestExecExpandRecursiveCopy() {
       var expressions = new List<Expression>
@@ -83 +105 @@
 
     [TestMethod]
+    [TestProperty("Time", "Short")]
+    [TestCategory("ExpressionTest")]
+    [TestCategory("StandartTests")]
     public void TestExecExpandRecursiveGetHashCode() {
       var expressions = new List<Expression>