[Maxent-commit] CVS: maxent/src/java/opennlp/maxent GISTrainer.java,1.11,1.12

[Thomas M. <tsm...@us...>]

Update of /cvsroot/maxent/maxent/src/java/opennlp/maxent
In directory sc8-pr-cvs1:/tmp/cvs-serv25478/src/java/opennlp/maxent

Modified Files:
	GISTrainer.java 
Log Message:
added performance on training data output when printing messages.

Index: GISTrainer.java
===================================================================
RCS file: /cvsroot/maxent/maxent/src/java/opennlp/maxent/GISTrainer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GISTrainer.java	13 Dec 2003 16:41:29 -0000	1.11
--- GISTrainer.java	17 Dec 2003 19:37:10 -0000	1.12
***************
*** 420,423 ****
--- 420,424 ----
          CFMOD=0.0;
  	int numEvents=0;
+         int numCorrect = 0;
          for (TID=0; TID<numTokens; TID++) {
  	  // TID, modeldistribution and PID are globals used in 
***************
*** 437,440 ****
--- 438,453 ----
  	  loglikelihood+=Math.log(modelDistribution[outcomes[TID]])*numTimesEventsSeen[TID];
  	  numEvents+=numTimesEventsSeen[TID];
+           if (printMessages) { 
+             int max = 0;
+             for (OID=1;OID<numOutcomes;OID++) {
+               if (modelDistribution[OID] > modelDistribution[max]) {
+                 max = OID;
+               }
+             }
+             if (max == outcomes[TID]) {
+               numCorrect+=numTimesEventsSeen[TID];
+             }
+           }
+     
          }
          display(".");
***************
*** 448,452 ****
              correctionParam +=(cfObservedExpect - Math.log(CFMOD));
  
!         display(". loglikelihood="+loglikelihood+"\n");
  	return(loglikelihood);
      }    
--- 461,465 ----
              correctionParam +=(cfObservedExpect - Math.log(CFMOD));
  
!         display(". loglikelihood="+loglikelihood+"\t"+((double) numCorrect/numEvents)+"\n");
  	return(loglikelihood);
      }