[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[freehaven-cvs] check in more cases
Update of /home/freehaven/cvsroot/doc/e2e-traffic/src
In directory moria.mit.edu:/tmp/cvs-serv6566
Modified Files:
Makefile PLAN.2 simmain.cpp
Log Message:
check in more cases
Index: Makefile
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 22 Dec 2003 03:58:20 -0000 1.9
+++ Makefile 10 Jan 2004 23:13:17 -0000 1.10
@@ -23,6 +23,12 @@
.cpp.o:
$(CXX) $(CFLAGS) -I boost -c $<
+export: sim
+ rm -f /tmp/sim /tmp/sim.gz
+ cp sim /tmp
+ strip /tmp/sim
+ gzip -9 /tmp/sim
+
sim: sim.o vec.o rng.o simmain.o netparams.o trials.o
$(CXX) $(CFLAGS) -o sim sim.o vec.o rng.o simmain.o netparams.o trials.o
Index: PLAN.2
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PLAN.2 9 Jan 2004 05:26:24 -0000 1.2
+++ PLAN.2 10 Jan 2004 23:13:17 -0000 1.3
@@ -1,88 +1,137 @@
have:
- case 1:
+ case 1: moria (done)
b = 1000
N = 2^6...2^17
all m
- case 1.1
+ case 1.1: dhcp14-49 (done)
b = 5, 25, 125
N = 32, 256, 2048, 16384, 131072, 1048576
m = 1,2,4,8,16,32,64
- case 2:
+ case 2: totoro (done)
b = 5
N = 2^6..2^14
all m
all pMA
all strat
- case 2.1:
+ case 2.1: moria (done)
b = 5
N = 32, 256, 2048, 16384
m = 1,2,4,8,16,32,64
pMA = 0.9
strat = SG
- case 2.2:
+ case 2.2: totoro (done)
b = 25
N = 32, 256, 2048, 16384
m = 1,2,4,8,16,32,64
pMA = 0.9
- strat = SG
-
+ strat = SG
-wanted:
-===case 1.1.1:
+ case 1.1.1: dhcp14-49
3 b = 5, 25, 125
HAVE = 32, 256, 2048, 16384, 1048576
WANT = 16, 256, 4096, 65536, 1048576
3 N = 16, 4096, 65536
4 m = 1,4,16,64
36
+
-===case 2.1.1:
+A: 10 Jan, 15:10
+
+wanted:
+===case 2.1.1: (moria)
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
+16
+A: 4.00 done
-===case2.2.1:
+===case 2.1.2: (ariddoch)
+1 b = 5
+1 N = 1048576
+4 m = 1,4,16,64
+4
+started 18:00, 10 Jan
+
+===case2.2.1: (totoro)
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
-16
+16
+A: 10.02 done
-===case2.2.2:
+===case2.2.2: (dhcp14-49)
1 b = 125
5 N = 16, 256, 4096, 65536, 1048576
4 m = 1,4,16,64
20
+A: 10.04 done
+===case 3: timed dyn-pool mix. (cassandra)
+ Fix N=65536, m=32, strategy=SG
+4 Vary mix alg: pDelay = .1, .3, .6, .9
+4 Vary Alice freq: .6, .75, .9, .99
+3 Vary background volume: 320, 3200, 32000
+ -> 48 (stop after 12.)
+A: 5.31 done
+===case 3.1: timed dyn-pool mix. (esox)
+ Fix N=65536, m=32, strategy=SG
+4 Vary mix alg: pDelay = .1, .3, .6, .9
+1 Vary Alice freq: .3
+3 Vary background volume: 320, 3200, 32000
+ -> 12
+A: 2.03 done
+===case 3.2: timed dyn-pool mix. (esox)
-===case 3: timed dyn-pool mix.
+ Fix N=65536, m=32, strategy=SG
+4 Vary mix alg: pDelay = .1, .3, .6, .9
+1 Vary Alice freq: .1
+3 Vary background volume: 320, 3200, 32000
+ -> 12
+A: 1.12 done
+
+===case 3.3: timed dyn-pool mix. (opus)
Fix N=65536, m=32, strategy=SG
4 Vary mix alg: pDelay = .1, .3, .6, .9
-4 Vary Alice freq: .6, .75, .9, .99
-4 Vary background volume: alice*10, alice*100, alice*1000, alice*10000
- -> 64
+1 Fix Alice freq: .9
+3 Vary background volume: 320, 3200, 32000
+ -> 12
+A: 0 done, started
===case 4: mixnet
-
Fix N=65536, m=32, strategy=SG
-4 Vary mix alg: pDelay = .1 .3, .6, .9
+2 Vary mix alg: pDelay = .1, .6
3 Vary path length: 2, 4, 8
-3 Vary Alice freq: .6, .75, .9, .99
- Fixed background volume based on case 3.
- -> 48
+3 Vary Alice freq: .1, .6, .9
+ bgvol=320
+ ->
+
+===case 4.1: (cannabis)
+ N=65536, m=32, strategy=SG, bgvol=320
+ Alice freq=.1
+ pdelay = .1, .6
+3 path len = 2, 4, 8
+3
+started 18:00, 10 Jan
+
+===case 4.2: (sekrit)
+ N=65536, m=32, strategy=SG, bgvol=320
+ Alice freq=.6
+ pdelay = .1, .6
+3 path len = 2, 4, 8
+started 18:00, 10 Jan
===case 5: impact of dummies
Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- simmain.cpp 9 Jan 2004 05:26:24 -0000 1.16
+++ simmain.cpp 10 Jan 2004 23:13:17 -0000 1.17
@@ -219,6 +219,11 @@
}
}
+void trial2_1_2()
+{
+ trial2_base(5,1<<20);
+}
+
void trial2_2()
{
@@ -291,6 +296,127 @@
}
}
+void trial3_base(double pMsgA, double pDel, int bg)
+{
+ MixTrialSpec s;
+ s.setNRecipients(65536).setNAliceRecipients(32)
+ .setPathLen(1).setPadding(0)
+ .setExpAlice(1)
+ .setPMessage(1.0)
+ .setPartial(false)
+
+ .setPDelay(pDel)
+ .setPMessage(pMsgA)
+ .setBGVolMean(bg).setBGVolDev(bg/10.0)
+ .setPObserve(1.0)
+ .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 trial3_1() {
+ const double pDelay[] = { .1, .3, .6, .9 };
+
+ for (int pDi = 0; pDi <= 3; ++pDi) {
+ for (int bg = 32*10; bg <= 32*1000; bg*= 10) {
+ trial3_base(.3, pDelay[pDi], bg);
+ }
+ }
+}
+
+void trial3_2() {
+ const double pDelay[] = { .1, .3, .6, .9 };
+
+ for (int pDi = 0; pDi <= 3; ++pDi) {
+ for (int bg = 32*10; bg <= 32*1000; bg*= 10) {
+ trial3_base(.1, pDelay[pDi], bg);
+ }
+ }
+}
+
+
+void trial3_3() {
+ const double pDelay[] = { .1, .3, .6, .9 };
+
+ for (int pDi = 0; pDi <= 3; ++pDi) {
+ for (int bg = 32*10; bg <= 32*1000; bg*= 10) {
+ trial3_base(.9, pDelay[pDi], bg);
+ }
+ }
+}
+
+
+void trial4_base(double pMsgA, double pDel, int pathlen)
+{
+ MixTrialSpec s;
+ s.setNRecipients(65536).setNAliceRecipients(32)
+ .setPathLen(pathlen).setPadding(0)
+ .setExpAlice(1)
+ .setPMessage(1.0)
+ .setPartial(false)
+
+ .setPDelay(pDel)
+ .setPMessage(pMsgA)
+ .setBGVolMean(320).setBGVolDev(32.0)
+ .setPObserve(1.0)
+ .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 trial4_1()
+{
+ for (int pd = 0; pd < 2; ++pd) {
+ for (int pl = 2; pl <= 8; pl *= 2) {
+ trial4_base(.1, (!pd)?.1:.6, pl);
+ }
+ }
+}
+
+void trial4_2()
+{
+ for (int pd = 0; pd < 2; ++pd) {
+ for (int pl = 2; pl <= 8; pl *= 2) {
+ trial4_base(.6, (!pd)?.1:.6, pl);
+ }
+ }
+}
typedef void (*trialfunc)(void);
@@ -302,11 +428,18 @@
{ "1.1.1", trial1_1_1 },
{ "2", trial2 },
{ "2.1", trial2_1 },
- { "2.1", trial2_1_1 },
+ { "2.1.1", trial2_1_1 },
+ { "2.1.2", trial2_1_2 },
{ "2.2", trial2_2 },
{ "2.2.2", trial2_2_1 },
{ "2.2.1", trial2_2_2 },
{ "3", trial3 },
+ { "3.1", trial3_1 },
+ { "3.2", trial3_2 },
+ { "3.3", trial3_3 },
+ { "4.1", trial4_1 },
+ { "4.2", trial4_2 },
+
{ 0, 0 }
};
***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs in the body. http://freehaven.net/