[marf-cvs] apps/ZipfLawApp ZipfLaw.java,1.26,1.27

[Serguei A. M. <mo...@us...>]

Update of /cvsroot/marf/apps/ZipfLawApp
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24170/apps/ZipfLawApp

Modified Files:
	ZipfLaw.java 
Log Message:
Fix two bugs in the Zipf's Law implementation, namely #1459461 and #1551592.
In the latter a case when just a corpus filename is supplied was overlooked
and was giving and error of invalid options. The former of the
irregular ArrayIndexOutOfBounds, was due to the fact that for the large
corpora (and depending on the tokenizer settings) there exist words
with the occurence frequency greater than 100, but we were collecting up
to the hundred only, so this was for now fixed by placing a warning that
beyond the page boundary, no C(f,w) is computed. This ought to change
for the general case, but in some near future. Clean up some comments
in the StatisticalObject.


Index: ZipfLaw.java
===================================================================
RCS file: /cvsroot/marf/apps/ZipfLawApp/ZipfLaw.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ZipfLaw.java	27 Jan 2006 19:53:37 -0000	1.26
--- ZipfLaw.java	3 Sep 2006 20:56:01 -0000	1.27
***************
*** 15,19 ****
   * </p>
   *
!  * * <p>Copyright (c) 2005 - 2006 The MARF Research and Development Group.
   * For more details, please consult <a href="http://marf.sf.net">http://marf.sf.net</a>.
   * </p>
--- 15,19 ----
   * </p>
   *
!  * <p>Copyright (c) 2005 - 2006 The MARF Research and Development Group.
   * For more details, please consult <a href="http://marf.sf.net">http://marf.sf.net</a>.
   * </p>
***************
*** 158,162 ****
  			(
  				oGetOpt.getInvalidOptions().size() > 1
! 				|| oGetOpt.getInvalidOptions().size() == oGetOpt.size()
  			)
  			{
--- 158,162 ----
  			(
  				oGetOpt.getInvalidOptions().size() > 1
! 				|| (oGetOpt.getInvalidOptions().size() == oGetOpt.size() && oGetOpt.getInvalidOptions().size() > 1)
  			)
  			{