[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[freehaven-cvs] checkpoint status



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

Modified Files:
	PLAN.3 simmain.cpp 
Log Message:
checkpoint status

Index: PLAN.3
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PLAN.3	14 Jan 2004 04:55:19 -0000	1.1
+++ PLAN.3	15 Jan 2004 19:15:24 -0000	1.2
@@ -1,5 +1,5 @@
 
-
+Free: opus, esox1, zermelo, novalis
 
 case3: have
   HAVE
@@ -11,13 +11,14 @@
          .6   320,3200         {cass}
     .9:  .1   (320,3200,32000) {opus}
          .3   (320,3200,32000) {opus}
-         .6   (320')           {opus}  ---continue 3.3
-
+         .6   (320,3200)       {opus}  ---continue 3.3
+                  ,3200
 
 A: 10 Jan, 15:10
 B: 13 Jan, 13:34
 C: 13 Jan, 23:33
 D: 13 Jan, 23:55  -- 3r and 4r begun!
+E: 15 Jan, 13:39
 
 ===case 3.2: timed dyn-pool mix. (esox)
 
@@ -32,6 +33,8 @@
    (done pMAlice=.1,pDelay=.1(partial))
 
   {CONTINUE UNTIL 2.00 DONE.)
+  ETA: 15 Jan, 03:00
+  {DONE}
 
 ===case 3.3: timed dyn-pool mix. (opus)
 
@@ -45,7 +48,10 @@
 C: 6.71 done
    (done pMA=.9,pDelay=0.1,0.3(most))
 
+E: 7.44
+
    (CONTINUE UNTIL 7.00 DONE)
+   ETA: 14 Jan, 03:20
 
 ===case 3r: timed dyn-pool mix
     FIX N=65536, m=32, strategy=SG
@@ -66,13 +72,17 @@
          .6   (320')           {opus}  ---continue 3.3
   NEED:
     AF
-    *     *         (25)          16   (case 3r.1)  <cassandra>
-    *     *         (125)         16   (case 3r.2)  <dhcp-14-49>
-    .1:  .3,.6,.9   (320,3200)     6   (case 3r.3)  <moria>
-    .3:  .3,.6,.9   (320,3200)     6   (case 3r.4)  <sekrit>
-    .6:  .9         (320,3200)     2   (case 3r.5)  <ariddoch>
+    *     *         (25)          16   (case 3r.1)  <cassandra>  E:3.82  *4
+    *     *         (125)         16   (case 3r.2)  <dhcp-14-49> E:2.63  *6
+XXX .1:  .3,.6,.9   (320,3200)     6   (case 3r.3)  <moria>      E:1.00  *6 (!)
+    .3:  .3,.6,.9   (320,3200)     6   (case 3r.4)  <sekrit>     E:2.84  *2
+    .6:  .9         (320,3200)     2   (case 3r.5)  <ariddoch>   E:1.94  *2
     .9:  .9         (320,3200)     2   (case 3r.5)
 
+  ADDED (E):
+   .6,.9:    *      (25)            8   (case 3r.1.1) <opus>
+   .3,.6,.9: *      (125)          12   (case 3r.2.1) <zermelo>
+
 ===case 4: mixnet
     Fix N=65536, m=32, strategy=SG
 2   Vary mix alg: pDelay =  .1, .6
@@ -89,10 +99,14 @@
     pDelay: .1, .6
 
     PL   AF         PD
-    2:   .1,.6,.9   .1,.6   6  (case4r.1)     <totoro>
-    4:   .1,.6,.9   .1,.6   6  (case4r.2)     <cannabis>
-    8:   .1,.6,.9   .1      3  (case4r.3.1)   <esox2?>
-    8:   .1,.6,.9   .6      3  (case4r.3.2)   <zermello, when free>
+    2:   .1,.6,.9   .1,.6   6  (case4r.1)     <totoro>              {E:2.77} *2
+    4:   .1,.6,.9   .1,.6   6  (case4r.2)     <cannabis>            {E:1.73} *3
+    8:   .1,.6,.9   .1      3  (case4r.3.1)   <esox2?>              {E: .89} *3
+    8:   .1,.6,.9   .6      3  (case4r.3.2)   <zermello, when free> {done,fail}
+
+  ADDED (E):
+    8:   .9         .1      1  (case4r.3.1.1) <esox1 covers esox2>
+    4:   .9         .1,.6   2  (case4r.2.1)   <novalis covers cannabis>
 
 ===case 5: impact of dummies
 

Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- simmain.cpp	14 Jan 2004 04:39:05 -0000	1.18
+++ simmain.cpp	15 Jan 2004 19:15:24 -0000	1.19
@@ -374,7 +374,16 @@
     }
   }
 }
