Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ref: add zwo as alternative for 2 #723

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ref: add zwo as alternative for 2 #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0cd873
rebase to original fork
souvikg10 Oct 18, 2023
29e5eeb
Update Rules.hs
souvikg10 Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Duckling/Numeral/DE/Corpus.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ allExamples = concat
, "Eine"
, "einen"
]
, examples (NumeralValue 2)
[ "2"
, "Zwei"
, "Zwo"
]
, examples (NumeralValue 3)
[ "3"
, "Drei"
Expand Down
6 changes: 5 additions & 1 deletion Duckling/Numeral/DE/NumParser.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ two =
, times10 = [assign 20 "zwanzig"]
}

two_alternative :: NumItem
two_alternative = defaultNumItem 2 "zwo"


three :: NumItem
three =
(defaultNumItem 3 "drei")
Expand Down Expand Up @@ -139,7 +143,7 @@ nine :: NumItem
nine = defaultNumItem 9 "neun"

digitLexicon :: [NumItem]
digitLexicon = [one, two, three, four, five, six, seven, eight, nine]
digitLexicon = [one, two_alternative, two, three, four, five, six, seven, eight, nine]

from1to9 :: NumParser
from1to9 = foldr ((<|>) . base) empty digitLexicon
Expand Down
12 changes: 11 additions & 1 deletion Duckling/Numeral/DE/Rules.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ ruleDecimalNumeral = Rule
_ -> Nothing
}

ruleTwo :: Rule
ruleTwo = Rule
{ name = "integer 2"
, pattern =
[ regex "(zwei|zwo)"
]
, prod = \_ -> integer 2
}

ruleNumeralsUnd :: Rule
ruleNumeralsUnd = Rule
{ name = "numbers und"
Expand Down Expand Up @@ -218,7 +227,7 @@ ruleIntegerWithThousandsSeparator = Rule
ruleAllNumeralWords :: Rule
ruleAllNumeralWords = Rule
{ name = "simple and complex numerals written as one word"
, pattern = [regex "(ein|zwei|drei|vier|fünf|sech|sieb|acht|neun|zehn|elf|zwölf|hundert|tausend)?([^\\s]+)?(eine[m|n|r|s]?|eins?|zwei|drei|vier|fünf|sechs|sieben|acht|neun|zehn|elf|zwölf|[s|ß|z]ig|hundert|tausend)"]
, pattern = [regex "(ein|zwei|zwo|drei|vier|fünf|sech|sieb|acht|neun|zehn|elf|zwölf|hundert|tausend)?([^\\s]+)?(eine[m|n|r|s]?|eins?|zwei|drei|vier|fünf|sechs|sieben|acht|neun|zehn|elf|zwölf|[s|ß|z]ig|hundert|tausend)"]
, prod = \tokens -> case tokens of
(Token RegexMatch (GroupMatch matches) : _) ->
(parseNumeral $ concat $ Text.unpack . Text.toLower <$> matches)
Expand All @@ -239,6 +248,7 @@ rules =
, ruleNumeralDotNumeral
, ruleNumeralsPrefixWithNegativeOrMinus
, ruleNumeralsSuffixesKMG
, ruleTwo
, ruleNumeralsUnd
, rulePowersOfTen
, ruleZero
Expand Down
Loading