[freehaven-cvs] next wave of sims

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	PLAN.2 simmain.cpp 
Log Message:
next wave of sims

Index: PLAN.2
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PLAN.2	8 Jan 2004 03:26:34 -0000	1.1
+++ PLAN.2	9 Jan 2004 05:26:24 -0000	1.2
@@ -4,6 +4,11 @@
     N = 2^6...2^17
     all m
 
+  case 1.1
+    b = 5, 25, 125
+    N = 32, 256, 2048, 16384, 131072, 1048576
+    m = 1,2,4,8,16,32,64
+
   case 2:
     b = 5
     N = 2^6..2^14
@@ -11,24 +16,56 @@
     all pMA
     all strat
 
-new:
-===case 1.1:
+  case 2.1:
+    b = 5
+    N = 32, 256, 2048, 16384
+    m = 1,2,4,8,16,32,64
+    pMA = 0.9
+    strat = SG
+
+  case 2.2:
+    b = 25
+    N = 32, 256, 2048, 16384
+    m = 1,2,4,8,16,32,64
+    pMA = 0.9
+    strat = SG
+      
+
+wanted:
+===case 1.1.1:
 3    b = 5, 25, 125
-5    N = 32, 256, 4096, 65536, 1048576
+     HAVE = 32, 256, 2048, 16384, 1048576
+     WANT = 16, 256, 4096, 65536, 1048576 
+3    N = 16, 4096, 65536
 4    m = 1,4,16,64
-3*5*4 -> 80
+36
 
-  have to discard old case 1 (because b=1000)
+===case 2.1.1:
+1    b = 5
+     HAVE = 32, 256, 2048, 16384
+     WANT = 16, 256, 4096, 65536, 1048576
+4    N = 16, 4096, 65536, 1048576
+4    m = 1,4,16,64
+16
 
-===case 2.1/2.2:
-3    b = 5, 25, 125
-5    N = 32, 256, 4096, 65536, 1048576
+===case2.2.1:
+1    b = 25
+     HAVE = 32, 256, 2048, 16384
+     WANT = 16, 256, 4096, 65536, 1048576
+4    N = 16, 4096, 65536, 1048576
 4    m = 1,4,16,64
-3*5*4 = 80 (but skip b=5, N<65536 cases:: skip 12) -> 68
-     pM = .9
-     strat = SG
+16
+
+===case2.2.2:
+1    b = 125
+5    N = 16, 256, 4096, 65536, 1048576
+4    m = 1,4,16,64
+20
+
+
+
+
 
-   we can contrast other cases with pMA, strategy, for b=5.
 
 ===case 3: timed dyn-pool mix.
 

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- simmain.cpp	8 Jan 2004 03:57:30 -0000	1.15
+++ simmain.cpp	9 Jan 2004 05:26:24 -0000	1.16
@@ -91,6 +91,48 @@
   }
 }
 
+void trial1_1_1()
+{
+  // fill in gaps in 1.1 :(
+  int nrArray[] = { 16, 4096, 65536 };
+
+  for (int batchSize = 5; batchSize <= 125; batchSize *= 5) {
+    for (int nrIdx = 0; nrIdx < 3; ++nrIdx) {
+      int nRecips = nrArray[nrIdx];
+      for (int nAR = 1; (nAR <= 64 && nAR < nRecips); nAR *= 4) {
+	SDTrialSpec s;
+	s.setNRecipients(nRecips);
+	s.setAliceRecipients(nAR);
+	s.setBatchSize(batchSize);
+	if (nRecips > 65536)
+	  s.setCutoff(4000000);
+	else
+	  s.setCutoff(1000000);
+	if (nRecips > 2000)
+	  s.setGranularity(100);
+	else
+	  s.setGranularity(10);
+	int nBad = 0;
+	int nGood = 0;
+	for (int i = 1; i <= 100; ++i) {
+	  s.write(std::cout);
+	  std::cout << "\"" << i << "/" << 100 << "\"" << std::endl;
+	  SDTrial 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 trial2()
 {
   const double pMsgAlice[] = { 0.6, 0.9, 0.99 };
@@ -128,7 +170,7 @@
 
 void trial2_base(int batchSize, int nRecips)
 {
-  for (int nAR = 1; (nAR <= 64 && nAR < nRecips); nAR *= 2) {
+  for (int nAR = 1; (nAR <= 64 && nAR < nRecips); nAR *= 4) {
     UnkBGBatchTrialSpec s;
     s.setNRecipients(nRecips).setNAliceRecipients(nAR)
       .setBatchSize(batchSize).setPaddingLevel(0)
@@ -170,6 +212,13 @@
   }
 }
 
+void trial2_1_1()
+{
+  for (int nRecips = 65536; nRecips <= 2000000; nRecips *= 16) {
+    trial2_base(5,nRecips);
+  }
+}
+
 
 void trial2_2()
 {
@@ -180,6 +229,21 @@
   }
 }
 
+void trial2_2_1()
+{
+  for (int nRecips = 16; nRecips <= 2000000; nRecips *= 16) {
+    if (nRecips == 256) continue; // already have
+    trial2_base(25,nRecips);
+  }
+}
+void trial2_2_2()
+{
+  for (int nRecips = 16; nRecips <= 2000000; nRecips *= 16) {
+    if (nRecips == 256) continue; // already have
+    trial2_base(125,nRecips);
+  }
+}
+
 void trial3()
 {
   // attack with small-worlds network and unknown background.
@@ -235,9 +299,13 @@
 } trials[] = {
   { "1", trial1 },
   { "1.1", trial1_1 },
+  { "1.1.1", trial1_1_1 },
   { "2", trial2 },
   { "2.1", trial2_1 },
+  { "2.1", trial2_1_1 },
   { "2.2", trial2_2 },
+  { "2.2.2", trial2_2_1 },
+  { "2.2.1", trial2_2_2 },
   { "3", trial3 },
   { 0, 0 }
 };

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