[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[freehaven-cvs] Debug case 5d; sims restarted



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

Modified Files:
	PLAN.5 sim.cpp trials.cpp 
Log Message:
Debug case 5d; sims restarted

Index: PLAN.5
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.5,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PLAN.5	11 Apr 2004 05:02:56 -0000	1.4
+++ PLAN.5	27 Apr 2004 19:44:39 -0000	1.5
@@ -2,7 +2,11 @@
 B: Apr9,  01:00
 C: Apr9,  16:00
 D: Apr10, 03:10
-D: Apr10, 14:10
+E: Apr10, 14:10
+F: Apr12, 01:16
+G: Apr21, 23:00
+H: Apr27, 14:52
+I: Apr27, 15:44
 
 New cases for preproceedings:
 
@@ -31,11 +35,11 @@
     5c.1: cassandra: DONE
     5c.2: sekrit:    DONE
     5c.3: ariddoch:  DONE
-    5c.4: cannabis:  9th,noon: 0.0 C:0.29  D:1.00
-    5c.5: cassandra: D: 0.0
-    5c.6: poincare:  D: 0.0
-    5c.7: noether:   D: 0.0
-    5c.8: totoro:    A: 0.0 B:0.97 C:1.64 D:2.70
+    5c.4: cannabis:  DONE
+    5c.5: cassandra: DONE
+    5c.6: poincare:  DONE
+    5c.7: noether:   DONE
+    5c.8: totoro:    DONE
 
 
 5d: Perfect padding with previous nonmembership
@@ -49,18 +53,18 @@
 
    5d.1: pDelay=.1
    5d.3: pDelay=.3
-   5d.9: pDelay=.9
+   5d.3: pDelay=.9
 
-   5d.1: impulse   E:0.0
-   5d.2: borel:    E:0.0
-   5d.3: lebesgue: E:0.0
+   5d.1: cassandra:      I:0 
+   5d.2: noether:        I:0
+   5d.3: cassandra:2222: I:0
 
 7a: Pseudonyms
 
    Alice sends with P1; (N-1) others send to pseudonyms P2...PN.
    All pseudonymous users other than Alice send with equal frequency.
 
-   N=1024,4096,16384,65536,232144
+   N=1024,4096,16384,65536
    pDelay = .1,.6,.9
    pathlen=1,4
    pM = .1,.6
@@ -73,4 +77,11 @@
    7a.5 pDelay=.6, pathlen=4
    7a.6 pDelay=.9, pathlen=4
 
-        
+  Start 12Apr,15:00
+   7a.1: cassandra DONE
+   7a.2: cassandra DONE
+   7a.3: noether DONE
+   7a.4: cassandra DONE
+   7a.5: cannabis  G:0 H:10.54 (stopping)
+   7a.6: impulse   G:0 H:11.30 (stopping)
+

Index: sim.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/sim.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sim.cpp	11 Apr 2004 01:17:01 -0000	1.14
+++ sim.cpp	27 Apr 2004 19:44:39 -0000	1.15
@@ -43,6 +43,10 @@
   } else if (nDummyDist) {
     n_out += nDummyDist->get();
   }
+#ifndef QUIET
+  std::cout << "Alice sends " << n_out << "; " << nPending << " pending."
+	    << std::endl;
+#endif
 }
 
 void
@@ -259,6 +263,7 @@
 void
 DelayMixAttacker::setKnownBackground(vec<double> &bg)
 {
+  // std::cerr << "set known background" << std::endl; 
   knownBackground = new vec<double>(bg);
 }
 
@@ -309,8 +314,8 @@
   double exAlice = expectedAliceMsgs();
   double exOther = expectedOtherMsgs();
   ++nRoundsObserved;
-  //std::cout << exAlice << std::endl;
-  if (exAlice < BG_THRESHOLD) {
+  // std::cerr << exAlice << std::endl;
+  if (exAlice < BG_THRESHOLD && !knownBackground) {
     for (int i = 0; i < nRecips; ++i)
       background[i] += r[i];//*(exOther+exAlice);
     exOtherInBackground += exOther;
@@ -333,7 +338,7 @@
 {
   double uTotal = background.total(0.0);
   double oTotal = observed.total(0.0);
-#ifndef QUIET
+#ifndef QUIET // XXXX
   std::cout << exOtherInBackground << "++++" << exAliceInBackground
 	    << "  " << ((double)exAliceInBackground)/exOtherInBackground
 	    << "(" << uTotal << ")" <<std::endl;
@@ -342,23 +347,25 @@
 	    << "(" << observed.total(0.0) << ")" << std::endl;
   std::cout << observed << std::endl;
   std::cout << background << std::endl;
-  std::cout << res << std::endl;
 #endif
-  if (!uTotal || !nObservedAlice)
-    return false;
   if (knownBackground) {
+    if (!nObservedAlice)
+      return false;
     vec<double> u(*knownBackground);
-    u *= (nObservedOther);
+    u *= (oTotal);
     res = observed - u;
     res /= nObservedAlice;
   } else {
+    if (!uTotal || !nObservedAlice)
+      return false;
+
     vec<double> u(background);
     u *= (oTotal / exOtherInBackground);
     res = observed - u;
     res /= nObservedAlice;
   }
 #ifndef QUIET
-  std::cout << res << std::endl;
+  std::cout << res << std::endl << std::endl;
 #endif
   return true;
 }

Index: trials.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/trials.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- trials.cpp	11 Apr 2004 05:02:56 -0000	1.18
+++ trials.cpp	27 Apr 2004 19:44:39 -0000	1.19
@@ -299,7 +299,7 @@
     << ",l=" << pathLen << ",pDelay=" << pDelay
     << ",bgVolume=" << bgVolMean << ",bgVolumeStdDev=" << bgVolDev
     << ",pObserve=" << pObserve << ",padding="<<padding
-    << ",smoothPadding" << smoothPadding
+    << ",smoothPadding=" << smoothPadding
     << ",pOnline=" << pOnline << ",pMessage="<<pMessage
     << ",pDummy=" << pDummy
     << ",granularity=" << granularity

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