|
From: Sasa M. <sa...@us...> - 2004-03-30 10:07:02
|
Update of /cvsroot/jrobin/src/org/jrobin/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23258/org/jrobin/core Modified Files: Archive.java Robin.java Log Message: XFF bug resolved Index: Archive.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/core/Archive.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Archive.java 26 Mar 2004 08:47:05 -0000 1.12 --- Archive.java 30 Mar 2004 09:55:22 -0000 1.13 *************** *** 195,199 **** 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); --- 195,199 ---- 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); Index: Robin.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/core/Robin.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Robin.java 26 Mar 2004 08:47:05 -0000 1.9 --- Robin.java 30 Mar 2004 09:55:22 -0000 1.10 *************** *** 103,109 **** String dump() throws IOException { StringBuffer buffer = new StringBuffer("Robin " + pointer.get() + "/" + rows + ": "); ! int startPos = pointer.get(); ! for(int i = startPos; i < startPos + rows; i++) { ! buffer.append(Util.formatDouble(values.get(i % rows), true) + " "); } buffer.append("\n"); --- 103,109 ---- String dump() throws IOException { StringBuffer buffer = new StringBuffer("Robin " + pointer.get() + "/" + rows + ": "); ! double[] values = getValues(); ! for(int i = 0; i < values.length; i++) { ! buffer.append(Util.formatDouble(values[i], true) + " "); } buffer.append("\n"); |