|
From: Sasa M. <sa...@us...> - 2004-03-30 13:00:19
|
Update of /cvsroot/jrobin/src/org/jrobin/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19569/org/jrobin/core Modified Files: Archive.java Log Message: XFF bug resolved (?) Index: Archive.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/core/Archive.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Archive.java 30 Mar 2004 09:55:22 -0000 1.13 --- Archive.java 30 Mar 2004 12:48:42 -0000 1.14 *************** *** 192,199 **** // should store long arcSteps = steps.get(); long nanSteps = state.getNanSteps(); ! double nanPct = (double) nanSteps / (double) arcSteps; double accumValue = state.getAccumValue(); ! if(nanPct < xff.get() && !Double.isNaN(accumValue)) { if(consolFun.get().equals("AVERAGE")) { accumValue /= (arcSteps - nanSteps); --- 192,200 ---- // should store long arcSteps = steps.get(); + double arcXff = xff.get(); long nanSteps = state.getNanSteps(); ! //double nanPct = (double) nanSteps / (double) arcSteps; double accumValue = state.getAccumValue(); ! if(nanSteps <= arcXff * arcSteps && !Double.isNaN(accumValue)) { if(consolFun.get().equals("AVERAGE")) { accumValue /= (arcSteps - nanSteps); |