fix inconsistent charts

If the test order isn't the same in each benchmark run
things go haywire because we assume the arrays are in the
same order. This changes the code to use the order of things
in the first run to be the reference order and then we search
for results in other runs based on that order.

1 files changed, 16 insertions, 4 deletions

diff --git a/android_benchmark_views_app/templates/android_benchmark_views_app/report.html b/android_benchmark_views_app/templates/android_benchmark_views_app/report.html
index 2b05403..809611f 100644
--- a/android_benchmark_views_app/templates/android_benchmark_views_app/report.html
+++ b/android_benchmark_views_app/templates/android_benchmark_views_app/report.html
@@ -32,21 +32,33 @@
 function get_test_result_averages(test_run, test) {
   var results = []
   var avgs = tra[test_run][test];
-  for (var i=0; i < avgs.length; i++)
-    results.push([(i+1), avgs[i]['average'], avgs[i]['std_dev']]);
+  //we build the order of the results based on the order of the tests
+  //defined in the first test_run
+  order = [];
+  for (var i=0; i < tra[bruns[0]][test].length; i++)
+    order.push(tra[bruns[0]][test][i]['test']);
+
+  for (var i=0; i < order.length; i++) {
+    tr = get_test_result(test_run, test, order[i])
+    results.push([(i+1), tr['average'], tr['std_dev']]);
+  }
   return results;
 }
 
-function get_test_result_average(test_run, test, test_result) {
+function get_test_result(test_run, test, test_result) {
   averages = tra[test_run][test];
   for(i = 0; i < averages.length; i++) {
     if( averages[i]['test'] == test_result )
-      return averages[i]['average'];
+      return averages[i];
   }
   alert("ERROR missing test result for: " + test_run + ": " + test + "->" + test_result);
   return 0;
 }
 
+function get_test_result_average(test_run, test, test_result) {
+  return get_test_result(test_run, test, test_result)['average'];
+}
+
 function populate_table(test, tableid) {
   //use the test results order from the first run to define what we show
   main_test_results = tra[bruns[0]][test];