Loading scripts/pyivastest/IvasModeAnalyzer.py +28 −4 Original line number Diff line number Diff line Loading @@ -391,9 +391,9 @@ class IvasModeAnalyzer(IvasModeCollector): result_table = [["conf", "com"]] else: if max_or_add == "add": result_table = [["conf", "enc", "dec", "com", "total"]] result_table = [["conf", "enc", "dec", "com", "rend", "total"]] if max_or_add == "max": result_table = [["conf", "enc", "dec", "com", "max"]] result_table = [["conf", "enc", "dec", "com", "rend", "max"]] sorted_modes = self.sort_log_modes() Loading Loading @@ -455,9 +455,11 @@ class IvasModeAnalyzer(IvasModeCollector): for oc in self.selected_logs[mode]["oc_list"]: formatted_name_oc = formatted_name + " to " + oc dec_value = -1 rend_value = -1 for item in self.selected_logs[mode]["items"]: if oc in self.selected_logs[mode]["items"][item]["dec"]: dec_log_name = self.get_dec_log_file_name(item, mode, oc) # get dec if keyword_suffix == 1: dec_value = max( dec_value, Loading @@ -478,6 +480,27 @@ class IvasModeAnalyzer(IvasModeCollector): strip_suffix=strip_suffix, ), ) # get rend if keyword_suffix == 1: rend_value = max( rend_value, self.get_log_value_from_file( dec_log_name, [keyword, "lib_rend"], position, strip_suffix=strip_suffix, ), ) else: rend_value = max( rend_value, self.get_log_value_from_file( dec_log_name, keyword, position, strip_suffix=strip_suffix, ), ) if encdec == 2: if max_or_add == "add": total = number_format.format( Loading @@ -503,13 +526,13 @@ class IvasModeAnalyzer(IvasModeCollector): elif encdec == 4: if max_or_add == "add": total = number_format.format( float(enc_value) + float(dec_value) + float(com_value) float(enc_value) + float(dec_value) + float(com_value) + float(rend_value) ) elif max_or_add == "max": total = number_format.format( max( float(enc_value) + float(com_value), float(dec_value) + float(com_value), float(dec_value) + float(com_value) + float(rend_value), ) ) result_line = [ Loading @@ -517,6 +540,7 @@ class IvasModeAnalyzer(IvasModeCollector): number_format.format(enc_value), number_format.format(float(dec_value)), number_format.format(com_value), number_format.format(rend_value), total, ] result_table.append(result_line) Loading Loading
scripts/pyivastest/IvasModeAnalyzer.py +28 −4 Original line number Diff line number Diff line Loading @@ -391,9 +391,9 @@ class IvasModeAnalyzer(IvasModeCollector): result_table = [["conf", "com"]] else: if max_or_add == "add": result_table = [["conf", "enc", "dec", "com", "total"]] result_table = [["conf", "enc", "dec", "com", "rend", "total"]] if max_or_add == "max": result_table = [["conf", "enc", "dec", "com", "max"]] result_table = [["conf", "enc", "dec", "com", "rend", "max"]] sorted_modes = self.sort_log_modes() Loading Loading @@ -455,9 +455,11 @@ class IvasModeAnalyzer(IvasModeCollector): for oc in self.selected_logs[mode]["oc_list"]: formatted_name_oc = formatted_name + " to " + oc dec_value = -1 rend_value = -1 for item in self.selected_logs[mode]["items"]: if oc in self.selected_logs[mode]["items"][item]["dec"]: dec_log_name = self.get_dec_log_file_name(item, mode, oc) # get dec if keyword_suffix == 1: dec_value = max( dec_value, Loading @@ -478,6 +480,27 @@ class IvasModeAnalyzer(IvasModeCollector): strip_suffix=strip_suffix, ), ) # get rend if keyword_suffix == 1: rend_value = max( rend_value, self.get_log_value_from_file( dec_log_name, [keyword, "lib_rend"], position, strip_suffix=strip_suffix, ), ) else: rend_value = max( rend_value, self.get_log_value_from_file( dec_log_name, keyword, position, strip_suffix=strip_suffix, ), ) if encdec == 2: if max_or_add == "add": total = number_format.format( Loading @@ -503,13 +526,13 @@ class IvasModeAnalyzer(IvasModeCollector): elif encdec == 4: if max_or_add == "add": total = number_format.format( float(enc_value) + float(dec_value) + float(com_value) float(enc_value) + float(dec_value) + float(com_value) + float(rend_value) ) elif max_or_add == "max": total = number_format.format( max( float(enc_value) + float(com_value), float(dec_value) + float(com_value), float(dec_value) + float(com_value) + float(rend_value), ) ) result_line = [ Loading @@ -517,6 +540,7 @@ class IvasModeAnalyzer(IvasModeCollector): number_format.format(enc_value), number_format.format(float(dec_value)), number_format.format(com_value), number_format.format(rend_value), total, ] result_table.append(result_line) Loading