Index: trunk/fundraiser-statistics/fundraiser-scripts/classes/DataReporting.py |
— | — | @@ -84,7 +84,7 @@ |
85 | 85 | if kwargs[key] == 'campaign_interval': |
86 | 86 | self._data_loader_ = DL.CampaignIntervalReportingLoader() |
87 | 87 | |
88 | | - print self._data_loader_.__str__ |
| 88 | + # print self._data_loader_.__str__ |
89 | 89 | |
90 | 90 | """ |
91 | 91 | |
— | — | @@ -1157,7 +1157,7 @@ |
1158 | 1158 | """ |
1159 | 1159 | def run(self, start_time, end_time, interval, query_type, metric_name, campaign, labels): |
1160 | 1160 | |
1161 | | - print '\nGenerating ' + query_type +', start and end times are: ' + start_time + ' - ' + end_time +' ... \n' |
| 1161 | + # print '\nGenerating ' + query_type +', start and end times are: ' + start_time + ' - ' + end_time +' ... \n' |
1162 | 1162 | |
1163 | 1163 | """ Execute the query that generates interval reporting data """ |
1164 | 1164 | return_val = self._data_loader_.run_query(start_time, end_time, interval, query_type, metric_name, campaign) |
— | — | @@ -1165,7 +1165,6 @@ |
1166 | 1166 | times = return_val[1] |
1167 | 1167 | |
1168 | 1168 | """ Select only the specified item keys """ |
1169 | | - print counts.keys() |
1170 | 1169 | if len(self._item_keys_) > 0: |
1171 | 1170 | counts = self.select_metric_keys(counts) |
1172 | 1171 | times = self.select_metric_keys(times) |
— | — | @@ -1248,7 +1247,7 @@ |
1249 | 1248 | if kwargs[key] == 't_test': |
1250 | 1249 | self._hypothesis_test_ = HT.TTest() |
1251 | 1250 | |
1252 | | - print self._hypothesis_test_.__str__ |
| 1251 | + # print self._hypothesis_test_.__str__ |
1253 | 1252 | |
1254 | 1253 | self._data_loader_ = DL.HypothesisTestLoader() |
1255 | 1254 | DataReporting.__init__(self, **kwargs) |
— | — | @@ -1454,4 +1453,66 @@ |
1455 | 1454 | self.print_metrics(fname, title, means_1, means_2, std_devs_1, std_devs_2, times_indices, labels, test_call) |
1456 | 1455 | |
1457 | 1456 | return |
1458 | | - |
\ No newline at end of file |
| 1457 | + |
| 1458 | + |
| 1459 | + |
| 1460 | + |
| 1461 | +class CampaignReporting(DataReporting): |
| 1462 | + |
| 1463 | + """ |
| 1464 | + |
| 1465 | + Constructor for confidence reporting class |
| 1466 | + |
| 1467 | + INPUT: |
| 1468 | + |
| 1469 | + |
| 1470 | + |
| 1471 | + |
| 1472 | + """ |
| 1473 | + def __init__(self, **kwargs): |
| 1474 | + |
| 1475 | + self._data_loader_ = DL.CampaignReportingLoader() |
| 1476 | + DataReporting.__init__(self, **kwargs) |
| 1477 | + |
| 1478 | + |
| 1479 | + |
| 1480 | + |
| 1481 | + |
| 1482 | + """ |
| 1483 | + Describes how to run a report !! MODIFY !! |
| 1484 | + """ |
| 1485 | + def usage(self): |
| 1486 | + |
| 1487 | + print '' |
| 1488 | + |
| 1489 | + return |
| 1490 | + |
| 1491 | + """ |
| 1492 | + Print in Tabular form the means and standard deviation of each group over each |
| 1493 | + interval |
| 1494 | + |
| 1495 | + INPUT: |
| 1496 | + |
| 1497 | + RETURN: |
| 1498 | + |
| 1499 | + """ |
| 1500 | + def print_metrics(self): |
| 1501 | + |
| 1502 | + return |
| 1503 | + |
| 1504 | + |
| 1505 | + """ |
| 1506 | + Executes the test reporting |
| 1507 | + |
| 1508 | + INPUT: |
| 1509 | + |
| 1510 | + RETURN: |
| 1511 | + |
| 1512 | + """ |
| 1513 | + def run(self, query_type, params): |
| 1514 | + |
| 1515 | + data = self._data_loader_.run_query(start_time, end_time, interval, query_type, metric_name, campaign) |
| 1516 | + |
| 1517 | + return |
| 1518 | + |
| 1519 | + |
\ No newline at end of file |