Changeset 15341 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests

Timestamp:

08/28/17 09:03:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Improved Performance

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Benchmark/SolutionTests.cs (modified) (29 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Tests/Benchmark/SolutionTests.cs

@@ -42 +42 @@
     public void Checksum() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 0 STRING.ITERATE ( INTEGER.FROMCHAR INTEGER.+ ) 64 INTEGER.% \' \' INTEGER.FROMCHAR INTEGER.+ \"Check sum is \" PRINT.PRINTSTRING CHAR.FROMINTEGER PRINT.PRINTCHAR )"),
+        PushParser.ParseProgram(
+          @"(
+              0 STRING.ITERATE (
+                INTEGER.FROMCHAR INTEGER.+
+              )
+              64 INTEGER.% ' ' INTEGER.FROMCHAR INTEGER.+
+              ""Check sum is "" PRINT.PRINTSTRING
+              CHAR.FROMINTEGER PRINT.PRINTCHAR
+            )"),
         new Checksum());
     }
@@ -51 +59 @@
     public void CollatzNumbers() {
       TestProgram(
-        PushParser.ParseProgram("( INTEGER.DUP 1 INTEGER.= BOOLEAN.NOT EXEC.WHILE ( INTEGER.DUP INTEGER.DUP 2 INTEGER.% 0 INTEGER.= EXEC.IF ( 2 INTEGER./ ) ( 3 INTEGER.* 1 INTEGER.+ ) INTEGER.DUP 1 INTEGER.= BOOLEAN.NOT ) INTEGER.POP INTEGER.STACKDEPTH )"),
+        PushParser.ParseProgram(
+          @"(
+              INTEGER.DUP 1 INTEGER.= BOOLEAN.NOT
+              EXEC.WHILE (
+                INTEGER.DUP INTEGER.DUP 2 INTEGER.% 0 INTEGER.=
+                EXEC.IF (
+                  2 INTEGER./
+                ) (
+                  3 INTEGER.* 1 INTEGER.+
+                )
+                INTEGER.DUP 1 INTEGER.= BOOLEAN.NOT
+              )
+              INTEGER.POP INTEGER.STACKDEPTH
+            )"),
         new CollatzNumbers());
     }
@@ -60 +81 @@
     public void CompareStringLengths() {
       TestProgram(
-        PushParser.ParseProgram("IN1 IN2 IN3 STRING.LENGTH STRING.LENGTH INTEGER.DUP STRING.LENGTH INTEGER.> INTEGER.> BOOLEAN.AND"),
+        PushParser.ParseProgram(@"
+          (
+            STRING.LENGTH STRING.LENGTH INTEGER.DUP
+            STRING.LENGTH INTEGER.> INTEGER.> BOOLEAN.AND
+          )"),
         new CompareStringLengths());
     }
@@ -69 +94 @@
     public void CountOdds() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 0 INTEGER[].ITERATE ( 2 INTEGER.% INTEGER.DUP 1 INTEGER.= -1 INTEGER.= BOOLEAN.OR EXEC.WHEN INTEGER.INC ) )"),
+        PushParser.ParseProgram(@"
+          (
+            0 INTEGER[].ITERATE (
+              2 INTEGER.% INTEGER.DUP
+              1 INTEGER.=
+              -1 INTEGER.=
+              BOOLEAN.OR
+              EXEC.WHEN INTEGER.INC
+            )
+          )"),
         new CountOdds());
     }
