[freehaven-cvs] Add trial 6

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	PLAN.3 simmain.cpp 
Log Message:
Add trial 6

Index: PLAN.3
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PLAN.3	17 Jan 2004 19:12:39 -0000	1.3
+++ PLAN.3	17 Jan 2004 23:02:38 -0000	1.4
@@ -134,5 +134,17 @@
      Vary pObserve.
 
 
+  Fix N=65536,m=32,SG,bgvol=125,
+  len=4, pA=.6
+  pD=.6/.1
+  pObserve=1.00{done},.99,.95,.90,.85,.80,.70,.60,.50
+
+  pD    PO
+  .6    .99,.95,.90,.85   (case6.1)
+  .1    .99,.95,.90,.85   (case6.2)
+  .6    .80,.70           (case6.3)
+  .1    .80,.60           (case6.4)
+  .6    .60,.50           (case6.5)
+  .1    .60,.50           (case6.6)
 
 ===case 7: pseudonymity
\ No newline at end of file

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- simmain.cpp	17 Jan 2004 19:17:16 -0000	1.21
+++ simmain.cpp	17 Jan 2004 23:02:38 -0000	1.22
@@ -554,6 +554,76 @@
   trial4_base(.9, .6, 8, 125);
 }
 
+void trial6_base(double pDelay, double pObserve)
+{
+  MixTrialSpec s;
+  s.setNRecipients(65536).setNAliceRecipients(32)
+    .setPathLen(4).setPadding(0)
+    .setExpAlice(1)
+    .setPMessage(1.0)
+    .setPartial(true)
+    
+    .setPDelay(pDelay)
+    .setPMessage(0.6)
+    .setBGVolMean(125).setBGVolDev(125/10.0)
+    .setPObserve(pObserve)
+    .setPDummy(0.0);
+
+  s.setGranularity(50);
+  
+  s.setCutoff(1500000);
+  int nBad = 0;
+  int nGood = 0;
+  for (int i = 1; i <= 100; ++i) {
+    s.write(std::cout);
+    std::cout << "\"" << i << "/" << 100 << "\"" << std::endl;
+    MixTrial trial(s);
+    TrialResult res = trial.attempt();
+    std::cout << res << std::endl << std::endl; 
+    if (res.failed)
+      ++nBad;
+    else
+      ++nGood;
+    if (nBad >= 5 && nGood < nBad/2) {
+      break;
+    }
+  }
+}
+
+void trial6_1(void) {
+  trial6_base(.6,.99);
+  trial6_base(.6,.95);
+  trial6_base(.6,.90);
+  trial6_base(.6,.85);
+}
+
+void trial6_2(void) {
+  trial6_base(.1,.99);
+  trial6_base(.1,.95);
+  trial6_base(.1,.90);
+  trial6_base(.1,.85);
+}
+
+void trial6_3(void) {
+  trial6_base(.6,.80);
+  trial6_base(.6,.70);
+}
+
+void trial6_4(void) {
+  trial6_base(.1,.80);
+  trial6_base(.1,.70);
+}
+
+void trial6_5(void) {
+  trial6_base(.6,.60);
+  trial6_base(.6,.50);
+}
+
+void trial6_6(void) {
+  trial6_base(.1,.60);
+  trial6_base(.1,.50);
+}
+
 typedef void (*trialfunc)(void);
 
 struct {
@@ -590,6 +660,14 @@
   { "4r.3.1.2", trial4r_3_1_2 },
   { "4r.3.2", trial4r_3_2 },
 
+  { "6.1",    trial6_1 },
+  { "6.2",    trial6_2 },
+  { "6.3",    trial6_3 },
+  { "6.4",    trial6_4 },
+  { "6.5",    trial6_5 },
+  { "6.6",    trial6_6 },
+
+
   { 0, 0 }
 };
 

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