[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain DrainTest.java, 1.3, 1.4

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22501

Modified Files:
	DrainTest.java 
Log Message:
more info from the DrainTest tool

Index: DrainTest.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/DrainTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DrainTest.java	18 Aug 2005 22:50:44 -0000	1.3
--- DrainTest.java	22 Aug 2005 18:46:45 -0000	1.4
***************
*** 70,78 ****
        double aggTrafficUnique = 0;
        double aggTraffic = 0;
  
!       for(Iterator it = nodes.keySet().iterator();
  	  it.hasNext(); ) {
  	Integer addr = (Integer) it.next();
  	NodeRec rec = (NodeRec) nodes.get(addr);
  	double receiveRateUnique = (rec.received - rec.lastReceived) / 4.0;
  	double receiveRate = (rec.received + rec.receivedDup - rec.lastReceivedDup) / 4.0;
--- 70,84 ----
        double aggTrafficUnique = 0;
        double aggTraffic = 0;
+       int count = 0;
+       int activeCount = 0;
  
!       List nodeList = new ArrayList(nodes.keySet());
!       Collections.sort(nodeList);
!       for(Iterator it = nodeList.iterator();
  	  it.hasNext(); ) {
  	Integer addr = (Integer) it.next();
  	NodeRec rec = (NodeRec) nodes.get(addr);
+ 	count++;
+ 
  	double receiveRateUnique = (rec.received - rec.lastReceived) / 4.0;
  	double receiveRate = (rec.received + rec.receivedDup - rec.lastReceivedDup) / 4.0;
***************
*** 84,88 ****
--- 90,101 ----
  
  	log.info(addr + ": " + "sent= " + rec.sent + " received= " + rec.received + " success=" + 100*((float)rec.received / rec.sent) + " pps=" + receiveRate + " ppsUnique=" + receiveRateUnique);
+ 
+ 	if (receiveRateUnique > 0) {
+ 	  activeCount++;
+ 	}
+ 
        }
+       log.info("Node count=" + count);
+       log.info("Active Nodes=" + activeCount);
        log.info("Aggregate pps=" + aggTraffic);
        log.info("Aggregate Unique pps=" + aggTrafficUnique);