[llvm-commits] [zorg] r149616 - in /zorg/trunk/lnt/lnt/server: db/testsuite.py db/testsuitedb.py reporting/analysis.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb  2 13:07:26 2012
New Revision: 149616

URL: http://llvm.org/viewvc/llvm-project?rev=149616&view=rev
Log:
[lnt/v0.4] lnt.server.db: Include field index directly in the StatusField object.

Modified:
    zorg/trunk/lnt/lnt/server/db/testsuite.py
    zorg/trunk/lnt/lnt/server/db/testsuitedb.py
    zorg/trunk/lnt/lnt/server/reporting/analysis.py

Modified: zorg/trunk/lnt/lnt/server/db/testsuite.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/db/testsuite.py?rev=149616&r1=149615&r2=149616&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/db/testsuite.py (original)
+++ zorg/trunk/lnt/lnt/server/db/testsuite.py Thu Feb  2 13:07:26 2012
@@ -191,6 +191,9 @@
         self.info_key = info_key
         self.status_field = status_field
 
+        # Index of this column.
+        self.index = None
+
         # Column instance for fields which have been bound (non-DB
         # parameter). This is provided for convenience in querying.
         self.column = None

Modified: zorg/trunk/lnt/lnt/server/db/testsuitedb.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/db/testsuitedb.py?rev=149616&r1=149615&r2=149616&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/db/testsuitedb.py (original)
+++ zorg/trunk/lnt/lnt/server/db/testsuitedb.py Thu Feb  2 13:07:26 2012
@@ -35,6 +35,8 @@
         self.order_fields = list(self.test_suite.order_fields)
         self.run_fields = list(self.test_suite.run_fields)
         self.sample_fields = list(self.test_suite.sample_fields)
+        for i,field in enumerate(self.sample_fields):
+            field.index = i
 
         self.base = sqlalchemy.ext.declarative.declarative_base()
 

Modified: zorg/trunk/lnt/lnt/server/reporting/analysis.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/reporting/analysis.py?rev=149616&r1=149615&r2=149616&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/reporting/analysis.py (original)
+++ zorg/trunk/lnt/lnt/server/reporting/analysis.py Thu Feb  2 13:07:26 2012
@@ -16,13 +16,8 @@
 
     def get_run_comparison_result(self, run, compare_to, test_id, field,
                                   comparison_window=[]):
-        field_index = self.testsuite.sample_fields.index(field)
-
         # Get the field which indicates the requested field's status.
         status_field = field.status_field
-        if status_field:
-            status_field_index = self.testsuite.sample_fields.index(
-                status_field)
 
         # Load the sample data for the current and previous runs and the
         # comparison window.
@@ -48,13 +43,13 @@
         run_failed = prev_failed = False
         if status_field:
             for sample in run_samples:
-                run_failed |= sample[status_field_index] == FAIL
+                run_failed |= sample[status_field.index] == FAIL
             for sample in prev_samples:
-                prev_failed |= sample[status_field_index] == FAIL
+                prev_failed |= sample[status_field.index] == FAIL
 
         # Get the current and previous values.
-        run_values = [s[field_index] for s in run_samples]
-        prev_values = [s[field_index] for s in prev_samples]
+        run_values = [s[field.index] for s in run_samples]
+        prev_values = [s[field.index] for s in prev_samples]
         if run_values:
             run_value = min(run_values)
         else:
@@ -108,9 +103,9 @@
             # Filter out failing samples.
             if status_field:
                 prev_samples = [s for s in prev_samples
-                                if s[status_field_index] == PASS]
+                                if s[status_field.index] == PASS]
             if prev_samples:
-                prev_values = [s[field_index]
+                prev_values = [s[field.index]
                                for s in prev_samples]
                 stddev = stats.standard_deviation(prev_values)
                 MAD = stats.median_absolute_deviation(prev_values)