Skip to content
Browse files

Change nomenclature

  • Loading branch information...
1 parent 37b623f commit ebb656468d65db490a96d33b33482a41117ce62a @snktagarwal committed Apr 1, 2012
Showing with 8 additions and 8 deletions.
  1. +4 −4 delay_profile/TrainModel.py
  2. +4 −4 delay_profile/tests.py
View
8 delay_profile/TrainModel.py
@@ -691,13 +691,13 @@ def hourVsSegmentTrafficMat(self):
self.seg_hour_traffic_mat[i][j] = float(self.seg_hour_traffic_mat[i][j])/len(self.idx_list)
- def totalAverageTrafficPS(self):
+ def averageTrafficPS(self):
""" Total hourly traffic for each hour slot using the master matrix """
self.total_average_traffic_ps = \
map(lambda x: sum(x.itervalues()), self.seg_hour_traffic_mat)
- def totalAverageTrafficPHS(self):
+ def averageTrafficPHS(self):
""" Total hourly traffic for each hour slot using the master matrix """
@@ -710,13 +710,13 @@ def totalAverageTrafficPHS(self):
val = val + seg[j]
self.total_average_traffic_phs.append(val)
- def totalAverageDelayPS(self):
+ def averageDelayPS(self):
""" Total hourly traffic for each hour slot using the master matrix """
self.total_average_delay_ps = \
map(lambda x: sum(x.itervalues()), self.seg_hour_delay_mat)
- def totalAverageDelayPHS(self):
+ def averageDelayPHS(self):
""" Total hourly delay for each hour slot using the master matrix """
View
8 delay_profile/tests.py
@@ -87,11 +87,11 @@ def new_test():
handle.hourVsSegmentDelayMat()
handle.hourVsSegmentTrafficMat()
- handle.totalAverageTrafficPS()
- handle.totalAverageTrafficPHS()
+ handle.averageTrafficPS()
+ handle.averageTrafficPHS()
- handle.totalAverageDelayPS()
- handle.totalAverageDelayPHS()
+ handle.averageDelayPS()
+ handle.averageDelayPHS()
print 'NEW'
print handle.total_average_traffic_ps

0 comments on commit ebb6564

Please sign in to comment.
Something went wrong with that request. Please try again.