[Maxent-commit] CVS: maxent/src/java/opennlp/maxent GISModel.java,1.9,1.10

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

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

Modified Files:
	GISModel.java 
Log Message:
Fixed formatting bug in getAllOutcomes.  Problem pointed out by Leif Arda Nielsen in help forum.  Thanks Leif.


Index: GISModel.java
===================================================================
RCS file: /cvsroot/maxent/maxent/src/java/opennlp/maxent/GISModel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GISModel.java	11 Dec 2002 16:18:41 -0000	1.9
--- GISModel.java	11 Mar 2003 03:05:03 -0000	1.10
***************
*** 20,23 ****
--- 20,24 ----
  import gnu.trove.*;
  import java.util.*;
+ import java.text.DecimalFormat;
  
  /**
***************
*** 38,41 ****
--- 39,43 ----
      private final double iprob;
      private final double fval;
+     private DecimalFormat df;
  
      private int[] numfeats;
***************
*** 159,172 ****
          }
          else {
              StringBuffer sb = new StringBuffer(ocs.length*2);
!             String d = Double.toString(ocs[0]);
!             if (d.length() > 6)
!                 d = d.substring(0,7);
!             sb.append(ocNames[0]).append("[").append(d).append("]");
              for (int i = 1; i<ocs.length; i++) {
!                 d = Double.toString(ocs[i]);
!                 if (d.length() > 6)
!                     d = d.substring(0,7);
!                 sb.append("  ").append(ocNames[i]).append("[").append(d).append("]");
              }
              return sb.toString();
--- 161,171 ----
          }
          else {
+             if (df == null) { //lazy initilazation
+               df = new DecimalFormat("0.0000");
+             }
              StringBuffer sb = new StringBuffer(ocs.length*2);
!             sb.append(ocNames[0]).append("[").append(df.format(ocs[0])).append("]");
              for (int i = 1; i<ocs.length; i++) {
!                 sb.append("  ").append(ocNames[i]).append("[").append(df.format(ocs[i])).append("]");
              }
              return sb.toString();