Merge branch 'master' of github.com:perl6/perl6-examples

Author: stmuk

categories/euler/prob004-unobe.pl

@@ -17,16 +17,13 @@
 
 # another case where @array = %*% (100..999) would be nice to have:
 # http://use.perl.org/~dpuu/journal/38142
-sub diagonal_x (@array) {
-    my @result = [];
-    my @copy = @array;
-    for @copy -> $this {
-        @copy.shift;
-        for @copy -> $that { @result.push($this * $that); }
+sub diagonal_x (@array is copy) {
+        
+    gather while @array.shift -> $this {
+        for @array -> $that { take $this * $that  }
     }
-    return @result;
 }
 
-diagonal_x(100..999).grep({ $_ eq .flip }).sort.reverse.[0].say;
+diagonal_x(100...999).grep({ $_ eq $_.flip }).sort.reverse.[0].say;
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob025-polettix.pl

@@ -40,7 +40,7 @@ (Int :$length = 1000, Bool :$boring = False)
         return;
     }
 
-    my @fibs := 0, 1, *+* ... *;
+    my @fibs = 0, 1, *+* ... *;
     ((1..*).grep:{@fibs[$_].chars == $length})[0].say;
     return;
 }

categories/euler/prob030-andreoss.pl

@@ -23,17 +23,18 @@
 =end   pod
 
 sub get-numbers(:$start = 10, :$depth = 6, *@a) {
-    return @a.item unless $depth;
-    do for ^$start -> \x {
+    return $@a unless $depth;
+    flat do for ^$start -> \x {
         get-numbers start => x + 1,
                     depth => $depth -1, |@a,x;
     }
 }
 
-say [+] -1, gather for get-numbers() -> @a {
-    my $v = [+] @a       »**» 5;
-    my $b = [+] $v.comb  »**» 5;
+say [+] gather for get-numbers() -> @a {
+    my $v = [+] @a »**» 5;
+    my $b = [+] $v.comb.list »**» 5;
     take $b if $v == $b;
+    LAST take -1;
 }
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob053-gerdr.pl

@@ -27,13 +27,13 @@
 
 my @result;
 
-[1], -> @p { [0, @p Z+ @p, 0] } ... * \ # generate Pascal's triangle
+$[1], -> @p { $[0, |@p Z+ |@p, 0] } ... * \ # generate Pascal's triangle
 ==> (*[0..100])() \
 ==> map *.list \
 ==> grep * > 1_000_000 \
 ==> elems() \
 ==> @result;  # work around .say not yet handling feeds in Rakudo 2015.02
 #==> say;
-@result.say;
+@result[0].say;
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob054-andreoss.pl

@@ -9,13 +9,13 @@
 L<https://projecteuler.net/problem=54>
 
 The file, poker.txt, contains one-thousand random hands dealt to two
-players. Each line of the file contains ten cards (separated by a single
-space): the first five are Player 1's cards and the last five are Player 2's
-cards. You can assume that all hands are valid (no invalid characters or
-repeated cards), each player's hand is in no specific order, and in each
-hand there is a clear winner.
+                              players. Each line of the file contains ten cards (separated by a single
+                                                                                 space): the first five are Player 1's cards and the last five are Player 2's
+                                                                                             cards. You can assume that all hands are valid (no invalid characters or
+                                                                                                                                             repeated cards), each player's hand is in no specific order, and in each
+                                                                                                                                                                                                              hand there is a clear winner.
 
-How many hands does Player 1 win?
+                                                                                                                                                                                                              How many hands does Player 1 win?
 
 =end pod
 
@@ -122,7 +122,7 @@
 
     method !flush {
         if [~~] @.cards».suit {
-            (Flush) => Array[Rank].new: @.cards».rank;
+            (Flush) => Array[Rank].new: |@.cards».rank;
         }
     }
 
@@ -148,7 +148,7 @@
     }
     method !full-house {
         # Three of a kind and a pair.
-        my Ranks %x{Hand} = self!three-of-kind , self!one-pair;
+        my Ranks %x{Hand} = flat self!three-of-kind , self!one-pair;
         if %x{ThreeOfKind}.defined && %x{OnePair}.defined {
             (FullHouse) => Ace
         }
@@ -179,7 +179,6 @@
             (TwoPairs)  => my $y= @pairs».value.max,
             (HighCard)  => max grep { $_ !~~ $x | $y },@.cards».rank;
         }
-
     }
 
     method !one-pair {

categories/euler/prob059-andreoss.pl

@@ -42,7 +42,7 @@
 my constant @common-words = <the was who not did with have does and one that>;
 
 sub infix:<XOR>(@cipher, @password) {
-    @cipher Z+^ (@password xx *);
+    @cipher Z+^ flat (@password xx *);
 }
 
 sub as-code(Str $w) {
@@ -56,19 +56,19 @@ sub infix:<XOR>(@cipher, @password) {
 sub guess-password(Str $w, @cipher) {
     my @word = as-code $w;
 
-    my @chunks := @cipher.rotor((@word.elems) => -(@word.elems - 1));
+    my @chunks = @cipher.rotor((@word.elems) => -(@word.elems - 1));
     my %tries;
     my $offset = 0;
 
     for @chunks -> @chunk {
-
+        
         my @password  = @chunk[^3] XOR @word;
+        
         my $password  = as-word @password;
-
+        
         next unless $password ~~ /^^ <[a..z]> ** 3 $$/ ;
-
         my $decrypted = as-word @cipher[$offset .. *] XOR @password;
-
+        
         my $count =  [+] do for @common-words.grep({$_ !~~ $w}) -> $word {
             elems $decrypted ~~ m:g:i/$word/
         }
@@ -86,7 +86,9 @@ sub infix:<XOR>(@cipher, @password) {
 sub MAIN(Bool :$verbose = False,
         :$file = $*SPEC.catdir($*PROGRAM-NAME.IO.dirname, 'cipher.txt'),
         :$word = @common-words[0],
-        :$pass is copy) {
+        :$pass is copy,
+        Bool :$test = False) {
+    return TEST if $test;
     die "'$file' is missing" unless $file.IO.e ;
     my @cipher     = map *.Int, split /<[,]>/ , slurp $file;
 
@@ -97,12 +99,18 @@ sub infix:<XOR>(@cipher, @password) {
     }
 
     my $decrypted =  as-word @cipher XOR as-code($pass);
-
+    
     say "The message: {$decrypted.perl}" if $verbose;
-
     say [+] as-code $decrypted;
-
     say "Done in {now - BEGIN now}" if $verbose;
 }
 
+sub TEST {
+    use Test;
+    is as-code("abc"), [97,98,99], "as-code works";
+    is as-word(100,101,102), "def", "as-word works";
+    is as-word([79,59,12] XOR [103,111,100]), "(Th", "XOR works";
+    done;
+}
+
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob065-andreoss.pl

@@ -60,7 +60,7 @@
         continued-fraction :depth($depth - 1), @sequence
 }
 
-my @e := gather { take 2;  take (1; $_; 1) for 2,4 ... * };
+my @e = lazy gather { take 2;  (1, $_, 1)».&take for 2,4 ... * };
 
 say [+] continued-fraction(@e, depth => 100).numerator.comb;
 

categories/euler/prob081-moritz.pl

@@ -26,10 +26,10 @@
 
 my @m;
 
-my $matrix-file = $*SPEC.catdir($*PROGRAM-NAME.IO.dirname, 'matrix.txt');
+my $matrix-file = $*SPEC.catdir(#`{$*PROGRAM-NAME.IO.dirname} "./categories/euler/", 'matrix.txt');
 my $f = open $matrix-file or die "Can't open file for reading: $!";
-for $f.lines {
-    @m.push: [ .comb(/\d+/) ];
+for $f.lines <-> $line {
+    @m.push: $line.comb(/\d+/).Array.item;
 }
 $f.close;
 

categories/euler/prob098-andreoss.pl

@@ -61,13 +61,16 @@ (@x)
 
     my %words   =  anagrams(@words);
     my $longest-word = %words.keys.max;
+    
     my %squares =  anagrams(
-        (1 ... (10**($longest-word + 1).sqrt)) »**» 2
+        (1 ... (10**($longest-word + 1).sqrt)).list »**» 2
     );
 
 
     say max do for 3 ... $longest-word -> \size {
+        next unless %words{size};
         do for @(%words{size}) -> @pair {
+            next unless %squares{size};
             do for @(%squares{size}) -> @nums {
                 if correspond(@pair, @nums) {
                     $verbose and say "@pair[] => @nums[]" ;

t/categories/euler.t

@@ -366,9 +366,9 @@ skip("prob034 takes too long in tests");
 unless $skip {
     subtest {
         plan 1;
-         my $problem = "prob034";
-         my @authors = <quinny>;
-         my $expected-output = 40730;
+        my $problem = "prob034";
+        my @authors = <quinny>;
+        my $expected-output = 40730;
 
         check-example-solutions($problem, $expected-output, @authors)
     }, "prob034";
@@ -456,16 +456,18 @@ subtest {
     check-example-solutions($problem, $expected-output, @authors)
 }, "prob059";
 
-subtest {
-    plan 1;
-
-    my $problem = "prob060";
-    my @authors = <andreoss>;
-    my $expected-output = 26033;
+skip("prob060 takes too long to run (about 90m)");
+unless $skip {
+    subtest {
+        plan 1;
 
-    check-example-solutions($problem, $expected-output, @authors)
-}, "prob060";
+        my $problem = "prob060";
+        my @authors = <andreoss>;
+        my $expected-output = 26033;
 
+        check-example-solutions($problem, $expected-output, @authors)
+    }, "prob060";
+};
 
 subtest {
     plan 2;
@@ -687,8 +689,8 @@ sub run-example($name) {
     my $base-dir = "categories/euler";
     my $script-path = $base-dir ~ "/" ~ $name;
     $script-path = "$script-path.pl".IO.e
-                ?? "$script-path.pl"
-                !! "$script-path.p6";
+    ?? "$script-path.pl"
+    !! "$script-path.p6";
     my $base-cmd = "perl6 $script-path";
     my $output = qqx{$base-cmd};