[or-cvs] r20622: {torflow} Fix diff= keyword to use descriptor values for differences. (torflow/branches/stable/NetworkScanners/BwAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-09-21 02:11:30 -0400 (Mon, 21 Sep 2009)
New Revision: 20622

Modified:
   torflow/branches/stable/NetworkScanners/BwAuthority/aggregate.py
Log:

Fix diff= keyword to use descriptor values for differences.



Modified: torflow/branches/stable/NetworkScanners/BwAuthority/aggregate.py
===================================================================
--- torflow/branches/stable/NetworkScanners/BwAuthority/aggregate.py	2009-09-20 21:20:57 UTC (rev 20621)
+++ torflow/branches/stable/NetworkScanners/BwAuthority/aggregate.py	2009-09-21 06:11:30 UTC (rev 20622)
@@ -308,7 +308,7 @@
     # Node class
     use_bw = BETA*n.ns_bw[chosen_bw_idx]+(1.0-BETA)*n.desc_bw[chosen_bw_idx]
     n.new_bw = use_bw*((ALPHA + n.ratio)/(ALPHA + 1.0))
-    n.change = n.new_bw - n.ns_bw[chosen_bw_idx]
+    n.change = n.new_bw - n.desc_bw[chosen_bw_idx]
 
     if n.idhex in prev_consensus:
       if prev_consensus[n.idhex].bandwidth != None: