[freehaven-cvs] tweak sections 4,5. Add to conclusion.

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	simmain.cpp 
Log Message:
tweak sections 4,5. Add to conclusion.

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- simmain.cpp	24 Jan 2004 14:42:08 -0000	1.32
+++ simmain.cpp	25 Jan 2004 17:07:25 -0000	1.33
@@ -211,6 +211,11 @@
   trial1u_base(125, 131072, 8, 8);
 }
 
+void trial1u_4()
+{
+   trial1u_base(125, 1048576, 8, 8);
+}
+
 void trial2()
 {
   const double pMsgAlice[] = { 0.6, 0.9, 0.99 };
@@ -953,6 +958,13 @@
   trial5a_base(.6,.6,  .7, 1);
   trial5a_base(.6,.6,  .8, 1);
 }
+
+void trial5a_5_1()
+{
+  trial5a_base(.6,.6,  .7, 1);
+  trial5a_base(.6,.6,  .8, 1);
+}
+
 void trial5a_6()
 {
   trial5a_base(.6,.6,  .5, 4);
@@ -960,6 +972,13 @@
   trial5a_base(.6,.6,  .7, 4);
   trial5a_base(.6,.6,  .8, 4);
 }
+
+void trial5a_6_1()
+{
+  trial5a_base(.6,.6,  .7, 4);
+  trial5a_base(.6,.6,  .8, 4);
+}
+
 void trial5a_7()
 {
   trial5a_base(.6,.1,  .8, 1);
@@ -1213,6 +1232,7 @@
   { "1u.1", trial1u_1 },
   { "1u.2", trial1u_2 },
   { "1u.3", trial1u_3 },
+  { "1u.4", trial1u_4 },
 
   { "2", trial2 },
   { "2.1", trial2_1 },
@@ -1268,7 +1288,9 @@
   { "5a.4.2", trial5a_4_2 },
   { "5a.4.3", trial5a_4_3 },
   { "5a.5", trial5a_5 },
+  { "5a.5.1", trial5a_5_1 },
   { "5a.6", trial5a_6 },
+  { "5a.6.1", trial5a_6_1 },
   { "5a.7", trial5a_7 },
 
   { "5b.1", trial5b_1 },

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