MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add short_scale and ordinal args to helpers. 

This is in support of issues-1959.
pull/1977/head
Chris Rogers 2019-02-01 18:28:40 -05:00
parent cbebf957e4
commit 6645ab6bfe
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mycroft/util/lang/parse_en.py
View File

@ -175,7 +175,7 @@ def _partition_list(items, split_on):
return list(filter(lambda x: len(x) != 0, splits)) return list(filter(lambda x: len(x) != 0, splits))
def _extract_fraction(tokens): def _extract_fraction(tokens, short_scale, ordinals):
""" """
Extract fraction numbers from a string. Extract fraction numbers from a string.
@ -202,7 +202,7 @@ def _extract_fraction(tokens):
if len(partitions) == 3: if len(partitions) == 3:
text = ' '.join([t.word for t in partitions[0]]) text = ' '.join([t.word for t in partitions[0]])
numbers = extract_numbers_with_text(text) numbers = extract_numbers_with_text(text, short_scale, ordinals)
if len(numbers) > 1: if len(numbers) > 1:
return None, None return None, None
# ensure first is not a fraction and second is a fraction # ensure first is not a fraction and second is a fraction
@ -214,7 +214,7 @@ def _extract_fraction(tokens):
return None, None return None, None
def _extract_decimal(tokens): def _extract_decimal(tokens, short_scale, ordinals):
""" """
Extract decimal numbers from a string. Extract decimal numbers from a string.
@ -314,11 +314,11 @@ def _extract_number_with_text_en(tokens, short_scale=True, ordinals=False):
""" """
fraction, fraction_text = _extract_fraction(tokens) fraction, fraction_text = _extract_fraction(tokens, short_scale, ordinals)
if fraction: if fraction:
return fraction, fraction_text return fraction, fraction_text
decimal, decimal_text = _extract_decimal(tokens) decimal, decimal_text = _extract_decimal(tokens, short_scale, ordinals)
if decimal: if decimal:
return decimal, decimal_text return decimal, decimal_text
@ -517,7 +517,6 @@ def convert_words_to_numbers(text, short_scale=True, ordinals=False):
if numbers_to_replace and token.index == numbers_to_replace[0].end_index: if numbers_to_replace and token.index == numbers_to_replace[0].end_index:
numbers_to_replace.pop(0) numbers_to_replace.pop(0)
return ' '.join(results) return ' '.join(results)