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

[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-serv23243

Modified Files:
	DrainTest.java 
Log Message:
more status reporting for DrainTest

Index: DrainTest.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/DrainTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DrainTest.java	18 Aug 2005 06:38:37 -0000	1.1
--- DrainTest.java	18 Aug 2005 08:39:35 -0000	1.2
***************
*** 42,45 ****
--- 42,48 ----
  	rec.lastSeqno = dtMsg.get_seqno();
        }
+       if (dtMsg.get_seqno() == rec.lastSeqno) {
+ 	rec.receivedDup++;
+       }
        if (dtMsg.get_seqno() < rec.lastSeqno) {
  	rec.lastSeqno = dtMsg.get_seqno();
***************
*** 55,59 ****
--- 58,64 ----
    private class NodeRec {
      int received;
+     int receivedDup;
      int lastReceived;
+     int lastReceivedDup;
      int sent;
      int lastSeqno;
***************
*** 63,66 ****
--- 68,72 ----
      public void run() {
        log.info("Status Report");
+       double aggTrafficUnique = 0;
        double aggTraffic = 0;
  
***************
*** 69,79 ****
  	Integer addr = (Integer) it.next();
  	NodeRec rec = (NodeRec) nodes.get(addr);
! 	double receiveRate = (rec.received - rec.lastReceived) / 4.0;
  	aggTraffic += receiveRate;
  	rec.lastReceived = rec.received;
  
! 	log.info(addr + ": " + "sent= " + rec.sent + " received= " + rec.received + " success=" + 100*((float)rec.received / rec.sent) + " pps=" + receiveRate);
        }
        log.info("Aggregate pps=" + aggTraffic);
      }
    }
--- 75,90 ----
  	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;
! 	aggTrafficUnique += receiveRateUnique;
  	aggTraffic += receiveRate;
+ 
  	rec.lastReceived = rec.received;
+ 	rec.lastReceivedDup = rec.received + rec.receivedDup;
  
! 	log.info(addr + ": " + "sent= " + rec.sent + " received= " + rec.received + " success=" + 100*((float)rec.received / rec.sent) + " pps=" + receiveRate + " ppsUnique=" + receiveRateUnique);
        }
        log.info("Aggregate pps=" + aggTraffic);
+       log.info("Aggregate Unique pps=" + aggTrafficUnique);
      }
    }