Code Review
/
trex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
fda9842
)
fixed detailed table to return more detailed data
21/5221/1
author
itraviv
<
[email protected]
>
Sun, 1 Jan 2017 16:38:06 +0000
(18:38 +0200)
committer
itraviv
<
[email protected]
>
Sun, 1 Jan 2017 16:38:48 +0000
(18:38 +0200)
Signed-off-by: itraviv <
[email protected]
>
doc/TRexDataAnalysis.py
patch
|
blob
|
history
diff --git
a/doc/TRexDataAnalysis.py
b/doc/TRexDataAnalysis.py
index
4cd928b
..
9ddc3b0
100755
(executable)
--- a/
doc/TRexDataAnalysis.py
+++ b/
doc/TRexDataAnalysis.py
@@
-110,7
+110,7
@@
def create_all_data_per_setup(setup_dict, setup_name, start_date, end_date, show
\r
\r
def create_detailed_table(dframe_arr_detailed):
\r
- result = reduce(lambda x, y: pd.merge(x, y,
on=('Build Id', 'Setup')
), dframe_arr_detailed)
\r
+ result = reduce(lambda x, y: pd.merge(x, y,
how='outer'
), dframe_arr_detailed)
\r
return result
\r
\r
\r