[freehaven-cvs] Add test for case 5d but with no padding.

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	PLAN.5 simmain.cpp 
Log Message:
Add test for case 5d but with no padding.

Index: PLAN.5
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.5,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PLAN.5	1 May 2004 01:59:32 -0000	1.7
+++ PLAN.5	2 May 2004 21:56:23 -0000	1.8
@@ -53,7 +53,7 @@
     5c.10.3: pDelay=.6, len=1
 
 
-    5c.9: lebesgue: K:0 
+    5c.9: lebesgue: K:0
     5c.10.1: totoro: K:0
     5c.10.2: cassandra:2222: K:0
     5c.10.3: cassanda: K:0
@@ -79,10 +79,12 @@
    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
-        
+
+
+   5dd.1: m=32 len=1 pD=.1,.3,.6,.9, NO PADDING.
+     cassandra: May2, 17:05: 0.0
 
 7a: Pseudonyms
 

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- simmain.cpp	1 May 2004 01:59:32 -0000	1.39
+++ simmain.cpp	2 May 2004 21:56:23 -0000	1.40
@@ -1255,12 +1255,12 @@
   trial5c_base(.975, 2, true, .6, 1);
 }
 
-void trial5d_base(double pDelay, int pathLen, int nAlice)
+void trial5d_base(double pDelay, int pathLen, int nAlice, bool padding=true)
 {
   MixTrialSpec s;
 
   s.setNRecipients(65536).setNAliceRecipients(nAlice)
-    .setPathLen(pathLen).setPadding(2).setSmoothPadding(true)
+    .setPathLen(pathLen)
     .setExpAlice(1)
     .setPartial(false)
     .setPOnline(1.0)
@@ -1270,6 +1270,8 @@
     .setPObserve(1.0)
     .setPDummy(0.0)
     .setKnownBackground(true);
+  if (padding)
+    s.setPadding(2).setSmoothPadding(true);
 
   s.setGranularity(10);
 
@@ -1325,6 +1327,15 @@
   trial5d_base(.6, 1, 32);
 }
 
+void trial5dd_1()
+{
+  trial5d_base(.1, 1, 32, false);
+  trial5d_base(.3, 1, 32, false);
+  trial5d_base(.6, 1, 32, false);
+  trial5d_base(.9, 1, 32, false);
+}
+
+
 
 void trial6_base(double pDelay, double pObserve)
 {
@@ -1606,6 +1617,7 @@
   { "5d.2", trial5d_2 },
   { "5d.3", trial5d_3 },
   { "5d.4", trial5d_4 },
+  { "5dd.1", trial5dd_1 },
 
   { "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/