ch-1.raku touch-up

2 files changed, 24 insertions, 4 deletions

diff --git a/challenge-214/mark-anderson/raku/ch-1.raku b/challenge-214/mark-anderson/raku/ch-1.raku
index fe4c92d8e4..149a1ee75e 100644
--- a/challenge-214/mark-anderson/raku/ch-1.raku
+++ b/challenge-214/mark-anderson/raku/ch-1.raku
@@ -7,12 +7,16 @@ is rank-score(<3 5 4 2>),                          <B G S 4>;
 is rank-score(<2 5 2 1 7 5 1>),                    <4 S 4 6 G S 6>;
 is rank-score(<20 76 15 55 76 15 20 20 15 20 20>), <4 G 9 B G 9 4 4 9 4 4>;
 
-sub rank-score($list)
+multi rank-score($list where .elems == 1) { 'G' }
+
+multi rank-score($list)
 {
     my $b = $list.Bag;
-    my @a = [\+] flat 1, $b.sort(-*.key)>>.value;
-    @a .= map({ <Nil G S B>[$_] or $_ });
+    my @k = $b.keys.sort(-*);
+    my @v = [\+] flat 1, $b{@k};
+
+    @v[^3] .= map({ <Nil G S B>[$_] or $_ });
+    my %h = @k Z=> @v;
 
-    my %h = $b.keys.sort(-*) Z=> @a;
     $list.map({ %h{$_} })
 }
diff --git a/challenge-214/mark-anderson/raku/tst.raku b/challenge-214/mark-anderson/raku/tst.raku
new file mode 100644
index 0000000000..7929a76036
--- /dev/null
+++ b/challenge-214/mark-anderson/raku/tst.raku
@@ -0,0 +1,16 @@
+#!/usr/bin/env raku
+use Test;
+
+say rank-score(<20 76 15 55 76 15 20 20 15 20 20>);
+
+sub rank-score($list)
+{
+    my $b = $list.Bag;
+    my @k = $b.keys.sort(-*);
+    my @v = [\+] flat 1, $b{@k};
+
+    @v[^3] .= map({ <Nil G S B>[$_] or $_ });
+    my %h = @k Z=> @v;
+
+    $list.map({ %h{$_} })
+}