[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[freehaven-cvs] Add final test implementations
Update of /home/freehaven/cvsroot/doc/e2e-traffic/src
In directory moria.mit.edu:/tmp/cvs-serv10617
Modified Files:
PLAN.5 analyze.py postproc.py simmain.cpp
Log Message:
Add final test implementations
Index: PLAN.5
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/PLAN.5,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PLAN.5 27 Apr 2004 19:44:39 -0000 1.5
+++ PLAN.5 30 Apr 2004 00:32:58 -0000 1.6
@@ -7,6 +7,7 @@
G: Apr21, 23:00
H: Apr27, 14:52
I: Apr27, 15:44
+J: Apr28, 12:41
New cases for preproceedings:
@@ -41,6 +42,14 @@
5c.7: noether: DONE
5c.8: totoro: DONE
+ padding=2, smoothing=yes
+ 5c.9: pDelay=.6, len=4, pOn=.2,.8
+
+ (pDelay, len) in (.6,1),(.1,1),(.1,4):
+ pOn in .95, .99
+ 5c.10.1: pDelay=.1, len=1
+ 5c.10.2: pDelay=.1, len=4
+ 5c.10.3: pDelay=.6, len=1
5d: Perfect padding with previous nonmembership
@@ -52,12 +61,12 @@
Background is known.
5d.1: pDelay=.1
- 5d.3: pDelay=.3
+ 5d.2: pDelay=.3
5d.3: pDelay=.9
- 5d.1: cassandra: I:0
- 5d.2: noether: I:0
- 5d.3: cassandra:2222: I:0
+ 5d.1: cassandra: I:0 J:3.14 DONE
+ 5d.2: noether: I:0 J:1.01 K:1.04 ????
+ 5d.3: cassandra:2222: I:0 J:3.23 DONE
7a: Pseudonyms
@@ -82,6 +91,6 @@
7a.2: cassandra DONE
7a.3: noether DONE
7a.4: cassandra DONE
- 7a.5: cannabis G:0 H:10.54 (stopping)
+ 7a.5: cannabis G:0 H:10.54 J: 10.64 K:11.56
7a.6: impulse G:0 H:11.30 (stopping)
Index: analyze.py
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/analyze.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- analyze.py 24 Jan 2004 14:42:08 -0000 1.9
+++ analyze.py 30 Apr 2004 00:32:58 -0000 1.10
@@ -61,13 +61,14 @@
int(test['pDummy']*100),
int(test['pDelay']*100),
test['bgVolume'],
- test['pading'], #Yes, it's misspelled. :/
+ test['padding'], # "Pading" on older tests.
int(test['pOnline']*100),
- int(test['pObserve']*100))
+ int(test['pObserve']*100),
+ test.get('smoothPadding',0))
def disp(self):
- N,m,l,pA,pJ,pD,bgV,pad,pOn,pO=self.p
- return ("N:%5d m:%3d l:%1d pA:%2s%% pJ:%2s%% pD:%2s%% bg:%5d pl:%d pOn:%d%% pOb:%2d%%"
- %(N,m,l,pA,pJ,pD,bgV,pad,pOn,pO))
+ N,m,l,pA,pJ,pD,bgV,pad,pOn,pO,smooth=self.p
+ return ("N:%5d m:%3d l:%1d pA:%2s%% pJ:%2s%% pD:%2s%% bg:%5d pl:%d sm:%d pOn:%d%% pOb:%2d%%"
+ %(N,m,l,pA,pJ,pD,bgV,pad,smooth,pOn,pO))
def getM(self):
return self.p[1]
def getPMsg(self):
@@ -113,7 +114,7 @@
self.nGuessedAtRoundN[r] += 1
except KeyError:
self.nGuessedAtRoundN[r] = 1
- def getPercentile(self,pctile):
+ def getPercentile(self,pctile):
r = []
p = int(math.ceil(self.items * (pctile/100.0)))
for l in self.lst:
@@ -125,7 +126,7 @@
return r
class ResultSet:
- SCOPE = { 'MixTrial' : MixTrialParams,
+ SCOPE = { 'MixTrial' : MixTrialParams,
'UnkBGBatchTrial' : UnkBGParams,
'SDTrial' : SDParams,
'Result' : kwdict }
@@ -136,13 +137,13 @@
self.nRoundsAlice = {}
self.nGuessed = {}
self.nRoundsToGuessN = {}
-
+
def readFile(self,fn):
f = gzopen(fn)
next = getNext(f)
scope = self.SCOPE
-
+
nTrials = self.nTrials
nSuccess = self.nSuccess
nRounds = self.nRounds
@@ -164,6 +165,10 @@
if not (testline and resultline): break
if not resultline.startswith("Result"):
print xth,"Bad result line:",resultline
+ testline = testline.replace("smoothPadding0",
+ "smoothPadding=0")
+ testline = testline.replace("smoothPadding1",
+ "smoothPadding=1")
params = eval(testline, scope)
result = eval(resultline, scope)
try:
@@ -189,7 +194,7 @@
pass
except SyntaxError:
print xth
-
+
def display(self):
params = self.nTrials.keys()
params.sort()
Index: postproc.py
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/postproc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- postproc.py 23 Jan 2004 00:34:19 -0000 1.4
+++ postproc.py 30 Apr 2004 00:32:58 -0000 1.5
@@ -38,7 +38,7 @@
elif blocked.has_key(c[0]):
if blocked[c[0]].has_key(c[1]):
skip = 1
- break
+ break
if c[0] == xvar and xval is None:
xval = float(c[1])
elif c[0] == yvar:
@@ -76,7 +76,7 @@
print "\n\n# ","; ".join(["%s=%s"%(k,v) for idx,k,v in group])
for x,y in d:
- if y is None:
+ if y is None:
continue
else:
print x,y
@@ -86,7 +86,7 @@
fn = sys.argv[1]
fixed = {}
blocked = {}
- while 1:
+ while 1:
if "=" in sys.argv[2]:
k,v= sys.argv[2].split("=")
for i in v.split(","):
@@ -98,7 +98,7 @@
blocked.setdefault(k,{})[i]=1
del sys.argv[2]
else:
- break
+ break
xv = sys.argv[2]
yv = sys.argv[3]
gv = sys.argv[4:]
@@ -116,4 +116,3 @@
print "# %s not in %s"%(k,vallist)
pp(fn,fixed,blocked,xv,yv,gv)
print
-
Index: simmain.cpp
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/src/simmain.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- simmain.cpp 11 Apr 2004 05:02:56 -0000 1.37
+++ simmain.cpp 30 Apr 2004 00:32:58 -0000 1.38
@@ -1227,7 +1227,27 @@
}
}
}
+void trial5c_9()
+{
+ trial5c_base(.8, 2, true, .6, 4);
+}
+
+void trial5c_10_1()
+{
+ trial5c_base(.95, 2, true, .1, 1);
+ trial5c_base(.99, 2, true, .1, 1);
+}
+void trial5c_10_2()
+{
+ trial5c_base(.95, 2, true, .1, 4);
+ trial5c_base(.99, 2, true, .1, 4);
+}
+void trial5c_10_3()
+{
+ trial5c_base(.95, 2, true, .6, 1);
+ trial5c_base(.99, 2, true, .6, 1);
+}
void trial5d_base(double pDelay, int pathLen, int nAlice)
{
@@ -1563,6 +1583,10 @@
{ "5c.6", trial5c_6 },
{ "5c.7", trial5c_7 },
{ "5c.8", trial5c_8 },
+ { "5c.9", trial5c_9 },
+ { "5c.10.1", trial5c_10_1 },
+ { "5c.10.2", trial5c_10_2 },
+ { "5c.10.3", trial5c_10_3 },
{ "5d.1", trial5d_1 },
{ "5d.2", trial5d_2 },
***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs in the body. http://freehaven.net/