[Maxent-commit] CVS: maxent/src/main/java/opennlp/perceptron PerceptronModelWriter.java, 1.3, 1.4

[Joern K. <joe...@us...>]

Update of /cvsroot/maxent/maxent/src/main/java/opennlp/perceptron
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9875/src/main/java/opennlp/perceptron

Modified Files:
	PerceptronModelWriter.java 
Log Message:
[ maxent-Bugs-3077040 ] ClassCastException when Perceptron model is serialized

Index: PerceptronModelWriter.java
===================================================================
RCS file: /cvsroot/maxent/maxent/src/main/java/opennlp/perceptron/PerceptronModelWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PerceptronModelWriter.java	6 Sep 2010 08:02:18 -0000	1.3
--- PerceptronModelWriter.java	28 Sep 2010 07:54:07 -0000	1.4
***************
*** 24,28 ****
  import java.util.Arrays;
  import java.util.List;
- import java.util.Map;
  
  import opennlp.model.AbstractModel;
--- 24,27 ----
***************
*** 30,33 ****
--- 29,33 ----
  import opennlp.model.ComparablePredicate;
  import opennlp.model.Context;
+ import opennlp.model.IndexHashTable;
  
  /**
***************
*** 48,58 ****
        this.numOutcomes = model.getNumOutcomes();
        PARAMS = (Context[]) data[0];
!       Map<String,Integer> pmap = (Map<String,Integer>)data[1];
        OUTCOME_LABELS = (String[])data[2];
        
        PRED_LABELS = new String[pmap.size()];
!       for (String pred : pmap.keySet()) {
!         PRED_LABELS[pmap.get(pred)] = pred;
!       }
      }
  
--- 48,56 ----
        this.numOutcomes = model.getNumOutcomes();
        PARAMS = (Context[]) data[0];
!       IndexHashTable<String> pmap = (IndexHashTable<String>) data[1];
        OUTCOME_LABELS = (String[])data[2];
        
        PRED_LABELS = new String[pmap.size()];
!       pmap.toArray(PRED_LABELS);
      }