[or-cvs] r16721: {torstatus} (ticket:98) Cleaning up code (torstatus/trunk)

[kasimir at seul.org]

Author: kasimir
Date: 2008-09-01 15:15:05 -0400 (Mon, 01 Sep 2008)
New Revision: 16721

Modified:
   torstatus/trunk/tns_update.pl
Log:
(ticket:98) Cleaning up code

Modified: torstatus/trunk/tns_update.pl
===================================================================
--- torstatus/trunk/tns_update.pl	2008-09-01 19:12:13 UTC (rev 16720)
+++ torstatus/trunk/tns_update.pl	2008-09-01 19:15:05 UTC (rev 16721)
@@ -646,24 +646,24 @@
 		close ($digestSocket);
 		}
 
-		# Calculate the bandwidth using a linear weight moving average
-		#my $divisor = 900*($currentRouter{'writenumber'} + $currentRouter{'readnumber'});
+		# Calculate the bandwidth using a linear weighted average
 		my $n = ($currentRouter{'writenumber'} + $currentRouter{'readnumber'})/2;
 		my $divisor = (($n*($n+1))/2);
+		
 		# Ensure that no division by zero occurs
 		if ($divisor == 0)
 		{
 			$divisor = 96*97/2;
 		}
+
 		# Add up all of the values, weighting them
 		my $i = $n;
 		my @writehistory = reverse(@{$currentRouter{'wh'}});
 		my @readhistory = reverse(@{$currentRouter{'rh'}});
-		#print $currentRouter{'Fingerprint'} . "\n";
 		my $sum = 0;
 		foreach my $num (@writehistory)
 		{
-			$sum += ($num + $readhistory[$n - $i])/1800*$i;
+			$sum += ($num + $readhistory[$n - $i])/(2*$currentRouter{'ReadHistoryINC'})*$i;
 			$i--;
 		}
 		$currentRouter{'BandwidthOBSERVED'} = $sum/$divisor;