fixes

kyclark · kyclark · commit fe528f61eb9e · 2020-04-29T12:17:08.000-07:00
diff --git a/14_rhymer/solution1_regex.py b/14_rhymer/solution1_regex.py
@@ -40,17 +40,25 @@ def main():
 def stemmer(word):
     """Return leading consonants (if any), and 'stem' of word"""
 
+    word = word.lower()
     vowels = 'aeiou'
     consonants = ''.join(
         [c for c in string.ascii_lowercase if c not in vowels])
     pattern = (
-        '([' + consonants + ']+)?'  # capture one or more, optional
-        '('                         # start capture
-        '[' + vowels + ']'          # at least one vowel
-        '.*'                        # zero or more of anything else
-        ')?')                       # end capture, optional group
-    match = re.match(pattern, word.lower())
-    return (match.group(1) or '', match.group(2) or '') if match else ('', '')
+        '([' + consonants + ']+)?' # capture one or more, optional
+        '([' + vowels     + '])'   # capture at least one vowel
+        '(.*)'                     # capture zero or more of anything
+    )
+    pattern = f'([{consonants}]+)?([{vowels}])(.*)'
+
+    match = re.match(pattern, word)
+    if match:
+        p1 = match.group(1) or ''
+        p2 = match.group(2) or ''
+        p3 = match.group(3) or ''
+        return (p1, p2 + p3)
+    else:
+        return (word, '')
 
 
 # --------------------------------------------------
@@ -62,6 +70,7 @@ def test_stemmer():
     assert stemmer('chair') == ('ch', 'air')
     assert stemmer('APPLE') == ('', 'apple')
     assert stemmer('RDNZL') == ('rdnzl', '')
+    assert stemmer('123') == ('123', '')
 
 
 # --------------------------------------------------
diff --git a/14_rhymer/solution2_no_regex.py b/14_rhymer/solution2_no_regex.py
@@ -39,12 +39,11 @@ def stemmer(word):
     """Return leading consonants (if any), and 'stem' of word"""
 
     word = word.lower()
-    vowel_map = map(lambda c: word.index(c) if c in word else -1, 'aeiou')
-    pos = list(filter(lambda v: v >= 0, vowel_map))
+    vowel_pos = list(map(word.index, filter(lambda v: v in word, 'aeiou')))
 
-    if pos:
-        first = min(pos)
-        return (word[:first], word[first:])
+    if vowel_pos:
+        first_vowel = min(vowel_pos)
+        return (word[:first_vowel], word[first_vowel:])
     else:
         return (word, '')
 
@@ -58,6 +57,7 @@ def test_stemmer():
     assert stemmer('chair') == ('ch', 'air')
     assert stemmer('APPLE') == ('', 'apple')
     assert stemmer('RDNZL') == ('rdnzl', '')
+    assert stemmer('123') == ('123', '')
 
 
 # --------------------------------------------------
