Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv19987/src/freenet/node/rt
Modified Files:
StandardNodeEstimator.java ResponseTimeEstimator.java
NodeEstimator.java
Log Message:
Added ability for Color to render itself to a hex string.
Made some doubles (routing probabilities) show up with only two decimals instead of
many in various HTML views.
Made the OCM PeerHandler mode routing information section useable.
Index: StandardNodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- StandardNodeEstimator.java 30 Oct 2003 08:46:13 -0000 1.15
+++ StandardNodeEstimator.java 30 Oct 2003 13:09:54 -0000 1.16
@@ -646,6 +646,13 @@
return null;
}
}
+
+ /* (non-Javadoc)
+ * @see
freenet.node.rt.NodeEstimator.HTMLReportTool#graphNiceName(java.lang.String)
+ */
+ public String graphNiceName(String type) {
+ return graphNiceName(graphType(type));
+ }
}
Index: ResponseTimeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/ResponseTimeEstimator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- ResponseTimeEstimator.java 30 Oct 2003 04:48:59 -0000 1.20
+++ ResponseTimeEstimator.java 30 Oct 2003 13:09:57 -0000 1.21
@@ -5,6 +5,7 @@
import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.text.NumberFormat;
import java.util.Enumeration;
import java.util.Random;
@@ -949,12 +950,14 @@
throw new IllegalArgumentException("negative!");
}
if(type == TIME) return Long.toString(x)+"ms";
+ NumberFormat nf = NumberFormat.getInstance();
+ nf.setMaximumFractionDigits(2);
if(type == PROBABILITY) {
if(x > Integer.MAX_VALUE) throw new
IllegalArgumentException("to big probability");
- return Double.toString(intToProbability((int)x));
+ return nf.format(intToProbability((int)x));
}
if(type == TRANSFER_RATE)
- return Double.toString(((double)x) / (16*1000)) +
"bytes/second";
+ return nf.format(((double)x) / (16*1000)) +
"bytes/second";
throw new IllegalArgumentException("unknown type");
}
public void drapGraphOnImage(boolean dontClipPoints, Bitmap bmp, Color
lineCol, Color crossCol) {
Index: NodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NodeEstimator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- NodeEstimator.java 30 Oct 2003 08:46:13 -0000 1.8
+++ NodeEstimator.java 30 Oct 2003 13:09:57 -0000 1.9
@@ -83,7 +83,9 @@
throws IOException;
abstract public String graphName(int type);
abstract public String graphNiceName(int type);
+ abstract public String graphNiceName(String type);
abstract public int graphType(String type);
+
abstract public int estimatorType(int estimator);
abstract public TimeEstimator getEstimator(int type);
abstract public TimeEstimator getEstimator(String type);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
