[Maxent-commit] CVS: maxent CHANGES,1.4,1.5 build.xml,1.11,1.12

[Eric F. <er...@us...>]

Update of /cvsroot/maxent/maxent
In directory usw-pr-cvs1:/tmp/cvs-serv11903

Modified Files:
	CHANGES build.xml 
Log Message:
This is the merge of the no_colt branch -> head.  The following notes
are copied from the head of the CHANGES file.

Removed Colt dependency in favor of GNU Trove. (Eric)

Refactored index() method in DataIndexer so that only one pass over the
list of events is needed.  This saves time (of course) and also space,
since it's no longer necessary to allocate temporary data structures to
share data between two loops. (Eric)

Refactored sorting/merging algorithm for ComparableEvents so that
merging can be done in place.  This makes it possible to merge without
copying duplicate events into sublists and so improves the indexer's
ability to work on large data sets with a reasonable amount of memory.
There is still more to be done in this department, however. (Eric)


Index: CHANGES
===================================================================
RCS file: /cvsroot/maxent/maxent/CHANGES,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGES	2001/11/21 10:15:54	1.4
--- CHANGES	2001/12/27 19:20:26	1.5
***************
*** 1,2 ****
--- 1,17 ----
+ 1.2.6
+ -----
+ Removed Colt dependency in favor of GNU Trove. (Eric)
+ 
+ Refactored index() method in DataIndexer so that only one pass over the
+ list of events is needed.  This saves time (of course) and also space,
+ since it's no longer necessary to allocate temporary data structures to
+ share data between two loops. (Eric)
+ 
+ Refactored sorting/merging algorithm for ComparableEvents so that
+ merging can be done in place.  This makes it possible to merge without
+ copying duplicate events into sublists and so improves the indexer's
+ ability to work on large data sets with a reasonable amount of memory.
+ There is still more to be done in this department, however. (Eric)
+ 
  1.2.4
  -----
***************
*** 139,141 ****
  0.2.0
  _____
! Initial release of fully functional maxent package.
\ No newline at end of file
--- 154,156 ----
  0.2.0
  _____
! Initial release of fully functional maxent package.

Index: build.xml
===================================================================
RCS file: /cvsroot/maxent/maxent/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml	2001/11/22 15:07:05	1.11
--- build.xml	2001/12/27 19:20:26	1.12
***************
*** 17,21 ****
      <property name="build.compiler" value="classic"/>
      <property name="debug" value="on"/>
!     <property name="optimize" value="on"/>
      <property name="deprecation" value="on"/>
  
--- 17,21 ----
      <property name="build.compiler" value="classic"/>
      <property name="debug" value="on"/>
!     <property name="optimize" value="off"/>
      <property name="deprecation" value="on"/>
  
***************
*** 42,46 ****
      <path id="build.classpath">
        <pathelement location="${lib.dir}/java-getopt.jar"/>
-       <pathelement location="${lib.dir}/colt.jar"/>
        <pathelement location="${lib.dir}/trove.jar"/>
      </path>
--- 42,45 ----
***************
*** 125,129 ****
          <pathelement path="${build.dir}/${name}-${DSTAMP}.jar"/>
  	<pathelement location="${lib.dir}/java-getopt.jar"/>
- 	<pathelement location="${lib.dir}/colt.jar"/>
  	<pathelement location="${lib.dir}/trove.jar"/>
        </mergefiles>
--- 124,127 ----