Drop unused entries in getApdexData return value.

apachedex/__init__.py

@@ -178,8 +178,7 @@ class GenericSiteStats(object):
     for data in self.apdex.itervalues():
       apdex.accumulateFrom(data)
     return [
-      (date, apdex.getApdex() * 100, apdex.getAverage(),
-        apdex.getMax(), apdex.hit) for date, apdex
+      (date, apdex.getApdex() * 100, apdex.hit) for date, apdex
       in sorted(self.apdex.iteritems(), key=ITEMGETTER0)]
 
   def asHTML(self, stat_filter=lambda x: x):
@@ -615,7 +614,7 @@ def main():
       minTickSize = (max(1,
         (date_list[-1] - date_list[0]) / (60 * 60 * 1000 * 10)), 'hour')
       # Guesstimation: 6px per digit. If only em were allowed...
-      yLabelWidth = max(int(math.log10(max(x[4] for x in daily_data))) + 1,
+      yLabelWidth = max(int(math.log10(max(x[2] for x in daily_data))) + 1,
         3) * 6
       graph('apdex',
         [zip(date_list, (x[1] for x in daily_data))],
@@ -635,7 +634,7 @@ def main():
         },
       )
       graph('Hits (per %s)' % graph_period,
-        [zip(date_list, (x[4] for x in daily_data))],
+        [zip(date_list, (x[2] for x in daily_data))],
         {
           'xaxis': {
             'mode': 'time',