You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by tm...@apache.org on 2017/08/30 21:01:50 UTC

svn commit: r1806735 - in /ctakes/trunk: ctakes-temporal-res/src/main/resources/org/apache/ctakes/temporal/ae/timeannotator/ ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/

Author: tmill
Date: Wed Aug 30 21:01:50 2017
New Revision: 1806735

URL: http://svn.apache.org/viewvc?rev=1806735&view=rev
Log:
Updated time annotator with model that finds time classes as well as time spans. Added to test and adjusted offsets.

Modified:
    ctakes/trunk/ctakes-temporal-res/src/main/resources/org/apache/ctakes/temporal/ae/timeannotator/model.jar
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotator.java
    ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java

Modified: ctakes/trunk/ctakes-temporal-res/src/main/resources/org/apache/ctakes/temporal/ae/timeannotator/model.jar
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal-res/src/main/resources/org/apache/ctakes/temporal/ae/timeannotator/model.jar?rev=1806735&r1=1806734&r2=1806735&view=diff
==============================================================================
Binary files - no diff available.

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotator.java?rev=1806735&r1=1806734&r2=1806735&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotator.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotator.java Wed Aug 30 21:01:50 2017
@@ -152,7 +152,7 @@ public class BackwardsTimeAnnotator exte
     super.initialize(context);
 
     // define chunking
-    this.timeChunking = new BioChunking<BaseToken, TimeMention>(BaseToken.class, TimeMention.class);
+    this.timeChunking = new BioChunking<BaseToken, TimeMention>(BaseToken.class, TimeMention.class, "timeClass");
 
     CombinedExtractor1<BaseToken> allExtractors = new CombinedExtractor1<>(
         new CoveredTextExtractor<BaseToken>(),

Modified: ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java?rev=1806735&r1=1806734&r2=1806735&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java (original)
+++ ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java Wed Aug 30 21:01:50 2017
@@ -46,7 +46,7 @@ public class BackwardsTimeAnnotatorTest
 	public void testPipeline() throws UIMAException, IOException {
 
 		String note = "The patient is a 55-year-old man referred by Dr. Good for recently diagnosed colorectal cancer.  "
-				+ "The patient was well till 6 months ago, when he started having a little blood with stool.";
+				+ "The patient was well until 6 months ago, when he started having a little blood with stool.";
 		JCas jcas = JCasFactory.createJCas();
 		jcas.setDocumentText(note);
 
@@ -74,13 +74,14 @@ public class BackwardsTimeAnnotatorTest
 
 		ArrayList<String> temp = new ArrayList<>();
 		for (TimeMention mention : mentions) {
-			LOGGER.info("Event: " + mention.getCoveredText());
+			LOGGER.info("Time: " + mention.getCoveredText());
+			LOGGER.info("Time class: " + mention.getTimeClass());
 			//LOGGER.info("Time: " + mention.getTime().getNormalizedForm());
 			temp.add(mention.getCoveredText());
 		}
 		assertEquals(2, temp.size());
 		assertTrue(temp.contains("recently"));
-		assertTrue(temp.contains("6 months ago"));
+		assertTrue(temp.contains("until 6 months ago"));
 	}
 
 }