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-3859] arabic time noon #3140

Open
wants to merge 362 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
362 commits
Select commit Hold shift + click to select a range
ead5013
Add mealtime python support
Apr 28, 2022
30e574c
Unskip tests and bump version number
Apr 28, 2022
5b1bd08
Merge pull request #31 from purecloudlabs/master
Apr 29, 2022
433d95c
Merge branch 'develop' into task/NLU-2864
Apr 29, 2022
778273f
Alpha release versions
Apr 29, 2022
8a25858
Release version
May 4, 2022
cc23761
Merge pull request #32 from purecloudlabs/task/NLU-2864
May 4, 2022
3a2342a
Merge pull request #33 from microsoft/master
samhickey25 May 11, 2022
e5b365b
Merge branch 'master' into develop
samhickey25 May 11, 2022
b1529f8
Update base datetime files
samhickey25 May 16, 2022
76ba177
Update package version
samhickey25 May 16, 2022
ed0421a
Fix imports
samhickey25 May 16, 2022
33c53ec
Fix failed tests
samhickey25 May 16, 2022
5e47f93
Reskip Japanese tests
samhickey25 May 17, 2022
a0dc184
Undo changes to .NET and release version
samhickey25 May 18, 2022
658bf48
Merge pull request #34 from purecloudlabs/NLU-2872
samhickey25 May 19, 2022
ad8a484
NLU-2922: Fix for case like 'Monday 21' to match .NET implementation …
kevinwalshgen Jun 1, 2022
46d446a
NLU-2922: Fix for missing version number (#36)
kevinwalshgen Jun 7, 2022
cd9ba48
Merge pull request #37 from microsoft/master
kevinwalshgen Jun 9, 2022
4eb7370
Merge pull request #38 from purecloudlabs/master
kevinwalshgen Jun 10, 2022
da9cc66
NLU-2966: Updated python resources based on latest changes
kevinwalshgen Jun 10, 2022
901b901
NLU-2966: 1.0.20 Version number
kevinwalshgen Jun 10, 2022
22f56fd
NLU-2966: Fix failing tests
kevinwalshgen Jun 10, 2022
c544eff
Revert "NLU-2966: Fix failing tests"
kevinwalshgen Jun 10, 2022
f2dabf2
NLU-2966: Fix failing tests
kevinwalshgen Jun 10, 2022
2069aee
Merge pull request #39 from purecloudlabs/NLU-2966
kevinwalshgen Jun 13, 2022
185c140
NLU-2995: Update date parser to handle week_day_and_day_regex
kevinwalshgen Jun 20, 2022
728ed45
NLU-2995: Update date parser to handle _
kevinwalshgen Jun 20, 2022
d475109
NLU-2995: Update date parser to handle _
kevinwalshgen Jun 22, 2022
22bf644
NLU-2995: Update Date parser and extractor tests cases that now pass
kevinwalshgen Jun 22, 2022
49e2e7b
NLU-2995: Remove temp test
kevinwalshgen Jun 22, 2022
186d305
NLU-2995: Update version number to 1.0.21
kevinwalshgen Jun 22, 2022
b5a72eb
Merge pull request #40 from purecloudlabs/NLU-2995
kevinwalshgen Jun 23, 2022
8f92c9a
Merge pull request #42 from microsoft/master
samhickey25 Jul 15, 2022
7729ff8
Merge branch 'master' into develop
samhickey25 Jul 15, 2022
c0d9581
Add EnglishOthers to Python cultures
samhickey25 Jul 20, 2022
b1a76ca
Remove commented out lines
samhickey25 Jul 20, 2022
472f30a
Fix initialization tests
samhickey25 Jul 20, 2022
e5875be
bugfix/NLU-3035 - Fixed "half/ y medio" bug with es-us
rbrennangen Jul 22, 2022
c4d0de2
Release version
samhickey25 Jul 26, 2022
756e68e
Merge pull request #43 from purecloudlabs/bug/NLU-3033
samhickey25 Jul 26, 2022
1395148
Merge branch 'develop' of github.com:purecloudlabs/Recognizers-Text i…
rbrennangen Jul 27, 2022
b4f2c62
Updated versions
rbrennangen Jul 22, 2022
3c108b1
Updated resources and incremented versions
rbrennangen Jul 25, 2022
1f24c93
Updated new version numbers to recognizers-suite
rbrennangen Jul 26, 2022
ff568c1
Incremented version numbers
rbrennangen Jul 27, 2022
f08bb3d
Release version
rbrennangen Jul 27, 2022
75369c2
Merge pull request #44 from purecloudlabs/bugfix/NLU-3035
rbrennangen Jul 27, 2022
f14677d
Merge branch 'microsoft:master' into master
samhickey25 Aug 8, 2022
c72b19d
Merge branch 'master' into develop
samhickey25 Aug 8, 2022
d631cbe
Merge branch 'microsoft:master' into master
rbrennangen Aug 15, 2022
a830707
Merge branch 'microsoft:master' into master
rbrennangen Aug 17, 2022
9568288
Merge branch 'microsoft:master' into develop
rbrennangen Aug 17, 2022
9c1deee
Adjust parsers
rbrennangen Aug 18, 2022
c9ca340
Add tests and update base parser
rbrennangen Aug 18, 2022
ae8ef25
Package version changelist
rbrennangen Aug 18, 2022
3aed5b9
Update english tests and increment versions
rbrennangen Aug 22, 2022
a62869a
Package release version
rbrennangen Aug 25, 2022
5dd3af0
Merge pull request #48 from purecloudlabs/bugfix/NLU-3071
rbrennangen Aug 30, 2022
e378aa3
Merge branch 'microsoft:master' into master
rbrennangen Aug 31, 2022
86f14b8
Merge branch 'microsoft:master' into master
Conor-Keaney Nov 10, 2022
ea3a0dd
Merge upstream master
Conor-Keaney Nov 10, 2022
5b99f5a
Adding resources for Python Dutch number and number_with_unit extract…
Conor-Keaney Nov 11, 2022
a2d1c76
Add datetime files for dutch
samhickey25 Nov 14, 2022
924f86b
Merge remote-tracking branch 'origin/NLU-3194' into NLU-3206
samhickey25 Nov 14, 2022
5abe5d7
Adding MergedNumbers, fixed regexes, fixed tests
Conor-Keaney Nov 15, 2022
1042ecc
Regex bug fixes and parser corrections
Conor-Keaney Nov 17, 2022
2c6d78d
Merge remote-tracking branch 'origin/NLU-3194' into NLU-3206
samhickey25 Nov 17, 2022
ceb6899
Update test files
samhickey25 Nov 21, 2022
85d9aa9
NLU-3194 - Dutch language support: Builtin number and amountOfMoney …
Conor-Keaney Nov 23, 2022
9cd338c
Update test files
samhickey25 Nov 23, 2022
854073a
Merge branch 'develop' into NLU-3206
samhickey25 Nov 23, 2022
6ddacb2
Update package version
samhickey25 Nov 23, 2022
18f89d1
Fix pattern
samhickey25 Nov 23, 2022
26829f5
More fixes
samhickey25 Nov 23, 2022
b0f744c
Update package version
samhickey25 Nov 23, 2022
ac02d4a
Clean up regex
samhickey25 Nov 24, 2022
bdf0766
release version
samhickey25 Nov 24, 2022
6ab38e8
Merge pull request #50 from purecloudlabs/NLU-3206
samhickey25 Nov 24, 2022
030d6f4
[NLU-3333] - Updating parser to merge joinable numbers (#52)
Conor-Keaney Dec 15, 2022
4451a53
Merge pull request #53 from microsoft/master
samhickey25 Dec 19, 2022
2873e0b
Merge branch 'master' into develop
samhickey25 Dec 19, 2022
2279ac5
Merge branch 'develop' of https://github.com/purecloudlabs/Recognizer…
samhickey25 Dec 19, 2022
aa4fda5
French Noon Fix
samhickey25 Dec 21, 2022
f24b5f2
Support del between Day and Month
samhickey25 Dec 22, 2022
6339741
Update package version
samhickey25 Dec 22, 2022
c07f967
release version
samhickey25 Jan 3, 2023
5bd7cb4
Merge pull request #55 from purecloudlabs/NLU-3219
samhickey25 Jan 3, 2023
3764a19
NLU-3222: V3 Entity Improvement: EN-US time: 10 past 3 (#56)
andrew-gradinari Jan 4, 2023
d1263e7
Update tests and date regex order
samhickey25 Jan 4, 2023
fc377b4
Merge branch 'develop' into NLU-3215
samhickey25 Jan 4, 2023
e53d470
Update package version
samhickey25 Jan 4, 2023
bc593e8
release version
samhickey25 Jan 5, 2023
06c8977
Merge pull request #57 from purecloudlabs/NLU-3215
samhickey25 Jan 5, 2023
a32895d
NLU-3222: V3 Entity Improvement: DE-DE time: 10 nach 3 (#58)
andrew-gradinari Jan 6, 2023
2b17394
NLU-3224: V3 Entity Improvement: DE-DE time: 5 minuten vor 4 (#59)
andrew-gradinari Jan 9, 2023
6b1f880
[NLU-3220] IT-IT amountOfMoney: dollari 345 (#60)
KanchanKumar12 Jan 9, 2023
07682fd
[NLU-3221] V3 Entity Improvement: IT-IT time: 5 minuti alle quattro (…
andrew-gradinari Jan 10, 2023
9da938c
[NLU-3229] - V3 Entity Improvement: 2 digit year (#51)
Conor-Keaney Jan 16, 2023
12c1467
[NLU-3399] - Single quote before 2 digit year not being recognized
Conor-Keaney Jan 27, 2023
2c0cb6e
Update version (#63)
Conor-Keaney Jan 31, 2023
791c424
[NLU-3377] - <day> del <month> del <year> resolution fix (#64)
Conor-Keaney Jan 31, 2023
aaba9c5
NLU-3377 - Small test fix (#65)
Conor-Keaney Jan 31, 2023
493a5b4
[NLU-3504] - MS Recognisers python - Japanese Number to parity with .…
Conor-Keaney Mar 29, 2023
c59a18e
Bugfix/NLU-3499 - "00:XX" time not being recognized (#67)
andrew-gradinari Apr 6, 2023
1302f5d
Add number with unit support for python
samhickey25 Apr 12, 2023
d06a0ba
Update script
samhickey25 Apr 13, 2023
0242cad
Actually fix script
samhickey25 Apr 13, 2023
590dfec
remove merge error from slack branch
samhickey25 Apr 13, 2023
15aa559
Release Version
samhickey25 Apr 19, 2023
a5d3a23
Merge pull request #68 from purecloudlabs/NLU-3505
samhickey25 Apr 19, 2023
6898ca5
Bugfix/NLU-3519: German: invalid date fix (#69)
andrew-gradinari Apr 19, 2023
f368d77
initial changes - includes japanese setup
KanchanKumar12 Apr 17, 2023
8a593c8
mvp - japanese time entity
KanchanKumar12 Apr 19, 2023
cb629e5
fixed 3 tests
KanchanKumar12 Apr 19, 2023
205a6b7
fix for 5 tests
KanchanKumar12 Apr 20, 2023
bafd713
refactor
KanchanKumar12 Apr 24, 2023
6e81526
fix for 2 more tests
KanchanKumar12 Apr 24, 2023
417a383
fix two more tests
KanchanKumar12 Apr 24, 2023
782092c
last working version
KanchanKumar12 Apr 24, 2023
8b5fef9
unskip/skip tests
KanchanKumar12 Apr 24, 2023
d408ed7
update packages
KanchanKumar12 Apr 24, 2023
434171f
remove comments
KanchanKumar12 Apr 24, 2023
fa378bc
remove unnecessary parsers/extractors
KanchanKumar12 Apr 25, 2023
bb145f3
update variables
KanchanKumar12 Apr 25, 2023
df2b83b
update based on comments
KanchanKumar12 Apr 26, 2023
e5ce793
update packages
KanchanKumar12 Apr 26, 2023
55d97bf
Save progress
samhickey25 Apr 28, 2023
51dfd28
[NLU-3534] Fix for case like 'March one 2020' (#73)
andrew-gradinari May 2, 2023
948c6e7
Separate utils into directory
samhickey25 May 2, 2023
51ce402
Merge branch 'develop' into cleanup_slack
samhickey25 May 2, 2023
b7b388b
Phase 2
samhickey25 May 4, 2023
56a3d9e
Merge pull request #75 from purecloudlabs/cleanup_slack
samhickey25 May 4, 2023
c64585a
Merge branch 'develop' into NLU-3579
samhickey25 May 4, 2023
4e40074
switch laptops
samhickey25 May 4, 2023
078200b
[NLU-3471] EN-US DateTime: "the MM/DD[/YYYY]" resolution fix (#78)
andrew-gradinari May 5, 2023
3436e05
Finish utils changes
samhickey25 May 9, 2023
a58dfef
Merge branch 'develop' into NLU-3579
samhickey25 May 9, 2023
fc2b57b
Update package version
samhickey25 May 9, 2023
d636f46
revert merge errors
samhickey25 May 10, 2023
5ef9e4d
revert more merge errors
samhickey25 May 10, 2023
bba5952
Fix type
samhickey25 May 10, 2023
d2fcdb2
Bit of cleanup
samhickey25 May 10, 2023
c4be0c2
Address PR comments
samhickey25 May 12, 2023
d5ffa45
Address PR comments, update time_period_function.handle
samhickey25 May 15, 2023
12afd7d
Address PR comments
samhickey25 May 16, 2023
1087914
Merge pull request #79 from purecloudlabs/NLU-3579
samhickey25 May 16, 2023
9109d02
[NLU-3600] CJK Holiday parsers and extractors (#80)
KanchanKumar12 Jun 16, 2023
6524ec6
Base CJK duration support
samhickey25 Jun 21, 2023
fa06eb8
[NLU-3662] CJK Set Parser and Extractors (#81)
KanchanKumar12 Jun 22, 2023
c45515e
Address comments
samhickey25 Jun 23, 2023
1cedd97
[NLU-3663] - Create CJK Date and Dateperiod parser and extractor (#83)
Conor-Keaney Jun 23, 2023
4715e04
Merge branch 'develop' into NLU-3659
samhickey25 Jun 23, 2023
6016666
Merge pull request #82 from purecloudlabs/NLU-3659
samhickey25 Jun 23, 2023
b72d014
[NLU-3661] CJK Datetime period parsers and extractors (#84)
KanchanKumar12 Jun 23, 2023
3bb8b4b
Japanese Time Support
samhickey25 Jun 29, 2023
801d132
Unskip tests
samhickey25 Jun 29, 2023
ed920a0
Fix Order of Patterns files
samhickey25 Jun 29, 2023
2ae934a
Fix time utils tests
samhickey25 Jun 30, 2023
d9fe8ad
Fix the merged extractor
samhickey25 Jul 3, 2023
9f49bb3
Missing comma
samhickey25 Jul 3, 2023
2feb35b
Resolutions needs to be a list
samhickey25 Jul 3, 2023
560caa8
address pr comment
samhickey25 Jul 4, 2023
61cb0a2
update package version
samhickey25 Jul 4, 2023
f935794
Change dict to list
samhickey25 Jul 4, 2023
119cf01
Release Version
samhickey25 Jul 4, 2023
79292d1
Merge pull request #85 from purecloudlabs/NLU-3540
samhickey25 Jul 4, 2023
aa68d8a
[NLU-3681] Fix for infinite loop issue in BaseDateParser (#87)
andrew-gradinari Jul 6, 2023
e32a2d3
Datetime v1
samhickey25 Jul 10, 2023
a2c6c51
[NLU-3508] - Japanese Date Support (#86)
Conor-Keaney Jul 12, 2023
0d999b0
Datetime v1.5
samhickey25 Jul 12, 2023
a8a5092
Merge branch 'develop' into NLU-3706
samhickey25 Jul 12, 2023
0728be0
Japanese Datetime
samhickey25 Jul 19, 2023
3885f87
Fix Chinese tests
samhickey25 Jul 19, 2023
e54835f
Different package version
samhickey25 Jul 19, 2023
dbbc792
Undo Number with Unit changes
samhickey25 Jul 19, 2023
4f147ec
Fix for time period functions
samhickey25 Jul 20, 2023
20a2181
Release Version
samhickey25 Jul 21, 2023
4100254
Merge pull request #89 from purecloudlabs/NLU-3706
samhickey25 Jul 21, 2023
859c16c
[NLU-3748] - Japanese Time - '[Number] minutes to [HOUR]' failing (#90)
Conor-Keaney Aug 1, 2023
ec1e9bd
[NLU-3753] Fix German Date <WeekDay><Day><Month> (#92)
andrew-gradinari Aug 3, 2023
7c8b4e9
[NLU-3758] - Japanese Time regression test failure (#93)
Conor-Keaney Sep 4, 2023
cf513b7
initial commit, with Sam's changes
colm-dillon Sep 6, 2023
307565f
translated catalan_numeric_with_unit
colm-dillon Sep 7, 2023
f071c40
Created a CatalanBaseDateParser and added Now to catalan base time
colm-dillon Sep 7, 2023
7851e07
Added some test cases for Catalan
colm-dillon Sep 8, 2023
71dc1af
add some more tests
colm-dillon Sep 11, 2023
909c4ce
NLU-3726: Adding ArabicNumeric class
kevinwalshgen Sep 6, 2023
09fc979
NLU-3726: Added Arabic Parsers and Extractors
kevinwalshgen Sep 8, 2023
399a276
NLU-3726: Added get_lang_specific_int_value method to parser
kevinwalshgen Sep 8, 2023
805491a
alpha version update
colm-dillon Sep 15, 2023
ed3e8bf
Add Catalan to runner.py
colm-dillon Sep 15, 2023
f217d7b
Add Catalan to culture
colm-dillon Sep 15, 2023
d225d2f
update alpha
colm-dillon Sep 15, 2023
f52a43c
Add arabic date and time support
samhickey25 Sep 18, 2023
094dc4c
Add arabic date and time support
samhickey25 Sep 18, 2023
d2a699c
NLU-3726: Latest updates based on testing
kevinwalshgen Sep 14, 2023
382d7ae
NLU-3726_II: remove base config methods from children where there is…
kevinwalshgen Sep 18, 2023
b720b5a
NLU-3726_II: update version number
kevinwalshgen Sep 18, 2023
d3814be
NLU-3726_II: 1.0.65 <= update version number
kevinwalshgen Sep 20, 2023
b0ddcd5
NLU-3726_II: Remove gython tag
kevinwalshgen Sep 20, 2023
fdfb2e7
Merge pull request #95 from purecloudlabs/NLU-3726_II
kevinwalshgen Sep 20, 2023
b32b5c9
Add arabic date and time support
samhickey25 Sep 20, 2023
a7e77c3
Merge branch 'develop' into NLU-3727
samhickey25 Sep 20, 2023
c665e82
NLU-3726_III: Update for Choice failing tests
kevinwalshgen Sep 20, 2023
2aec0d1
Merge pull request #96 from purecloudlabs/NLU-3726_III
kevinwalshgen Sep 21, 2023
233ae4f
Update Arabic tests
samhickey25 Sep 25, 2023
500ad41
Update package version
samhickey25 Sep 25, 2023
7e13b3b
Merge branch 'develop' into NLU-3727
samhickey25 Sep 25, 2023
1c0f779
Unskip other language tests
samhickey25 Sep 25, 2023
07e9267
updates to Catalan
colm-dillon Sep 26, 2023
b5fcae3
update alpha
colm-dillon Sep 26, 2023
d176f9b
Fix some use cases
samhickey25 Sep 26, 2023
189ccb5
Update package version
samhickey25 Sep 26, 2023
215098b
Release Version
samhickey25 Sep 28, 2023
b52e719
Address pr comments
samhickey25 Sep 28, 2023
214e016
Unskip language tests
samhickey25 Sep 28, 2023
35673bf
Merge pull request #97 from purecloudlabs/NLU-3727
samhickey25 Sep 28, 2023
9340356
Merge branch 'develop' into feature/NLU-3780
colm-dillon Sep 29, 2023
b28fe09
remove failing unit tests and handle no duration extractor
colm-dillon Oct 3, 2023
315536c
Add a few currency tests
colm-dillon Oct 3, 2023
d5885d0
Add todo for fractional pattern
colm-dillon Oct 3, 2023
18ca371
update to alpha
colm-dillon Oct 3, 2023
81e2ba6
remove commented code
colm-dillon Oct 3, 2023
4584967
address comments
colm-dillon Oct 4, 2023
07bbbd6
address comments
colm-dillon Oct 4, 2023
503bdbe
update comment
colm-dillon Oct 4, 2023
2e3a5ff
Add arabic datetime support
samhickey25 Oct 4, 2023
e0e475c
Add final datetime entities for Arabic
samhickey25 Oct 4, 2023
9376ba9
Unskip language tests
samhickey25 Oct 4, 2023
78f4763
Release Version
samhickey25 Oct 5, 2023
5acd4b4
Merge pull request #98 from purecloudlabs/NLU-3728
samhickey25 Oct 5, 2023
20fbd44
Merge branch 'develop' into NLU-3729
samhickey25 Oct 5, 2023
f8e52f8
release version
samhickey25 Oct 5, 2023
e04bf49
Merge pull request #99 from purecloudlabs/NLU-3729
samhickey25 Oct 5, 2023
9bed889
release version
colm-dillon Oct 10, 2023
225ec72
Merge branch 'develop' into feature/NLU-3780
colm-dillon Oct 11, 2023
b94b2d2
Merge pull request #94 from purecloudlabs/feature/NLU-3780
colm-dillon Oct 11, 2023
bfc7a08
Arabic Currency Support
samhickey25 Oct 18, 2023
ddf897e
Update Currency mapping
samhickey25 Oct 19, 2023
ea9d028
Release version
samhickey25 Oct 23, 2023
67897d2
Merge pull request #100 from purecloudlabs/NLU-3867
samhickey25 Oct 23, 2023
3bafc20
NLU-3857 - Arabic Time: am and pm bug (#101)
Conor-Keaney Oct 25, 2023
e369b6f
[NLU-3858] - Arabic Time: now (#102)
Conor-Keaney Nov 1, 2023
ec0e30b
NLU-3861 - Arabic Date: date format (#103)
Conor-Keaney Nov 6, 2023
0113fc0
[NLU-3860] - Arabic Time: half past an hour not working (#104)
Conor-Keaney Nov 7, 2023
91ff1d2
-- removed noon from TimeOfDayRegex, updated all library versions
BobbyMartins5 Nov 13, 2023
e955b34
-- reverted accidental update to AmPmDescRegex and DescRegex
BobbyMartins5 Nov 13, 2023
5db6fa7
-- updated pacakge versions to alpha build, removed auto-generated co…
BobbyMartins5 Nov 13, 2023
85588f5
-- updated pacakge versions to final version
BobbyMartins5 Nov 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontSimpleCasesRegex = $@"\b({RangePrefixRegex}\s+)?(({MonthSuffixRegex}\s+((van)\s+)?({DayRegex})|({DayRegex})\s+((van)\s+)?{MonthSuffixRegex})\s*{TillRegex}\s*({DayRegex})|(op\s+)?({DayRegex})\s*{TillRegex}\s*({DayRegex})\s+{MonthSuffixRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string MonthFrontBetweenRegex = $@"\b{MonthSuffixRegex}\s+(tussen\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string BetweenRegex = $@"\b(tussen\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})\s+{MonthSuffixRegex}((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string RelativeYearRegex = $@"({YearRegex}|(?<order>volgende?|komende?|aanstaande?|aankomende?|huidige?|vorige?|afgelopen|dit)\s+jaar)";
public static readonly string RelativeYearRegex = $@"({YearRegex}|{TwoDigitYearRegex}|(?<order>volgende?|komende?|aanstaande?|aankomende?|huidige?|vorige?|afgelopen|dit)\s+jaar)";
public static readonly string MonthWithYear = $@"\b(({WrittenMonthRegex}(\.)?(\s*)[/\\\-\.,]?(\s+(van|over|in))?(\s*){RelativeYearRegex})|({RelativeYearRegex}(\s*),?(\s*){WrittenMonthRegex}))\b";
public static readonly string OneWordPeriodRegex = $@"\b((((de\s+)?maand\s+(van\s+)?)?({StrictRelativeRegex}\s+)?(?<month>januari|februari|maart|april|mei|juni|juli|augustus|september|oktober|november|december|jan\.?|feb\.?|mar\.?|mrt\.?|apr\.?|jun\.?|jul\.?|aug\.?|sep\.?|sept\.?|oct\.?|okt\.?|nov\.?|dec\.?))|(maand|jaar)\s+tot(\s+op)?\s+heden|(({RelativeRegex}\s+)(mijn\s+)?(weekend|(?<business>werkweek)|week|maand|jaar(?!\s+hoger dan))|({RelativeRegex}\s+)?(mijn\s+)(weekend|(?<business>werkweek)|week|maand|jaar))(?!((\s+van)?\s+\d+|\s+tot(\s+op)?\s+heden|nu))(\s+{AfterNextSuffixRegex})?)\b";
public static readonly string MonthNumWithYear = $@"\b(({BaseDateTime.FourDigitYearRegex}(\s*)[/\-\.](\s*){MonthNumRegex})|({MonthNumRegex}(\s*)[/\-](\s*){BaseDateTime.FourDigitYearRegex}))\b";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontSimpleCasesRegex = $@"\b({RangePrefixRegex}\s+)?{MonthSuffixRegex}\s+((from)\s+)?({DayRegex}|{WrittenOrdinalDayRegex})\s*{TillRegex}\s*({DayRegex}|{WrittenOrdinalDayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string MonthFrontBetweenRegex = $@"\b{MonthSuffixRegex}\s+(between\s+)({DayRegex}|{WrittenOrdinalDayRegex})\s*{RangeConnectorRegex}\s*({DayRegex}|{WrittenOrdinalDayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string BetweenRegex = $@"\b(between\s+)({DayRegex}|{WrittenOrdinalDayRegex})\s*{RangeConnectorRegex}\s*({DayRegex}|{WrittenOrdinalDayRegex})\s+{MonthSuffixRegex}((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string MonthWithYear = $@"\b((({WrittenMonthRegex}[\.]?|((the\s+)?(?<cardinal>first|1st|second|2nd|third|3rd|fourth|4th|fifth|5th|sixth|6th|seventh|7th|eighth|8th|ninth|9th|tenth|10th|eleventh|11th|twelfth|12th|last)\s+month(?=\s+(of|in))))((\s*)[/\\\-\.,]?(\s+(of|in))?(\s*)({YearRegex}|(?<order>following|next|last|this)\s+year)|\s+(of|in)\s+{TwoDigitYearRegex}))|(({YearRegex}|(?<order>following|next|last|this)\s+year)(\s*),?(\s*){WrittenMonthRegex}))\b";
public static readonly string MonthWithYear = $@"\b((({WrittenMonthRegex}[\.]?|((the\s+)?(?<cardinal>first|1st|second|2nd|third|3rd|fourth|4th|fifth|5th|sixth|6th|seventh|7th|eighth|8th|ninth|9th|tenth|10th|eleventh|11th|twelfth|12th|last)\s+month(?=\s+(of|in))))((\s*)[/\\\-\.,]?(\s+(of|in))?(\s*)({YearRegex}|{TwoDigitYearRegex}|(?<order>following|next|last|this)\s+year)|\s+(of|in)\s+{TwoDigitYearRegex}))|(({YearRegex}|(?<order>following|next|last|this)\s+year)(\s*),?(\s*){WrittenMonthRegex}))\b";
public const string SpecialYearPrefixes = @"(calendar|(?<special>fiscal|school))";
public static readonly string OneWordPeriodRegex = $@"\b((((the\s+)?month of\s+)?({StrictRelativeRegex}\s+)?{MonthRegex})|(month|year) to date|(?<toDate>((un)?till?|to)\s+date)|({RelativeRegex}\s+)?(my\s+)?((?<business>working\s+week|workweek)|week(end)?|month|fortnight|(({SpecialYearPrefixes}\s+)?year))(?!((\s+of)?\s+\d+(?!({BaseDateTime.BaseAmDescRegex}|{BaseDateTime.BasePmDescRegex}))|\s+to\s+date))(\s+{AfterNextSuffixRegex})?)\b";
public static readonly string MonthNumWithYear = $@"\b(({BaseDateTime.FourDigitYearRegex}(\s*)[/\-\.](\s*){MonthNumRegex})|({MonthNumRegex}(\s*)[/\-](\s*){BaseDateTime.FourDigitYearRegex}))\b";
Expand Down Expand Up @@ -139,8 +139,8 @@ public static class DateTimeDefinitions
public static readonly string DateExtractor4 = $@"\b{MonthNumRegex}\s*[/\\\-]\s*{DayRegex}[\.]?\s*[/\\\-]\s*{DateYearRegex}";
public static readonly string DateExtractor5 = $@"\b({DayPrefix}(\s*,)?\s+)?{DayRegex}\s*[/\\\-\.]\s*({MonthNumRegex}|{MonthRegex})\s*[/\\\-\.]\s*{DateYearRegex}(?!\s*[/\\\-\.]\s*\d+)";
public static readonly string DateExtractor6 = $@"(?<={DatePreposition}\s+)({StrictRelativeRegex}\s+)?({DayPrefix}\s+)?{MonthNumRegex}[\-\.]{DayRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor7L = $@"\b({DayPrefix}(\s*,)?\s+)?{MonthNumRegex}\s*/\s*{DayRegex}{DateExtractorYearTermRegex}(?![%])\b";
public static readonly string DateExtractor7S = $@"\b({DayPrefix}(\s*,)?\s+)?{MonthNumRegex}\s*/\s*{DayRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor7L = $@"\b({DayPrefix}(\s*,)?\s+)?(the\s+)?{MonthNumRegex}\s*/\s*{DayRegex}{DateExtractorYearTermRegex}(?![%])\b";
public static readonly string DateExtractor7S = $@"\b({DayPrefix}(\s*,)?\s+)?(the\s+)?{MonthNumRegex}\s*/\s*{DayRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor8 = $@"(?<={DatePreposition}\s+)({StrictRelativeRegex}\s+)?({DayPrefix}\s+)?{DayRegex}[\\\-]{MonthNumRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor9L = $@"\b({DayPrefix}(\s*,)?\s+)?{DayRegex}\s*/\s*{MonthNumRegex}{DateExtractorYearTermRegex}(?![%])\b";
public static readonly string DateExtractor9S = $@"\b({DayPrefix}(\s*,)?\s+)?{DayRegex}\s*/\s*{MonthNumRegex}{BaseDateTime.CheckDecimalRegex}(?![%])\b";
Expand All @@ -160,7 +160,7 @@ public static class DateTimeDefinitions
public const string LunchRegex = @"\blunchtime\b";
public const string NightRegex = @"\b(mid)?night\b";
public const string CommonDatePrefixRegex = @"^[\.]";
public static readonly string LessThanOneHour = $@"(?<lth>(a\s+)?quarter|three quarter(s)?|half( an hour)?|{BaseDateTime.DeltaMinuteRegex}(\s+(minutes?|mins?))|{DeltaMinuteNumRegex}(\s+(minutes?|mins?)))";
public static readonly string LessThanOneHour = $@"(?<lth>(a\s+)?quarter|three quarter(s)?|half( an hour)?|{BaseDateTime.DeltaMinuteRegex}(\s+(minutes?|mins?)|(?=\s+past))|{DeltaMinuteNumRegex}(\s+(minutes?|mins?)|(?=\s+past)))";
public static readonly string WrittenTimeRegex = $@"(?<writtentime>{HourNumRegex}\s+{MinuteNumRegex}(\s+(minutes?|mins?))?)";
public static readonly string TimePrefix = $@"(?<prefix>{LessThanOneHour}\s+(past|to))";
public static readonly string TimeSuffix = $@"(?<suffix>{AmRegex}|{PmRegex}|{OclockRegex})";
Expand Down Expand Up @@ -924,4 +924,4 @@ public static class DateTimeDefinitions
public const string QuarterTypeRegex = @"(quarter(s|ly)?)$";
public const string YearTypeRegex = @"((years?|annual)(ly)?)$";
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontSimpleCasesRegex = $@"((vom|zwischen)\s*)?{MonthSuffixRegex}\s*((vom|zwischen)\s*)?({DayRegex})\s*{TillRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?";
public static readonly string MonthFrontBetweenRegex = $@"({MonthSuffixRegex}\s+(zwischen\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?)";
public static readonly string BetweenRegex = $@"((zwischen\s+)({DayRegex})(\s+{MonthSuffixRegex})?\s*{RangeConnectorRegex}\s*({DayRegex})(\s+{MonthSuffixRegex})((\s+|\s*,\s*){YearRegex})?|(zwischen\s+)({DayRegex})(\s+{MonthSuffixRegex})?\s*{RangeConnectorRegex}\s*({DayRegex})(\s+{MonthSuffixRegex})?((\s+|\s*,\s*){YearRegex})?)";
public static readonly string MonthWithYear = $@"\b((?<month>apr(il|\.)|aug(ust|\.)|dez(ember|\.)|feb(ruar|ber|\.)|januar|j[äa]n(ner|\.)|jul(e?i|l\.)|jun([io]|\.)|märz|mai|nov(ember|\.)|okt(ober|\.)|sept?(ember|\.))(\s*),?(\s+des)?(\s*)({YearRegex}|(?<order>nächste[mn]|letzte[mn]|diese(s|n))\s+jahres))";
public static readonly string MonthWithYear = $@"\b((?<month>apr(il|\.)|aug(ust|\.)|dez(ember|\.)|feb(ruar|ber|\.)|januar|j[äa]n(ner|\.)|jul(e?i|l\.)|jun([io]|\.)|märz|mai|nov(ember|\.)|okt(ober|\.)|sept?(ember|\.))(\s*),?(\s+des)?(\s*)({YearRegex}|{TwoDigitYearRegex}|(?<order>nächste[mn]|letzte[mn]|diese(s|n))\s+jahres))";
public static readonly string OneWordPeriodRegex = $@"\b((((im\s+)?monat\s+)?({RelativeRegex}\s*(jahr\s*(im\s*)?)?)?(?<month>apr(il|\.)|aug(ust|\.)|dez(ember|\.)|feb(ruar|ber|\.)|j[äa]n(uar|ner|\.)|jul(e?i|l\.)|jun([io]|\.)|märz|mai|nov(ember|\.)|okt(ober|\.)|sept?(ember|\.)))|(?<business>unter\s+der\s+woche)|({RelativeRegex}\s+)?((?<business>werktags|arbeitswoche)|woche(nende)?|monat(s)?|jahr|jahres)(?!(\s+\d+(?!({BaseDateTime.BaseAmDescRegex}|{BaseDateTime.BasePmDescRegex}))|\s+bis\s+heute)))\b";
public static readonly string MonthNumWithYear = $@"({YearRegex}(\s*)[/\-\.](\s*){MonthNumRegex})|({MonthNumRegex}(\s*)[/\-\.](\s*){YearRegex})";
public static readonly string WeekOfMonthRegex = $@"(?<wom>((die|der)\s+)(?<cardinal>erste[rns]?|1\.|zweite[rns]?|2\.|dritte[rns]?|3\.|vierte[rns]?|4\.|fünfte[rns]?|5\.|letzte[rmns]?)\s+woche\s+(des|diese(s|n)|im)\s+({MonthSuffixRegex}|monat(s)?))";
Expand Down Expand Up @@ -98,13 +98,13 @@ public static class DateTimeDefinitions
public static readonly string WeekDayOfMonthRegex = $@"\b(?<wom>((an( dem)?|de[rs]|am)\s+)?(?<cardinal>erste[rns]?|1\.|zweite[rns]?|2\.|dritte[rns]?|3\.|vierte[rns]?|4\.|fünfte[rns]?|5\.|letzte[rmns]?)\s+{WeekDayRegex}\s+{MonthSuffixRegex})\b";
public static readonly string RelativeWeekDayRegex = $@"\b({WrittenNumRegex}\s+{WeekDayRegex}e\s+(von\s+jetzt|später))\b";
public static readonly string SpecialDate = $@"(?=\b(an( dem)?|am)\s+){DayRegex}\b";
public static readonly string DateExtractor1 = $@"\b(({WeekDayRegex})(\s+|\s*,\s*))?({DayRegex}\s*[/\\.,\- ]\s*{MonthRegex}(\s*[/\\.,\- ]\s*{DateYearRegex})?|{BaseDateTime.FourDigitYearRegex}\s*[/\\.,\- ]\s*{DayRegex}\s*[/\\.,\- ]\s*{MonthRegex})\b";
public static readonly string DateExtractor1 = $@"\b(({WeekDayRegex})(\s+|\s*,\s*))?({DayRegex}\s*[/\\.,\- ]\s*({MonthNumRegex}|{MonthRegex})(\s*[/\\.,\- ]\s*{DateYearRegex})?|{BaseDateTime.FourDigitYearRegex}\s*[/\\.,\- ]\s*{DayRegex}\s*[/\\.,\- ]\s*{MonthRegex})\b";
public static readonly string DateExtractor2 = $@"\b({MonthRegex}\s*[/\\.,\- ]\s*{DayRegex}(?!\s*\-\s*\d{{2}}\b)(\s*[/\\.,\- ]\s*{DateYearRegex})?)\b";
public static readonly string DateExtractor3 = $@"\b({DayRegex}{MonthRegex})";
public static readonly string DateExtractor4 = $@"\b({DayRegex}\s*{MonthNumRegex}\s*{DateYearRegex})\b";
public static readonly string DateExtractor5 = $@"\b(({WeekDayRegex})(\s+|\s*,\s*))?({DayRegex}\s*[/\\\-\.]\s*({MonthNumRegex}|{MonthRegex})\s*[/\\\-\.]\s*{DateYearRegex})\b(?!\s*[/\\\-\.]\s*\d+)";
public static readonly string DateExtractor6 = $@"^[.]";
public static readonly string DateExtractor7 = $@"({DayRegex}\s*[\.]\s*{MonthNumRegex}[\.]){BaseDateTime.CheckDecimalRegex}";
public static readonly string DateExtractor7 = $@"\b({DayRegex}\s*[\.]\s*{MonthNumRegex}[\.]){BaseDateTime.CheckDecimalRegex}";
public static readonly string DateExtractor8 = $@"(?<=\b(am)\s+){DayRegex}[/\\\.]{MonthNumRegex}([/\\\.]{DateYearRegex})?{BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor9 = $@"\b({DayRegex}\s*/\s*{MonthNumRegex}((\s+|\s*,\s*){DateYearRegex})?){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor10 = $@"^[.]";
Expand All @@ -125,7 +125,7 @@ public static class DateTimeDefinitions
public const string NightRegex = @"\b(mitternacht|(nachts?|primetime|abends?))\b";
public const string AmPmPrefixRegex = @"\b((((um|gegen)\s*)?(?<suffix>(((?<am>am morgen)|((früh|spät)\s*)?morgens|früh|(vor|nach)mittags?)|(?<pm>((früh|spät)\s*)?(nachmittags?|abends?)|mitternachts?))|(in der\s*)?(?<pm>nachts?)))\s*(um|gegen|von)\s*)";
public const string CommonDatePrefixRegex = @"^[\.]";
public static readonly string LessThanOneHour = $@"\b(?<lth>(ein(er?)?\s+)?((drei)?viertel|halb(en?)?)(\s*stunden?)?)|{BaseDateTime.DeltaMinuteRegex}(\s+(min(uten?)?))|{DeltaMinuteNumRegex}(\s+(min(uten?)?))";
public static readonly string LessThanOneHour = $@"\b(?<lth>(ein(er?)?\s+)?((drei)?viertel|halb(en?)?)(\s*stunden?)?)|{BaseDateTime.DeltaMinuteRegex}(\s+(min(uten?)?)|(?=\s+(nach|vor)))|{DeltaMinuteNumRegex}(\s+(min(uten?)?)|(?=\s+(nach|vor)))";
public static readonly string WrittenTimeRegex = $@"(um\s*)?(?<writtentime>{HourNumRegex}(\s*{OclockRegex}\s*)({MinuteNumRegex}|{MinuteNumRegex}und(?<tens>zwanzig|dreißig|vierzig|fünfzig)))";
public static readonly string TimePrefix = $@"(?<prefix>({LessThanOneHour})(\s*(vor(\W)?|nach(\W)?))?)";
public static readonly string TimeSuffix = $@"(?<suffix>{AmRegex}|{PmRegex}|{OclockRegex})";
Expand Down Expand Up @@ -936,4 +936,4 @@ public static class DateTimeDefinitions
@"year to date"
};
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontBetweenRegex = $@"\b{MonthSuffixRegex}\s+([tf]ra\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string BetweenRegex = $@"\b([tf]ra\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})\s+{MonthSuffixRegex}((\s+|\s*,\s*){YearRegex})?\b";
public const string YearWordRegex = @"\b(?<year>l'anno)\b";
public static readonly string MonthWithYear = $@"\b({MonthRegex}(\.)?(\s*)[/\\\-\.,]?(((\s+del)?\s+{YearRegex})|((\s+(del|di|il))?\s+(?<order>prossim['o]|passato|quest['o])\s*anno)|((\s+(del)?l')anno\s+(?<order>prossimo|passato))))";
public static readonly string MonthWithYear = $@"\b({MonthRegex}(\.)?(\s*)[/\\\-\.,]?(((\s+del)?\s+{YearRegex}|{TwoDigitYearRegex})|((\s+(del|di|il))?\s+(?<order>prossim['o]|passato|quest['o])\s*anno)|((\s+(del)?l')anno\s+(?<order>prossimo|passato))))";
public const string SpecialYearPrefixes = @"(?<special>fiscale|scolastico)";
public static readonly string OneWordPeriodRegex = $@"\b((((il|l[o'])\s*)?((mese di\s+)|({RelativeRegex}\s*))?{MonthRegex}(\s+{RelativeRegex})?)|dall'inizio\s+del(l')\s*(mese|anno)|({RelativeRegex}\s*)?(mi[ao]\s+)?(weekend|finesettimana|settimana|mese|anno)(\s+{RelativeRegex})?(?!((\s+di|del)?\s+\d+))(\s+{AfterNextSuffixRegex})?)\b";
public static readonly string MonthNumWithYear = $@"({YearRegex}[/\-\.]{MonthNumRegex})|({MonthNumRegex}[/\-]{YearRegex})";
Expand Down Expand Up @@ -139,9 +139,9 @@ public static class DateTimeDefinitions
public const string AmRegex = @"\b(?<am>((((la|alla|verso|per|della|di|in)\s+(la\s+)?)?(mattinata|mattina))|(((il|al|verso|per|del|di)\s+(il\s+)?)?(mattino))))\b";
public const string LunchRegex = @"\b(ora di pranzo)\b";
public const string NightRegex = @"\b(mezzanotte|notte)\b";
public static readonly string LessThanOneHour = $@"(?<lth>(un\s+quarto|tre quarti?|mezz[oa]|mezz'ora|{BaseDateTime.DeltaMinuteRegex}(\s+(minut[oi]|min))?|{DeltaMinuteNumRegex}(\s+(minut[oi]|min))|(?<=(e|meno)\s+){DeltaMinuteNumRegex}))";
public static readonly string LessThanOneHour = $@"(?<lth>(un\s+quarto|tre quarti?|mezz[oa]|mezz'ora|{BaseDateTime.DeltaMinuteRegex}|{DeltaMinuteNumRegex}))";
public static readonly string EngTimeRegex = $@"(?<engtime>{HourNumRegex}\s+e\s+({MinuteNumRegex}|(?<tens>venti?|trenta?|quaranta?|cinquanta?){MinuteNumRegex}))";
public static readonly string TimePrefix = $@"(?<prefix>(e\s+{LessThanOneHour}|{LessThanOneHour}\s+(minut[oi]|min)\s+all[e']|meno {LessThanOneHour}))";
public static readonly string TimePrefix = $@"(?<prefix>((e|meno)\s+{LessThanOneHour}(\s+(minut[oi]|min))?|{LessThanOneHour}\s+(minut[oi]|min)\s+all[e']))";
public static readonly string TimeSuffix = $@"(?<suffix>{AmRegex}|{PmRegex}|{OclockRegex})";
public static readonly string BasicTime = $@"\b(?<basictime>{EngTimeRegex}|{HourNumRegex}|{BaseDateTime.HourRegex}:{BaseDateTime.MinuteRegex}(:{BaseDateTime.SecondRegex})?|{BaseDateTime.HourRegex})";
public const string MidnightRegex = @"(?<midnight>mezzanotte|mezza notte)";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ public static class NumbersWithUnitDefinitions
public const string CompoundUnitConnectorRegex = @"(?<spacer>e)";
public static readonly Dictionary<string, string> CurrencyPrefixList = new Dictionary<string, string>
{
{ @"Dollar", @"$" },
{ @"Dollar", @"$|dollari" },
{ @"United States dollar", @"$ stati uniti|us$|us $|u.s. $|u.s $" },
{ @"East Caribbean dollar", @"east caribbean $" },
{ @"Australian dollar", @"$ australiano|$ australia" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ public void AdjustByPrefix(string prefix, ref int hour, ref int min, ref bool ha
minStr = match.Groups["deltaminnum"].Value;
deltaMin = Numbers[minStr];
}
}

// @TODO move hardcoded values to resources file
// @TODO move hardcoded values to resources file

if (trimmedPrefix.EndsWith("zum", StringComparison.Ordinal))
{
deltaMin = -deltaMin;
if (trimmedPrefix.EndsWith("vor", StringComparison.Ordinal))
{
deltaMin = -deltaMin;
}
}

min += deltaMin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public void AdjustByPrefix(string prefix, ref int hour, ref int min, ref bool ha
}

// 'to' i.e 'one to five'
if (trimmedPrefix.StartsWith("meno", StringComparison.Ordinal))
if (trimmedPrefix.StartsWith("meno", StringComparison.Ordinal) ||
trimmedPrefix.EndsWith("alle", StringComparison.Ordinal))
{
deltaMin = -deltaMin;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,9 @@ public PrefixAdjustResult adjustByPrefix(String prefix, int hour, int min, boole
minStr = match.get().getGroup("deltaminnum").value;
deltaMin = numbers.getOrDefault(minStr, 0);
}
}

if (trimmedPrefix.endsWith("zum")) {
deltaMin = -deltaMin;
if (trimmedPrefix.endsWith("vor")) {
deltaMin = -deltaMin;
}
}

min += deltaMin;
Expand Down
Loading