You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2011/11/11 12:43:20 UTC

svn commit: r1200826 - /incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/TrainEval.java

Author: joern
Date: Fri Nov 11 11:43:20 2011
New Revision: 1200826

URL: http://svn.apache.org/viewvc?rev=1200826&view=rev
Log:
OPENNLP-369 Now using for each loop. Thanks to Aliaksandr Autayeu for providing patch.

Modified:
    incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/TrainEval.java

Modified: incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/TrainEval.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/TrainEval.java?rev=1200826&r1=1200825&r2=1200826&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/TrainEval.java (original)
+++ incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/TrainEval.java Fri Nov 11 11:43:20 2011
@@ -43,18 +43,20 @@ public class TrainEval {
 	Event[] events = (e.getEventCollector(r)).getEvents(true);
 	//MaxentModel model = e.getModel(dir, name);
 	String negOutcome = e.getNegativeOutcome();
-	for(int i=0; i<events.length; i++) {
-	    String guess =
-		model.getBestOutcome(model.eval(events[i].getContext()));
-	    String ans = events[i].getOutcome();
-	    if(verbose)
-		System.out.println(ans + " " + guess);
-	    if(!ans.equals(negOutcome)) totPos++;
-	    if(!guess.equals(negOutcome) && !guess.equals(ans))
-		falsePos++;
-	    else if(ans.equals(guess))
-		truePos++;
-	}
+    for (Event event : events) {
+      String guess = model.getBestOutcome(model.eval(event.getContext()));
+      String ans = event.getOutcome();
+      if (verbose)
+        System.out.println(ans + " " + guess);
+      
+      if (!ans.equals(negOutcome))
+        totPos++;
+      
+      if (!guess.equals(negOutcome) && !guess.equals(ans))
+        falsePos++;
+      else if (ans.equals(guess))
+        truePos++;
+    }
 	
 	System.out.println("Precision: " + truePos/(truePos+falsePos));
 	System.out.println("Recall:    " + truePos/totPos);