[Maxent-commit] CVS: maxent/src/java/opennlp/maxent RealBasicEventStream.java, 1.1, 1.2

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

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

Modified Files:
	RealBasicEventStream.java 
Log Message:
simplified code and fixed bug.

Index: RealBasicEventStream.java
===================================================================
RCS file: /cvsroot/maxent/maxent/src/java/opennlp/maxent/RealBasicEventStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RealBasicEventStream.java	21 Mar 2007 19:04:37 -0000	1.1
--- RealBasicEventStream.java	13 Apr 2007 16:14:39 -0000	1.2
***************
*** 38,73 ****
        return null;
      else {
!       String[] contexts = obs.substring(lastSpace+1).split("\\s+");
!       float[] values = new float[contexts.length];
!       boolean hasRealValue = false;
!       for (int ci=0;ci<contexts.length;ci++) {
!         int ei = contexts[ci].lastIndexOf("=");
!         if (ei > 0 && ei+1 < contexts[ci].length()) {
!           values[ci] = Float.parseFloat(contexts[ci].substring(ei+1));
!           if (values[ci] < 0) {
!             // TODO: Throw corrpurt data exception
!             return null;
!           }
!           contexts[ci] = contexts[ci].substring(0,ei);
!           hasRealValue = true;
!         }
!         else {
!           values[ci] = 1;
!         }
!       }
!       if (!hasRealValue) {
!         values = null;
!       }
        return new Event(obs.substring(lastSpace+1),contexts,values);
      }
    }
  
-   /**
-    * @param args
-    */
-   public static void main(String[] args) {
-     // TODO Auto-generated method stub
- 
-   }
- 
  }
--- 38,46 ----
        return null;
      else {
!       String[] contexts = obs.substring(0,lastSpace).split("\\s+");
!       float[] values = RealValueFileEventStream.parseContexts(contexts);
        return new Event(obs.substring(lastSpace+1),contexts,values);
      }
    }
  
  }