+void trial3r_1_1() {
+  const double pAlice[] = { .6, .9 };
+  const double pDelay[] = { .1, .3, .6, .9 };
 
+  for (int pAi = 0; pAi <= 1; ++pAi) {
+    for (int pDi = 0; pDi <= 3; ++pDi) {
+      trial3_base(pAlice[pAi], pDelay[pDi], 25);
+    }
+  }
+}
 void trial3r_2() {
   const double pAlice[] = { .1, .3, .6, .9 };
   const double pDelay[] = { .1, .3, .6, .9 };
@@ -385,6 +394,16 @@
     }
   }
 }
+void trial3r_2_1() {
+  const double pAlice[] = { .3, .6, .9 };
+  const double pDelay[] = { .1, .3, .6, .9 };
+
+  for (int pAi = 0; pAi <= 2; ++pAi) {
+    for (int pDi = 0; pDi <= 3; ++pDi) {
+      trial3_base(pAlice[pAi], pDelay[pDi], 125);
+    }
+  }
+}
 
 void trial3r_3() {
   trial3_base(.1, .3, 320);
@@ -395,6 +414,25 @@
   trial3_base(.1, .9, 3200);
 }
 
+void trial3r_3_1() {
+  trial3_base(.1, .3, 320);
+  trial3_base(.1, .6, 320);
+  trial3_base(.1, .9, 320);
+  trial3_base(.1, .3, 3200);
+  trial3_base(.1, .6, 3200);
+  trial3_base(.1, .9, 3200);
+}
+
+void trial3r_3_2() {
+  trial3_base(.1, .3, 320);
+  trial3_base(.1, .6, 320);
+  trial3_base(.1, .9, 320);
+  trial3_base(.1, .3, 3200);
+  trial3_base(.1, .6, 3200);
+  trial3_base(.1, .9, 3200);
+}
+
+
 void trial3r_4() {
   trial3_base(.3, .3, 320);
   trial3_base(.3, .6, 320);
@@ -485,6 +523,12 @@
   trial4_base(.9, .6, 4, 125);
 }
 
+void trial4r_2_1()
+{
+  trial4_base(.9, .1, 4, 125);
+  trial4_base(.9, .6, 4, 125);
+}
+
 void trial4r_3_1()
 {
   trial4_base(.1, .1, 8, 125);
@@ -492,6 +536,11 @@
   trial4_base(.9, .1, 8, 125);
 }
 
+void trial4r_3_1_1()
+{
+  trial4_base(.9, .1, 8, 125);
+}
+
 void trial4r_3_2()
 {
   trial4_base(.1, .6, 8, 125);
@@ -521,13 +570,17 @@
   { "4.1", trial4_1 },
   { "4.2", trial4_2 },
   { "3r.1", trial3r_1 },
+  { "3r.1.1", trial3r_1_1 },
   { "3r.2", trial3r_2 },
+  { "3r.2.2", trial3r_2_1 },
   { "3r.3", trial3r_3 },
   { "3r.4", trial3r_4 },
   { "3r.5", trial3r_5 },
   { "4r.1",   trial4r_1 },
   { "4r.2",   trial4r_2 },
+  { "4r.2.1",   trial4r_2_1 },
   { "4r.3.1", trial4r_3_1 },
+  { "4r.3.1_1", trial4r_3_1_1 },
   { "4r.3.2", trial4r_3_2 },
 
 

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