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

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

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/ExpressionTest.cs (modified) (2 diffs)

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);
     }
   }