diff options
| -rw-r--r-- | challenge-151/lubos-kolouch/perl/ch-1.pl | 16 | ||||
| -rw-r--r-- | challenge-151/lubos-kolouch/python/ch-1.py | 13 |
2 files changed, 16 insertions, 13 deletions
diff --git a/challenge-151/lubos-kolouch/perl/ch-1.pl b/challenge-151/lubos-kolouch/perl/ch-1.pl index ba464fb82d..c60f681143 100644 --- a/challenge-151/lubos-kolouch/perl/ch-1.pl +++ b/challenge-151/lubos-kolouch/perl/ch-1.pl @@ -1,6 +1,5 @@ use strict; use warnings; -use Data::Dumper; sub get_min_depth { my $input = shift; @@ -9,24 +8,25 @@ sub get_min_depth { # iterate through the layers. If the next layer does not have 2^n items, # there must be a leaf node - - $input =~ s/\s//g; + my @layers = split /\|/, $input; my $layer_count = 1; for my $layer (@layers) { + # if not defined means we are at the last layer return $layer_count unless defined $layers[$layer_count]; - my $items_count = length($layers[$layer_count]); - return $layer_count unless $items_count == 2**$layer_count; + my $items_count = scalar( split /\s+/, $layers[$layer_count] ); + return $layer_count unless $items_count == 2**$layer_count + 1; $layer_count++; } } use Test::More; -is(get_min_depth('1 | 2 3 | 4 5'), 2); -is(get_min_depth('1 | 2 3 | 4 * * 5 | * 6'), 3); -done_testing; +is( get_min_depth('1 | 2 3 | 4 5'), 2 ); +is( get_min_depth('1 | 2 3 | 4 * * 5 | * 6'), 3 ); +is( get_min_depth('1 | 20 3 | 4 * * 5 | * 6'), 3 ); +done_testing; diff --git a/challenge-151/lubos-kolouch/python/ch-1.py b/challenge-151/lubos-kolouch/python/ch-1.py index fd34a05784..b30797ece3 100644 --- a/challenge-151/lubos-kolouch/python/ch-1.py +++ b/challenge-151/lubos-kolouch/python/ch-1.py @@ -1,21 +1,22 @@ import re -def get_min_depth(input: str): +def get_min_depth(my_input: str): """Calculate the depth""" # Input: '1 | 2 3 | 4 5' # iterate through the layers. If the next layer does not have 2^n items, # there must be a leaf node - input = re.sub(r"\s", "", input) - layers = input.split("|") + layers = my_input.split("|") for layer_count, _ in enumerate(layers, 1): # if not defined means we are at the last layer - try: - items_count = len(layers[layer_count]) + layers[layer_count] = re.sub(r"^\s+", "", layers[layer_count]) + layers[layer_count] = re.sub(r"\s+$", "", layers[layer_count]) + + items_count = len(re.split(r"\s+", layers[layer_count])) except IndexError: return layer_count @@ -27,4 +28,6 @@ def get_min_depth(input: str): assert get_min_depth("1 | 2 3 | 4 5") == 2 assert get_min_depth("1 | 2 3 | 4 * * 5 | * 6") == 3 +assert get_min_depth("1 | 20 3 | 4 * * 5 | * 6") == 3 + assert get_min_depth("1 | 2 3") == 2 |