Python3: Vagrant update

[csit.git] / resources / tools / presentation / generator_plots.py

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 67c8318..3cbd35c 100644 (file)
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -117,7 +117,7 @@ def plot_service_density_reconf_box_name(plot, input_data):
                           replace('2n1l-', ''))
         tst_name = "-".join(tst_name.split("-")[3:-2])
         name = "{nr}. ({samples:02d} run{plural}, packets lost average: " \
-               "{loss:.1f}, {name}".format(
+               "{loss:.1f}) {name}".format(
                     nr=(i + 1),
                     samples=nr_of_samples[i],
                     plural='s' if nr_of_samples[i] > 1 else '',
@@ -127,9 +127,7 @@ def plot_service_density_reconf_box_name(plot, input_data):
         traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
                                y=[y if y else None for y in df[col]],
                                name=name,
-                               hoverinfo="x+y",
-                               boxpoints="outliers",
-                               whiskerwidth=0))
+                               hoverinfo="y+name"))
     try:
         # Create plot
         layout = deepcopy(plot["layout"])
@@ -226,9 +224,7 @@ def plot_performance_box_name(plot, input_data):
         traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
                                y=[y / 1000000 if y else None for y in df[col]],
                                name=name,
-                               hoverinfo="x+y",
-                               boxpoints="outliers",
-                               whiskerwidth=0))
+                               hoverinfo="y+name"))
         try:
             val_max = max(df[col])
         except ValueError as err:
@@ -1826,7 +1822,7 @@ def plot_service_density_heatmap(plot, input_data):
                                       stdev=None)
                 try:
                     if plot["include-tests"] == "MRR":
-                        result = test["result"]["receive-rate"].avg
+                        result = test["result"]["receive-rate"]  # .avg
                     elif plot["include-tests"] == "PDR":
                         result = test["throughput"]["PDR"]["LOWER"]
                     elif plot["include-tests"] == "NDR":
@@ -2114,7 +2110,7 @@ def plot_service_density_heatmap_compare(plot, input_data):
                                       stdev_c=None)
                 try:
                     if plot["include-tests"] == "MRR":
-                        result = test["result"]["receive-rate"].avg
+                        result = test["result"]["receive-rate"]  # .avg
                     elif plot["include-tests"] == "PDR":
                         result = test["throughput"]["PDR"]["LOWER"]
                     elif plot["include-tests"] == "NDR":