commit 2416763b6351d5ad2e7514677412fc501e9dda4e Author: Mike Perry mikeperry-git@fscked.org Date: Mon Dec 5 16:18:06 2011 -0800
The old code should use circ failures..
I think this was added because circ_fail_rate used to get set to 0 by a consensus param that we later changed. --- NetworkScanners/BwAuthority/aggregate.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 4c5fc28..1207b07 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -529,10 +529,8 @@ def main(argv):
else: plog("INFO", "PID control disabled") - filt_avg = sum(map(lambda n: n.filt_bw*(1.0-n.circ_fail_rate), - nodes.itervalues()))/float(len(nodes)) - strm_avg = sum(map(lambda n: n.strm_bw*(1.0-n.circ_fail_rate), - nodes.itervalues()))/float(len(nodes)) + filt_avg = sum(map(lambda n: n.filt_bw, nodes.itervalues()))/float(len(nodes)) + strm_avg = sum(map(lambda n: n.strm_bw, nodes.itervalues()))/float(len(nodes)) for cl in ["Guard+Exit", "Guard", "Exit", "Middle"]: true_filt_avg[cl] = filt_avg true_strm_avg[cl] = strm_avg