X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=32f146bca84d5e412a1cc7ee6759496b1f0fd896;hb=2e6fbdb290ab6128403f1f6edcc6072644843f77;hp=03cee06cb04776327b3a368deda482b02f86677f;hpb=1304e1ba4c723e255019a2990612906790f47bca;p=csit.git
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 03cee06cb0..32f146bca8 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -144,21 +144,22 @@ def plot_performance_box(plot, input_data):
df.head()
y_max = list()
for i, col in enumerate(df.columns):
- name = "{0}. {1}".format(i + 1, col.lower().replace('-ndrpdr', ''))
- if len(name) > 60:
+ name = "{nr}. ({samples:02d} run{plural}) {name}".\
+ format(nr=(i + 1),
+ samples=nr_of_samples[i],
+ plural='s' if nr_of_samples[i] > 1 else '',
+ name=col.lower().replace('-ndrpdr', ''))
+ if len(name) > 50:
name_lst = name.split('-')
name = ""
split_name = True
for segment in name_lst:
- if (len(name) + len(segment) + 1) > 60 and split_name:
+ if (len(name) + len(segment) + 1) > 50 and split_name:
name += "
"
split_name = False
name += segment + '-'
name = name[:-1]
- name = "{name} ({samples} run{plural})".\
- format(name=name,
- samples=nr_of_samples[i],
- plural='s' if nr_of_samples[i] > 1 else '')
+
logging.debug(name)
traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
y=[y / 1000000 if y else None for y in df[col]],
@@ -298,13 +299,13 @@ def plot_latency_error_bars(plot, input_data):
nr_of_samples = list()
for key, val in y_sorted.items():
name = "-".join(key.split("-")[1:-1])
- if len(name) > 60:
+ if len(name) > 50:
name_lst = name.split('-')
name = ""
split_name = True
for segment in name_lst:
- if (len(name) + len(segment) + 1) > 60 and split_name:
- name += "
"
+ if (len(name) + len(segment) + 1) > 50 and split_name:
+ name += "
"
split_name = False
name += segment + '-'
name = name[:-1]
@@ -332,11 +333,11 @@ def plot_latency_error_bars(plot, input_data):
direction = "West-East"
else:
direction = "East-West"
- hovertext = ("Test: {test}
"
- "Direction: {dir}
"
- "No. of Runs: {nr}
".format(test=x_vals[idx],
- dir=direction,
- nr=nr_of_samples[idx]))
+ hovertext = ("No. of Runs: {nr}
"
+ "Test: {test}
"
+ "Direction: {dir}
".format(test=x_vals[idx],
+ dir=direction,
+ nr=nr_of_samples[idx]))
if isinstance(y_maxs[idx], float):
hovertext += "Max: {max:.2f}uSec
".format(max=y_maxs[idx])
if isinstance(y_vals[idx], float):
@@ -487,13 +488,13 @@ def plot_throughput_speedup_analysis(plot, input_data):
try:
if test_vals["1"][1]:
name = "-".join(test_name.split('-')[1:-1])
- if len(name) > 60:
+ if len(name) > 50:
name_lst = name.split('-')
name = ""
split_name = True
for segment in name_lst:
- if (len(name) + len(segment) + 1) > 60 and split_name:
- name += "
"
+ if (len(name) + len(segment) + 1) > 50 and split_name:
+ name += "
"
split_name = False
name += segment + '-'
name = name[:-1]
@@ -545,6 +546,8 @@ def plot_throughput_speedup_analysis(plot, input_data):
limit = plot["limits"]["nic"]["xxv710"]
elif "xl710" in test_name:
limit = plot["limits"]["nic"]["xl710"]
+ elif "x553" in test_name:
+ limit = plot["limits"]["nic"]["x553"]
else:
limit = 0
if limit > nic_limit:
@@ -694,9 +697,9 @@ def plot_throughput_speedup_analysis(plot, input_data):
for idx in range(len(val["val"])):
htext = ""
if isinstance(val["val"][idx], float):
- htext += "Mean: {0:.2f}Mpps
" \
- "No. of Runs: {1}
".format(val["val"][idx],
- val["count"][idx])
+ htext += "No. of Runs: {1}
" \
+ "Mean: {0:.2f}Mpps
".format(val["val"][idx],
+ val["count"][idx])
if isinstance(val["diff"][idx], float):
htext += "Diff: {0:.0f}%
".format(round(val["diff"][idx]))
if isinstance(val["rel"][idx], float):
@@ -804,21 +807,21 @@ def plot_http_server_performance_box(plot, input_data):
df = pd.DataFrame(y_vals)
df.head()
for i, col in enumerate(df.columns):
- name = "{0}. {1}".format(i + 1, col.lower().replace('-ndrpdr', ''))
- if len(name) > 60:
+ name = "{nr}. ({samples:02d} run{plural}) {name}".\
+ format(nr=(i + 1),
+ samples=nr_of_samples[i],
+ plural='s' if nr_of_samples[i] > 1 else '',
+ name=col.lower().replace('-ndrpdr', ''))
+ if len(name) > 50:
name_lst = name.split('-')
name = ""
split_name = True
for segment in name_lst:
- if (len(name) + len(segment) + 1) > 60 and split_name:
+ if (len(name) + len(segment) + 1) > 50 and split_name:
name += "
"
split_name = False
name += segment + '-'
name = name[:-1]
- name = "{name} ({samples} run{plural})".\
- format(name=name,
- samples=nr_of_samples[i],
- plural='s' if nr_of_samples[i] > 1 else '')
traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
y=df[col],