Merge pull request #2349 from Abigail/abigail/week-079

Abigail/week 079

2 files changed, 63 insertions, 4 deletions

diff --git a/challenge-079/abigail/bc/ch-1.bc b/challenge-079/abigail/bc/ch-1.bc
new file mode 100644
index 0000000000..bd708a7df8
--- /dev/null
+++ b/challenge-079/abigail/bc/ch-1.bc
@@ -0,0 +1,37 @@
+#
+# Challenge:
+#
+#   You are given a positive number $N.
+#
+#   Write a script to count the total numbrer of set bits of the binary
+#   representations of all numbers from 1 to $N and return
+#   $total_count_set_bit % 1000000007.
+#
+# https://perlweeklychallenge.org/blog/perl-weekly-challenge-079/
+#
+
+#
+# This is A000778 (https://oeis.org/A000788). There's a recursive formala
+# for the number of bits in the binary representation of 0 .. $N:
+#
+#    bits (0) = 0
+#    bits (2 * N)     =     bits (N) + bits (N - 1) + N
+#    bits (2 * N + 1) = 2 * bits (N)                + N + 1
+#
+
+bignum = 1000000007;
+
+define f(nn) {
+    auto n;
+    if (nn == 0) {return (0);}
+    if (nn % 2 == 1) {
+        n = (nn - 1) / 2;
+        return 2 * f(n) + n + 1;
+    }
+    n = nn / 2;
+    return f(n) + f(n - 1) + n;
+}
+
+define main(n) {
+    return f(n) % bignum;
+}
diff --git a/challenge-079/abigail/test.pl b/challenge-079/abigail/test.pl
index 222475a99b..10eb19dc37 100755
--- a/challenge-079/abigail/test.pl
+++ b/challenge-079/abigail/test.pl
@@ -17,24 +17,46 @@ use experimental 'signatures';
 
 use Test::More;
 
+
 my %languages = (
-    Perl        =>   ["/opt/perl/bin/perl"  => 'pl', 'perl'],
-    JavaScript  =>   ["/usr/local/bin/node" => 'js', 'node'],
+    Perl        =>   {
+        exe     =>   "/opt/perl/bin/perl",
+        ext     =>   "pl",
+    },
+    JavaScript  =>   {
+        exe     =>   "/usr/local/bin/node",
+        ext     =>   "js",
+        dir     =>   "node",
+    },
+    bc          =>   {
+        exe     =>   "/usr/bin/bc",
+        ext     =>   "bc",
+        filter  =>   's/.*/main($&)/',
+    },
 );
 
+my $perl_exe = $languages {Perl} {exe};
 
 foreach my $challenge (1, 2) {
     my @inputs = <input-$challenge-*> or next;
     subtest "Challenge $challenge" => sub {
         foreach my $language (sort keys %languages) {
-            my ($exe, $ext, $dir) = @{$languages {$language}};
+            my $info     = $languages {$language};
+            my $exe      = $$info {exe};
+            my $ext      = $$info {ext};
+            my $dir      = $$info {dir}    // lc $language;
+            my $filter   = $$info {filter} // '';
             my $solution = "$dir/ch-$challenge.$ext";
             next unless -r $solution;
+
             subtest $language => sub {
                 foreach my $input (@inputs) {
                     my $output_exp = ($input =~ s/input/output/r) . ".exp";
                     my $exp        = `cat $output_exp`;
-                    my $got        = `$exe ./$solution < $input`;
+
+                    my $got = `$perl_exe -ple '$filter' $input |\
+                               $exe ./$solution`;
+
                     s/\h+$//gm for $exp, $got;
                     is $got, $exp, $input;
                 }