Merge pull request #2406 from drbaggy/master

prob 2 - Removed need for outer loop by reversing 2nd loop...

2 files changed, 32 insertions, 23 deletions

diff --git a/challenge-080/james-smith/perl/ch-1.pl b/challenge-080/james-smith/perl/ch-1.pl
index 09526718d6..b0c63324fa 100644
--- a/challenge-080/james-smith/perl/ch-1.pl
+++ b/challenge-080/james-smith/perl/ch-1.pl
@@ -5,13 +5,19 @@ use warnings;
 
 use feature qw(say);
 
-say smallest_number_sort(qw(200 1 -2 2 5 1000 -6 3000 ),1e6..1e7,6001..9001,3,4,3401..5900);
-say smallest_number_sort(qw(5 2 -2 0));
-say smallest_number_sort(qw(1 8 -1));
-say smallest_number_sort(qw(2 0 -1));
+use Test::More;
+
+is( smallest_number_sort( qw(200 1 -2 2 5 1000 -6 3000 ),6001..9001,3,4,3401..5900 ), 6 );
+is( smallest_number_sort( qw(5 2 -2 0)                                             ), 1 );
+is( smallest_number_sort( qw(1 8 -1)                                               ), 2 );
+is( smallest_number_sort( qw(-10 -8 -1)                                            ), 1 );
+is( smallest_number_sort( qw(2 0 -1)                                               ), 1 );
+
+done_testing;
 
 sub smallest_number_sort {
   my @q = sort { $a <=> $b } grep {$_>0} @_; ## Need +ve in order!
+  return 1 unless @q;                        ## No positive integers - avoids warn in next line
   for( $_=1; $_ == shift @q; $_++  ) {}      ## Loop through from 1.. exit loop if the array
                                              ##   value isn't equal to index (1-based)
   return $_;                                 ## return value...
diff --git a/challenge-080/james-smith/perl/ch-2.pl b/challenge-080/james-smith/perl/ch-2.pl
index 9116f85539..c263204651 100644
--- a/challenge-080/james-smith/perl/ch-2.pl
+++ b/challenge-080/james-smith/perl/ch-2.pl
@@ -5,27 +5,30 @@ use warnings;
 
 use feature qw(say);
 
-say candies( qw(1 2 2) );
-say candies( qw(1 4 3 2) );
+use Test::More;
+
+is( candies( qw(1 2 2) ),          4 );
+is( candies( qw(1 4 3 2) ),        7 );
+is( candies( qw(5 4 3 2 1) ),     15 );
+is( candies( qw(5 4 3 4 3 2 1) ), 16 );
+is( candies( qw(2 1 2 1 2 1 2) ), 11 );
+
+done_testing;
 
 sub candies {
   my @ranks = @_;
-  my $prev_count = @candies = map { 1 } @ranks; ## First pass we set everything to 1!
+  my $prev_count = my @candies = map { 1 } @ranks; ## First pass we set everything to 1!
   my $flag;
-  do {
-    my $count = 0;
-    foreach( 0..(@ranks-2) ) {         ## Loop through comparing element to next one - increase as approprite
-
-      $candies[$_]   = $candies[$_+1]+1 if ($ranks[$_] > $ranks[$_+1]) && ($candies[$_] <= $candies[$_+1]);
-      $candies[$_+1] = $candies[$_  ]+1 if ($ranks[$_] < $ranks[$_+1]) && ($candies[$_] => $candies[$_+1]);
-
-      $count        += $candies[$_  ]; ## by the time we get here we would have done both comparisons that
-                                       ## cause this entry to be updated..
-    }
-
-    $count += $candies[-1];            ## Add count for the last element...
-
-    return $count if $count == $prev_count; ## Totals are the same so nothing been update can return
-    $prev_count = $count;
-  } while( 1 ); ## Infinite loop - will hit exit condition in loop...!
+  ## Sweep left first...
+  foreach( 0..(@ranks-2) ) {
+    $candies[$_+1] = $candies[$_]+1 if $ranks[$_] < $ranks[$_+1] && $candies[$_] >= $candies[$_+1];
+  }
+  ## Then sweep right... we have to go right to left otherwise you don't get the right answer
+  ## at the end...
+  foreach( reverse 1..(@ranks-1) ) {
+    $candies[$_-1] = $candies[$_]+1 if $ranks[$_] < $ranks[$_-1] && $candies[$_] >= $candies[$_-1];
+  }
+  my $t = 0;
+  $t+= $_ foreach @candies;
+  return $t;
 }