From 7762af850a6a436c2f2e36b7931c0151fdb78837 Mon Sep 17 00:00:00 2001 From: Daniel Cartwright Date: Fri, 14 May 2021 13:41:21 -0700 Subject: [PATCH] ES Numeral `con` Summary: In ES (Spanish), decimals can be expressed by ` con `, where the whole part is to the left and the decimal part is to the right. Resolves #615 Reviewed By: stroxler Differential Revision: D28449722 fbshipit-source-id: caa0fb52f72f94c4a4cc456a46c25fa5f3b9b625 --- Duckling/Numeral/ES/Corpus.hs | 2 +- Duckling/Numeral/ES/Rules.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Duckling/Numeral/ES/Corpus.hs b/Duckling/Numeral/ES/Corpus.hs index 874b189e..71cd664c 100644 --- a/Duckling/Numeral/ES/Corpus.hs +++ b/Duckling/Numeral/ES/Corpus.hs @@ -42,7 +42,7 @@ allExamples = , examples (NumeralValue 3_000_000) ["3M", "3000K", "3000000"] , examples (NumeralValue 1_200_000) ["1200000", "1200K"] , examples (NumeralValue (-1_200_000)) ["-1200000", "-1200K"] - , examples (NumeralValue 1.5) ["1 punto cinco", "una punto cinco"] + , examples (NumeralValue 1.5) ["1 punto cinco", "una punto cinco", "1 con cinco", "1 con 5"] , examples (NumeralValue 1) ["cero uno", "zero uno"] , examples (NumeralValue 2) ["cero dos", "zero dos"] , examples (NumeralValue 3) diff --git a/Duckling/Numeral/ES/Rules.hs b/Duckling/Numeral/ES/Rules.hs index 1268b011..beba6b43 100644 --- a/Duckling/Numeral/ES/Rules.hs +++ b/Duckling/Numeral/ES/Rules.hs @@ -285,7 +285,7 @@ ruleNumeralMillionsAnd = Rule ruleNumeralDotNumeral :: Rule ruleNumeralDotNumeral = Rule { name = "number dot number" - , pattern = [dimension Numeral, regex "punto", Predicate $ not . hasGrain] + , pattern = [dimension Numeral, regex "(con|punto)", Predicate $ not . hasGrain] , prod = \tokens -> case tokens of (Token Numeral NumeralData { TNumeral.value = v1 } : _ : Token Numeral NumeralData { TNumeral.value = v2 } : _) -> double $ v1 + decimalsToDouble v2