Changeset 15334 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Problem

Timestamp:

08/21/17 11:33:53 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Testet error functions, Small fixes, Created HL files

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests/Problem/DeterministicTests.cs (modified) (1 diff)
• HeuristicLab.Tests/Problem/IndividualMapperTests.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP

@@ -1 +1 @@
 *.user
+packages
+TestResults

@@ -1 +1 @@
 *.user
+packages
+TestResults

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Problem/DeterministicTests.cs

@@ -44 +44 @@
       var currentAverageQuality1 = GetDoubleResult(ga1, "CurrentAverageQuality");
       var currentAverageQuality2 = GetDoubleResult(ga2, "CurrentAverageQuality");
-      Assert.AreEqual(currentAverageQuality1, currentAverageQuality2, 0.0001);
+      Assert.AreEqual(currentAverageQuality1, currentAverageQuality2, 0.01);
 
       var currentWorstQuality1 = GetDoubleResult(ga1, "CurrentWorstQuality");

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Problem/IndividualMapperTests.cs

@@ -11 +11 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Encoding;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Individual;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Parser;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
   using HeuristicLab.Random;
@@ -53 +56 @@
       var random = new MersenneTwister();
       var config = new PushConfiguration {
-        ParenthesesCloseBiasLevel = 4
+        CloseBiasLevel = 4
       };
 
@@ -75 +78 @@
       Assert.AreEqual(vector.Length, program.TotalExpressionCount);
     }
+
+    [TestMethod]
+    [TestProperty("Time", "Short")]
+    [TestCategory("Individual")]
+    public void PlushToPushProgram() {
+      var plushGenome = new PlushVector();
+
+      plushGenome.Add(new PlushEntry { Instruction = new ExecDoTimesExpression(), Close = 0 });
+      plushGenome.Add(new PlushEntry { Instruction = new IntegerPushExpression(8), Close = 0 });
+      plushGenome.Add(new PlushEntry { Instruction = new IntegerPushExpression(11), Close = 3 });
+      plushGenome.Add(new PlushEntry { Instruction = new IntegerAddExpression(), Close = 3, Silent = true });
+      plushGenome.Add(new PlushEntry { Instruction = new ExecIfExpression(), Close = 1 });
+      plushGenome.Add(new PlushEntry { Instruction = new IntegerPushExpression(17), Close = 0 });
+      plushGenome.Add(new PlushEntry { Instruction = new BooleanPushExpression(false), Close = 0 });
+      plushGenome.Add(new PlushEntry { Instruction = new CodeQuoteExpression(), Close = 0 });
+      plushGenome.Add(new PlushEntry { Instruction = new FloatMultiplyExpression(), Close = 2 });
+      plushGenome.Add(new PlushEntry { Instruction = new ExecRotateExpression(), Close = 0 });
+      plushGenome.Add(new PlushEntry { Instruction = new FloatPushExpression(34.44), Close = 0 });
+
+      var expected = PushParser.ParseProgram("( EXEC.DO*TIMES ( 8 11 ) EXEC.IF ( ) ( 17 false CODE.QUOTE ( FLOAT.* ) ) EXEC.ROT ( 34.44 ) ( ) ( ) )");
+
+      Assert.AreEqual(expected, plushGenome.PushProgram);
+    }
   }
 }

@@ -1 +1 @@
 *.user
+packages
+TestResults