[freehaven-cvs] Commit rest of nym tests

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	NYMPLAN simmain.cpp 
Log Message:
Commit rest of nym tests

Index: NYMPLAN
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/NYMPLAN,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NYMPLAN	12 Sep 2004 02:39:32 -0000	1.1
+++ NYMPLAN	13 Sep 2004 18:37:38 -0000	1.2
@@ -15,5 +15,14 @@
 
 Too big.  Start with:
 
-  n1: pA==.1,.5, pD==.1,.6, pL=1, N=1024...65536
+  nym.1: pA==.1,.5, pD==.1,.6, pL=1, N=1024...65536
    [2*2*4 == 1600]
+
+  nym.2: pA==.1,.5, pD==.9, pL=1, N=1024...65536
+   [2*4] == 800
+
+  nym.3: pA==.1, pD==.1,.6,.9, pL=4, N=1024...65536
+   [3*4 == 1200]
+
+  nym.4: pA==.5, pD==.1,.6,.9, pL=4, N=1024...65536
+   [3*4 == 1200]

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- simmain.cpp	12 Sep 2004 02:39:32 -0000	1.42
+++ simmain.cpp	13 Sep 2004 18:37:38 -0000	1.43
@@ -1551,6 +1551,32 @@
   }
 }
 
+void trialnym_2()
+{
+  for (int n = 1024; n <= 65536; n *= 4) {
+    trialnym_base(n, 1, .9, .5);
+    trialnym_base(n, 1, .9, .5);
+  }
+}
+
+void trialnym_3()
+{
+  for (int n = 1024; n <= 65536; n *= 4) {
+    trialnym_base(n, 4, .1, .1);
+    trialnym_base(n, 4, .6, .1);
+    trialnym_base(n, 4, .9, .1);
+  }
+}
+
+void trialnym_4()
+{
+  for (int n = 1024; n <= 65536; n *= 4) {
+    trialnym_base(n, 4, .1, .5);
+    trialnym_base(n, 4, .6, .5);
+    trialnym_base(n, 4, .9, .5);
+  }
+}
+
 typedef void (*trialfunc)(void);
 
 struct {
@@ -1682,6 +1708,9 @@
   { "7a.6", trial7a_6 },
 
   { "nym.1", trialnym_1 },
+  { "nym.2", trialnym_2 },
+  { "nym.3", trialnym_3 },
+  { "nym.4", trialnym_4 },
 
   { 0, 0 }
 };

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