[freehaven-cvs] Adjust verbosity on case 3

[nickm@seul.org (Nick Mathewson)]

Update of /home/freehaven/cvsroot/doc/e2e-traffic/src
In directory moria.mit.edu:/tmp/cvs-serv12984

Modified Files:
	LICENSE sim.cpp simmain.cpp trials.cpp trials.h 
Log Message:
Adjust verbosity on case 3

Index: LICENSE
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/LICENSE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LICENSE	8 Jan 2004 03:26:34 -0000	1.1
+++ LICENSE	8 Jan 2004 03:57:30 -0000	1.2
@@ -1,4 +1,4 @@
-Traffic analysis simulation code copyright (c) 2003 Nick Mathewson
+Traffic analysis simulation code copyright (c) 2003-2004 Nick Mathewson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Index: sim.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/sim.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sim.cpp	22 Dec 2003 03:58:20 -0000	1.9
+++ sim.cpp	8 Jan 2004 03:57:30 -0000	1.10
@@ -229,7 +229,7 @@
     delayDist(dynamic_cast<InvDist<int>*>(dDist->copy())),
     nRoundsObserved(0), nRoundsMaybeAlice(0)
 {
-  std::cout << "DMA : maxDelay = " << maxDelay << std::endl;
+  // std::cout << "DMA : maxDelay = " << maxDelay << std::endl;
 }
 
 double

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- simmain.cpp	8 Jan 2004 03:38:12 -0000	1.14
+++ simmain.cpp	8 Jan 2004 03:57:30 -0000	1.15
@@ -200,7 +200,8 @@
 	  .setPDelay(pDelay[pDi])
 	  .setPMessage(pMsgAlice[pMAi])
 	  .setBGVolMean(bg).setBGVolDev(bg/10.0)
-	  .setPObserve(1.0);
+	  .setPObserve(1.0)
+	  .setPDummy(0.0);
 
 	s.setGranularity(50);
 

Index: trials.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/trials.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- trials.cpp	8 Jan 2004 03:29:23 -0000	1.11
+++ trials.cpp	8 Jan 2004 03:57:30 -0000	1.12
@@ -283,7 +283,11 @@
 MixTrialSpec::write(std::ostream &o) const
 {
   o << "MixTrial(N=" << nRecipients << ",m=" << nAliceRecipients
-    << ",l=" << pathLen << ",pDelay=" << pDelay;
+    << ",l=" << pathLen << ",pDelay=" << pDelay 
+    << ",bgVolume=" << bgVolMean << ",bgVolumeStdDev=" << bgVolDev
+    << ",pObserve=" << pObserve << ",pading="<<padding
+    << ",pOnline=" << pOnline << ",pMessage="<<pMessage 
+    << ",pDummy=" << pDummy << ")" << std::endl;
     // padding XXX all other vars.
 }
 
@@ -332,9 +336,11 @@
   while (totalPDelay < 1.0-DELAY_SLOP) {
     totalPDelay += delayDist->getP(maxDelay++);
   }
+#if 0
   std::cout << "MAXDELAY="<<maxDelay<<std::endl;
   std::cout << "Prob of delay (max-1) is = " << delayDist->getP(maxDelay-1)
 	    << std::endl;
+#endif
 
   mixnet = new DelayMix(nR, maxDelay, delayDist);
   attacker = new DelayMixAttacker(nR, maxDelay, delayDist);

Index: trials.h
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/trials.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- trials.h	22 Dec 2003 04:37:34 -0000	1.8
+++ trials.h	8 Jan 2004 03:57:30 -0000	1.9
@@ -249,8 +249,11 @@
   void assertFilled() const {
     assert(nRecipients && nAliceRecipients && pathLen);
     assert(ea_set && p_set);
-    assert(pDelay >= 0.0 && pMessage >= 0.0 && pDummy >= 0.0 &&
-	   bgVolMean >= 0.0 && bgVolDev >= 0.0);
+    assert(pDelay >= 0.0);
+    assert(pMessage >= 0.0);
+    assert(pDummy >= 0.0);
+    assert(bgVolMean >= 0.0);
+    assert(bgVolDev >= 0.0);
   }
 
   void write(std::ostream &o) const;

***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs       in the body. http://freehaven.net/