X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=97f813d848013f9985483df036946fb1554ae945;hp=0e237e50aab0f5acbb73edb337f5a573aa69f482;hb=1cdffc39203589d5da2588927760762129ce2976;hpb=6fb043d8e4450d7db31a5f5903e84f600aa807a4

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 0e237e50aa..97f813d848 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -99,6 +99,9 @@ def plot_performance_box(plot, input_data):
                                 append(test["throughput"]["NDR"]["LOWER"])
                         else:
                             continue
+                    elif test["type"] in ("SOAK", ):
+                        y_vals[test["parent"]].\
+                            append(test["throughput"]["LOWER"])
                     else:
                         continue
                 except (KeyError, TypeError):
@@ -1447,13 +1450,13 @@ def plot_service_density_heatmap_compare(plot, input_data):
             if vals[key_c][key_n]["vals_r"]:
                 vals[key_c][key_n]["nr_r"] = len(vals[key_c][key_n]["vals_r"])
                 vals[key_c][key_n]["mean_r"] = \
-                    round(mean(vals[key_c][key_n]["vals_r"]) / 1000000, 1)
+                    mean(vals[key_c][key_n]["vals_r"])
                 vals[key_c][key_n]["stdev_r"] = \
                     round(stdev(vals[key_c][key_n]["vals_r"]) / 1000000, 1)
             if vals[key_c][key_n]["vals_c"]:
                 vals[key_c][key_n]["nr_c"] = len(vals[key_c][key_n]["vals_c"])
                 vals[key_c][key_n]["mean_c"] = \
-                    round(mean(vals[key_c][key_n]["vals_c"]) / 1000000, 1)
+                    mean(vals[key_c][key_n]["vals_c"])
                 vals[key_c][key_n]["stdev_c"] = \
                     round(stdev(vals[key_c][key_n]["vals_c"]) / 1000000, 1)
 
@@ -1474,17 +1477,24 @@ def plot_service_density_heatmap_compare(plot, input_data):
                 val_r = vals[txt_chains[c - 1]][txt_nodes[n - 1]]["mean_r"]
             except (KeyError, IndexError):
                 val_r = None
-            data_r[c - 1].append(val_r)
             try:
                 val_c = vals[txt_chains[c - 1]][txt_nodes[n - 1]]["mean_c"]
             except (KeyError, IndexError):
                 val_c = None
-            data_c[c - 1].append(val_c)
-
             if val_c is not None and val_r:
-                diff[c - 1].append(round((val_c - val_r) * 100 / val_r, 1))
+                val_d = (val_c - val_r) * 100 / val_r
             else:
-                diff[c - 1].append(None)
+                val_d = None
+
+            if val_r is not None:
+                val_r = round(val_r / 1000000, 1)
+            data_r[c - 1].append(val_r)
+            if val_c is not None:
+                val_c = round(val_c / 1000000, 1)
+            data_c[c - 1].append(val_c)
+            if val_d is not None:
+                val_d = int(round(val_d, 0))
+            diff[c - 1].append(val_d)
 
     # Colorscales:
     my_green = [[0.0, 'rgb(235, 249, 242)'],
@@ -1528,39 +1538,42 @@ def plot_service_density_heatmap_compare(plot, input_data):
                 showarrow=False
             )
 
+            point_text_r = "Not present"
+            point_text_c = "Not present"
+            point_text_diff = ""
             try:
-                point_r = str(data_r[c][n])
-                point_text_r = text_r.format(
-                    val_r=point_r,
-                    stdev_r=vals[txt_chains[c]][txt_nodes[n]]["stdev_r"],
-                    nr_r=vals[txt_chains[c]][txt_nodes[n]]["nr_r"])
+                point_r = data_r[c][n]
+                if point_r is not None:
+                    point_text_r = text_r.format(
+                        val_r=point_r,
+                        stdev_r=vals[txt_chains[c]][txt_nodes[n]]["stdev_r"],
+                        nr_r=vals[txt_chains[c]][txt_nodes[n]]["nr_r"])
             except KeyError:
                 point_r = None
-                point_text_r = "Not present"
             point["text"] = "" if point_r is None else point_r
             annotations_r.append(deepcopy(point))
 
             try:
-                point_c = str(data_c[c][n])
-                point_text_c = text_c.format(
-                    val_c=point_c,
-                    stdev_c=vals[txt_chains[c]][txt_nodes[n]]["stdev_c"],
-                    nr_c=vals[txt_chains[c]][txt_nodes[n]]["nr_c"])
+                point_c = data_c[c][n]
+                if point_c is not None:
+                    point_text_c = text_c.format(
+                        val_c=point_c,
+                        stdev_c=vals[txt_chains[c]][txt_nodes[n]]["stdev_c"],
+                        nr_c=vals[txt_chains[c]][txt_nodes[n]]["nr_c"])
             except KeyError:
                 point_c = None
-                point_text_c = "Not present"
             point["text"] = "" if point_c is None else point_c
             annotations_c.append(deepcopy(point))
 
             try:
-                point_d = str(diff[c][n])
-                point_text_diff = text_diff.format(
-                    title_r=plot["reference"]["name"],
-                    title_c=plot["compare"]["name"],
-                    diff=point_d)
+                point_d = diff[c][n]
+                if point_d is not None:
+                    point_text_diff = text_diff.format(
+                        title_r=plot["reference"]["name"],
+                        title_c=plot["compare"]["name"],
+                        diff=point_d)
             except KeyError:
                 point_d = None
-                point_text_diff = ""
             point["text"] = "" if point_d is None else point_d
             annotations_diff.append(deepcopy(point))