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.

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

[NLU-4815] - Fix for thousand seperators "1000,50" resolving as 1000,00 and 50,00 separately for German #160

Merged
merged 19 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
260e944
Update timex
Conor-Keaney Oct 23, 2023
b0c7166
Resolve conflict
Conor-Keaney Oct 23, 2023
99feae0
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Oct 31, 2023
c07c374
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Nov 2, 2023
9df4174
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Nov 6, 2023
521b7d0
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Nov 28, 2023
64986fe
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Jan 18, 2024
eb89cd2
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Jan 19, 2024
3bbe2ea
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Jan 31, 2024
a14fd1e
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Feb 1, 2024
c84fae2
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Feb 7, 2024
f9d591c
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Apr 16, 2024
c70f7da
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Aug 1, 2024
1ad3368
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Sep 2, 2024
65db00a
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
Conor-Keaney Feb 4, 2025
56373e9
Make thousand seperators optional, added test cases
Conor-Keaney Feb 6, 2025
3258a2b
Update version
Conor-Keaney Feb 6, 2025
9803a2d
Updated jfrog to nexus in jenkinsfile
Conor-Keaney Feb 10, 2025
c40d440
Update
Conor-Keaney Feb 11, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ def NumbersWithPlaceHolder(placeholder):
)

def DoubleDecimalPointRegex(placeholder):
return f'(?<=\\b)((\\d{{1,3}})(\\.\\d{{3}})*(\\,\\d+)?)(?={placeholder})'
return f'(?<=\\b)((\\d{{1,3}})(\\.?\\d{{3}})*(\\,\\d+)?)(?={placeholder})'

def DoubleWithoutIntegralRegex(placeholder):
return f'(?<=\\s|^)(?<!(\\d+))\\.\\d+(?!(\\.\\d+))(?={placeholder})'
return f'(?<=\\s|^)(?<!(\\d+))\\.?\\d+(?!(\\.\\d+))(?={placeholder})'
Conor-Keaney marked this conversation as resolved.
Show resolved Hide resolved

DoubleWithRoundNumber = (
f'(((?<!\\d+\\s*)-\\s*)|((?<=\\b)(?<!\\d+\\,)))\\d+\\,\\d+\\s+{RoundNumberIntegerRegex}(?=\\b)'
Expand Down
60 changes: 60 additions & 0 deletions Specs/Number/German/NumberModel.json
Original file line number Diff line number Diff line change
Expand Up @@ -1166,5 +1166,65 @@
"End": 5
}
]
},
{
"Input": "100,50",
"NotSupported": "dotnet, javascript, java",
"Results": [
{
"Text": "100,50",
"TypeName": "number",
"Resolution": {
"value": "100,5"
},
"Start": 0,
"End": 5
}
]
},
{
"Input": "2.000,99",
"NotSupported": "dotnet, javascript, java",
"Results": [
{
"Text": "2.000,99",
"TypeName": "number",
"Resolution": {
"value": "2000,99"
},
"Start": 0,
"End": 7
}
]
},
{
"Input": "1000,50",
"NotSupported": "dotnet, javascript, java",
"Results": [
{
"Text": "1000,50",
"TypeName": "number",
"Resolution": {
"value": "1000,5"
},
"Start": 0,
"End": 6
}
]
},
{
"Input": "1000000,50",
"NotSupported": "dotnet, javascript, java",
"Results": [
{
"Text": "1000000,50",
"TypeName": "number",
"Resolution": {
"value": "1000000,5"
},
"Start": 0,
"End": 9
}
]
}
]