[marf-cvs] marf/src/marf/Stats/StatisticalEstimators/Smoothing GoodTuring.java,1.18,1.19 WittenBell.java,1.18,1.19

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

Update of /cvsroot/marf/marf/src/marf/Stats/StatisticalEstimators/Smoothing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7622/marf/src/marf/Stats/StatisticalEstimators/Smoothing

Modified Files:
	GoodTuring.java WittenBell.java 
Log Message:
Clean up code more WRT coding conventions and remove redundant casts
reported by Eclipse.


Index: GoodTuring.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/Stats/StatisticalEstimators/Smoothing/GoodTuring.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GoodTuring.java	15 Jan 2006 06:58:08 -0000	1.18
--- GoodTuring.java	21 Jan 2006 02:35:32 -0000	1.19
***************
*** 106,110 ****
  								)
  								/
! 								(double)(1 - (this.iThreshold + 1) * alN[this.iThreshold + 1] / (double)alN[1]);
  						}
  
--- 106,110 ----
  								)
  								/
! 								(1 - (this.iThreshold + 1) * alN[this.iThreshold + 1] / (double)alN[1]);
  						}
  
***************
*** 158,162 ****
  									)
  									/
! 									(double)(1 - (this.iThreshold + 1) * alN[this.iThreshold + 1] / (double)alN[1]);
  							}
  
--- 158,162 ----
  									)
  									/
! 									(1 - (this.iThreshold + 1) * alN[this.iThreshold + 1] / (double)alN[1]);
  							}
  
***************
*** 212,216 ****
  										)
  										/
! 										(double)(1 - (this.iThreshold + 1) * alN[this.iThreshold + 1] / (double)alN[1]);
  
  								this.oProbabilityTable.setOccurence(j, i, k, dNewOccurence);
--- 212,216 ----
  										)
  										/
! 										(1 - (this.iThreshold + 1) * alN[this.iThreshold + 1] / (double)alN[1]);
  
  								this.oProbabilityTable.setOccurence(j, i, k, dNewOccurence);

Index: WittenBell.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/Stats/StatisticalEstimators/Smoothing/WittenBell.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** WittenBell.java	15 Jan 2006 06:58:08 -0000	1.18
--- WittenBell.java	21 Jan 2006 02:35:32 -0000	1.19
***************
*** 83,87 ****
  						else
  						{
! 							dNewOccurence = (double)lOccurence * dAdjustment;
  						}
  
--- 83,87 ----
  						else
  						{
! 							dNewOccurence = lOccurence * dAdjustment;
  						}
  
***************
*** 140,144 ****
  							else
  							{
! 								dNewOccurence = (double)lOccurence * dAdjustment;
  							}
  
--- 140,144 ----
  							else
  							{
! 								dNewOccurence = lOccurence * dAdjustment;
  							}
  
***************
*** 200,204 ****
  								else
  								{
! 									dNewOccurence = (double)lOccurence * dAdjustment;
  								}
  
--- 200,204 ----
  								else
  								{
! 									dNewOccurence = lOccurence * dAdjustment;
  								}