[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[freehaven-cvs] updated scripts to generate graphs
Update of /home/freehaven/cvsroot/doc/e2e-traffic/src
In directory moria.mit.edu:/tmp/cvs-serv13467/src
Modified Files:
analyze.py simmain.cpp
Log Message:
updated scripts to generate graphs
Index: analyze.py
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/analyze.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- analyze.py 24 Jan 2004 05:49:24 -0000 1.8
+++ analyze.py 24 Jan 2004 14:42:08 -0000 1.9
@@ -26,7 +26,6 @@
return hash(self.p)
def __cmp__(self,o):
return cmp(self.p,o.p)
-
class SDParams(Params):
def __init__(self,**test):
self.p = (test['b'],test['N'],test['m'])
@@ -79,7 +78,7 @@
return int(x*100)
class RecipientDistribution:
- MAXIMUM = 1e50 #off the scale
+ MAXIMUM = 1e10 #off the scale
def __init__(self, M):
self.M=M
self.items = 0
@@ -202,8 +201,8 @@
avgR = self.nRounds[p]/float(self.nSuccess[p])
avgRA = self.nRoundsAlice[p]/float(self.nSuccess[p])
else:
- avgR = 1000000
- avgRA = (1000000*p.getPMsg())//100
+ avgR = 5000000
+ avgRA = (5000000*p.getPMsg())//100
pG = self.nGuessed[p]/(fT*p.getM())
dp = p.disp()
@@ -213,7 +212,7 @@
print ("%s | N:%3d succ:%3s%% guess:%3s%% rnds:%7d rndsA:%7s"
%(dp, nT, int(pS*100), int(pG*100), avgR, avgRA)),
- N_NAMES=6
+ N_NAMES=7
names = ["1st","1_2","3_4", "7_8", None, "but1", "all"]
for percentile in 50,80,90,95:
pct = nrtgn.getPercentile(percentile)
Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- simmain.cpp 24 Jan 2004 05:49:24 -0000 1.31
+++ simmain.cpp 24 Jan 2004 14:42:08 -0000 1.32
@@ -203,6 +203,14 @@
trial1u_base(1000,1048576,1,8);
}
+void trial1u_3()
+{
+ trial1u_base(125, 8192, 8, 8);
+ trial1u_base(125, 16384, 8, 8);
+ trial1u_base(125, 65536, 8, 8);
+ trial1u_base(125, 131072, 8, 8);
+}
+
void trial2()
{
const double pMsgAlice[] = { 0.6, 0.9, 0.99 };
@@ -712,7 +720,7 @@
s.setGranularity(25);
- s.setCutoff(1500000);
+ s.setCutoff(1000000);
int nBad = 0;
int nGood = 0;
for (int i = 1; i <= 100; ++i) {
@@ -834,6 +842,27 @@
trial4_base(.7, .6, 8, 125);
}
+void trial4r_7()
+{
+ trial4_base(.2, .6, 2, 125);
+ trial4_base(.3, .6, 2, 125);
+ trial4_base(.8, .6, 2, 125);
+}
+
+void trial4r_8()
+{
+ trial4_base(.2, .6, 4, 125);
+ trial4_base(.3, .6, 4, 125);
+ trial4_base(.8, .6, 4, 125);
+}
+
+void trial4r_9()
+{
+ trial4_base(.2, .9, 1, 125);
+ trial4_base(.8, .9, 1, 125);
+}
+
+
void trial5a_base(double pMsgA, double pDelay, double pDummy, int pathLen=4)
{
MixTrialSpec s;
@@ -931,6 +960,12 @@
trial5a_base(.6,.6, .7, 4);
trial5a_base(.6,.6, .8, 4);
}
+void trial5a_7()
+{
+ trial5a_base(.6,.1, .8, 1);
+ trial5a_base(.6,.1, .8, 4);
+}
+
void trial5b_base(double pMsgA, double pDelay, int nPad, double pOnline,
int pathLen=4)
@@ -1177,6 +1212,7 @@
{ "1.1.1", trial1_1_1 },
{ "1u.1", trial1u_1 },
{ "1u.2", trial1u_2 },
+ { "1u.3", trial1u_3 },
{ "2", trial2 },
{ "2.1", trial2_1 },
@@ -1220,6 +1256,9 @@
{ "4r.4", trial4r_4 },
{ "4r.5", trial4r_5 },
{ "4r.6", trial4r_6 },
+ { "4r.7", trial4r_7 },
+ { "4r.8", trial4r_8 },
+ { "4r.9", trial4r_9 },
{ "5a.1", trial5a_1 },
{ "5a.2", trial5a_2 },
@@ -1230,6 +1269,7 @@
{ "5a.4.3", trial5a_4_3 },
{ "5a.5", trial5a_5 },
{ "5a.6", trial5a_6 },
+ { "5a.7", trial5a_7 },
{ "5b.1", trial5b_1 },
{ "5b.2", trial5b_2 },
***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs in the body. http://freehaven.net/