[freehaven-cvs] Code for last tests for preproceedins, I think

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	PLAN.5 analyze.py postproc.py simmain.cpp 
Log Message:
Code for last tests for preproceedins, I think

Index: PLAN.5
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.5,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PLAN.5	30 Apr 2004 00:32:58 -0000	1.6
+++ PLAN.5	1 May 2004 01:59:32 -0000	1.7
@@ -8,6 +8,7 @@
 H: Apr27, 14:52
 I: Apr27, 15:44
 J: Apr28, 12:41
+K: Apr29, 20:35
 
 New cases for preproceedings:
 
@@ -51,6 +52,16 @@
     5c.10.2: pDelay=.1, len=4
     5c.10.3: pDelay=.6, len=1
 
+
+    5c.9: lebesgue: K:0 
+    5c.10.1: totoro: K:0
+    5c.10.2: cassandra:2222: K:0
+    5c.10.3: cassanda: K:0
+
+    5c.10.4: pDelay = .975. [pDelay=.1, len in 1,4] [pDelay=.6, len=1]
+        totoro: start on 20:21, Apr 30.
+
+
 5d: Perfect padding with previous nonmembership
 
     N=65536, nAlice=2,8,32,128 bgVol=125
@@ -68,6 +79,11 @@
    5d.2: noether:        I:0 J:1.01 K:1.04 ????
    5d.3: cassandra:2222: I:0 J:3.23 DONE
 
+[488]% ./src/postproc.py results//trial34r.analyzed l=1 m=32 bg=125 pA=60 pD p50_all > tmp/3.d
+
+   5d.4: m=32 len=1 pD=.3,.6
+        
+
 7a: Pseudonyms
 
    Alice sends with P1; (N-1) others send to pseudonyms P2...PN.

Index: analyze.py
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/analyze.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- analyze.py	30 Apr 2004 00:32:58 -0000	1.10
+++ analyze.py	1 May 2004 01:59:32 -0000	1.11
@@ -61,7 +61,7 @@
                   int(test['pDummy']*100),
                   int(test['pDelay']*100),
                   test['bgVolume'],
-                  test['padding'],  # "Pading" on older tests.
+                  test.get('padding'),
                   int(test['pOnline']*100),
                   int(test['pObserve']*100),
                   test.get('smoothPadding',0))
@@ -169,6 +169,7 @@
                                             "smoothPadding=0")
                 testline = testline.replace("smoothPadding1",
                                             "smoothPadding=1")
+                testline = testline.replace("pading", "padding")
                 params = eval(testline, scope)
                 result = eval(resultline, scope)
                 try:

Index: postproc.py
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/postproc.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- postproc.py	30 Apr 2004 00:32:58 -0000	1.5
+++ postproc.py	1 May 2004 01:59:32 -0000	1.6
@@ -109,7 +109,7 @@
     for k,vals in fixed.iteritems():
         vallist = vals.keys()
         vallist.sort()
-        print "#     %s in %s"%(k,v)
+        print "#     %s in %s"%(k,vallist)
     for k,vals in blocked.iteritems():
         vallist = vals.keys()
         vallist.sort()

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- simmain.cpp	30 Apr 2004 00:32:58 -0000	1.38
+++ simmain.cpp	1 May 2004 01:59:32 -0000	1.39
@@ -1248,6 +1248,12 @@
   trial5c_base(.95, 2, true, .6, 1);
   trial5c_base(.99, 2, true, .6, 1);
 }
+void trial5c_10_4()
+{
+  trial5c_base(.975, 2, true, .1, 1);
+  trial5c_base(.975, 2, true, .1, 4);
+  trial5c_base(.975, 2, true, .6, 1);
+}
 
 void trial5d_base(double pDelay, int pathLen, int nAlice)
 {
@@ -1313,6 +1319,13 @@
   }
 }
 
+void trial5d_4()
+{
+  trial5d_base(.3, 1, 32);
+  trial5d_base(.6, 1, 32);
+}
+
+
 void trial6_base(double pDelay, double pObserve)
 {
   MixTrialSpec s;
@@ -1587,10 +1600,12 @@
   { "5c.10.1", trial5c_10_1 },
   { "5c.10.2", trial5c_10_2 },
   { "5c.10.3", trial5c_10_3 },
+  { "5c.10.4", trial5c_10_4 },
 
   { "5d.1", trial5d_1 },
   { "5d.2", trial5d_2 },
   { "5d.3", trial5d_3 },
+  { "5d.4", trial5d_4 },
 
   { "6.1",    trial6_1 },
   { "6.2",    trial6_2 },

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