ch-1.raku do-over

1 files changed, 17 insertions, 8 deletions

diff --git a/challenge-304/mark-anderson/raku/ch-1.raku b/challenge-304/mark-anderson/raku/ch-1.raku
index 0ac6806bad..2d64ed2b39 100644
--- a/challenge-304/mark-anderson/raku/ch-1.raku
+++ b/challenge-304/mark-anderson/raku/ch-1.raku
@@ -3,15 +3,24 @@ use Test;
 
 ok  arrange-binary([1,0,0,0,1], 1);
 nok arrange-binary([1,0,0,0,1], 2);
-nok arrange-binary([0,0,0,1,0,0,0,0,1,0,0], 4);
-nok arrange-binary([0,0,0,1,0,0,0,1,0,0,0], 4);
-ok  arrange-binary([0,0,0,1,0,0,0,1,0,0,0], 3);
-nok arrange-binary([0,0,1,0,0,0,0,1,0,0,0], 3);
+
+# E Choroba tests
+ok  arrange-binary([1,0,0],         1);
+ok  arrange-binary([0,0,1],         1);
+nok arrange-binary([1,0,0,0,0,1],   2);
+ok  arrange-binary([1,0,0,0,0,0,1], 2);
+ok  arrange-binary([0,0,0,0,0],     3);
+nok arrange-binary([0,0,0,0,0],     4);
 
 sub arrange-binary(@ints, $n)
 {
-    return False unless @ints.join ~~ m:g/00/ >= $n;
-    my $even = @ints.first(1,:k) %% 2;
-    my @mask = (flat $even ?? (0,1) xx * !! (1,0) xx *).head(@ints);
-    return not @mask.join.parse-base(2) +& @ints.join.parse-base(2)
+    my $str = [~] @ints;
+
+    return False if $str ~~ m:g/11/;
+
+    return .elems >= $n given do loop
+    {
+        last unless $str ~~ s/<!after 1> 0 <!before 1>/1/;
+        1 
+    }
 }