ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1633191 - in /ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval: Evaluation_ImplBase.java THYMEData.java
Date Mon, 20 Oct 2014 18:00:13 GMT
Author: clin
Date: Mon Oct 20 18:00:13 2014
New Revision: 1633191

URL: http://svn.apache.org/r1633191
Log:
re-split thyme data:
1-2: train
3: dev
4-5: test

Modified:
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/THYMEData.java

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java?rev=1633191&r1=1633190&r2=1633191&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
(original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
Mon Oct 20 18:00:13 2014
@@ -145,13 +145,13 @@ org.cleartk.eval.Evaluation_ImplBase<Int
 		@Option(longName = "patients")
 		public CommandLine.IntegerRanges getPatients();
 
-		@Option(longName = "train-remainders", defaultValue = "0-3")
+		@Option(longName = "train-remainders", defaultValue = "0-2")
 		public CommandLine.IntegerRanges getTrainRemainders();
 
-		@Option(longName = "dev-remainders", defaultValue = "4-5")
+		@Option(longName = "dev-remainders", defaultValue = "3")
 		public CommandLine.IntegerRanges getDevRemainders();
 
-		@Option(longName = "test-remainders", defaultValue = "6-7")
+		@Option(longName = "test-remainders", defaultValue = "4-5")
 		public CommandLine.IntegerRanges getTestRemainders();
 
 		@Option(longName = "treebank", defaultToNull=true)
@@ -274,11 +274,11 @@ org.cleartk.eval.Evaluation_ImplBase<Int
 	}
 
 	private List<File> getFilesFor(List<Integer> patientSets) throws FileNotFoundException
{
-		List<File> files = new ArrayList<File>();
+		List<File> files = new ArrayList<>();
 		if (this.rawTextDirectory == null
 				&& this.xmlFormat == XMLFormat.Anafora) {
 			for (File dir : this.xmlDirectory.listFiles()) {
-				Set<String> ids = new HashSet<String>();
+				Set<String> ids = new HashSet<>();
 				for (Integer set : patientSets) {
 					ids.add(String.format("ID%03d", set));
 				}
@@ -614,7 +614,7 @@ org.cleartk.eval.Evaluation_ImplBase<Int
 
 		@Override
 		public void process(JCas jCas) throws AnalysisEngineProcessException {
-			List<LookupWindowAnnotation> lws = new ArrayList<LookupWindowAnnotation>(JCasUtil.select(jCas,
LookupWindowAnnotation.class));
+			List<LookupWindowAnnotation> lws = new ArrayList<>(JCasUtil.select(jCas, LookupWindowAnnotation.class));
 			// we'll navigate backwards so that as we delete things we shorten the list from the back
 			for(int i = lws.size()-2; i >= 0; i--){
 				LookupWindowAnnotation lw1 = lws.get(i);

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/THYMEData.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/THYMEData.java?rev=1633191&r1=1633190&r2=1633191&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/THYMEData.java
(original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/THYMEData.java
Mon Oct 20 18:00:13 2014
@@ -30,9 +30,9 @@ import com.google.common.collect.Sets;
 public class THYMEData {
 	public static final Set<String> SEGMENTS_TO_SKIP = Sets.newHashSet("20104", "20105",
"20116", "20138");
 
-	public static final Set<Integer> TRAIN_REMAINDERS = Sets.newHashSet(0, 1, 2);//, 3);
-	public static final Set<Integer> DEV_REMAINDERS = Sets.newHashSet(3);//(4, 5);
-	public static final Set<Integer> TEST_REMAINDERS = Sets.newHashSet(4, 5);//(6, 7);
//6 and 7 were reserved.
+	public static final Set<Integer> TRAIN_REMAINDERS = Sets.newHashSet(0, 1, 2, 3);
+	public static final Set<Integer> DEV_REMAINDERS = Sets.newHashSet(4, 5);
+	public static final Set<Integer> TEST_REMAINDERS = Sets.newHashSet(6, 7); 
 
 	public static List<Integer> getPatientSets(List<Integer> patientSets, Collection<Integer>
remainders) {
 		List<Integer> items = new ArrayList<>();



Mime
View raw message