From 62ed482ffc8bff01701080d9697e53c0c78f4407 Mon Sep 17 00:00:00 2001 From: Andy Doan Date: Fri, 24 Feb 2012 10:17:33 -0600 Subject: fix computation for averages Doing the query by test doesn't return the proper metrics. We instead need to query by the actual test name. Signed-off-by: Andy Doan --- android_benchmark_views_app/helpers.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/android_benchmark_views_app/helpers.py b/android_benchmark_views_app/helpers.py index 4b8d5c8..78d030f 100644 --- a/android_benchmark_views_app/helpers.py +++ b/android_benchmark_views_app/helpers.py @@ -19,21 +19,21 @@ def _get_tests(bundle): name = test_run.test.test_id if name in seen or name == 'lava': continue seen[name] = 1 - tests.append(test_run.test) + tests.append(name) return tests def _b_is_b_str(test): - if test.test_id == 'Totals': + if test == 'Totals': return '' - if test.test_id == 'skia': + if test == 'skia': return "Smaller is better" return "Bigger is better" -def _get_test_result_averages(bundle, test): +def _get_test_result_averages(bundle, test_id): avgs = lava_models.TestResult.objects.filter( - test_run__bundle=bundle, test_case__test=test). \ + test_run__bundle=bundle, test_case__test__test_id=test_id). \ values('test_case__test_case_id'). \ annotate(std_dev=StdDev('measurement'), average=Avg('measurement')). \ order_by('relative_index') @@ -123,11 +123,11 @@ def benchmark_run_test_averages(benchmarkrun): test_averages = [] for test in _get_tests(bundle): test_averages.append({ - 'test': test.test_id, + 'test': test, 'test_result_averages':_get_test_result_averages(bundle, test), 'b_is_b_str': _b_is_b_str(test) }) - if test.test_id == '0xbench': + if test == '0xbench': _fix_0xbench(test_averages) _add_totals(test_averages) -- cgit v1.2.3