[Maxent-commit] CVS: maxent/src/java/opennlp/maxent GISTrainer.java,1.4,1.5

[Jason B. <jas...@us...>]

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

Modified Files:
	GISTrainer.java 
Log Message:
Made use of new increment() and adjustValue() methods available for Trove hashmaps.

Index: GISTrainer.java
===================================================================
RCS file: /cvsroot/maxent/maxent/src/java/opennlp/maxent/GISTrainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GISTrainer.java	8 Apr 2002 16:14:06 -0000	1.4
--- GISTrainer.java	9 Apr 2002 09:15:10 -0000	1.5
***************
*** 132,136 ****
          new TIntDoubleProcedure() {
                  public boolean execute(int oid, double arg) {
!                     pabi[TID].put(oid, pabi[TID].get(oid) + arg);
                      return true;
                  }
--- 132,136 ----
          new TIntDoubleProcedure() {
                  public boolean execute(int oid, double arg) {
!                     pabi[TID].adjustValue(oid, arg);
                      return true;
                  }
***************
*** 180,184 ****
          new TIntDoubleProcedure() {
                  public boolean execute(int oid, double arg) {
!                     CFMOD +=  arg * cfvals[TID].get(oid) * numTimesEventsSeen[TID];
                      return true;
                  }
--- 180,185 ----
          new TIntDoubleProcedure() {
                  public boolean execute(int oid, double arg) {
!                     CFMOD +=
! 			arg * cfvals[TID].get(oid) * numTimesEventsSeen[TID];
                      return true;
                  }
***************
*** 357,363 ****
                      for (int i=0; i<predkeys.length; i++) {
                          OID = predkeys[i];
!                         if (cfvals[TID].containsKey(OID)) {
!                             cfvals[TID].put(OID, cfvals[TID].get(OID) + 1);
!                         } else {
                              cfvals[TID].put(OID, 1);
                              pabi[TID].put(OID, 0.0);
--- 358,362 ----
                      for (int i=0; i<predkeys.length; i++) {
                          OID = predkeys[i];
!                         if (!cfvals[TID].increment(OID)) {
                              cfvals[TID].put(OID, 1);
                              pabi[TID].put(OID, 0.0);