diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /doc/TRexDataAnalysis.py | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'doc/TRexDataAnalysis.py')
| -rwxr-xr-x | doc/TRexDataAnalysis.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/TRexDataAnalysis.py b/doc/TRexDataAnalysis.py index 4cd928bb..3f6dc170 100755 --- a/doc/TRexDataAnalysis.py +++ b/doc/TRexDataAnalysis.py @@ -59,7 +59,7 @@ def create_plot_for_dframe_arr(dframe_arr, setup_name, start_date, end_date, sho dframe_all = dframe_all.astype(float)
dframe_all.plot()
plt.legend(fontsize='small', loc='best')
- plt.ylabel('MPPS')
+ plt.ylabel('MPPS/Core (Norm)')
plt.title('Setup: ' + setup_name)
plt.tick_params(
axis='x',
@@ -81,7 +81,7 @@ def create_bar_plot_for_latest_runs_per_setup(dframe_all_tests_latest, setup_nam dframe_all_tests_latest = dframe_all_tests_latest[['Test Name', 'Setup', 'Date', 'MPPS']]
plt.xticks(rotation='horizontal')
plt.xlabel('Index of Tests')
- plt.ylabel('MPPS')
+ plt.ylabel('MPPS/Core (Norm)')
plt.title("Test Runs for Setup: " + setup_name)
if save_path:
plt.savefig(os.path.join(save_path, setup_name + '_latest_test_runs.png'))
@@ -110,7 +110,7 @@ def create_all_data_per_setup(setup_dict, setup_name, start_date, end_date, show def create_detailed_table(dframe_arr_detailed):
- result = reduce(lambda x, y: pd.merge(x, y, on=('Build Id', 'Setup')), dframe_arr_detailed)
+ result = reduce(lambda x, y: pd.merge(x, y, how='outer'), dframe_arr_detailed)
return result
|