Several optimizations, refactoring

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.github.heideltime</groupId>
 	<artifactId>heideltime</artifactId>
-	<version>2.2.1</version>
+	<version>2.2.2-SNAPSHOT</version>
 
 	<name>HeidelTime</name>
 	<description>HeidelTime is a multilingual cross-domain temporal tagger that extracts temporal expressions from documents and normalizes them according to the TIMEX3 annotation standard.</description>
@@ -24,6 +24,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.test.skip>true</maven.test.skip>
+		<gpg.skip>true</gpg.skip>
 	</properties>
 
 	<developers>
@@ -50,6 +52,8 @@
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<outputDirectory>${basedir}/class</outputDirectory>
+		<testSourceDirectory>test</testSourceDirectory>
+		<testOutputDirectory>${basedir}/testclass</testOutputDirectory>
 		<resources>
 			<resource>
 				<directory>${basedir}</directory>
@@ -70,8 +74,17 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<outputDirectory>
+						${project.build.directory}/lib
+					</outputDirectory>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -183,21 +196,21 @@
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-core</artifactId>
-			<version>2.8.1</version>
+			<version>2.10.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- for the StanfordPOSTaggerWrapper -->
 		<dependency>
 			<groupId>edu.stanford.nlp</groupId>
 			<artifactId>stanford-corenlp</artifactId>
-			<version>3.3.1</version>
+			<version>3.8.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- these are for JVnTextPro -->
 		<dependency>
 			<groupId>args4j</groupId>
 			<artifactId>args4j</artifactId>
-			<version>2.32</version>
+			<version>2.33</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -206,5 +219,32 @@
 			<version>0.1</version>
 			<scope>provided</scope>
 		</dependency>
+		<!-- Logging facade -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Default logging - you can mask these -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>[1.2.3,)</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>[1.2.3,)</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- JUnit4 testing -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>[4.12,5)</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

resources/english/normalization/resources_normalization_normDay.txt

@@ -1,52 +1,42 @@
 // author: Jannik Strötgen
-// email:  [email protected]
+// email:  stroetgen@uni-hd\.de
 // date:   2011-06-10
 // This file contains "day words" and their normalized expressions
-// according to TIMEX3 format.
+// according to TIMEX3 format\.
 // For example, the normalized value of "first" is "01"
 // FORMAT: "day-word","normalized-day-word"
-"0","00"
-"00","00"
-"1","01"
-"01","01"
-"2","02"
-"02","02"
-"3","03"
-"03","03"
-"4","04"
-"04","04"
-"5","05"
-"05","05"
-"6","06"
-"06","06"
-"7","07"
-"07","07"
-"8","08"
-"08","08"
-"9","09"
-"09","09"
-"10","10"
-"11","11"
-"12","12"
-"13","13"
-"14","14"
-"15","15"
-"16","16"
-"17","17"
-"18","18"
-"19","19"
-"20","20"
-"21","21"
-"22","22"
-"23","23"
-"24","24"
-"25","25"
-"26","26"
-"27","27"
-"28","28"
-"29","29"
-"30","30"
-"31","31"
+"00?\.?","00"
+"0?1\.?","01"
+"0?2\.?","02"
+"0?3\.?","03"
+"0?4\.?","04"
+"0?5\.?","05"
+"0?6\.?","06"
+"0?7\.?","07"
+"0?8\.?","08"
+"0?9\.?","09"
+"10\.?","10"
+"11\.?","11"
+"12\.?","12"
+"13\.?","13"
+"14\.?","14"
+"15\.?","15"
+"16\.?","16"
+"17\.?","17"
+"18\.?","18"
+"19\.?","19"
+"20\.?","20"
+"21\.?","21"
+"22\.?","22"
+"23\.?","23"
+"24\.?","24"
+"25\.?","25"
+"26\.?","26"
+"27\.?","27"
+"28\.?","28"
+"29\.?","29"
+"30\.?","30"
+"31\.?","31"
 //
 "first","01"
 "second","02"
@@ -115,15 +105,15 @@
 "Thirtieth","30"
 "Thirty-first","31"
 // 
-"1st","01"
-"2nd","02"
-"3rd","03"
-"4th","04"
-"5th","05"
-"6th","06"
-"7th","07"
-"8th","08"
-"9th","09"
+"0?1st","01"
+"0?2nd","02"
+"0?3rd","03"
+"0?4th","04"
+"0?5th","05"
+"0?6th","06"
+"0?7th","07"
+"0?8th","08"
+"0?9th","09"
 "10th","10"
 "11th","11"
 "12th","12"

resources/english/normalization/resources_normalization_normDayInWeek.txt

@@ -19,3 +19,5 @@
 "Friday","5"
 "Saturday","6"
 "Sunday","7"
+// Popular spelling mistakes
+"[Ww]e[dn][nd]e?sday","3"