@@ -108 +142 @@
     public void DoubleLetters() {
       TestProgram(
-        PushParser.ParseProgram(
-        @"IN1
+        PushParser.ParseProgram(@"
+        (
           STRING.ITERATE (
             3 EXEC.DO*COUNT CHAR.DUP
             CHAR.ISLETTER EXEC.WHEN PRINT.PRINTCHAR
-            '!' CHAR.= EXEC.WHEN ( CHAR.DUP PRINT.PRINTCHAR PRINT.PRINTCHAR )
+            '!' CHAR.= EXEC.WHEN (
+              CHAR.DUP PRINT.PRINTCHAR PRINT.PRINTCHAR
+            )
             PRINT.PRINTCHAR
+          )
         )"),
         new DoubleLetters());
@@ -124 +161 @@
     public void EvenSquares() {
       TestProgram(
-        PushParser.ParseProgram(
-        @"INTEGER.DUP EXEC.DO*COUNT (
+        PushParser.ParseProgram(@"
+        (
+          INTEGER.DUP EXEC.DO*COUNT (
             INTEGER.DUP 0 INTEGER.>
             EXEC.WHEN (
@@ -139 +177 @@
             )
             INTEGER.POP
-          )"),
+          )
+        )"),
         new EvenSquares());
     }
@@ -148 +187 @@
     public void ForLoopIndex() {
       TestProgram(
-        PushParser.ParseProgram(@"(
-          STRING.FROMINTEGER INTEGER.SWAP true EXEC.WHILE (
+        PushParser.ParseProgram(@"
+        (
+          STRING.FROMINTEGER INTEGER.SWAP true
+          EXEC.WHILE (
             INTEGER.DUP PRINT.ENSURE_NEWLINE PRINT.PRINTINTEGER
             STRING.DUP INTEGER.FROMSTRING INTEGER.+
@@ -163 +204 @@
     public void Grades() {
       TestProgram(
-        PushParser.ParseProgram("( \"Student has a \" PRINT.PRINTSTRING INTEGER.DUP INTEGER.ROT INTEGER.> EXEC.WHEN ( \"F\" \" grade.\" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH ) INTEGER.DUP INTEGER.ROT INTEGER.> EXEC.WHEN ( \"D\" \" grade.\" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH ) INTEGER.DUP INTEGER.ROT INTEGER.> EXEC.WHEN ( \"C\" \" grade.\" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH ) INTEGER.DUP INTEGER.ROT INTEGER.> EXEC.WHEN ( \"B\" \" grade.\" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH ) \"A\" \" grade.\" STRING.CONCAT PRINT.PRINTSTRING )"),
+        PushParser.ParseProgram(@"
+        (
+          ""Student has a "" PRINT.PRINTSTRING
+          INTEGER.DUP INTEGER.ROT INTEGER.>
+          EXEC.WHEN ( ""F"" "" grade."" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH )
+          INTEGER.DUP INTEGER.ROT INTEGER.>
+          EXEC.WHEN ( ""D"" "" grade."" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH )
+          INTEGER.DUP INTEGER.ROT INTEGER.>
+          EXEC.WHEN ( ""C"" "" grade."" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH )
+          INTEGER.DUP INTEGER.ROT INTEGER.>
+          EXEC.WHEN ( ""B"" "" grade."" STRING.CONCAT PRINT.PRINTSTRING EXEC.FLUSH )
+          ""A"" "" grade."" STRING.CONCAT PRINT.PRINTSTRING
+        )"),
         new Grades());
     }
@@ -172 +225 @@
     public void LastIndexOfZero() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 INTEGER[].DUP INTEGER[].LENGTH INTEGER[].REVERSE 0 INTEGER[].INDEXOF INTEGER.- INTEGER.DEC )"),
+        PushParser.ParseProgram(@"
+        (
+          INTEGER[].DUP INTEGER[].LENGTH INTEGER[].REVERSE
+          0 INTEGER[].INDEXOF INTEGER.- INTEGER.DEC
+        )"),
         new LastIndexOfZero());
     }
@@ -181 +238 @@
     public void Median() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 IN2 IN3 INTEGER.ROT INTEGER.DUP 2 INTEGER.YANKDUP INTEGER.MAX 3 INTEGER.YANKDUP INTEGER.MIN INTEGER.ROT INTEGER.MIN INTEGER.MAX PRINT.PRINTINTEGER )"),
+        PushParser.ParseProgram(@"
+        (
+          INTEGER.ROT INTEGER.DUP 2 INTEGER.YANKDUP
+          INTEGER.MAX 3 INTEGER.YANKDUP INTEGER.MIN
+          INTEGER.ROT INTEGER.MIN INTEGER.MAX
+          PRINT.PRINTINTEGER
+        )"),
         new Median());
     }
@@ -190 +253 @@
     public void MirrorImage() {
       TestProgram(
-        PushParser.ParseProgram(
-          @"( IN1 IN2
-              INTEGER[].PUSHALL INTEGER[].ITERATE (
-                INTEGER.= BOOLEAN.NOT EXEC.WHEN ( false EXEC.FLUSH )
-              )
-              true
-            )"),
+        PushParser.ParseProgram(@"
+        (
+          INTEGER[].PUSHALL INTEGER[].ITERATE (
+            INTEGER.= BOOLEAN.NOT EXEC.WHEN (
+              false EXEC.FLUSH
+            )
+          )
+          true
+        )"),
         new MirrorImage());
     }
@@ -205 +270 @@
     public void NegativeToZero() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 INTEGER[].DUP INTEGER[].LENGTH INTEGER.DEC EXEC.DO*COUNT ( INTEGER.DUP INTEGER[].DUP INTEGER[].NTH 0 INTEGER.< EXEC.WHEN ( 0 INTEGER[].SET ) ) )"),
+        PushParser.ParseProgram(@"
+        (
+          INTEGER[].DUP INTEGER[].LENGTH INTEGER.DEC
+          EXEC.DO*COUNT (
+            INTEGER.DUP INTEGER[].DUP INTEGER[].NTH 0 INTEGER.<
+            EXEC.WHEN (
+              0 INTEGER[].SET
+            )
+          )
+        )"),
         new NegativeToZero());
     }
@@ -214 +288 @@
     public void NumberIo() {
       TestProgram(
-        PushParser.ParseProgram("IN1 IN2 FLOAT.FROMINTEGER FLOAT.+ PRINT.PRINTFLOAT"),
+        PushParser.ParseProgram(@"
+        (
+          FLOAT.FROMINTEGER FLOAT.+ PRINT.PRINTFLOAT
+        )"),
         new NumberIO());
     }
@@ -224 +301 @@
     public void PigLatin() {
       TestProgram(
-        PushParser.ParseProgram("@( STRING.SPLIT STRING.STACKDEPTH 0 INTEGER.= EXEC.WHEN EXEC.FLUSH STRING.STACKDEPTH EXEC.DO*TIMES ( STRING.DUP STRING.FIRST CHAR.ALLFROMSTRING CHAR.DUP \"aeiou\" STRING.CONTAINSCHAR EXEC.IF ( CHAR.POP ) ( STRING.REST STRING.CONJCHAR ) \"ay\" STRING.CONCAT STRING.STACKDEPTH 1 INTEGER.> EXEC.WHEN ( ' ' STRING.CONJCHAR ) PRINT.PRINTSTRING ) )"),
+        PushParser.ParseProgram(@"
+        (
+          STRING.SPLIT STRING.STACKDEPTH 0 INTEGER.=
+          EXEC.WHEN EXEC.FLUSH
+          STRING.STACKDEPTH EXEC.DO*TIMES (
+            STRING.DUP STRING.FIRST CHAR.ALLFROMSTRING CHAR.DUP ""aeiou""
+            STRING.CONTAINSCHAR EXEC.IF (
+              CHAR.POP
+            ) (
+              STRING.REST STRING.CONJCHAR
+            )
+            ""ay"" STRING.CONCAT
+            STRING.STACKDEPTH 1 INTEGER.>
+            EXEC.WHEN (
+              ' ' STRING.CONJCHAR
+            )
+            PRINT.PRINTSTRING
+          )
+        )"),
         new PigLatin());
     }
@@ -234 +329 @@
 
       TestProgram(
-        PushParser.ParseProgram("IN1 STRING.DUP 0 STRING.ITERATE ( CHAR.DUP ' ' CHAR.= EXEC.IF ( CHAR.POP '\n' ) INTEGER.INC PRINT.PRINTCHAR )"),
+        PushParser.ParseProgram(@"
+        (
+          STRING.DUP 0 STRING.ITERATE (
+            CHAR.DUP ' ' CHAR.=
+            EXEC.IF (
+              CHAR.POP '\n'
+            )
+          INTEGER.INC PRINT.PRINTCHAR
+        )"),
         new ReplaceSpaceWithNewline());
     }
@@ -243 +346 @@
     public void ScrabbleScore() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 STRING.ITERATE ( INTEGER.FROMCHAR INTEGER.DUP INTEGER.DUP 96 INTEGER.> 123 INTEGER.< BOOLEAN.AND EXEC.WHEN ( 32 INTEGER.- ) 65 INTEGER.- INTEGER.DUP INTEGER.DUP 0 INTEGER.>= 26 INTEGER.< BOOLEAN.AND EXEC.IF ( [1 3 3 2 1 4 2 4 1 8 5 1 3 1 1 3 10 1 1 1 1 4 4 8 4 10] INTEGER[].NTH INTEGER.+ ) ( INTEGER.POP ) ) )"),
+        PushParser.ParseProgram(@"
+        (
+          STRING.ITERATE (
+            INTEGER.FROMCHAR INTEGER.DUP INTEGER.DUP
+            96 INTEGER.>
+            123 INTEGER.<
+            BOOLEAN.AND EXEC.WHEN (
+              32 INTEGER.-
+            )
+            65 INTEGER.- INTEGER.DUP INTEGER.DUP
+            0 INTEGER.>=
+            26 INTEGER.<
+            BOOLEAN.AND EXEC.IF (
+              [1 3 3 2 1 4 2 4 1 8 5 1 3 1 1 3 10 1 1 1 1 4 4 8 4 10]
+              INTEGER[].NTH INTEGER.+
+            ) (
+              INTEGER.POP
+            )
+          )
+        )"),
         new ScrabbleScore());
     }
@@ -252 +374 @@
     public void Smallest() {
       TestProgram(
-        PushParser.ParseProgram("( 3 EXEC.DO*TIMES INTEGER.MIN PRINT.PRINTINTEGER )"),
+        PushParser.ParseProgram(@"
+        (
+          3 EXEC.DO*TIMES INTEGER.MIN
+          PRINT.PRINTINTEGER
+        )"),
         new Smallest());
     }
@@ -261 +387 @@
     public void SmallOrLarge() {
       TestProgram(
-        PushParser.ParseProgram(
-          @"IN1
-            INTEGER.DUP 1000 INTEGER.< 2000 INTEGER.>=
-            EXEC.WHEN ""large""
-            EXEC.WHEN ""small""
-            STRING.EMPTY
-            EXEC.WHEN """"
-            PRINT.PRINTSTRING"),
+        PushParser.ParseProgram(@"
+        (
+          INTEGER.DUP 1000 INTEGER.< 2000 INTEGER.>=
+          EXEC.WHEN ""large""
+          EXEC.WHEN ""small""
+          STRING.EMPTY
+          EXEC.WHEN """"
+          PRINT.PRINTSTRING
+        )"),
         new SmallOrLarge());
     }
@@ -277 +404 @@
     public void StringDifferences() {
       TestProgram(
-        PushParser.ParseProgram(
-          @"CHAR.ALLFROMSTRING 0 STRING.ITERATE (
+        PushParser.ParseProgram(@"
+        (
+          CHAR.ALLFROMSTRING 0
+          STRING.ITERATE (
             CHAR.DUP 2 CHAR.YANKDUP CHAR.= BOOLEAN.NOT EXEC.IF (
               INTEGER.DUP PRINT.ENSURE_NEWLINE PRINT.PRINTINTEGER
               ' ' PRINT.PRINTCHAR PRINT.PRINTCHAR
               ' ' PRINT.PRINTCHAR PRINT.PRINTCHAR
-            )
-            ( CHAR.POP CHAR.POP )
-            INTEGER.INC )"),
+            ) (
+              CHAR.POP CHAR.POP
+            )
+            INTEGER.INC
+          )
+        )"),
         new StringDifferences());
     }
@@ -294 +426 @@
     public void StringLengthsBackwards() {
       TestProgram(
-        PushParser.ParseProgram(@"STRING[].ITERATE ( STRING.LENGTH PRINT.ENSURE_NEWLINE PRINT.PRINTINTEGER )"),
+        PushParser.ParseProgram(@"
+        (
+          STRING[].ITERATE (
+            STRING.LENGTH PRINT.ENSURE_NEWLINE PRINT.PRINTINTEGER
+          )
+        )"),
         new StringLengthsBackwards());
     }
@@ -303 +440 @@
     public void SumOfSquares() {
       TestProgram(
-       PushParser.ParseProgram(@"( EXEC.DO*COUNT ( INTEGER.DUP INTEGER.* INTEGER.+ ) )"),
-       new SumOfSquares());
+        PushParser.ParseProgram(@"
+        (
+          EXEC.DO*COUNT (
+            INTEGER.DUP INTEGER.* INTEGER.+
+          )
+        )"),
+        new SumOfSquares());
     }
 
@@ -312 +454 @@
     public void SuperAnagrams() {
       TestProgram(
-        PushParser.ParseProgram(@"( IN1 IN2 STRING.SWAP STRING.DUP STRING.ITERATE ( CHAR.DUP STRING.DUP STRING.OCCURRENCESOFCHAR 1 STRING.YANKDUP STRING.OCCURRENCESOFCHAR INTEGER.> EXEC.WHEN ( false EXEC.FLUSH ) ) true )"),
+        PushParser.ParseProgram(@"
+        (
+          STRING.SWAP STRING.DUP STRING.ITERATE (
+            CHAR.DUP STRING.DUP STRING.OCCURRENCESOFCHAR
+            1 STRING.YANKDUP STRING.OCCURRENCESOFCHAR
+            INTEGER.> EXEC.WHEN (
+              false EXEC.FLUSH
+            )
+          )
+          true
+        )"),
         new SuperAnagrams());
     }
@@ -321 +473 @@
     public void Syllables() {
       TestProgram(
-       PushParser.ParseProgram("( IN1 \"aeiouy\" 0 STRING.ITERATE ( STRING.DUP STRING.OCCURRENCESOFCHAR INTEGER.+ ) \"The number of syllables is \" PRINT.PRINTSTRING PRINT.PRINTINTEGER )"),
+       PushParser.ParseProgram(@"
+       (
+          ""aeiouy"" 0 STRING.ITERATE (
+            STRING.DUP STRING.OCCURRENCESOFCHAR INTEGER.+
+          )
+          ""The number of syllables is ""
+          PRINT.PRINTSTRING PRINT.PRINTINTEGER
+       )"),
        new Syllables());
     }
@@ -330 +489 @@
     public void VectorAverage() {
       TestProgram(
-        PushParser.ParseProgram("( IN1 FLOAT[].DUP FLOAT[].LENGTH FLOAT[].ITERATE FLOAT.+ FLOAT.FROMINTEGER FLOAT./ )"),
+        PushParser.ParseProgram(@"
+        (
+          FLOAT[].DUP FLOAT[].LENGTH
+          FLOAT[].ITERATE FLOAT.+
+          FLOAT.FROMINTEGER FLOAT./
+        )"),
         new VectorAverage());
     }
@@ -339 +503 @@
     public void VectorSummed() {
       TestProgram(
-        PushParser.ParseProgram(@"( IN1 IN2 INTEGER[].PUSHALL INTEGER[].DUP INTEGER[].LENGTH INTEGER.DEC EXEC.DO*COUNT ( INTEGER.DUP INTEGER[].DUP INTEGER[].NTH INTEGER.SWAP INTEGER.ROT INTEGER.+ INTEGER[].SET ) )"),
+        PushParser.ParseProgram(@"
+        (
+          INTEGER[].PUSHALL INTEGER[].DUP
+          INTEGER[].LENGTH INTEGER.DEC
+          EXEC.DO*COUNT (
+            INTEGER.DUP INTEGER[].DUP INTEGER[].NTH
+            INTEGER.SWAP INTEGER.ROT INTEGER.+ INTEGER[].SET
+          )
+        )"),
         new VectorSummed());
     }
@@ -348 +520 @@
     public void WallisPi() {
       TestProgram(
-        PushParser.ParseProgram(@"(
-          IN1 2 3 INTEGER.ROT INTEGER.ROT
+        PushParser.ParseProgram(@"
+        (
+          2 3 INTEGER.ROT INTEGER.ROT
           EXEC.DO*TIMES (
             2 EXEC.DO*TIMES (
@@ -370 +543 @@
     public void WordStats() {
       TestProgram(
-        PushParser.ParseProgram(@"(
+        PushParser.ParseProgram(@"
+        (
           STRING.DUP STRING.SPLIT
           STRING.STACKDEPTH 1 INTEGER.= BOOLEAN.NOT
@@ -414 +588 @@
     public void XWordLines() {
       TestProgram(
-        PushParser.ParseProgram(@"(
+        PushParser.ParseProgram(@"
+        (
           STRING.SPLIT STRING.EMPTY BOOLEAN.NOT INTEGER.DUP 1 INTEGER.=
           EXEC.IF (