[Maxent-commit] CVS: maxent/src/java/opennlp/maxent BasicEventStream.java, 1.2, 1.3

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

Update of /cvsroot/maxent/maxent/src/java/opennlp/maxent
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21119/src/java/opennlp/maxent

Modified Files:
	BasicEventStream.java 
Log Message:
reformatted.

Index: BasicEventStream.java
===================================================================
RCS file: /cvsroot/maxent/maxent/src/java/opennlp/maxent/BasicEventStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BasicEventStream.java	10 May 2004 03:11:54 -0000	1.2
--- BasicEventStream.java	21 Mar 2007 19:02:10 -0000	1.3
***************
*** 1,19 ****
  ///////////////////////////////////////////////////////////////////////////////
! // Copyright (C) 2001 Jason Baldridge
  //
! // This library is free software; you can redistribute it and/or
! // modify it under the terms of the GNU Lesser General Public
! // License as published by the Free Software Foundation; either
! // version 2.1 of the License, or (at your option) any later version.
  //
! // This library is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! // GNU General Public License for more details.
  //
! // You should have received a copy of the GNU Lesser General Public
! // License along with this program; if not, write to the Free Software
! // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! //////////////////////////////////////////////////////////////////////////////   
  package opennlp.maxent;
  
--- 1,19 ----
  ///////////////////////////////////////////////////////////////////////////////
! //Copyright (C) 2001 Jason Baldridge
  //
! //This library is free software; you can redistribute it and/or
! //modify it under the terms of the GNU Lesser General Public
! //License as published by the Free Software Foundation; either
! //version 2.1 of the License, or (at your option) any later version.
  //
! //This library is distributed in the hope that it will be useful,
! //but WITHOUT ANY WARRANTY; without even the implied warranty of
! //MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! //GNU General Public License for more details.
  //
! //You should have received a copy of the GNU Lesser General Public
! //License along with this program; if not, write to the Free Software
! //Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! //////////////////////////////////////////////////////////////////////////////
  package opennlp.maxent;
  
***************
*** 29,84 ****
   * @author      Jason Baldridge
   * @version $Revision$, $Date$ 
! */
  public class BasicEventStream implements EventStream {
!     ContextGenerator _cg = new BasicContextGenerator();
!     DataStream _ds;
!     Event _next;
! 
!     public BasicEventStream (DataStream ds) {
! 	_ds = ds;
! 	if (_ds.hasNext())
! 	    _next = createEvent((String)_ds.nextToken());
!     }
! 
!     /**
!      * Returns the next Event object held in this EventStream.  Each call to nextEvent advances the EventStream.
!      *
!      * @return the Event object which is next in this EventStream
!      */
!     public Event nextEvent () {
! 	while (_next == null && _ds.hasNext())
! 	    _next = createEvent((String)_ds.nextToken());
! 
! 	Event current = _next;
! 	if (_ds.hasNext()) {
! 	    _next = createEvent((String)_ds.nextToken());
! 	}
! 	else {
! 	    _next = null;
! 	}
! 	return current;
!     }
!  
!     /**
!      * Test whether there are any Events remaining in this EventStream.
!      *
!      * @return true if this EventStream has more Events
!      */
!     public boolean hasNext () {
! 	while (_next == null && _ds.hasNext())
! 	    _next = createEvent((String)_ds.nextToken());
! 	return _next != null;
      }
! 
!     private Event createEvent(String obs) {
! 	int lastSpace = obs.lastIndexOf(' ');
! 	if (lastSpace == -1) 
! 	    return null;
! 	else
! 	    return new Event(obs.substring(lastSpace+1),
! 			     _cg.getContext(obs.substring(0, lastSpace)));
      }
! 
! 
  }
  
--- 29,84 ----
   * @author      Jason Baldridge
   * @version $Revision$, $Date$ 
!  */
  public class BasicEventStream implements EventStream {
!   ContextGenerator cg = new BasicContextGenerator();
!   DataStream ds;
!   Event next;
!   
!   public BasicEventStream (DataStream ds) {
!     this.ds = ds;
!     if (this.ds.hasNext())
!       next = createEvent((String)this.ds.nextToken());
!   }
!   
!   /**
!    * Returns the next Event object held in this EventStream.  Each call to nextEvent advances the EventStream.
!    *
!    * @return the Event object which is next in this EventStream
!    */
!   public Event nextEvent () {
!     while (next == null && this.ds.hasNext())
!       next = createEvent((String)this.ds.nextToken());
!     
!     Event current = next;
!     if (this.ds.hasNext()) {
!       next = createEvent((String)this.ds.nextToken());
      }
!     else {
!       next = null;
      }
!     return current;
!   }
!   
!   /**
!    * Test whether there are any Events remaining in this EventStream.
!    *
!    * @return true if this EventStream has more Events
!    */
!   public boolean hasNext () {
!     while (next == null && ds.hasNext())
!       next = createEvent((String)ds.nextToken());
!     return next != null;
!   }
!   
!   private Event createEvent(String obs) {
!     int lastSpace = obs.lastIndexOf(' ');
!     if (lastSpace == -1) 
!       return null;
!     else
!       return new Event(obs.substring(lastSpace+1),
!           cg.getContext(obs.substring(0, lastSpace)));
!   }
!   
!   
  }