X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=9cce8ed8b2570b849fb293caff5e1d764f5f5d18;hp=bca5535d43c53eda986314415591853f38a8782b;hb=061ea1864e550ea7f9fbc6bc2a096b2cedd94b96;hpb=3458e725729098a6c10f68ec4a05d7256984bcdc

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index bca5535d43..9cce8ed8b2 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -291,19 +291,21 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
             "color": anomalies_res,
             "colorscale": color_scale,
             "showscale": True,
-
+            "line": {
+                "width": 2
+            },
             "colorbar": {
                 "y": 0.5,
                 "len": 0.8,
-                "title": "Results Clasification",
+                "title": "Circles Marking Data Classification",
                 "titleside": 'right',
                 "titlefont": {
                     "size": 14
                 },
                 "tickmode": 'array',
                 "tickvals": [0.125, 0.375, 0.625, 0.875],
-                "ticktext": ["Outlier", "Regress", "Normal", "Progress"],
-                "ticks": 'outside',
+                "ticktext": ["Outlier", "Regression", "Normal", "Progression"],
+                "ticks": "",
                 "ticklen": 0,
                 "tickangle": -90,
                 "thickness": 10
@@ -314,7 +316,7 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
 
     if show_moving_median:
         data_mean_y = pd.Series(data_y).rolling(
-            window=moving_win_size).median()
+            window=moving_win_size, min_periods=2).median()
         trace_median = plgo.Scatter(
             x=data_x,
             y=data_mean_y,
@@ -324,7 +326,7 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
                 "width": 1,
                 "color": color,
             },
-            name='{name}-trend'.format(name=name, size=moving_win_size)
+            name='{name}-trend'.format(name=name)
         )
         traces.append(trace_median)
 
@@ -363,6 +365,7 @@ def _generate_all_charts(spec, input_data):
     csv_table = list()
     # Create the header:
     builds = spec.cpta["data"].values()[0]
+    job_name = spec.cpta["data"].keys()[0]
     builds_lst = [str(build) for build in range(builds[0], builds[-1] + 1)]
     header = "Build Number:," + ",".join(builds_lst) + '\n'
     csv_table.append(header)
@@ -388,7 +391,7 @@ def _generate_all_charts(spec, input_data):
                         chart_data[test_name][int(idx)] = \
                             test["result"]["throughput"]
                     except (KeyError, TypeError):
-                        chart_data[test_name][int(idx)] = None
+                        pass
 
         # Add items to the csv table:
         for tst_name, tst_data in chart_data.items():
@@ -422,9 +425,8 @@ def _generate_all_charts(spec, input_data):
                 idx += 1
 
             # Generate the chart:
-            period_name = "Daily" if period == 1 else \
-                "Weekly" if period < 20 else "Monthly"
-            chart["layout"]["title"] = chart["title"].format(period=period_name)
+            chart["layout"]["xaxis"]["title"] = \
+                chart["layout"]["xaxis"]["title"].format(job=job_name)
             _generate_chart(traces,
                             chart["layout"],
                             file_name="{0}-{1}-{2}{3}".format(
@@ -443,10 +445,18 @@ def _generate_all_charts(spec, input_data):
     txt_table = None
     with open("{0}.csv".format(file_name), 'rb') as csv_file:
         csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
+        header = True
         for row in csv_content:
             if txt_table is None:
                 txt_table = prettytable.PrettyTable(row)
+                header = False
             else:
+                if not header:
+                    for idx, item in enumerate(row):
+                        try:
+                            row[idx] = str(round(float(item) / 1000000, 2))
+                        except ValueError:
+                            pass
                 txt_table.add_row(row)
         txt_table.align["Build Number:"] = "l"
     with open("{0}.txt".format(file_name), "w") as txt_file: