Match both centuries in "19th and early 20th century".

HeidelTime · Apr 23, 2018 · 650651d · 650651d
1 parent 7a4f56b
commit 650651d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/resources/english/rules/resources_rules_daterules.txt b/resources/english/rules/resources_rules_daterules.txt
@@ -195,7 +195,7 @@ RULENAME="date_r14d",EXTRACTION="(?:[Tt]he )?%rePartWords\s?%reNumWordTeen %reDe
 //// EXAMPLE r15a_2: the seventh century
 RULENAME="date_r15a",EXTRACTION="(?:[Tt]he )?%(reDayNumberTh|reDayWordTh) [Cc]entur(?:y|ies)",NORM_VALUE="%normDay(%SUM%(%normDay(group(1)),-1))"
 RULENAME="date_r15b",EXTRACTION="%rePartWords(?: the)? %(reDayNumberTh|reDayWordTh) [Cc]entur(?:y|ies)",NORM_VALUE="%normDay(%SUM%(%normDay(group(2)),-1))",NORM_MOD="%normPartWords(group(1))"
-RULENAME="date_r15c",EXTRACTION="(?:[Tt]he )?%(reDayNumberTh|reDayWordTh)%reAndOrTo(?:the )?%(reDayNumberTh|reDayWordTh) [Cc]entur(?:y|ies)",NORM_VALUE="%normDay(%SUM%(%normDay(group(1)),-1))",OFFSET="group(0)-group(1)"
+RULENAME="date_r15c",EXTRACTION="(?:[Tt]he )?%(reDayNumberTh|reDayWordTh)%reAndOrTo(?:the )?(?:%rePartWords )?%(reDayNumberTh|reDayWordTh) [Cc]entur(?:y|ies)",NORM_VALUE="%normDay(%SUM%(%normDay(group(1)),-1))",OFFSET="group(0)-group(1)"
 RULENAME="date_r15d",EXTRACTION="%rePartWords(?: the)? %(reDayNumberTh|reDayWordTh)%reAndOrTo(?:the )?%(reDayNumberTh|reDayWordTh) [Cc]entur(?:y|ies)?",NORM_VALUE="%normDay(%SUM%(%normDay(group(2)),-1))",OFFSET="group(0)-group(2)",NORM_MOD="%normPartWords(group(1))"
 
 ///////////////////////////////////

diff --git a/test/de/unihd/dbs/heideltime/test/english/EnglishDateTest.java b/test/de/unihd/dbs/heideltime/test/english/EnglishDateTest.java
@@ -364,6 +364,20 @@ public void testdate_r15a() {
 				new String[] { "date_r15a", "the seventh century", "06" });
 	}
 
+	@Test
+	public void testdate_r15c() {
+		testSingleCase("19th and 20th century", //
+				new String[] { "date_r15c", "19th", "18" }, //
+				new String[] { "date_r15a", "20th century", "19" });
+	}
+
+	@Test
+	public void testdate_r15b() {
+		testSingleCase("19th and early 20th century", //
+				new String[] { "date_r15c", "19th", "18" }, //
+				new String[] { "date_r15b", "early 20th century", "19" });
+	}
+
 	@Test
 	public void testdate_r16a() {
 		testSingleCase("March", //