diff options
| -rw-r--r-- | resources/tools/presentation/generator_tables.py | 33 | ||||
| -rw-r--r-- | resources/tools/presentation/specifications/report/environment.yaml | 4 |
2 files changed, 12 insertions, 25 deletions
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 0b063b1067..c36159825b 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -297,28 +297,15 @@ def table_oper_data_html(table, input_data): threads = dict({idx: list() for idx in range(len(runtime))}) for idx, run_data in runtime.items(): for gnode, gdata in run_data.items(): - if gdata[u"vectors"] > 0: - clocks = gdata[u"clocks"] / gdata[u"vectors"] - elif gdata[u"calls"] > 0: - clocks = gdata[u"clocks"] / gdata[u"calls"] - elif gdata[u"suspends"] > 0: - clocks = gdata[u"clocks"] / gdata[u"suspends"] - else: - clocks = 0.0 - if gdata[u"calls"] > 0: - vectors_call = gdata[u"vectors"] / gdata[u"calls"] - else: - vectors_call = 0.0 - if int(gdata[u"calls"]) + int(gdata[u"vectors"]) + \ - int(gdata[u"suspends"]): - threads[idx].append([ - gnode, - int(gdata[u"calls"]), - int(gdata[u"vectors"]), - int(gdata[u"suspends"]), - clocks, - vectors_call - ]) + threads[idx].append([ + gnode, + int(gdata[u"calls"]), + int(gdata[u"vectors"]), + int(gdata[u"suspends"]), + float(gdata[u"clocks"]), + float(gdata[u"vectors"] / gdata[u"calls"]) \ + if gdata[u"calls"] else 0.0 + ]) bold = ET.SubElement(tcol, u"b") bold.text = ( diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml index 74fbd579b4..1ddaf6158c 100644 --- a/resources/tools/presentation/specifications/report/environment.yaml +++ b/resources/tools/presentation/specifications/report/environment.yaml @@ -267,5 +267,5 @@ format: html: - full - pdf: - - minimal + # pdf: + # - minimal |