From 8c0818707cbbb5e54b87d1d9b6e26ac84ecf7a7c Mon Sep 17 00:00:00 2001
From: Thomas Proisl <thomas.proisl@fau.de>
Date: Mon, 14 Aug 2023 20:48:05 +0200
Subject: [PATCH] Fix #25 (dates at the end of sentences)

---
 src/somajo/tokenizer.py         | 8 ++++----
 tests/test_sentence_splitter.py | 3 +++
 tests/test_tokenizer.py         | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/somajo/tokenizer.py b/src/somajo/tokenizer.py
index 0c72981..ad63cad 100644
--- a/src/somajo/tokenizer.py
+++ b/src/somajo/tokenizer.py
@@ -277,10 +277,10 @@ def __init__(self, split_camel_case=False, token_classes=False, extra_info=False
         self.underline = re.compile(r"(?<!\w)(?P<left>_)(?P<middle>\w[^_]+\w)(?P<right>_)(?!\w)")
 
         # DATE, TIME, NUMBERS
-        self.three_part_date_year_first = re.compile(r'(?<![\d.]) (?P<a_year>\d{4}) (?P<b_month_or_day>([/-])\d{1,2}) (?P<c_day_or_month>\3\d{1,2}) (?![\d.])', re.VERBOSE)
-        self.three_part_date_dmy = re.compile(r'(?<![\d.]) (?P<a_day>(?:0?[1-9]|1[0-9]|2[0-9]|3[01])([./-])) (?P<b_month>(?:0?[1-9]|1[0-2])\2) (?P<c_year>(?:\d\d){1,2}) (?![\d.])', re.VERBOSE)
-        self.three_part_date_mdy = re.compile(r'(?<![\d.]) (?P<a_month>(?:0?[1-9]|1[0-2])([./-])) (?P<b_day>(?:0?[1-9]|1[0-9]|2[0-9]|3[01])\2) (?P<c_year>(?:\d\d){1,2}) (?![\d.])', re.VERBOSE)
-        self.two_part_date = re.compile(r'(?<![\d.]) (?P<a_day_or_month>\d{1,2}([./-])) (?P<b_day_or_month>\d{1,2}\2) (?![\d.])', re.VERBOSE)
+        self.three_part_date_year_first = re.compile(r'(?<![\d.]) (?P<a_year>\d{4}) (?P<b_month_or_day>([/-])\d{1,2}) (?P<c_day_or_month>\3\d{1,2}) (?!\d)', re.VERBOSE)
+        self.three_part_date_dmy = re.compile(r'(?<![\d.]) (?P<a_day>(?:0?[1-9]|1[0-9]|2[0-9]|3[01])([./-])) (?P<b_month>(?:0?[1-9]|1[0-2])\2) (?P<c_year>(?:\d\d){1,2}) (?!\d)', re.VERBOSE)
+        self.three_part_date_mdy = re.compile(r'(?<![\d.]) (?P<a_month>(?:0?[1-9]|1[0-2])([./-])) (?P<b_day>(?:0?[1-9]|1[0-9]|2[0-9]|3[01])\2) (?P<c_year>(?:\d\d){1,2}) (?!\d)', re.VERBOSE)
+        self.two_part_date = re.compile(r'(?<![\d.]) (?P<a_day_or_month>\d{1,2}([./-])) (?P<b_day_or_month>\d{1,2}\2) (?!\d)', re.VERBOSE)
         self.time = re.compile(r'(?<!\w)\d{1,2}(?:(?::\d{2}){1,2}){1,2}(?![\d:])')
         self.en_time = re.compile(r'(?<![\w])(?P<a_time>\d{1,2}(?:(?:[.:]\d{2})){0,2}) ?(?P<b_am_pm>(?:[ap]m\b|[ap]\.m\.(?!\w)))', re.IGNORECASE)
         self.en_us_phone_number = re.compile(r"(?<![\d-])(?:[2-9]\d{2}[/-])?\d{3}-\d{4}(?![\d-])")
diff --git a/tests/test_sentence_splitter.py b/tests/test_sentence_splitter.py
index ff08a74..4a44ef8 100644
--- a/tests/test_sentence_splitter.py
+++ b/tests/test_sentence_splitter.py
@@ -195,6 +195,9 @@ def test_misc_22(self):
     def test_misc_23(self):
         self._equal("Auf drei Schiffen des III. Geschwaders", ["Auf drei Schiffen des III. Geschwaders"])
 
+    def test_misc_24(self):
+        self._equal("Am Ende dieses Satzes steht 12.03.2023. Am Ende dieses Satzes steht 12.03.2023.", ["Am Ende dieses Satzes steht 12. 03. 2023 .", "Am Ende dieses Satzes steht 12. 03. 2023 ."])
+
 
 class TestMiscEnglish(TestSentenceSplitterEnglish):
     """"""
diff --git a/tests/test_tokenizer.py b/tests/test_tokenizer.py
index 34b52e9..a9441e7 100644
--- a/tests/test_tokenizer.py
+++ b/tests/test_tokenizer.py
@@ -950,6 +950,9 @@ def test_punctuation_71(self):
     def test_punctuation_72(self):
         self._equal("Punkte 2-4. Das System", "Punkte 2 - 4 . Das System")
 
+    def test_punctuation_73(self):
+        self._equal("Am Ende dieses Satzes steht 12.03.2023.", "Am Ende dieses Satzes steht 12. 03. 2023 .")
+
 
 class TestEmailsURLs(TestTokenizer):
     def test_emails_urls_01(self):