Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/NameExpressionTests.cs

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,

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Interpreter/Expressions/NameExpressionTests.cs (modified) (9 diffs)

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