Changed the implementation to make the tests more robust

There were some rounding issues between python2 and 3 - fixed most of them.
Sorted all views from dictionaries to get the same result on python 2 and 3
Added a python dictionary comparator to be able to compare the content of the gold file with the real file and not only the string representation

ext/std/tools/export.py

@@ -33,9 +33,9 @@ class Plugin(mpp.api.Plugin, mpp.api.IRunable):
     
         columns = []
         columnNames = ["file", "region", "type", "modified", "line start", "line end"]
-        for name in self.loader.iterate_namespace_names():
+        for name in sorted(self.loader.iterate_namespace_names()):
             namespace = self.loader.get_namespace(name)
-            for field in namespace.iterate_field_names():
+            for field in sorted(namespace.iterate_field_names()):
                 columns.append((name, field))
                 columnNames.append(name + ":" + field)
     

ext/std/tools/view.py

@@ -12,6 +12,8 @@ import mpp.api
 import mpp.utils
 import mpp.cout
 
+DIGIT_COUNT = 8
+
 class Plugin(mpp.api.Plugin, mpp.api.IConfigurable, mpp.api.IRunable):
     
     MODE_NEW     = 0x01
@@ -90,8 +92,8 @@ def export_to_str(out_format, paths, loader, loader_prev, nest_regions, dist_col
         subfiles = []
         if aggregated_data != None:
             aggregated_data_tree = aggregated_data.get_data_tree()
-            subdirs = aggregated_data.get_subdirs()
-            subfiles = aggregated_data.get_subfiles()
+            subdirs = sorted(aggregated_data.get_subdirs())
+            subfiles = sorted(aggregated_data.get_subfiles())
         else:
             mpp.utils.report_bad_path(path)
             exit_code += 1
@@ -121,7 +123,7 @@ def export_to_str(out_format, paths, loader, loader_prev, nest_regions, dist_col
         if out_format == 'txt':
             cout_txt(data, loader)
         elif out_format == 'xml':
-            result += mpp.utils.serialize_to_xml(data, root_name = "data") + "\n"
+            result += mpp.utils.serialize_to_xml(data, root_name = "data", digitCount = DIGIT_COUNT) + "\n"
         elif out_format == 'python':
             postfix = ""
             if ind < len(paths) - 1:
@@ -434,7 +436,7 @@ def compress_dist(data, columns):
                                 'metric_f': bar['metric']}
                     if '__diff__' in list(bar.keys()):
                         next_bar['__diff__'] = bar['__diff__']
-                    next_consume = int(round(remaining_count/ (columns - len(new_dist))))
+                    next_consume = int(remaining_count/ (columns - len(new_dist)))
                 else:
                     # merge to existing bar
                     next_bar['count'] += bar['count']
@@ -530,11 +532,11 @@ def cout_txt_regions(path, regions, indent = 0):
             ('Line numbers', str(region['info']['line_begin']) + "-" + str(region['info']['line_end'])),
             ('Modified', str(region['info']['modified']))
         ]
-        for namespace in list(region['data'].keys()):
+        for namespace in sorted(list(region['data'].keys())):
             diff_data = {}
             if '__diff__' in list(region['data'][namespace].keys()):
                 diff_data = region['data'][namespace]['__diff__']
-            for field in list(region['data'][namespace].keys()):
+            for field in sorted(list(region['data'][namespace].keys())):
                 diff_str = ""
                 if field == '__diff__':
                     continue
@@ -561,7 +563,7 @@ def cout_txt(data, loader):
             diff_data = {}
             if '__diff__' in list(data['file-data'][namespace].keys()):
                 diff_data = data['file-data'][namespace]['__diff__']
-            for field in list(data['file-data'][namespace].keys()):
+            for field in sorted(list(data['file-data'][namespace].keys())):
                 diff_str = ""
                 if field == '__diff__':
                     continue
@@ -580,8 +582,8 @@ def cout_txt(data, loader):
                 'min': 'Minimum',
                 'max': 'Maximum',
     }
-    for namespace in list(data['aggregated-data'].keys()):
-        for field in list(data['aggregated-data'][namespace].keys()):
+    for namespace in sorted(list(data['aggregated-data'].keys())):
+        for field in sorted(list(data['aggregated-data'][namespace].keys())):
             details = []
             diff_data = {}
             if '__diff__' in list(data['aggregated-data'][namespace][field].keys()):
@@ -590,14 +592,14 @@ def cout_txt(data, loader):
                 diff_str = ""
                 if attr in list(diff_data.keys()):
                     if isinstance(diff_data[attr], float):
-                        diff_str = " [" + ("+" if diff_data[attr] >= 0 else "") + str(round(diff_data[attr], 10)) + "]"
+                        diff_str = " [" + ("+" if diff_data[attr] >= 0 else "") + str(round(diff_data[attr], DIGIT_COUNT)) + "]"
                     else:
                         diff_str = " [" + ("+" if diff_data[attr] >= 0 else "") + str(diff_data[attr]) + "]"
                 if attr == 'avg' and data['aggregated-data'][namespace][field]['nonzero'] == True:
                     diff_str += " (excluding zero metric values)"
                 if isinstance(data['aggregated-data'][namespace][field][attr], float):
-                    # round the data to 10 digits to reach same results on platforms with different precision
-                    details.append((attr_map[attr], str(round(data['aggregated-data'][namespace][field][attr], 10)) + diff_str))
+                    # round the data to reach same results on platforms with different precision
+                    details.append((attr_map[attr], str(round(data['aggregated-data'][namespace][field][attr], DIGIT_COUNT)) + diff_str))
                 else:
                     details.append((attr_map[attr], str(data['aggregated-data'][namespace][field][attr]) + diff_str))
 
@@ -637,16 +639,16 @@ def cout_txt(data, loader):
                 count_str = ((" " * (count_str_len - len(count_str))) + count_str + diff_str + "\t")
                 details.append((metric_str,
                                 "{0:.3f}".format(bar['ratio']) + " : " + "{0:.3f}".format(sum_ratio) +  " : " +
-                                count_str + ('|' * int(round(bar['ratio']*100)))))
+                                count_str + ('|' * int(bar['ratio']*100))))
             mpp.cout.notify(data['info']['path'],
                     '', # no line number
                     mpp.cout.SEVERITY_INFO,
                     "Overall metrics for '" + namespace + ":" + field + "' metric",
                     details)
     details = []
-    for each in data['subdirs']:
+    for each in sorted(data['subdirs']):
         details.append(('Directory', each))
-    for each in data['subfiles']:
+    for each in sorted(data['subfiles']):
         details.append(('File', each))
     if len(details) > 0: 
         mpp.cout.notify(data['info']['path'],

mpp/internal/py2xml.py

@@ -25,10 +25,16 @@ Usage:
 '''
 
 class Py2XML():
+    
+    digitCount = 0
 
-    def __init__( self ):
+    def __init__( self, digitCount = None ):
 
         self.data = "" # where we store the processed XML string
+        if digitCount != None:
+            self.digitCount = digitCount
+        else:
+            self.digitCount = 8
 
     def parse( self, pythonObj, objName=None, indent = 0 ):
         '''
@@ -60,7 +66,7 @@ class Py2XML():
         attrStr = ""    # attribute string of this level
         childStr = ""   # XML string of this level's children
 
-        for k, v in list(pyDictObj.items()):
+        for k, v in sorted(list(pyDictObj.items())):
 
             if isinstance( v, dict ):
                 # child tags, with attributes
@@ -80,7 +86,7 @@ class Py2XML():
         # create XML string for attributes
         for k, v in sorted(attributes.items()):
             if isinstance(v, float):
-                attrStr += " %s=\"%s\"" % ( k, round(v, 10) )
+                attrStr += " %s=\"%s\"" % ( k, round(v, self.digitCount) )
             else:
                 attrStr += " %s=\"%s\"" % ( k, v )
 

mpp/utils.py

@@ -97,8 +97,8 @@ def preprocess_path(path):
 def report_bad_path(path):
     logging.error("Specified path '" + path + "' is invalid: not found in the database records.")
 
-def serialize_to_xml(data, root_name = None):
-    serializer = mpp.internal.py2xml.Py2XML()
+def serialize_to_xml(data, root_name = None, digitCount = None):
+    serializer = mpp.internal.py2xml.Py2XML(digitCount)
     return serializer.parse(data, objName=root_name)
 
 def serialize_to_python(data, root_name = None):

tests/common.py

@@ -12,6 +12,7 @@ import logging
 import difflib
 import unittest
 import shutil
+import ast
 
 class ToolRunner(object):
 
@@ -120,22 +121,33 @@ class ToolRunner(object):
         f = open(gold_file, 'r');
         gold_text = f.read();
         f.close()
-
-        gold_to_compare = gold_text
-        text_to_compare = str(text.decode('ascii'))
-        if lines != None:
-            gold_to_compare = ""
-            text_to_compare = ""
-            gold_lines = gold_text.splitlines(True)
-            text_lines = str(text.decode('ascii')).splitlines(True)
-            for each in lines:
-                gold_to_compare += "".join(gold_lines[each[0] : each[1]])
-                text_to_compare += "".join(text_lines[each[0] : each[1]])
-
-        gold_to_compare = gold_to_compare.replace('\n', ' ').replace('\r', '').replace(" ", "")
-        text_to_compare = text_to_compare.replace('\n', ' ').replace('\r', '').replace(" ", "")
-
-        result = (gold_to_compare == text_to_compare)
+        
+        # don't compare dictionaries as string - they are not in order... (test case failes sometimes)
+        try:
+            textDict = ast.literal_eval(str(text.decode('ascii')))
+            goldDict = ast.literal_eval(str(gold_text))
+        except:
+            textDict = text
+            goldDict = gold_text
+        
+        if isinstance(textDict, dict) and isinstance(goldDict, dict):    
+            result = (textDict == goldDict)
+        else:
+            gold_to_compare = gold_text
+            text_to_compare = str(text.decode('ascii'))
+            if lines != None:
+                gold_to_compare = ""
+                text_to_compare = ""
+                gold_lines = gold_text.splitlines(True)
+                text_lines = str(text.decode('ascii')).splitlines(True)
+                for each in lines:
+                    gold_to_compare += "".join(gold_lines[each[0] : each[1]])
+                    text_to_compare += "".join(text_lines[each[0] : each[1]])
+    
+            gold_to_compare = gold_to_compare.replace('\n', ' ').replace('\r', '').replace(" ", "")
+            text_to_compare = text_to_compare.replace('\n', ' ').replace('\r', '').replace(" ", "")
+    
+            result = (gold_to_compare == text_to_compare)
         
         if result == False:
             f = open(real_file, 'wb')

tests/general/test_basic/test_std_code_magic_view_default_stdout.gold.txt

@@ -1,11 +1,11 @@
 ./:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.5555555556 (excluding zero metric values)
+	Average        : 1.55555556 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 4
 	Total          : 14.0
 	Distribution   : 9 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.667 : 0.667 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.667 : 0.667 : 6	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             2 : 0.222 : 0.889 : 2	||||||||||||||||||||||
 	             4 : 0.111 : 1.000 : 1	|||||||||||
 

tests/general/test_basic/test_std_code_magic_view_nest_per_file_stdout.gold.txt

@@ -83,7 +83,7 @@
             	std.code.magic:numbers: 2
 
 ./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.5714285714 (excluding zero metric values)
+	Average        : 1.57142857 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 4
 	Total          : 11.0

tests/general/test_basic/test_std_complexity_maxindent_view_nest_per_file_stdout.gold.txt

@@ -82,7 +82,7 @@
             	std.code.complexity:maxindent: 2
 
 ./simple.cpp:: info: Overall metrics for 'std.code.complexity:maxindent' metric
-	Average        : 1.8333333333
+	Average        : 1.83333333
 	Minimum        : 1
 	Maximum        : 3
 	Total          : 11.0
@@ -90,6 +90,6 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.333 : 0.333 : 2	|||||||||||||||||||||||||||||||||
 	             2 : 0.500 : 0.833 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||
-	             3 : 0.167 : 1.000 : 1	|||||||||||||||||
+	             3 : 0.167 : 1.000 : 1	||||||||||||||||
 
 

tests/general/test_basic/test_std_filelines_metrics_view_nest_per_file_stdout.gold.txt

@@ -77,8 +77,8 @@
 
 ./simple.cpp:0: info: Metrics per file
 	std.code.filelines:code: 53
-	std.code.filelines:preprocessor: 1
 	std.code.filelines:comments: 5
+	std.code.filelines:preprocessor: 1
 	std.code.filelines:total: 58
 
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:code' metric
@@ -90,15 +90,6 @@
 	  Metric value : Ratio : R-sum : Number of files
 	            53 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
-	Average        : 1.0
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:comments' metric
 	Average        : 5.0
 	Minimum        : 5
@@ -108,6 +99,15 @@
 	  Metric value : Ratio : R-sum : Number of files
 	             5 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
+./simple.cpp:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
+	Average        : 1.0
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
 ./simple.cpp:: info: Overall metrics for 'std.code.filelines:total' metric
 	Average        : 58.0
 	Minimum        : 58

tests/general/test_basic/test_std_filelines_metrics_view_txt_stdout.gold.txt

@@ -8,6 +8,15 @@
 	            21 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 	            53 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 
+./:: info: Overall metrics for 'std.code.filelines:comments' metric
+	Average        : 5.0
+	Minimum        : 5
+	Maximum        : 5
+	Total          : 10.0
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             5 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
 ./:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
 	Average        : 0.5
 	Minimum        : 0
@@ -18,15 +27,6 @@
 	             0 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 	             1 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./:: info: Overall metrics for 'std.code.filelines:comments' metric
-	Average        : 5.0
-	Minimum        : 5
-	Maximum        : 5
-	Total          : 10.0
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             5 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
 ./:: info: Overall metrics for 'std.code.filelines:total' metric
 	Average        : 41.5
 	Minimum        : 25

tests/general/test_basic/test_std_general_metrics_view_nest_per_file_stdout.gold.txt

@@ -79,6 +79,14 @@
 	std.general:proctime: 0.01
 	std.general:size: 697
 
+./simple.cpp:: info: Overall metrics for 'std.general:procerrors' metric
+	Average        : None
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
 ./simple.cpp:: info: Overall metrics for 'std.general:proctime' metric
 	Average        : 0.01
 	Minimum        : 0.01
@@ -88,14 +96,6 @@
 	  Metric value : Ratio : R-sum : Number of files
 	        0.0100 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.general:procerrors' metric
-	Average        : None
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
 ./simple.cpp:: info: Overall metrics for 'std.general:size' metric
 	Average        : 697.0
 	Minimum        : 697

tests/general/test_basic/test_std_general_metrics_view_txt_stdout.gold.txt

@@ -1,3 +1,11 @@
+./:: info: Overall metrics for 'std.general:procerrors' metric
+	Average        : None
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
 ./:: info: Overall metrics for 'std.general:proctime' metric
 	Average        : 0.01
 	Minimum        : 0.01
@@ -7,14 +15,6 @@
 	  Metric value : Ratio : R-sum : Number of files
 	        0.0100 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./:: info: Overall metrics for 'std.general:procerrors' metric
-	Average        : None
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
 ./:: info: Overall metrics for 'std.general:size' metric
 	Average        : 488.0
 	Minimum        : 279

tests/general/test_basic/test_std_lines_metrics_view_nest_per_file_stdout.gold.txt

@@ -5,8 +5,8 @@
 	Line numbers   : 1-71
 	Modified       : None
 	std.code.lines:code: 0
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 0
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 0
 
 .   ./simple.cpp:4: info: Metrics per 'hmm' region
@@ -16,8 +16,8 @@
     	Line numbers   : 3-70
     	Modified       : None
     	std.code.lines:code: 4
-    	std.code.lines:preprocessor: 1
     	std.code.lines:comments: 1
+    	std.code.lines:preprocessor: 1
     	std.code.lines:total: 6
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
@@ -27,8 +27,8 @@
         	Line numbers   : 9-68
         	Modified       : None
         	std.code.lines:code: 4
-        	std.code.lines:preprocessor: 0
         	std.code.lines:comments: 0
+        	std.code.lines:preprocessor: 0
         	std.code.lines:total: 4
 
 .   .   .   ./simple.cpp:12: info: Metrics per 'A' region
@@ -38,8 +38,8 @@
             	Line numbers   : 12-23
             	Modified       : None
             	std.code.lines:code: 11
-            	std.code.lines:preprocessor: 0
             	std.code.lines:comments: 2
+            	std.code.lines:preprocessor: 0
             	std.code.lines:total: 12
 
 .   .   .   ./simple.cpp:26: info: Metrics per 'func' region
@@ -49,8 +49,8 @@
             	Line numbers   : 26-40
             	Modified       : None
             	std.code.lines:code: 5
-            	std.code.lines:preprocessor: 0
             	std.code.lines:comments: 0
+            	std.code.lines:preprocessor: 0
             	std.code.lines:total: 5
 
 .   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
@@ -60,8 +60,8 @@
                 	Line numbers   : 28-38
                 	Modified       : None
                 	std.code.lines:code: 3
-                	std.code.lines:preprocessor: 0
                 	std.code.lines:comments: 0
+                	std.code.lines:preprocessor: 0
                 	std.code.lines:total: 3
 
 .   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
@@ -71,8 +71,8 @@
                     	Line numbers   : 30-37
                     	Modified       : None
                     	std.code.lines:code: 7
-                    	std.code.lines:preprocessor: 0
                     	std.code.lines:comments: 1
+                    	std.code.lines:preprocessor: 0
                     	std.code.lines:total: 8
 
 .   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
@@ -82,8 +82,8 @@
             	Line numbers   : 42-56
             	Modified       : None
             	std.code.lines:code: 5
-            	std.code.lines:preprocessor: 0
             	std.code.lines:comments: 0
+            	std.code.lines:preprocessor: 0
             	std.code.lines:total: 5
 
 .   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
@@ -93,8 +93,8 @@
                 	Line numbers   : 44-54
                 	Modified       : None
                 	std.code.lines:code: 3
-                	std.code.lines:preprocessor: 0
                 	std.code.lines:comments: 0
+                	std.code.lines:preprocessor: 0
                 	std.code.lines:total: 3
 
 .   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
@@ -104,8 +104,8 @@
                     	Line numbers   : 46-53
                     	Modified       : None
                     	std.code.lines:code: 7
-                    	std.code.lines:preprocessor: 0
                     	std.code.lines:comments: 1
+                    	std.code.lines:preprocessor: 0
                     	std.code.lines:total: 8
 
 .   .   .   ./simple.cpp:58: info: Metrics per 'never' region
@@ -115,12 +115,12 @@
             	Line numbers   : 58-65
             	Modified       : None
             	std.code.lines:code: 7
-            	std.code.lines:preprocessor: 0
             	std.code.lines:comments: 0
+            	std.code.lines:preprocessor: 0
             	std.code.lines:total: 7
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.0909090909
+	Average        : 5.09090909
 	Minimum        : 0
 	Maximum        : 11
 	Total          : 56.0
@@ -133,29 +133,29 @@
 	             7 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
 	            11 : 0.091 : 1.000 :  1	|||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.0909090909
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 11 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.909 : 0.909 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.091 : 1.000 :  1	|||||||||
-
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.4545454545
+	Average        : 0.45454545
 	Minimum        : 0
 	Maximum        : 2
 	Total          : 5.0
 	Distribution   : 11 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.636 : 0.636 :  7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.636 : 0.636 :  7	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             1 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
 	             2 : 0.091 : 1.000 :  1	|||||||||
 
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.09090909
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 11 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.909 : 0.909 : 10	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.091 : 1.000 :  1	|||||||||
+
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.5454545455
+	Average        : 5.54545455
 	Minimum        : 0
 	Maximum        : 12
 	Total          : 61.0

tests/general/test_basic/test_std_lines_metrics_view_txt_stdout.gold.txt

@@ -6,23 +6,13 @@
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
-	             3 : 0.188 : 0.312 :  3	|||||||||||||||||||
-	             4 : 0.188 : 0.500 :  3	|||||||||||||||||||
+	             3 : 0.188 : 0.312 :  3	||||||||||||||||||
+	             4 : 0.188 : 0.500 :  3	||||||||||||||||||
 	             5 : 0.125 : 0.625 :  2	||||||||||||
 	             7 : 0.250 : 0.875 :  4	|||||||||||||||||||||||||
 	             8 : 0.062 : 0.938 :  1	||||||
 	            11 : 0.062 : 1.000 :  1	||||||
 
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.0625
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 16 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.938 : 0.938 : 15	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.062 : 1.000 :  1	||||||
-
 ./:: info: Overall metrics for 'std.code.lines:comments' metric
 	Average        : 0.625
 	Minimum        : 0
@@ -31,10 +21,20 @@
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.625 : 0.625 : 10	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.188 : 0.812 :  3	|||||||||||||||||||
+	             1 : 0.188 : 0.812 :  3	||||||||||||||||||
 	             2 : 0.125 : 0.938 :  2	||||||||||||
 	             3 : 0.062 : 1.000 :  1	||||||
 
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.0625
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 16 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.938 : 0.938 : 15	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.062 : 1.000 :  1	||||||
+
 ./:: info: Overall metrics for 'std.code.lines:total' metric
 	Average        : 5.4375
 	Minimum        : 0
@@ -43,11 +43,11 @@
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 :  2	||||||||||||
-	             3 : 0.188 : 0.312 :  3	|||||||||||||||||||
+	             3 : 0.188 : 0.312 :  3	||||||||||||||||||
 	             4 : 0.062 : 0.375 :  1	||||||
 	             5 : 0.125 : 0.500 :  2	||||||||||||
 	             6 : 0.062 : 0.562 :  1	||||||
-	             7 : 0.188 : 0.750 :  3	|||||||||||||||||||
+	             7 : 0.188 : 0.750 :  3	||||||||||||||||||
 	             8 : 0.125 : 0.875 :  2	||||||||||||
 	             9 : 0.062 : 0.938 :  1	||||||
 	            12 : 0.062 : 1.000 :  1	||||||

tests/general/test_basic/test_std_member_metrics_view_nest_per_file_stdout.gold.txt

@@ -85,22 +85,6 @@
             	Line numbers   : 58-65
             	Modified       : None
 
-./simple.cpp:: info: Overall metrics for 'std.code.member:fields' metric
-	Average        : None (excluding zero metric values)
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-
-./simple.cpp:: info: Overall metrics for 'std.code.member:globals' metric
-	Average        : None (excluding zero metric values)
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-
 ./simple.cpp:: info: Overall metrics for 'std.code.member:classes' metric
 	Average        : 1.0 (excluding zero metric values)
 	Minimum        : 1
@@ -110,7 +94,7 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 1.000 : 1.000 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.member:structs' metric
+./simple.cpp:: info: Overall metrics for 'std.code.member:fields' metric
 	Average        : None (excluding zero metric values)
 	Minimum        : None
 	Maximum        : None
@@ -118,7 +102,7 @@
 	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 
-./simple.cpp:: info: Overall metrics for 'std.code.member:interfaces' metric
+./simple.cpp:: info: Overall metrics for 'std.code.member:globals' metric
 	Average        : None (excluding zero metric values)
 	Minimum        : None
 	Maximum        : None
@@ -126,14 +110,13 @@
 	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 
-./simple.cpp:: info: Overall metrics for 'std.code.member:types' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 3.0
-	Distribution   : 3 regions in total (including 0 suppressed)
+./simple.cpp:: info: Overall metrics for 'std.code.member:interfaces' metric
+	Average        : None (excluding zero metric values)
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.member:methods' metric
 	Average        : 2.0 (excluding zero metric values)
@@ -142,7 +125,7 @@
 	Total          : 6.0
 	Distribution   : 3 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.667 : 0.667 : 2	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.667 : 0.667 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             4 : 0.333 : 1.000 : 1	|||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.member:namespaces' metric
@@ -154,4 +137,21 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
+./simple.cpp:: info: Overall metrics for 'std.code.member:structs' metric
+	Average        : None (excluding zero metric values)
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+
+./simple.cpp:: info: Overall metrics for 'std.code.member:types' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 3.0
+	Distribution   : 3 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
 

tests/general/test_basic/test_std_member_metrics_view_txt_stdout.gold.txt

@@ -1,19 +1,3 @@
-./:: info: Overall metrics for 'std.code.member:fields' metric
-	Average        : None (excluding zero metric values)
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-
-./:: info: Overall metrics for 'std.code.member:globals' metric
-	Average        : None (excluding zero metric values)
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-
 ./:: info: Overall metrics for 'std.code.member:classes' metric
 	Average        : 1.0 (excluding zero metric values)
 	Minimum        : 1
@@ -23,7 +7,7 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 1.000 : 1.000 : 4	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./:: info: Overall metrics for 'std.code.member:structs' metric
+./:: info: Overall metrics for 'std.code.member:fields' metric
 	Average        : None (excluding zero metric values)
 	Minimum        : None
 	Maximum        : None
@@ -31,7 +15,7 @@
 	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 
-./:: info: Overall metrics for 'std.code.member:interfaces' metric
+./:: info: Overall metrics for 'std.code.member:globals' metric
 	Average        : None (excluding zero metric values)
 	Minimum        : None
 	Maximum        : None
@@ -39,14 +23,13 @@
 	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 
-./:: info: Overall metrics for 'std.code.member:types' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 4.0
-	Distribution   : 4 regions in total (including 0 suppressed)
+./:: info: Overall metrics for 'std.code.member:interfaces' metric
+	Average        : None (excluding zero metric values)
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 4	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.member:methods' metric
 	Average        : 1.6 (excluding zero metric values)
@@ -67,6 +50,23 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
+./:: info: Overall metrics for 'std.code.member:structs' metric
+	Average        : None (excluding zero metric values)
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+
+./:: info: Overall metrics for 'std.code.member:types' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 4.0
+	Distribution   : 4 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 4	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp
 	File           : simple.cpp

tests/general/test_basic/test_view_format_view_nest_per_file_stdout.gold.txt

@@ -1,63 +1,62 @@
 <view>
 
     <data>
-        <info id="1" path="./simple.cpp" />
         <aggregated-data>
             <std.code.complexity>
-                <cyclomatic avg="1.4285714286" count="7" max="3" min="0" nonzero="False" sup="0" total="10.0">
+                <cyclomatic avg="1.42857143" count="7" max="3" min="0" nonzero="False" sup="0" total="10.0">
+                    <__diff__ avg="-0.07142857" count="1" max="0" min="-1" nonzero="0" sup="0" total="1.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.1428571429" />
-                        <distribution-bar __diff__="-1" count="3" metric="1" ratio="0.4285714286" />
-                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.2857142857" />
-                        <distribution-bar __diff__="0" count="1" metric="3" ratio="0.1428571429" />
+                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.14285714" />
+                        <distribution-bar __diff__="-1" count="3" metric="1" ratio="0.42857143" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.28571429" />
+                        <distribution-bar __diff__="0" count="1" metric="3" ratio="0.14285714" />
                     </distribution-bars>
-                    <__diff__ avg="-0.0714285714" count="1" max="0" min="-1" nonzero="0" sup="0" total="1.0" />
                 </cyclomatic>
             </std.code.complexity>
         </aggregated-data>
         <file-data>
             <regions>
                 <region>
-                    <info cursor="0" line_begin="1" line_end="78" modified="False" name="__global__" offset_begin="0" offset_end="836" type="global" />
                     <data />
+                    <info cursor="0" line_begin="1" line_end="78" modified="False" name="__global__" offset_begin="0" offset_end="836" type="global" />
                     <subregions>
                         <subregion>
-                            <info cursor="4" line_begin="3" line_end="77" modified="True" name="hmm" offset_begin="2" offset_end="835" type="namespace" />
                             <data />
+                            <info cursor="4" line_begin="3" line_end="77" modified="True" name="hmm" offset_begin="2" offset_end="835" type="namespace" />
                             <subregions>
                                 <subregion>
-                                    <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />
                                     <data />
+                                    <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />
                                     <subregions>
                                         <subregion>
-                                            <info cursor="13" line_begin="13" line_end="24" modified="False" name="A" offset_begin="123" offset_end="269" type="function" />
                                             <data>
                                                 <std.code.complexity cyclomatic="3">
                                                     <__diff__ cyclomatic="0" />
                                                 </std.code.complexity>
                                             </data>
+                                            <info cursor="13" line_begin="13" line_end="24" modified="False" name="A" offset_begin="123" offset_end="269" type="function" />
                                             <subregions>
                                             </subregions>
                                         </subregion>
                                         <subregion>
-                                            <info cursor="26" line_begin="26" line_end="42" modified="False" name="func" offset_begin="272" offset_end="455" type="function" />
                                             <data>
                                                 <std.code.complexity cyclomatic="1">
                                                     <__diff__ cyclomatic="0" />
                                                 </std.code.complexity>
                                             </data>
+                                            <info cursor="26" line_begin="26" line_end="42" modified="False" name="func" offset_begin="272" offset_end="455" type="function" />
                                             <subregions>
                                                 <subregion>
-                                                    <info cursor="28" line_begin="28" line_end="40" modified="False" name="embeded" offset_begin="301" offset_end="441" type="class" />
                                                     <data />
+                                                    <info cursor="28" line_begin="28" line_end="40" modified="False" name="embeded" offset_begin="301" offset_end="441" type="class" />
                                                     <subregions>
                                                         <subregion>
-                                                            <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
                                                             <data>
                                                                 <std.code.complexity cyclomatic="2">
                                                                     <__diff__ cyclomatic="1" />
                                                                 </std.code.complexity>
                                                             </data>
+                                                            <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
                                                             <subregions>
                                                             </subregions>
                                                         </subregion>
@@ -66,36 +65,36 @@
                                             </subregions>
                                         </subregion>
                                         <subregion>
-                                            <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
                                             <data>
                                                 <std.code.complexity cyclomatic="1">
                                                     <__diff__ cyclomatic="0" />
                                                 </std.code.complexity>
                                             </data>
+                                            <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
                                             <subregions>
                                             </subregions>
                                         </subregion>
                                         <subregion>
-                                            <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
                                             <data>
                                                 <std.code.complexity cyclomatic="0" />
                                             </data>
+                                            <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
                                             <subregions>
                                             </subregions>
                                         </subregion>
                                         <subregion>
-                                            <info cursor="58" line_begin="58" line_end="62" modified="None" name="new_func_complex" offset_begin="588" offset_end="646" type="function" />
                                             <data>
                                                 <std.code.complexity cyclomatic="1" />
                                             </data>
+                                            <info cursor="58" line_begin="58" line_end="62" modified="None" name="new_func_complex" offset_begin="588" offset_end="646" type="function" />
                                             <subregions>
                                             </subregions>
                                         </subregion>
                                         <subregion>
-                                            <info cursor="65" line_begin="64" line_end="72" modified="None" name="new_func_complex_but_suppressed" offset_begin="649" offset_end="808" type="function" />
                                             <data>
                                                 <std.code.complexity cyclomatic="2" />
                                             </data>
+                                            <info cursor="65" line_begin="64" line_end="72" modified="None" name="new_func_complex_but_suppressed" offset_begin="649" offset_end="808" type="function" />
                                             <subregions>
                                             </subregions>
                                         </subregion>
@@ -107,6 +106,7 @@
                 </region>
             </regions>
         </file-data>
+        <info id="1" path="./simple.cpp" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_basic/test_view_format_view_nest_stdout.gold.txt

@@ -1,21 +1,21 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
                 <cyclomatic avg="1.625" count="8" max="3" min="0" nonzero="False" sup="0" total="13.0">
+                    <__diff__ avg="0.25" count="0" max="0" min="-1" nonzero="0" sup="0" total="2.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="1" count="1" metric="0" ratio="0.125" />
                         <distribution-bar __diff__="-3" count="3" metric="1" ratio="0.375" />
                         <distribution-bar __diff__="1" count="2" metric="2" ratio="0.25" />
                         <distribution-bar __diff__="1" count="2" metric="3" ratio="0.25" />
                     </distribution-bars>
-                    <__diff__ avg="0.25" count="0" max="0" min="-1" nonzero="0" sup="0" total="2.0" />
                 </cyclomatic>
             </std.code.complexity>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_basic/test_view_format_view_xml_stdout.gold.txt

@@ -1,7 +1,6 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
                 <cyclomatic avg="1.375" count="8" max="3" min="1" nonzero="False" sup="0" total="11.0">
@@ -14,6 +13,7 @@
             </std.code.complexity>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_basic/test_workflow_export_default_stdout.gold.txt

@@ -1,19 +1,19 @@
-file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.code.lines:code,std.code.lines:preprocessor,std.code.lines:comments,std.code.lines:total,std.suppress:count,std.suppress:list,std.suppress.file:count,std.suppress.file:list
+file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.code.lines:code,std.code.lines:comments,std.code.lines:preprocessor,std.code.lines:total,std.suppress:count,std.suppress:list,std.suppress.file:count,std.suppress.file:list
 ./file_deleted_in_new_sources.cpp,__global__,global,,1,34,,0,0,0,0,,,,
-./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,4,0,3,7,,,,
+./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,4,3,0,7,,,,
 ./file_deleted_in_new_sources.cpp,B,class,,9,22,,3,0,0,3,,,,
-./file_deleted_in_new_sources.cpp,B,function,,12,20,1,8,0,2,9,,,,
+./file_deleted_in_new_sources.cpp,B,function,,12,20,1,8,2,0,9,,,,
 ./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,7,0,0,7,,,,
 ./file_deleted_in_new_sources.cpp,,file,,1,34,,,,,,,,,
 ./simple.cpp,__global__,global,,1,71,,0,0,0,0,,,,
 ./simple.cpp,hmm,namespace,,3,70,,4,1,1,6,,,,
 ./simple.cpp,A,class,,9,68,,4,0,0,4,,,,
-./simple.cpp,A,function,,12,23,3,11,0,2,12,,,,
+./simple.cpp,A,function,,12,23,3,11,2,0,12,,,,
 ./simple.cpp,func,function,,26,40,1,5,0,0,5,,,,
 ./simple.cpp,embeded,class,,28,38,,3,0,0,3,,,,
-./simple.cpp,embeded,function,,30,37,1,7,0,1,8,,,,
+./simple.cpp,embeded,function,,30,37,1,7,1,0,8,,,,
 ./simple.cpp,func_to_be_removed_in_new_sources,function,,42,56,2,5,0,0,5,,,,
 ./simple.cpp,embeded,class,,44,54,,3,0,0,3,,,,
-./simple.cpp,embeded,function,,46,53,1,7,0,1,8,,,,
+./simple.cpp,embeded,function,,46,53,1,7,1,0,8,,,,
 ./simple.cpp,never,function,,58,65,1,7,0,0,7,,,,
 ./simple.cpp,,file,,1,71,,,,,,,,,

tests/general/test_basic/test_workflow_export_second_stdout.gold.txt

@@ -1,18 +1,18 @@
-file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.code.lines:code,std.code.lines:preprocessor,std.code.lines:comments,std.code.lines:total,std.suppress:count,std.suppress:list,std.suppress.file:count,std.suppress.file:list
+file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.code.lines:code,std.code.lines:comments,std.code.lines:preprocessor,std.code.lines:total,std.suppress:count,std.suppress:list,std.suppress.file:count,std.suppress.file:list
 ./simple.cpp,__global__,global,False,1,78,,0,0,0,0,,,,
-./simple.cpp,hmm,namespace,True,3,77,,4,2,1,7,,,,
+./simple.cpp,hmm,namespace,True,3,77,,4,1,2,7,,,,
 ./simple.cpp,A,class,True,10,75,,4,0,0,4,,,,
-./simple.cpp,A,function,False,13,24,3,11,0,2,12,,,,
+./simple.cpp,A,function,False,13,24,3,11,2,0,12,,,,
 ./simple.cpp,func,function,False,26,42,1,5,0,0,5,,,,
 ./simple.cpp,embeded,class,False,28,40,,3,0,0,3,,,,
-./simple.cpp,embeded,function,True,30,39,2,8,0,2,9,,,,
-./simple.cpp,never,function,True,44,51,1,7,0,1,7,,,,
-./simple.cpp,new_func,function,,53,56,0,3,0,1,4,,,,
+./simple.cpp,embeded,function,True,30,39,2,8,2,0,9,,,,
+./simple.cpp,never,function,True,44,51,1,7,1,0,7,,,,
+./simple.cpp,new_func,function,,53,56,0,3,1,0,4,,,,
 ./simple.cpp,new_func_complex,function,,58,62,1,5,0,0,5,,,,
-./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,8,0,1,9,1,[std.code.complexity:cyclomatic],,
+./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,8,1,0,9,1,[std.code.complexity:cyclomatic],,
 ./simple.cpp,,file,True,1,78,,,,,,,,,
 ./simple2.cpp,__global__,global,,1,26,,0,0,0,0,,,,
-./simple2.cpp,hmm,namespace,,3,25,,4,0,1,5,,,,
+./simple2.cpp,hmm,namespace,,3,25,,4,1,0,5,,,,
 ./simple2.cpp,New_A,class,,7,23,,3,0,0,3,,,,
-./simple2.cpp,New_A,function,,10,21,3,10,0,2,12,,,,
+./simple2.cpp,New_A,function,,10,21,3,10,2,0,12,,,,
 ./simple2.cpp,,file,,1,26,,,,,,,,,

tests/general/test_basic/test_workflow_view_default_stdout.gold.txt

@@ -1,7 +1,6 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
                 <cyclomatic avg="1.375" count="8" max="3" min="1" nonzero="False" sup="0" total="11.0">
@@ -24,12 +23,6 @@
                         <distribution-bar count="1" metric="11" ratio="0.0625" />
                     </distribution-bars>
                 </code>
-                <preprocessor avg="0.0625" count="16" max="1" min="0" nonzero="False" sup="0" total="1.0">
-                    <distribution-bars>
-                        <distribution-bar count="15" metric="0" ratio="0.9375" />
-                        <distribution-bar count="1" metric="1" ratio="0.0625" />
-                    </distribution-bars>
-                </preprocessor>
                 <comments avg="0.625" count="16" max="3" min="0" nonzero="False" sup="0" total="10.0">
                     <distribution-bars>
                         <distribution-bar count="10" metric="0" ratio="0.625" />
@@ -38,6 +31,12 @@
                         <distribution-bar count="1" metric="3" ratio="0.0625" />
                     </distribution-bars>
                 </comments>
+                <preprocessor avg="0.0625" count="16" max="1" min="0" nonzero="False" sup="0" total="1.0">
+                    <distribution-bars>
+                        <distribution-bar count="15" metric="0" ratio="0.9375" />
+                        <distribution-bar count="1" metric="1" ratio="0.0625" />
+                    </distribution-bars>
+                </preprocessor>
                 <total avg="5.4375" count="16" max="12" min="0" nonzero="False" sup="0" total="87.0">
                     <distribution-bars>
                         <distribution-bar count="2" metric="0" ratio="0.125" />
@@ -66,6 +65,7 @@
             </std.suppress.file>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_basic/test_workflow_view_second_per_file_stdout.gold.txt

@@ -1,107 +1,105 @@
 <view>
 
     <data>
-        <info id="1" path="./simple.cpp" />
         <aggregated-data>
             <std.code.complexity>
-                <cyclomatic avg="1.4285714286" count="7" max="3" min="0" nonzero="False" sup="1" total="10.0">
+                <cyclomatic avg="1.42857143" count="7" max="3" min="0" nonzero="False" sup="1" total="10.0">
+                    <__diff__ avg="-0.07142857" count="1" max="0" min="-1" nonzero="0" sup="1" total="1.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.1428571429" />
-                        <distribution-bar __diff__="-1" count="3" metric="1" ratio="0.4285714286" />
-                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.2857142857" />
-                        <distribution-bar __diff__="0" count="1" metric="3" ratio="0.1428571429" />
+                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.14285714" />
+                        <distribution-bar __diff__="-1" count="3" metric="1" ratio="0.42857143" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.28571429" />
+                        <distribution-bar __diff__="0" count="1" metric="3" ratio="0.14285714" />
                     </distribution-bars>
-                    <__diff__ avg="-0.0714285714" count="1" max="0" min="-1" nonzero="0" sup="1" total="1.0" />
                 </cyclomatic>
             </std.code.complexity>
             <std.code.lines>
-                <code avg="5.2727272727" count="11" max="11" min="0" nonzero="False" sup="0" total="58.0">
+                <code avg="5.27272727" count="11" max="11" min="0" nonzero="False" sup="0" total="58.0">
+                    <__diff__ avg="0.18181818" count="0" max="0" min="0" nonzero="0" sup="0" total="2.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="0" count="1" metric="0" ratio="0.0909090909" />
-                        <distribution-bar __diff__="0" count="2" metric="3" ratio="0.1818181818" />
-                        <distribution-bar __diff__="0" count="2" metric="4" ratio="0.1818181818" />
-                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.1818181818" />
-                        <distribution-bar __diff__="-2" count="1" metric="7" ratio="0.0909090909" />
-                        <distribution-bar __diff__="2" count="2" metric="8" ratio="0.1818181818" />
-                        <distribution-bar __diff__="0" count="1" metric="11" ratio="0.0909090909" />
+                        <distribution-bar __diff__="0" count="1" metric="0" ratio="0.09090909" />
+                        <distribution-bar __diff__="0" count="2" metric="3" ratio="0.18181818" />
+                        <distribution-bar __diff__="0" count="2" metric="4" ratio="0.18181818" />
+                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.18181818" />
+                        <distribution-bar __diff__="-2" count="1" metric="7" ratio="0.09090909" />
+                        <distribution-bar __diff__="2" count="2" metric="8" ratio="0.18181818" />
+                        <distribution-bar __diff__="0" count="1" metric="11" ratio="0.09090909" />
                     </distribution-bars>
-                    <__diff__ avg="0.1818181818" count="0" max="0" min="0" nonzero="0" sup="0" total="2.0" />
                 </code>
-                <preprocessor avg="0.1818181818" count="11" max="2" min="0" nonzero="False" sup="0" total="2.0">
+                <comments avg="0.72727273" count="11" max="2" min="0" nonzero="False" sup="0" total="8.0">
+                    <__diff__ avg="0.27272727" count="0" max="0" min="0" nonzero="0" sup="0" total="3.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="0" count="10" metric="0" ratio="0.9090909091" />
-                        <distribution-bar __diff__="-1" count="0" metric="1" ratio="0" />
-                        <distribution-bar __diff__="1" count="1" metric="2" ratio="0.0909090909" />
+                        <distribution-bar __diff__="-2" count="5" metric="0" ratio="0.45454545" />
+                        <distribution-bar __diff__="1" count="4" metric="1" ratio="0.36363636" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.18181818" />
                     </distribution-bars>
-                    <__diff__ avg="0.0909090909" count="0" max="1" min="0" nonzero="0" sup="0" total="1.0" />
-                </preprocessor>
-                <comments avg="0.7272727273" count="11" max="2" min="0" nonzero="False" sup="0" total="8.0">
+                </comments>
+                <preprocessor avg="0.18181818" count="11" max="2" min="0" nonzero="False" sup="0" total="2.0">
+                    <__diff__ avg="0.09090909" count="0" max="1" min="0" nonzero="0" sup="0" total="1.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="-2" count="5" metric="0" ratio="0.4545454545" />
-                        <distribution-bar __diff__="1" count="4" metric="1" ratio="0.3636363636" />
-                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.1818181818" />
+                        <distribution-bar __diff__="0" count="10" metric="0" ratio="0.90909091" />
+                        <distribution-bar __diff__="-1" count="0" metric="1" ratio="0" />
+                        <distribution-bar __diff__="1" count="1" metric="2" ratio="0.09090909" />
                     </distribution-bars>
-                    <__diff__ avg="0.2727272727" count="0" max="0" min="0" nonzero="0" sup="0" total="3.0" />
-                </comments>
-                <total avg="5.9090909091" count="11" max="12" min="0" nonzero="False" sup="0" total="65.0">
+                </preprocessor>
+                <total avg="5.90909091" count="11" max="12" min="0" nonzero="False" sup="0" total="65.0">
+                    <__diff__ avg="0.36363636" count="0" max="0" min="0" nonzero="0" sup="0" total="4.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="0" count="1" metric="0" ratio="0.0909090909" />
-                        <distribution-bar __diff__="-1" count="1" metric="3" ratio="0.0909090909" />
-                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.1818181818" />
-                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.1818181818" />
+                        <distribution-bar __diff__="0" count="1" metric="0" ratio="0.09090909" />
+                        <distribution-bar __diff__="-1" count="1" metric="3" ratio="0.09090909" />
+                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.18181818" />
+                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.18181818" />
                         <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
-                        <distribution-bar __diff__="1" count="2" metric="7" ratio="0.1818181818" />
+                        <distribution-bar __diff__="1" count="2" metric="7" ratio="0.18181818" />
                         <distribution-bar __diff__="-2" count="0" metric="8" ratio="0" />
-                        <distribution-bar __diff__="2" count="2" metric="9" ratio="0.1818181818" />
-                        <distribution-bar __diff__="0" count="1" metric="12" ratio="0.0909090909" />
+                        <distribution-bar __diff__="2" count="2" metric="9" ratio="0.18181818" />
+                        <distribution-bar __diff__="0" count="1" metric="12" ratio="0.09090909" />
                     </distribution-bars>
-                    <__diff__ avg="0.3636363636" count="0" max="0" min="0" nonzero="0" sup="0" total="4.0" />
                 </total>
             </std.code.lines>
             <std.suppress>
                 <count avg="1.0" count="1" max="1" min="1" nonzero="True" sup="0" total="1.0">
+                    <__diff__ avg="1.0" count="1" max="1" min="1" nonzero="0" sup="0" total="1.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="1" count="1" metric="1" ratio="1.0" />
                     </distribution-bars>
-                    <__diff__ avg="1.0" count="1" max="1" min="1" nonzero="0" sup="0" total="1.0" />
                 </count>
             </std.suppress>
             <std.suppress.file>
                 <count avg="None" count="0" max="None" min="None" nonzero="True" sup="0" total="0.0">
+                    <__diff__ avg="0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
                     <distribution-bars>
                     </distribution-bars>
-                    <__diff__ avg="0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
                 </count>
             </std.suppress.file>
         </aggregated-data>
         <file-data>
             <regions>
                 <region>
-                    <info cursor="0" line_begin="1" line_end="78" modified="False" name="__global__" offset_begin="0" offset_end="836" type="global" />
                     <data>
                         <std.code.lines code="0" comments="0" preprocessor="0" total="0">
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                         </std.code.lines>
                     </data>
+                    <info cursor="0" line_begin="1" line_end="78" modified="False" name="__global__" offset_begin="0" offset_end="836" type="global" />
                 </region>
                 <region>
-                    <info cursor="4" line_begin="3" line_end="77" modified="True" name="hmm" offset_begin="2" offset_end="835" type="namespace" />
                     <data>
                         <std.code.lines code="4" comments="1" preprocessor="2" total="7">
                             <__diff__ code="0" comments="0" preprocessor="1" total="1" />
                         </std.code.lines>
                     </data>
+                    <info cursor="4" line_begin="3" line_end="77" modified="True" name="hmm" offset_begin="2" offset_end="835" type="namespace" />
                 </region>
                 <region>
-                    <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />
                     <data>
                         <std.code.lines code="4" comments="0" preprocessor="0" total="4">
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                         </std.code.lines>
                     </data>
+                    <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />
                 </region>
                 <region>
-                    <info cursor="13" line_begin="13" line_end="24" modified="False" name="A" offset_begin="123" offset_end="269" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="3">
                             <__diff__ cyclomatic="0" />
@@ -110,9 +108,9 @@
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                         </std.code.lines>
                     </data>
+                    <info cursor="13" line_begin="13" line_end="24" modified="False" name="A" offset_begin="123" offset_end="269" type="function" />
                 </region>
                 <region>
-                    <info cursor="26" line_begin="26" line_end="42" modified="False" name="func" offset_begin="272" offset_end="455" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="1">
                             <__diff__ cyclomatic="0" />
@@ -121,17 +119,17 @@
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                         </std.code.lines>
                     </data>
+                    <info cursor="26" line_begin="26" line_end="42" modified="False" name="func" offset_begin="272" offset_end="455" type="function" />
                 </region>
                 <region>
-                    <info cursor="28" line_begin="28" line_end="40" modified="False" name="embeded" offset_begin="301" offset_end="441" type="class" />
                     <data>
                         <std.code.lines code="3" comments="0" preprocessor="0" total="3">
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                         </std.code.lines>
                     </data>
+                    <info cursor="28" line_begin="28" line_end="40" modified="False" name="embeded" offset_begin="301" offset_end="441" type="class" />
                 </region>
                 <region>
-                    <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="2">
                             <__diff__ cyclomatic="1" />
@@ -140,9 +138,9 @@
                             <__diff__ code="1" comments="1" preprocessor="0" total="1" />
                         </std.code.lines>
                     </data>
+                    <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
                 </region>
                 <region>
-                    <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="1">
                             <__diff__ cyclomatic="0" />
@@ -151,31 +149,33 @@
                             <__diff__ code="0" comments="1" preprocessor="0" total="0" />
                         </std.code.lines>
                     </data>
+                    <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
                 </region>
                 <region>
-                    <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="0" />
                         <std.code.lines code="3" comments="1" preprocessor="0" total="4" />
                     </data>
+                    <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
                 </region>
                 <region>
-                    <info cursor="58" line_begin="58" line_end="62" modified="None" name="new_func_complex" offset_begin="588" offset_end="646" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="1" />
                         <std.code.lines code="5" comments="0" preprocessor="0" total="5" />
                     </data>
+                    <info cursor="58" line_begin="58" line_end="62" modified="None" name="new_func_complex" offset_begin="588" offset_end="646" type="function" />
                 </region>
                 <region>
-                    <info cursor="65" line_begin="64" line_end="72" modified="None" name="new_func_complex_but_suppressed" offset_begin="649" offset_end="808" type="function" />
                     <data>
                         <std.code.complexity cyclomatic="2" />
                         <std.code.lines code="8" comments="1" preprocessor="0" total="9" />
                         <std.suppress count="1" list="[std.code.complexity:cyclomatic]" />
                     </data>
+                    <info cursor="65" line_begin="64" line_end="72" modified="None" name="new_func_complex_but_suppressed" offset_begin="649" offset_end="808" type="function" />
                 </region>
             </regions>
         </file-data>
+        <info id="1" path="./simple.cpp" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stdout.gold.txt

@@ -5,8 +5,8 @@
 	Line numbers   : 1-78
 	Modified       : False
 	std.code.lines:code: 0 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 0 [+0]
 
 ./simple.cpp:4: info: Metrics per 'hmm' region
@@ -16,8 +16,8 @@
 	Line numbers   : 3-77
 	Modified       : True
 	std.code.lines:code: 4 [+0]
-	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:comments: 1 [+0]
+	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:total: 7 [+1]
 
 ./simple.cpp:10: info: Metrics per 'A' region
@@ -27,8 +27,8 @@
 	Line numbers   : 10-75
 	Modified       : True
 	std.code.lines:code: 4 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 4 [+0]
 
 ./simple.cpp:13: info: Metrics per 'A' region
@@ -39,8 +39,8 @@
 	Modified       : False
 	std.code.complexity:cyclomatic: 3 [+0]
 	std.code.lines:code: 11 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 2 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 12 [+0]
 
 ./simple.cpp:26: info: Metrics per 'func' region
@@ -51,8 +51,8 @@
 	Modified       : False
 	std.code.complexity:cyclomatic: 1 [+0]
 	std.code.lines:code: 5 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 5 [+0]
 
 ./simple.cpp:28: info: Metrics per 'embeded' region
@@ -62,8 +62,8 @@
 	Line numbers   : 28-40
 	Modified       : False
 	std.code.lines:code: 3 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 3 [+0]
 
 ./simple.cpp:30: info: Metrics per 'embeded' region
@@ -74,8 +74,8 @@
 	Modified       : True
 	std.code.complexity:cyclomatic: 2 [+1]
 	std.code.lines:code: 8 [+1]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 2 [+1]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 9 [+1]
 
 ./simple.cpp:44: info: Metrics per 'never' region
@@ -86,8 +86,8 @@
 	Modified       : True
 	std.code.complexity:cyclomatic: 1 [+0]
 	std.code.lines:code: 7 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 1 [+1]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 7 [+0]
 
 ./simple.cpp:53: info: Metrics per 'new_func' region
@@ -98,8 +98,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 0
 	std.code.lines:code: 3
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 1
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 4
 
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
@@ -110,8 +110,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 1
 	std.code.lines:code: 5
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 0
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 5
 
 ./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
@@ -122,26 +122,26 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 2
 	std.code.lines:code: 8
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 1
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 9
 	std.suppress:count: 1
 	std.suppress:list: [std.code.complexity:cyclomatic]
 
 ./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.4285714286 [-0.0714285714]
+	Average        : 1.42857143 [-0.07142857]
 	Minimum        : 0 [-1]
 	Maximum        : 3 [+0]
 	Total          : 10.0 [+1.0]
 	Distribution   : 7 [+1] regions in total (including 1 [+1] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
-	             1 : 0.429 : 0.571 : 3 [-1]	|||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.286 : 0.857 : 2 [+1]	|||||||||||||||||||||||||||||
+	             1 : 0.429 : 0.571 : 3 [-1]	||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.286 : 0.857 : 2 [+1]	||||||||||||||||||||||||||||
 	             3 : 0.143 : 1.000 : 1 [+0]	||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.2727272727 [+0.1818181818]
+	Average        : 5.27272727 [+0.18181818]
 	Minimum        : 0 [+0]
 	Maximum        : 11 [+0]
 	Total          : 58.0 [+2.0]
@@ -155,19 +155,8 @@
 	             8 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||
 	            11 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.1818181818 [+0.0909090909]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.909 : 0.909 : 10 [+0 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.909 :  0 [-1 ]	
-	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
-
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.7272727273 [+0.2727272727]
+	Average        : 0.72727273 [+0.27272727]
 	Minimum        : 0 [+0]
 	Maximum        : 2 [+0]
 	Total          : 8.0 [+3.0]
@@ -177,8 +166,19 @@
 	             1 : 0.364 : 0.818 :  4 [+1 ]	||||||||||||||||||||||||||||||||||||
 	             2 : 0.182 : 1.000 :  2 [+1 ]	||||||||||||||||||
 
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.18181818 [+0.09090909]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.909 : 0.909 : 10 [+0 ]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.909 :  0 [-1 ]	
+	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.9090909091 [+0.3636363636]
+	Average        : 5.90909091 [+0.36363636]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+0]
 	Total          : 65.0 [+4.0]

tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stdout.gold.txt

@@ -5,8 +5,8 @@
 	Line numbers   : 1-78
 	Modified       : False
 	std.code.lines:code: 0 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 0 [+0]
 
 ./simple.cpp:4: info: Metrics per 'hmm' region
@@ -16,8 +16,8 @@
 	Line numbers   : 3-77
 	Modified       : True
 	std.code.lines:code: 4 [+0]
-	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:comments: 1 [+0]
+	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:total: 7 [+1]
 
 ./simple.cpp:10: info: Metrics per 'A' region
@@ -27,8 +27,8 @@
 	Line numbers   : 10-75
 	Modified       : True
 	std.code.lines:code: 4 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 4 [+0]
 
 ./simple.cpp:13: info: Metrics per 'A' region
@@ -39,8 +39,8 @@
 	Modified       : False
 	std.code.complexity:cyclomatic: 3 [+0]
 	std.code.lines:code: 11 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 2 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 12 [+0]
 
 ./simple.cpp:26: info: Metrics per 'func' region
@@ -51,8 +51,8 @@
 	Modified       : False
 	std.code.complexity:cyclomatic: 1 [+0]
 	std.code.lines:code: 5 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 5 [+0]
 
 ./simple.cpp:28: info: Metrics per 'embeded' region
@@ -62,8 +62,8 @@
 	Line numbers   : 28-40
 	Modified       : False
 	std.code.lines:code: 3 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 3 [+0]
 
 ./simple.cpp:30: info: Metrics per 'embeded' region
@@ -74,8 +74,8 @@
 	Modified       : True
 	std.code.complexity:cyclomatic: 2 [+1]
 	std.code.lines:code: 8 [+1]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 2 [+1]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 9 [+1]
 
 ./simple.cpp:44: info: Metrics per 'never' region
@@ -86,8 +86,8 @@
 	Modified       : True
 	std.code.complexity:cyclomatic: 1 [+0]
 	std.code.lines:code: 7 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 1 [+1]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 7 [+0]
 
 ./simple.cpp:53: info: Metrics per 'new_func' region
@@ -98,8 +98,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 0
 	std.code.lines:code: 3
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 1
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 4
 
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
@@ -110,8 +110,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 1
 	std.code.lines:code: 5
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 0
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 5
 
 ./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
@@ -122,8 +122,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 2
 	std.code.lines:code: 8
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 1
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 9
 	std.suppress:count: 1
 	std.suppress:list: [std.code.complexity:cyclomatic]
@@ -140,7 +140,7 @@
 	             2 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.3333333333 [+5.3333333333]
+	Average        : 5.33333333 [+5.33333333]
 	Minimum        : 3 [+3]
 	Maximum        : 8 [+8]
 	Total          : 16.0 [+16.0]
@@ -150,6 +150,16 @@
 	             5 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
 	             8 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
 
+./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.66666667 [+0.66666667]
+	Minimum        : 0 [+0]
+	Maximum        : 1 [+1]
+	Total          : 2.0 [+2.0]
+	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             1 : 0.667 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
 	Average        : 0.0 [+0.0]
 	Minimum        : 0 [+0]
@@ -159,16 +169,6 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 1.000 : 1.000 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.6666666667 [+0.6666666667]
-	Minimum        : 0 [+0]
-	Maximum        : 1 [+1]
-	Total          : 2.0 [+2.0]
-	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             1 : 0.667 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
 	Average        : 6.0 [+6.0]
 	Minimum        : 4 [+4]

tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stdout.gold.txt

@@ -5,8 +5,8 @@
 	Line numbers   : 1-78
 	Modified       : False
 	std.code.lines:code: 0 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 0 [+0]
 
 ./simple.cpp:4: info: Metrics per 'hmm' region
@@ -16,8 +16,8 @@
 	Line numbers   : 3-77
 	Modified       : True
 	std.code.lines:code: 4 [+0]
-	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:comments: 1 [+0]
+	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:total: 7 [+1]
 
 ./simple.cpp:10: info: Metrics per 'A' region
@@ -27,8 +27,8 @@
 	Line numbers   : 10-75
 	Modified       : True
 	std.code.lines:code: 4 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 4 [+0]
 
 ./simple.cpp:13: info: Metrics per 'A' region
@@ -39,8 +39,8 @@
 	Modified       : False
 	std.code.complexity:cyclomatic: 3 [+0]
 	std.code.lines:code: 11 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 2 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 12 [+0]
 
 ./simple.cpp:26: info: Metrics per 'func' region
@@ -51,8 +51,8 @@
 	Modified       : False
 	std.code.complexity:cyclomatic: 1 [+0]
 	std.code.lines:code: 5 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 5 [+0]
 
 ./simple.cpp:28: info: Metrics per 'embeded' region
@@ -62,8 +62,8 @@
 	Line numbers   : 28-40
 	Modified       : False
 	std.code.lines:code: 3 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 3 [+0]
 
 ./simple.cpp:30: info: Metrics per 'embeded' region
@@ -74,8 +74,8 @@
 	Modified       : True
 	std.code.complexity:cyclomatic: 2 [+1]
 	std.code.lines:code: 8 [+1]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 2 [+1]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 9 [+1]
 
 ./simple.cpp:44: info: Metrics per 'never' region
@@ -86,8 +86,8 @@
 	Modified       : True
 	std.code.complexity:cyclomatic: 1 [+0]
 	std.code.lines:code: 7 [+0]
-	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:comments: 1 [+1]
+	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 7 [+0]
 
 ./simple.cpp:53: info: Metrics per 'new_func' region
@@ -98,8 +98,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 0
 	std.code.lines:code: 3
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 1
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 4
 
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
@@ -110,8 +110,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 1
 	std.code.lines:code: 5
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 0
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 5
 
 ./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
@@ -122,8 +122,8 @@
 	Modified       : None
 	std.code.complexity:cyclomatic: 2
 	std.code.lines:code: 8
-	std.code.lines:preprocessor: 0
 	std.code.lines:comments: 1
+	std.code.lines:preprocessor: 0
 	std.code.lines:total: 9
 	std.suppress:count: 1
 	std.suppress:list: [std.code.complexity:cyclomatic]
@@ -140,54 +140,54 @@
 	             2 : 0.400 : 1.000 : 2 [+1]	||||||||||||||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.5714285714 [+0.2857142857]
+	Average        : 5.57142857 [+0.28571429]
 	Minimum        : 3 [+0]
 	Maximum        : 8 [+1]
 	Total          : 39.0 [+2.0]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             3 : 0.143 : 0.143 : 1 [+0]	||||||||||||||
-	             4 : 0.286 : 0.429 : 2 [+0]	|||||||||||||||||||||||||||||
+	             4 : 0.286 : 0.429 : 2 [+0]	||||||||||||||||||||||||||||
 	             5 : 0.143 : 0.571 : 1 [+0]	||||||||||||||
 	             7 : 0.143 : 0.714 : 1 [-2]	||||||||||||||
-	             8 : 0.286 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||
+	             8 : 0.286 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.2857142857 [+0.1428571429]
+./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.85714286 [+0.42857143]
 	Minimum        : 0 [+0]
 	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
+	Total          : 6.0 [+3.0]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.857 : 0.857 : 6 [+0]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.857 : 0 [-1]	
+	             0 : 0.286 : 0.286 : 2 [-2]	||||||||||||||||||||||||||||
+	             1 : 0.571 : 0.857 : 4 [+1]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
-./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.8571428571 [+0.4285714286]
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.28571429 [+0.14285714]
 	Minimum        : 0 [+0]
 	Maximum        : 2 [+1]
-	Total          : 6.0 [+3.0]
+	Total          : 2.0 [+1.0]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.286 : 0.286 : 2 [-2]	|||||||||||||||||||||||||||||
-	             1 : 0.571 : 0.857 : 4 [+1]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.857 : 0.857 : 6 [+0]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.857 : 0 [-1]	
 	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.4285714286 [+0.5714285714]
+	Average        : 6.42857143 [+0.57142857]
 	Minimum        : 4 [+1]
 	Maximum        : 9 [+1]
 	Total          : 45.0 [+4.0]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             3 : 0.000 : 0.000 : 0 [-1]	
-	             4 : 0.286 : 0.286 : 2 [+1]	|||||||||||||||||||||||||||||
+	             4 : 0.286 : 0.286 : 2 [+1]	||||||||||||||||||||||||||||
 	             5 : 0.143 : 0.429 : 1 [+0]	||||||||||||||
 	             6 : 0.000 : 0.429 : 0 [-1]	
-	             7 : 0.286 : 0.714 : 2 [+1]	|||||||||||||||||||||||||||||
+	             7 : 0.286 : 0.714 : 2 [+1]	||||||||||||||||||||||||||||
 	             8 : 0.000 : 0.714 : 0 [-2]	
-	             9 : 0.286 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||
+	             9 : 0.286 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||
 
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)

tests/general/test_basic/test_workflow_view_second_stdout.gold.txt

@@ -1,81 +1,81 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
                 <cyclomatic avg="1.625" count="8" max="3" min="0" nonzero="False" sup="1" total="13.0">
+                    <__diff__ avg="0.25" count="0" max="0" min="-1" nonzero="0" sup="1" total="2.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="1" count="1" metric="0" ratio="0.125" />
                         <distribution-bar __diff__="-3" count="3" metric="1" ratio="0.375" />
                         <distribution-bar __diff__="1" count="2" metric="2" ratio="0.25" />
                         <distribution-bar __diff__="1" count="2" metric="3" ratio="0.25" />
                     </distribution-bars>
-                    <__diff__ avg="0.25" count="0" max="0" min="-1" nonzero="0" sup="1" total="2.0" />
                 </cyclomatic>
             </std.code.complexity>
             <std.code.lines>
                 <code avg="5.0" count="15" max="11" min="0" nonzero="False" sup="0" total="75.0">
+                    <__diff__ avg="0.125" count="-1" max="0" min="0" nonzero="0" sup="0" total="-3.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="0" count="2" metric="0" ratio="0.1333333333" />
+                        <distribution-bar __diff__="0" count="2" metric="0" ratio="0.13333333" />
                         <distribution-bar __diff__="0" count="3" metric="3" ratio="0.2" />
                         <distribution-bar __diff__="0" count="3" metric="4" ratio="0.2" />
-                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.1333333333" />
-                        <distribution-bar __diff__="-3" count="1" metric="7" ratio="0.0666666667" />
-                        <distribution-bar __diff__="1" count="2" metric="8" ratio="0.1333333333" />
-                        <distribution-bar __diff__="1" count="1" metric="10" ratio="0.0666666667" />
-                        <distribution-bar __diff__="0" count="1" metric="11" ratio="0.0666666667" />
+                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.13333333" />
+                        <distribution-bar __diff__="-3" count="1" metric="7" ratio="0.06666667" />
+                        <distribution-bar __diff__="1" count="2" metric="8" ratio="0.13333333" />
+                        <distribution-bar __diff__="1" count="1" metric="10" ratio="0.06666667" />
+                        <distribution-bar __diff__="0" count="1" metric="11" ratio="0.06666667" />
                     </distribution-bars>
-                    <__diff__ avg="0.125" count="-1" max="0" min="0" nonzero="0" sup="0" total="-3.0" />
                 </code>
-                <preprocessor avg="0.1333333333" count="15" max="2" min="0" nonzero="False" sup="0" total="2.0">
-                    <distribution-bars>
-                        <distribution-bar __diff__="-1" count="14" metric="0" ratio="0.9333333333" />
-                        <distribution-bar __diff__="-1" count="0" metric="1" ratio="0" />
-                        <distribution-bar __diff__="1" count="1" metric="2" ratio="0.0666666667" />
-                    </distribution-bars>
-                    <__diff__ avg="0.0708333333" count="-1" max="1" min="0" nonzero="0" sup="0" total="1.0" />
-                </preprocessor>
-                <comments avg="0.7333333333" count="15" max="2" min="0" nonzero="False" sup="0" total="11.0">
+                <comments avg="0.73333333" count="15" max="2" min="0" nonzero="False" sup="0" total="11.0">
+                    <__diff__ avg="0.10833333" count="-1" max="-1" min="0" nonzero="0" sup="0" total="1.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="-3" count="7" metric="0" ratio="0.4666666667" />
-                        <distribution-bar __diff__="2" count="5" metric="1" ratio="0.3333333333" />
+                        <distribution-bar __diff__="-3" count="7" metric="0" ratio="0.46666667" />
+                        <distribution-bar __diff__="2" count="5" metric="1" ratio="0.33333333" />
                         <distribution-bar __diff__="1" count="3" metric="2" ratio="0.2" />
                     </distribution-bars>
-                    <__diff__ avg="0.1083333333" count="-1" max="-1" min="0" nonzero="0" sup="0" total="1.0" />
                 </comments>
-                <total avg="5.6666666667" count="15" max="12" min="0" nonzero="False" sup="0" total="85.0">
+                <preprocessor avg="0.13333333" count="15" max="2" min="0" nonzero="False" sup="0" total="2.0">
+                    <__diff__ avg="0.07083333" count="-1" max="1" min="0" nonzero="0" sup="0" total="1.0" />
                     <distribution-bars>
-                        <distribution-bar __diff__="0" count="2" metric="0" ratio="0.1333333333" />
-                        <distribution-bar __diff__="-1" count="2" metric="3" ratio="0.1333333333" />
-                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.1333333333" />
+                        <distribution-bar __diff__="-1" count="14" metric="0" ratio="0.93333333" />
+                        <distribution-bar __diff__="-1" count="0" metric="1" ratio="0" />
+                        <distribution-bar __diff__="1" count="1" metric="2" ratio="0.06666667" />
+                    </distribution-bars>
+                </preprocessor>
+                <total avg="5.66666667" count="15" max="12" min="0" nonzero="False" sup="0" total="85.0">
+                    <__diff__ avg="0.22916667" count="-1" max="0" min="0" nonzero="0" sup="0" total="-2.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="0" count="2" metric="0" ratio="0.13333333" />
+                        <distribution-bar __diff__="-1" count="2" metric="3" ratio="0.13333333" />
+                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.13333333" />
                         <distribution-bar __diff__="1" count="3" metric="5" ratio="0.2" />
                         <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
-                        <distribution-bar __diff__="-1" count="2" metric="7" ratio="0.1333333333" />
+                        <distribution-bar __diff__="-1" count="2" metric="7" ratio="0.13333333" />
                         <distribution-bar __diff__="-2" count="0" metric="8" ratio="0" />
-                        <distribution-bar __diff__="1" count="2" metric="9" ratio="0.1333333333" />
-                        <distribution-bar __diff__="1" count="2" metric="12" ratio="0.1333333333" />
+                        <distribution-bar __diff__="1" count="2" metric="9" ratio="0.13333333" />
+                        <distribution-bar __diff__="1" count="2" metric="12" ratio="0.13333333" />
                     </distribution-bars>
-                    <__diff__ avg="0.2291666667" count="-1" max="0" min="0" nonzero="0" sup="0" total="-2.0" />
                 </total>
             </std.code.lines>
             <std.suppress>
                 <count avg="1.0" count="1" max="1" min="1" nonzero="True" sup="0" total="1.0">
+                    <__diff__ avg="1.0" count="1" max="1" min="1" nonzero="0" sup="0" total="1.0" />
                     <distribution-bars>
                         <distribution-bar __diff__="1" count="1" metric="1" ratio="1.0" />
                     </distribution-bars>
-                    <__diff__ avg="1.0" count="1" max="1" min="1" nonzero="0" sup="0" total="1.0" />
                 </count>
             </std.suppress>
             <std.suppress.file>
                 <count avg="None" count="0" max="None" min="None" nonzero="True" sup="0" total="0.0">
+                    <__diff__ avg="0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
                     <distribution-bars>
                     </distribution-bars>
-                    <__diff__ avg="0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
                 </count>
             </std.suppress.file>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_basic/test_workflow_view_second_txt_all_stdout.gold.txt

@@ -6,7 +6,7 @@
 	Distribution   : 8 [+0] regions in total (including 1 [+1] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.125 : 0.125 : 1 [+1]	||||||||||||
-	             1 : 0.375 : 0.500 : 3 [-3]	||||||||||||||||||||||||||||||||||||||
+	             1 : 0.375 : 0.500 : 3 [-3]	|||||||||||||||||||||||||||||||||||||
 	             2 : 0.250 : 0.750 : 2 [+1]	|||||||||||||||||||||||||
 	             3 : 0.250 : 1.000 : 2 [+1]	|||||||||||||||||||||||||
 
@@ -21,35 +21,35 @@
 	             3 : 0.200 : 0.333 :  3 [+0 ]	||||||||||||||||||||
 	             4 : 0.200 : 0.533 :  3 [+0 ]	||||||||||||||||||||
 	             5 : 0.133 : 0.667 :  2 [+0 ]	|||||||||||||
-	             7 : 0.067 : 0.733 :  1 [-3 ]	|||||||
+	             7 : 0.067 : 0.733 :  1 [-3 ]	||||||
 	             8 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||
-	            10 : 0.067 : 0.933 :  1 [+1 ]	|||||||
-	            11 : 0.067 : 1.000 :  1 [+0 ]	|||||||
-
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.1333333333 [+0.0708333333]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.933 : 0.933 : 14 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.933 :  0 [-1 ]	
-	             2 : 0.067 : 1.000 :  1 [+1 ]	|||||||
+	            10 : 0.067 : 0.933 :  1 [+1 ]	||||||
+	            11 : 0.067 : 1.000 :  1 [+0 ]	||||||
 
 ./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.7333333333 [+0.1083333333]
+	Average        : 0.73333333 [+0.10833333]
 	Minimum        : 0 [+0]
 	Maximum        : 2 [-1]
 	Total          : 11.0 [+1.0]
 	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.467 : 0.467 :  7 [-3 ]	|||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.467 : 0.467 :  7 [-3 ]	||||||||||||||||||||||||||||||||||||||||||||||
 	             1 : 0.333 : 0.800 :  5 [+2 ]	|||||||||||||||||||||||||||||||||
 	             2 : 0.200 : 1.000 :  3 [+1 ]	||||||||||||||||||||
 
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.13333333 [+0.07083333]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.933 : 0.933 : 14 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.933 :  0 [-1 ]	
+	             2 : 0.067 : 1.000 :  1 [+1 ]	||||||
+
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.6666666667 [+0.2291666667]
+	Average        : 5.66666667 [+0.22916667]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+0]
 	Total          : 85.0 [-2.0]

tests/general/test_basic/test_workflow_view_second_txt_new_stdout.gold.txt

@@ -11,19 +11,30 @@
 	             3 : 0.250 : 1.000 : 1 [+1]	|||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 4.7142857143 [+4.7142857143]
+	Average        : 4.71428571 [+4.71428571]
 	Minimum        : 0 [+0]
 	Maximum        : 10 [+10]
 	Total          : 33.0 [+33.0]
 	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
-	             3 : 0.286 : 0.429 : 2 [+2]	|||||||||||||||||||||||||||||
+	             3 : 0.286 : 0.429 : 2 [+2]	||||||||||||||||||||||||||||
 	             4 : 0.143 : 0.571 : 1 [+1]	||||||||||||||
 	             5 : 0.143 : 0.714 : 1 [+1]	||||||||||||||
 	             8 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
 	            10 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
+./:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.71428571 [+0.71428571]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+2]
+	Total          : 5.0 [+5.0]
+	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.429 : 0.429 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.429 : 0.857 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+
 ./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
 	Average        : 0.0 [+0.0]
 	Minimum        : 0 [+0]
@@ -33,19 +44,8 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 1.000 : 1.000 : 7 [+7]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.7142857143 [+0.7142857143]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+2]
-	Total          : 5.0 [+5.0]
-	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.429 : 0.429 : 3 [+3]	|||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.429 : 0.857 : 3 [+3]	|||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
-
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.4285714286 [+5.4285714286]
+	Average        : 5.42857143 [+5.42857143]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+12]
 	Total          : 38.0 [+38.0]
@@ -54,7 +54,7 @@
 	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
 	             3 : 0.143 : 0.286 : 1 [+1]	||||||||||||||
 	             4 : 0.143 : 0.429 : 1 [+1]	||||||||||||||
-	             5 : 0.286 : 0.714 : 2 [+2]	|||||||||||||||||||||||||||||
+	             5 : 0.286 : 0.714 : 2 [+2]	||||||||||||||||||||||||||||
 	             9 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
 	            12 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 

tests/general/test_basic/test_workflow_view_second_txt_touched_stdout.gold.txt

@@ -1,17 +1,17 @@
 ./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.5 [+0.3333333333]
+	Average        : 1.5 [+0.33333333]
 	Minimum        : 0 [-1]
 	Maximum        : 3 [+1]
 	Total          : 9.0 [+2.0]
 	Distribution   : 6 [+0] regions in total (including 1 [+1] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.167 : 0.167 : 1 [+1]	|||||||||||||||||
+	             0 : 0.167 : 0.167 : 1 [+1]	||||||||||||||||
 	             1 : 0.333 : 0.500 : 2 [-3]	|||||||||||||||||||||||||||||||||
 	             2 : 0.333 : 0.833 : 2 [+1]	|||||||||||||||||||||||||||||||||
-	             3 : 0.167 : 1.000 : 1 [+1]	|||||||||||||||||
+	             3 : 0.167 : 1.000 : 1 [+1]	||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.0909090909 [+0.1742424242]
+	Average        : 5.09090909 [+0.17424242]
 	Minimum        : 0 [+0]
 	Maximum        : 10 [+2]
 	Total          : 56.0 [-3.0]
@@ -25,19 +25,8 @@
 	             8 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
 	            10 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.1818181818 [+0.0984848485]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.909 : 0.909 : 10 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.909 :  0 [-1 ]	
-	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
-
 ./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.8181818182 [+0.1515151515]
+	Average        : 0.81818182 [+0.15151515]
 	Minimum        : 0 [+0]
 	Maximum        : 2 [-1]
 	Total          : 9.0 [+1.0]
@@ -47,8 +36,19 @@
 	             1 : 0.455 : 0.818 :  5 [+2 ]	|||||||||||||||||||||||||||||||||||||||||||||
 	             2 : 0.182 : 1.000 :  2 [+1 ]	||||||||||||||||||
 
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.18181818 [+0.09848485]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.909 : 0.909 : 10 [-1 ]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.909 :  0 [-1 ]	
+	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+
 ./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.9090909091 [+0.3257575758]
+	Average        : 5.90909091 [+0.32575758]
 	Minimum        : 0 [+0]
 	Maximum        : 12 [+3]
 	Total          : 65.0 [-2.0]

tests/general/test_std_code_cpp/test_parser_view_default_stdout.gold.txt

@@ -1,19 +1,19 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
-                <cyclomatic avg="0.1976744186" count="86" max="2" min="0" nonzero="False" sup="0" total="17.0">
+                <cyclomatic avg="0.19767442" count="86" max="2" min="0" nonzero="False" sup="0" total="17.0">
                     <distribution-bars>
-                        <distribution-bar count="74" metric="0" ratio="0.8604651163" />
-                        <distribution-bar count="7" metric="1" ratio="0.0813953488" />
-                        <distribution-bar count="5" metric="2" ratio="0.0581395349" />
+                        <distribution-bar count="74" metric="0" ratio="0.86046512" />
+                        <distribution-bar count="7" metric="1" ratio="0.08139535" />
+                        <distribution-bar count="5" metric="2" ratio="0.05813953" />
                     </distribution-bars>
                 </cyclomatic>
             </std.code.complexity>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_std_code_cpp/test_parser_view_files_stdout.gold.txt

@@ -482,15 +482,15 @@
 	std.code.complexity:cyclomatic: 0
 
 ./operator_test.hpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.0784313725
+	Average        : 0.07843137
 	Minimum        : 0
 	Maximum        : 2
 	Total          : 4.0
 	Distribution   : 51 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.941 : 0.941 : 48	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.039 : 0.980 :  2	||||
-	             2 : 0.020 : 1.000 :  1	||
+	             1 : 0.039 : 0.980 :  2	|||
+	             2 : 0.020 : 1.000 :  1	|
 
 ./test.c:0: info: Metrics per '__global__' region
 	Region name    : __global__

tests/general/test_std_code_cs/test_parser_view_default_stdout.gold.txt

@@ -1,23 +1,23 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
-                <cyclomatic avg="1.1538461538" count="39" max="6" min="0" nonzero="False" sup="0" total="45.0">
+                <cyclomatic avg="1.15384615" count="39" max="6" min="0" nonzero="False" sup="0" total="45.0">
                     <distribution-bars>
-                        <distribution-bar count="23" metric="0" ratio="0.5897435897" />
-                        <distribution-bar count="7" metric="1" ratio="0.1794871795" />
-                        <distribution-bar count="1" metric="2" ratio="0.0256410256" />
-                        <distribution-bar count="1" metric="3" ratio="0.0256410256" />
-                        <distribution-bar count="3" metric="4" ratio="0.0769230769" />
-                        <distribution-bar count="3" metric="5" ratio="0.0769230769" />
-                        <distribution-bar count="1" metric="6" ratio="0.0256410256" />
+                        <distribution-bar count="23" metric="0" ratio="0.58974359" />
+                        <distribution-bar count="7" metric="1" ratio="0.17948718" />
+                        <distribution-bar count="1" metric="2" ratio="0.02564103" />
+                        <distribution-bar count="1" metric="3" ratio="0.02564103" />
+                        <distribution-bar count="3" metric="4" ratio="0.07692308" />
+                        <distribution-bar count="3" metric="5" ratio="0.07692308" />
+                        <distribution-bar count="1" metric="6" ratio="0.02564103" />
                     </distribution-bars>
                 </cyclomatic>
             </std.code.complexity>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_std_code_cs/test_parser_view_files_stdout.gold.txt

@@ -179,18 +179,18 @@
             	std.code.complexity:cyclomatic: 1
 
 ./File.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 2.0526315789
+	Average        : 2.05263158
 	Minimum        : 0
 	Maximum        : 6
 	Total          : 39.0
 	Distribution   : 19 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.316 : 0.316 :  6	||||||||||||||||||||||||||||||||
+	             0 : 0.316 : 0.316 :  6	|||||||||||||||||||||||||||||||
 	             1 : 0.263 : 0.579 :  5	||||||||||||||||||||||||||
 	             2 : 0.053 : 0.632 :  1	|||||
 	             3 : 0.053 : 0.684 :  1	|||||
-	             4 : 0.105 : 0.789 :  2	|||||||||||
-	             5 : 0.158 : 0.947 :  3	||||||||||||||||
+	             4 : 0.105 : 0.789 :  2	||||||||||
+	             5 : 0.158 : 0.947 :  3	|||||||||||||||
 	             6 : 0.053 : 1.000 :  1	|||||
 
 ./Generics.cs:0: info: Metrics per '__global__' region
@@ -313,7 +313,7 @@
 	Total          : 1.0
 	Distribution   : 8 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.875 : 0.875 : 7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.875 : 0.875 : 7	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             1 : 0.125 : 1.000 : 1	||||||||||||
 
 ./interface.cs:0: info: Metrics per '__global__' region
@@ -448,7 +448,7 @@
             	std.code.complexity:cyclomatic: 0
 
 ./interface.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.4166666667
+	Average        : 0.41666667
 	Minimum        : 0
 	Maximum        : 4
 	Total          : 5.0

tests/general/test_std_code_cs_unit/test_parser_view_default_stdout.gold.txt

@@ -1,7 +1,6 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
                 <cyclomatic avg="0.0" count="18" max="0" min="0" nonzero="False" sup="0" total="0.0">
@@ -12,6 +11,7 @@
             </std.code.complexity>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_std_code_java/test_parser_view_default_stdout.gold.txt

@@ -1,22 +1,22 @@
 <view>
 
     <data>
-        <info id="1" path="./" />
         <aggregated-data>
             <std.code.complexity>
-                <cyclomatic avg="1.0588235294" count="119" max="6" min="0" nonzero="False" sup="0" total="126.0">
+                <cyclomatic avg="1.05882353" count="119" max="6" min="0" nonzero="False" sup="0" total="126.0">
                     <distribution-bars>
-                        <distribution-bar count="58" metric="0" ratio="0.487394958" />
-                        <distribution-bar count="31" metric="1" ratio="0.2605042017" />
-                        <distribution-bar count="15" metric="2" ratio="0.1260504202" />
-                        <distribution-bar count="8" metric="3" ratio="0.0672268908" />
-                        <distribution-bar count="1" metric="5" ratio="0.0084033613" />
-                        <distribution-bar count="6" metric="6" ratio="0.0504201681" />
+                        <distribution-bar count="58" metric="0" ratio="0.48739496" />
+                        <distribution-bar count="31" metric="1" ratio="0.2605042" />
+                        <distribution-bar count="15" metric="2" ratio="0.12605042" />
+                        <distribution-bar count="8" metric="3" ratio="0.06722689" />
+                        <distribution-bar count="1" metric="5" ratio="0.00840336" />
+                        <distribution-bar count="6" metric="6" ratio="0.05042017" />
                     </distribution-bars>
                 </cyclomatic>
             </std.code.complexity>
         </aggregated-data>
         <file-data />
+        <info id="1" path="./" />
         <subdirs>
         </subdirs>
         <subfiles>

tests/general/test_std_code_java/test_parser_view_files_stdout.gold.txt

@@ -364,17 +364,17 @@
     	Modified       : None
 
 ./ArrayUtils.java:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.9302325581
+	Average        : 1.93023256
 	Minimum        : 0
 	Maximum        : 6
 	Total          : 83.0
 	Distribution   : 43 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.186 : 0.186 :  8	|||||||||||||||||||
-	             1 : 0.326 : 0.512 : 14	|||||||||||||||||||||||||||||||||
-	             2 : 0.209 : 0.721 :  9	|||||||||||||||||||||
+	             0 : 0.186 : 0.186 :  8	||||||||||||||||||
+	             1 : 0.326 : 0.512 : 14	||||||||||||||||||||||||||||||||
+	             2 : 0.209 : 0.721 :  9	||||||||||||||||||||
 	             3 : 0.163 : 0.884 :  7	||||||||||||||||
-	             6 : 0.116 : 1.000 :  5	||||||||||||
+	             6 : 0.116 : 1.000 :  5	|||||||||||
 
 ./BinaryHeapPriorityQueue.java:0: info: Metrics per '__global__' region
 	Region name    : __global__
@@ -750,14 +750,14 @@
         	std.code.complexity:cyclomatic: 0
 
 ./BinaryHeapPriorityQueue.java:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.8409090909
+	Average        : 0.84090909
 	Minimum        : 0
 	Maximum        : 6
 	Total          : 37.0
 	Distribution   : 44 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.523 : 0.523 : 23	||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.295 : 0.818 : 13	||||||||||||||||||||||||||||||
+	             1 : 0.295 : 0.818 : 13	|||||||||||||||||||||||||||||
 	             2 : 0.114 : 0.932 :  5	|||||||||||
 	             3 : 0.023 : 0.955 :  1	||
 	             5 : 0.023 : 0.977 :  1	||
@@ -1033,14 +1033,14 @@
         	std.code.complexity:cyclomatic: 0
 
 ./Generics.java:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.1935483871
+	Average        : 0.19354839
 	Minimum        : 0
 	Maximum        : 2
 	Total          : 6.0
 	Distribution   : 31 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.839 : 0.839 : 26	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.129 : 0.968 :  4	|||||||||||||
+	             0 : 0.839 : 0.839 : 26	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.129 : 0.968 :  4	||||||||||||
 	             2 : 0.032 : 1.000 :  1	|||
 
 ./attrs.java:0: info: Metrics per '__global__' region

tests/general/test_std_suppress/test_basic_view_default_stdout.gold.txt

@@ -1,46 +1,55 @@
 ./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.4705882353
+	Average        : 0.47058824
 	Minimum        : 0
 	Maximum        : 1
 	Total          : 8.0
 	Distribution   : 17 regions in total (including 7 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.529 : 0.529 :  9	|||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.529 : 0.529 :  9	||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             1 : 0.471 : 1.000 :  8	|||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.length:total' metric
-	Average        : 116.2692307692
+	Average        : 116.26923077
 	Minimum        : 43
 	Maximum        : 242
 	Total          : 3023.0
 	Distribution   : 26 regions in total (including 19 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	         43-53 : 0.115 : 0.115 :  3	||||||||||||
-	         53-63 : 0.115 : 0.231 :  3	||||||||||||
-	         63-73 : 0.038 : 0.269 :  1	||||
+	         43-53 : 0.115 : 0.115 :  3	|||||||||||
+	         53-63 : 0.115 : 0.231 :  3	|||||||||||
+	         63-73 : 0.038 : 0.269 :  1	|||
 	         73-83 : 0.192 : 0.462 :  5	|||||||||||||||||||
-	         83-93 : 0.038 : 0.500 :  1	||||
-	        93-103 : 0.038 : 0.538 :  1	||||
-	       103-113 : 0.038 : 0.577 :  1	||||
-	       113-123 : 0.038 : 0.615 :  1	||||
-	       123-133 : 0.038 : 0.654 :  1	||||
-	       133-143 : 0.077 : 0.731 :  2	||||||||
-	       143-153 : 0.077 : 0.808 :  2	||||||||
-	       153-163 : 0.038 : 0.846 :  1	||||
-	       163-173 : 0.038 : 0.885 :  1	||||
-	       173-183 : 0.038 : 0.923 :  1	||||
-	       183-193 : 0.038 : 0.962 :  1	||||
-	       193-242 : 0.038 : 1.000 :  1	||||
+	         83-93 : 0.038 : 0.500 :  1	|||
+	        93-103 : 0.038 : 0.538 :  1	|||
+	       103-113 : 0.038 : 0.577 :  1	|||
+	       113-123 : 0.038 : 0.615 :  1	|||
+	       123-133 : 0.038 : 0.654 :  1	|||
+	       133-143 : 0.077 : 0.731 :  2	|||||||
+	       143-153 : 0.077 : 0.808 :  2	|||||||
+	       153-163 : 0.038 : 0.846 :  1	|||
+	       163-173 : 0.038 : 0.885 :  1	|||
+	       173-183 : 0.038 : 0.923 :  1	|||
+	       183-193 : 0.038 : 0.962 :  1	|||
+	       193-242 : 0.038 : 1.000 :  1	|||
+
+./:: info: Overall metrics for 'std.general:size' metric
+	Average        : 3023.0
+	Minimum        : 3023
+	Maximum        : 3023
+	Total          : 3023.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	          3023 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.2380952381 (excluding zero metric values)
+	Average        : 1.23809524 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 2
 	Total          : 26.0
 	Distribution   : 21 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.762 : 0.762 : 16	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.238 : 1.000 :  5	||||||||||||||||||||||||
+	             2 : 0.238 : 1.000 :  5	|||||||||||||||||||||||
 
 ./:: info: Overall metrics for 'std.suppress.file:count' metric
 	Average        : 1.0 (excluding zero metric values)
@@ -51,15 +60,6 @@
 	  Metric value : Ratio : R-sum : Number of files
 	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./:: info: Overall metrics for 'std.general:size' metric
-	Average        : 3023.0
-	Minimum        : 3023
-	Maximum        : 3023
-	Total          : 3023.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	          3023 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
 ./:: info: Directory content:
 	File           : test.c
 

tests/system/test_boost_parts/test_std_member_metrics_view_nest_per_file_stdout.gold.txt

@@ -322,9 +322,9 @@
             	Line numbers   : 969-1846
             	Modified       : None
             	std.code.member:classes: 2
+            	std.code.member:methods: 77
             	std.code.member:structs: 7
             	std.code.member:types: 9
-            	std.code.member:methods: 77
 
 .   .   .   .   ./interprocess/detail/win32_api.hpp:971: info: Metrics per 'get_last_error' region
                 	Region name    : get_last_error
@@ -1057,7 +1057,7 @@
                 	Line numbers   : 1830-1843
                 	Modified       : None
 
-./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:fields' metric
+./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:classes' metric
 	Average        : 2.0 (excluding zero metric values)
 	Minimum        : 2
 	Maximum        : 2
@@ -1066,15 +1066,7 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             2 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:globals' metric
-	Average        : None (excluding zero metric values)
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-
-./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:classes' metric
+./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:fields' metric
 	Average        : 2.0 (excluding zero metric values)
 	Minimum        : 2
 	Maximum        : 2
@@ -1083,16 +1075,13 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             2 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:structs' metric
-	Average        : 4.1 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 26
-	Total          : 41.0
-	Distribution   : 10 regions in total (including 0 suppressed)
+./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:globals' metric
+	Average        : None (excluding zero metric values)
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.800 : 0.800 :  8	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             7 : 0.100 : 0.900 :  1	||||||||||
-	            26 : 0.100 : 1.000 :  1	||||||||||
 
 ./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:interfaces' metric
 	Average        : None (excluding zero metric values)
@@ -1102,17 +1091,6 @@
 	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 
-./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:types' metric
-	Average        : 4.3 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 26
-	Total          : 43.0
-	Distribution   : 10 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.800 : 0.800 :  8	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             9 : 0.100 : 0.900 :  1	||||||||||
-	            26 : 0.100 : 1.000 :  1	||||||||||
-
 ./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:methods' metric
 	Average        : 11.625 (excluding zero metric values)
 	Minimum        : 2
@@ -1125,13 +1103,35 @@
 	            77 : 0.125 : 1.000 : 1	||||||||||||
 
 ./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:namespaces' metric
-	Average        : 1.2857142857 (excluding zero metric values)
+	Average        : 1.28571429 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 3
 	Total          : 9.0
 	Distribution   : 7 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.857 : 0.857 : 6	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.857 : 0.857 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             3 : 0.143 : 1.000 : 1	||||||||||||||
 
+./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:structs' metric
+	Average        : 4.1 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 26
+	Total          : 41.0
+	Distribution   : 10 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.800 : 0.800 :  8	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             7 : 0.100 : 0.900 :  1	||||||||||
+	            26 : 0.100 : 1.000 :  1	||||||||||
+
+./interprocess/detail/win32_api.hpp:: info: Overall metrics for 'std.code.member:types' metric
+	Average        : 4.3 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 26
+	Total          : 43.0
+	Distribution   : 10 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.800 : 0.800 :  8	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             9 : 0.100 : 0.900 :  1	||||||||||
+	            26 : 0.100 : 1.000 :  1	||||||||||
+
 

tests/system/test_boost_parts/test_std_member_metrics_view_txt_stdout.gold.txt

@@ -1,11 +1,24 @@
+./:: info: Overall metrics for 'std.code.member:classes' metric
+	Average        : 1.33974359 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 5
+	Total          : 209.0
+	Distribution   : 156 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.776 : 0.776 : 121	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.160 : 0.936 :  25	||||||||||||||||
+	             3 : 0.026 : 0.962 :   4	||
+	             4 : 0.026 : 0.987 :   4	||
+	             5 : 0.013 : 1.000 :   2	|
+
 ./:: info: Overall metrics for 'std.code.member:fields' metric
-	Average        : 1.1428571429 (excluding zero metric values)
+	Average        : 1.14285714 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 2
 	Total          : 8.0
 	Distribution   : 7 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.857 : 0.857 : 6	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.857 : 0.857 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             2 : 0.143 : 1.000 : 1	||||||||||||||
 
 ./:: info: Overall metrics for 'std.code.member:globals' metric
@@ -17,38 +30,6 @@
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
-./:: info: Overall metrics for 'std.code.member:classes' metric
-	Average        : 1.3397435897 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 5
-	Total          : 209.0
-	Distribution   : 156 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.776 : 0.776 : 121	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.160 : 0.936 :  25	||||||||||||||||
-	             3 : 0.026 : 0.962 :   4	|||
-	             4 : 0.026 : 0.987 :   4	|||
-	             5 : 0.013 : 1.000 :   2	|
-
-./:: info: Overall metrics for 'std.code.member:structs' metric
-	Average        : 2.407079646 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 26
-	Total          : 272.0
-	Distribution   : 113 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.504 : 0.504 :  57	||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.274 : 0.779 :  31	|||||||||||||||||||||||||||
-	             3 : 0.088 : 0.867 :  10	|||||||||
-	             4 : 0.053 : 0.920 :   6	|||||
-	             5 : 0.027 : 0.947 :   3	|||
-	             6 : 0.009 : 0.956 :   1	|
-	             7 : 0.009 : 0.965 :   1	|
-	            10 : 0.009 : 0.973 :   1	|
-	            15 : 0.009 : 0.982 :   1	|
-	            20 : 0.009 : 0.991 :   1	|
-	            26 : 0.009 : 1.000 :   1	|
-
 ./:: info: Overall metrics for 'std.code.member:interfaces' metric
 	Average        : None (excluding zero metric values)
 	Minimum        : None
@@ -57,66 +38,85 @@
 	Distribution   : 0 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 
-./:: info: Overall metrics for 'std.code.member:types' metric
-	Average        : 2.0210084034 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 26
-	Total          : 481.0
-	Distribution   : 238 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.592 : 0.592 : 141	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.235 : 0.828 :  56	||||||||||||||||||||||||
-	             3 : 0.076 : 0.903 :  18	||||||||
-	             4 : 0.042 : 0.945 :  10	||||
-	             5 : 0.017 : 0.962 :   4	||
-	             6 : 0.008 : 0.971 :   2	|
-	             7 : 0.004 : 0.975 :   1	
-	             9 : 0.008 : 0.983 :   2	|
-	            15 : 0.004 : 0.987 :   1	
-	            16 : 0.004 : 0.992 :   1	
-	            20 : 0.004 : 0.996 :   1	
-	            26 : 0.004 : 1.000 :   1	
-
 ./:: info: Overall metrics for 'std.code.member:methods' metric
-	Average        : 6.9373219373 (excluding zero metric values)
+	Average        : 6.93732194 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 77
 	Total          : 2435.0
 	Distribution   : 351 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.168 : 0.168 :  59	|||||||||||||||||
-	             2 : 0.199 : 0.368 :  70	||||||||||||||||||||
+	             1 : 0.168 : 0.168 :  59	||||||||||||||||
+	             2 : 0.199 : 0.368 :  70	|||||||||||||||||||
 	             3 : 0.111 : 0.479 :  39	|||||||||||
 	             4 : 0.054 : 0.533 :  19	|||||
-	             5 : 0.040 : 0.573 :  14	||||
-	             6 : 0.077 : 0.650 :  27	||||||||
-	             7 : 0.046 : 0.695 :  16	|||||
-	             8 : 0.068 : 0.764 :  24	|||||||
-	          9-10 : 0.066 : 0.829 :  23	|||||||
+	             5 : 0.040 : 0.573 :  14	|||
+	             6 : 0.077 : 0.650 :  27	|||||||
+	             7 : 0.046 : 0.695 :  16	||||
+	             8 : 0.068 : 0.764 :  24	||||||
+	          9-10 : 0.066 : 0.829 :  23	||||||
 	            11 : 0.014 : 0.843 :   5	|
-	            12 : 0.020 : 0.863 :   7	||
-	            13 : 0.020 : 0.883 :   7	||
-	         14-15 : 0.017 : 0.900 :   6	||
-	         16-17 : 0.017 : 0.917 :   6	||
-	         18-20 : 0.020 : 0.937 :   7	||
+	            12 : 0.020 : 0.863 :   7	|
+	            13 : 0.020 : 0.883 :   7	|
+	         14-15 : 0.017 : 0.900 :   6	|
+	         16-17 : 0.017 : 0.917 :   6	|
+	         18-20 : 0.020 : 0.937 :   7	|
 	         21-22 : 0.011 : 0.949 :   4	|
-	         24-26 : 0.017 : 0.966 :   6	||
+	         24-26 : 0.017 : 0.966 :   6	|
 	         27-30 : 0.014 : 0.980 :   5	|
-	         31-53 : 0.011 : 0.991 :   4	|
-	         55-77 : 0.009 : 1.000 :   3	|
+	         31-38 : 0.009 : 0.989 :   3	
+	         53-77 : 0.011 : 1.000 :   4	|
 
 ./:: info: Overall metrics for 'std.code.member:namespaces' metric
-	Average        : 1.0615711253 (excluding zero metric values)
+	Average        : 1.06157113 (excluding zero metric values)
 	Minimum        : 1
 	Maximum        : 9
 	Total          : 500.0
 	Distribution   : 471 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             1 : 0.962 : 0.962 : 453	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.028 : 0.989 :  13	|||
-	             3 : 0.008 : 0.998 :   4	|
+	             2 : 0.028 : 0.989 :  13	||
+	             3 : 0.008 : 0.998 :   4	
 	             9 : 0.002 : 1.000 :   1	
 
+./:: info: Overall metrics for 'std.code.member:structs' metric
+	Average        : 2.40707965 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 26
+	Total          : 272.0
+	Distribution   : 113 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.504 : 0.504 :  57	||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.274 : 0.779 :  31	|||||||||||||||||||||||||||
+	             3 : 0.088 : 0.867 :  10	||||||||
+	             4 : 0.053 : 0.920 :   6	|||||
+	             5 : 0.027 : 0.947 :   3	||
+	             6 : 0.009 : 0.956 :   1	
+	             7 : 0.009 : 0.965 :   1	
+	            10 : 0.009 : 0.973 :   1	
+	            15 : 0.009 : 0.982 :   1	
+	            20 : 0.009 : 0.991 :   1	
+	            26 : 0.009 : 1.000 :   1	
+
+./:: info: Overall metrics for 'std.code.member:types' metric
+	Average        : 2.0210084 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 26
+	Total          : 481.0
+	Distribution   : 238 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.592 : 0.592 : 141	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.235 : 0.828 :  56	|||||||||||||||||||||||
+	             3 : 0.076 : 0.903 :  18	|||||||
+	             4 : 0.042 : 0.945 :  10	||||
+	             5 : 0.017 : 0.962 :   4	|
+	             6 : 0.008 : 0.971 :   2	
+	             7 : 0.004 : 0.975 :   1	
+	             9 : 0.008 : 0.983 :   2	
+	            15 : 0.004 : 0.987 :   1	
+	            16 : 0.004 : 0.992 :   1	
+	            20 : 0.004 : 0.996 :   1	
+	            26 : 0.004 : 1.000 :   1	
+
 ./:: info: Directory content:
 	Directory      : interprocess
 

tests/system/test_boost_parts/test_workflow_view_default_stdout.gold.txt

@@ -1,17 +1,17 @@
 ./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.6529026983
+	Average        : 0.6529027
 	Minimum        : 0
 	Maximum        : 37
 	Total          : 1597.0
 	Distribution   : 2446 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.771 : 0.771 : 1886	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.110 : 0.881 :  268	|||||||||||
+	             1 : 0.110 : 0.881 :  268	||||||||||
 	             2 : 0.044 : 0.925 :  108	||||
 	             3 : 0.025 : 0.949 :   60	||
-	             4 : 0.016 : 0.966 :   40	||
-	             5 : 0.007 : 0.973 :   18	|
-	             6 : 0.006 : 0.979 :   14	|
+	             4 : 0.016 : 0.966 :   40	|
+	             5 : 0.007 : 0.973 :   18	
+	             6 : 0.006 : 0.979 :   14	
 	             7 : 0.004 : 0.983 :   10	
 	             8 : 0.003 : 0.986 :    8	
 	             9 : 0.002 : 0.988 :    4	
@@ -21,38 +21,38 @@
 	            13 : 0.001 : 0.995 :    2	
 	            14 : 0.001 : 0.996 :    2	
 	         15-16 : 0.001 : 0.997 :    3	
-	         17-18 : 0.001 : 0.998 :    3	
-	            20 : 0.000 : 0.999 :    1	
-	         23-25 : 0.001 : 1.000 :    2	
-	            37 : 0.000 : 1.000 :    1	
+	            17 : 0.000 : 0.998 :    1	
+	            18 : 0.001 : 0.998 :    2	
+	         20-23 : 0.001 : 0.999 :    2	
+	         25-37 : 0.001 : 1.000 :    2	
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 6.6310840708
+	Average        : 6.63108407
 	Minimum        : 0
 	Maximum        : 220
 	Total          : 23978.0
 	Distribution   : 3616 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	           0-1 : 0.088 : 0.088 :  319	|||||||||
-	             2 : 0.319 : 0.408 : 1155	||||||||||||||||||||||||||||||||
-	             3 : 0.108 : 0.515 :  389	|||||||||||
+	           0-1 : 0.088 : 0.088 :  319	||||||||
+	             2 : 0.319 : 0.408 : 1155	|||||||||||||||||||||||||||||||
+	             3 : 0.108 : 0.515 :  389	||||||||||
 	             4 : 0.083 : 0.598 :  299	||||||||
 	             5 : 0.082 : 0.680 :  298	||||||||
 	             6 : 0.061 : 0.741 :  220	||||||
-	             7 : 0.049 : 0.790 :  176	|||||
-	             8 : 0.030 : 0.819 :  107	|||
+	             7 : 0.049 : 0.790 :  176	||||
+	             8 : 0.030 : 0.819 :  107	||
 	             9 : 0.025 : 0.844 :   89	||
 	         10-11 : 0.032 : 0.876 :  115	|||
-	         12-13 : 0.020 : 0.896 :   72	||
+	         12-13 : 0.020 : 0.896 :   72	|
 	            14 : 0.012 : 0.908 :   43	|
-	         15-16 : 0.017 : 0.924 :   60	||
-	         17-19 : 0.015 : 0.940 :   56	||
+	         15-16 : 0.017 : 0.924 :   60	|
+	         17-19 : 0.015 : 0.940 :   56	|
 	         20-22 : 0.013 : 0.952 :   46	|
 	         23-26 : 0.011 : 0.963 :   40	|
-	         27-31 : 0.010 : 0.973 :   35	|
-	         32-40 : 0.009 : 0.982 :   32	|
-	         41-65 : 0.009 : 0.991 :   32	|
-	        66-220 : 0.009 : 1.000 :   33	|
+	         27-31 : 0.010 : 0.973 :   35	
+	         32-40 : 0.009 : 0.982 :   32	
+	         41-65 : 0.009 : 0.991 :   32	
+	        66-220 : 0.009 : 1.000 :   33	
 
 ./:: info: Directory content:
 	Directory      : interprocess

tests/system/test_boost_parts/test_workflow_view_second_all_stdout.gold.txt

@@ -1,17 +1,17 @@
 ./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.6529026983 [+0.0036213841]
+	Average        : 0.6529027 [+0.00362138]
 	Minimum        : 0 [+0]
 	Maximum        : 37 [+1]
 	Total          : 1597.0 [+16.0]
 	Distribution   : 2446 [+11] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.771 : 0.771 : 1886 [+5   ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.110 : 0.881 :  268 [+4   ]	|||||||||||
+	             1 : 0.110 : 0.881 :  268 [+4   ]	||||||||||
 	             2 : 0.044 : 0.925 :  108 [+0   ]	||||
 	             3 : 0.025 : 0.949 :   60 [+2   ]	||
-	             4 : 0.016 : 0.966 :   40 [-1   ]	||
-	             5 : 0.007 : 0.973 :   18 [-1   ]	|
-	             6 : 0.006 : 0.979 :   14 [+1   ]	|
+	             4 : 0.016 : 0.966 :   40 [-1   ]	|
+	             5 : 0.007 : 0.973 :   18 [-1   ]	
+	             6 : 0.006 : 0.979 :   14 [+1   ]	
 	             7 : 0.004 : 0.983 :   10 [+1   ]	
 	             8 : 0.003 : 0.986 :    8 [+1   ]	
 	             9 : 0.002 : 0.988 :    4 [+0   ]	
@@ -21,38 +21,38 @@
 	            13 : 0.001 : 0.995 :    2 [+0   ]	
 	            14 : 0.001 : 0.996 :    2 [+0   ]	
 	         15-16 : 0.001 : 0.997 :    3 [-1   ]	
-	         17-18 : 0.001 : 0.998 :    3 [+1   ]	
-	            20 : 0.000 : 0.999 :    1 [+0   ]	
-	         23-25 : 0.001 : 1.000 :    2 [+0   ]	
-	         36-37 : 0.000 : 1.000 :    1 [+0   ]	
+	            17 : 0.000 : 0.998 :    1 [+0   ]	
+	            18 : 0.001 : 0.998 :    2 [+1   ]	
+	         20-23 : 0.001 : 0.999 :    2 [+0   ]	
+	         25-37 : 0.001 : 1.000 :    2 [+0   ]	
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 6.6310840708 [+0.0122487406]
+	Average        : 6.63108407 [+0.01224874]
 	Minimum        : 0 [+0]
 	Maximum        : 220 [+6]
 	Total          : 23978.0 [+223.0]
 	Distribution   : 3616 [+27] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	           0-1 : 0.088 : 0.088 :  319 [+3   ]	|||||||||
-	             2 : 0.319 : 0.408 : 1155 [+9   ]	||||||||||||||||||||||||||||||||
-	             3 : 0.108 : 0.515 :  389 [-3   ]	|||||||||||
+	           0-1 : 0.088 : 0.088 :  319 [+3   ]	||||||||
+	             2 : 0.319 : 0.408 : 1155 [+9   ]	|||||||||||||||||||||||||||||||
+	             3 : 0.108 : 0.515 :  389 [-3   ]	||||||||||
 	             4 : 0.083 : 0.598 :  299 [+7   ]	||||||||
 	             5 : 0.082 : 0.680 :  298 [+7   ]	||||||||
 	             6 : 0.061 : 0.741 :  220 [-1   ]	||||||
-	             7 : 0.049 : 0.790 :  176 [-2   ]	|||||
-	             8 : 0.030 : 0.819 :  107 [-1   ]	|||
+	             7 : 0.049 : 0.790 :  176 [-2   ]	||||
+	             8 : 0.030 : 0.819 :  107 [-1   ]	||
 	             9 : 0.025 : 0.844 :   89 [+4   ]	||
 	         10-11 : 0.032 : 0.876 :  115 [+9   ]	|||
-	         12-13 : 0.020 : 0.896 :   72 [-9   ]	||
+	         12-13 : 0.020 : 0.896 :   72 [-9   ]	|
 	            14 : 0.012 : 0.908 :   43 [+0   ]	|
-	         15-16 : 0.017 : 0.924 :   60 [+0   ]	||
-	         17-19 : 0.015 : 0.940 :   56 [+5   ]	||
+	         15-16 : 0.017 : 0.924 :   60 [+0   ]	|
+	         17-19 : 0.015 : 0.940 :   56 [+5   ]	|
 	         20-22 : 0.013 : 0.952 :   46 [-3   ]	|
 	         23-26 : 0.011 : 0.963 :   40 [+3   ]	|
-	         27-31 : 0.010 : 0.973 :   35 [-3   ]	|
-	         32-40 : 0.009 : 0.982 :   32 [+0   ]	|
-	         41-65 : 0.009 : 0.991 :   32 [+1   ]	|
-	        66-220 : 0.009 : 1.000 :   33 [+1   ]	|
+	         27-31 : 0.010 : 0.973 :   35 [-3   ]	
+	         32-40 : 0.009 : 0.982 :   32 [+0   ]	
+	         41-65 : 0.009 : 0.991 :   32 [+1   ]	
+	        66-220 : 0.009 : 1.000 :   33 [+1   ]	
 
 ./:: info: Directory content:
 	Directory      : interprocess

tests/system/test_boost_parts/test_workflow_view_second_new_stdout.gold.txt

@@ -1,12 +1,12 @@
 ./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.652173913 [+0.652173913]
+	Average        : 0.65217391 [+0.65217391]
 	Minimum        : 0 [+0]
 	Maximum        : 7 [+7]
 	Total          : 15.0 [+15.0]
 	Distribution   : 23 [+23] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.696 : 0.696 : 16 [+16]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.217 : 0.913 :  5 [+5 ]	||||||||||||||||||||||
+	             0 : 0.696 : 0.696 : 16 [+16]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.217 : 0.913 :  5 [+5 ]	|||||||||||||||||||||
 	             3 : 0.043 : 0.957 :  1 [+1 ]	||||
 	             7 : 0.043 : 1.000 :  1 [+1 ]	||||
 
@@ -18,9 +18,9 @@
 	Distribution   : 40 [+40] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	             0 : 0.050 : 0.050 :  2 [+2 ]	|||||
-	           1-2 : 0.275 : 0.325 : 11 [+11]	||||||||||||||||||||||||||||
+	           1-2 : 0.275 : 0.325 : 11 [+11]	|||||||||||||||||||||||||||
 	             3 : 0.125 : 0.450 :  5 [+5 ]	||||||||||||
-	             4 : 0.075 : 0.525 :  3 [+3 ]	||||||||
+	             4 : 0.075 : 0.525 :  3 [+3 ]	|||||||
 	             5 : 0.100 : 0.625 :  4 [+4 ]	||||||||||
 	             6 : 0.125 : 0.750 :  5 [+5 ]	||||||||||||
 	             8 : 0.050 : 0.800 :  2 [+2 ]	|||||

tests/system/test_boost_parts/test_workflow_view_second_per_file_stdout.gold.txt

@@ -373,27 +373,27 @@
 	Total          : 37.0 [+1.0]
 	Distribution   : 32 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.969 : 0.969 : 31 [+0 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.969 : 0.969 : 31 [+0 ]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	            36 : 0.000 : 0.969 :  0 [-1 ]	
 	            37 : 0.031 : 1.000 :  1 [+1 ]	|||
 
 ./interprocess/detail/managed_open_or_create_impl.hpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 9.0714285714 [+0.0952380952]
+	Average        : 9.07142857 [+0.0952381]
 	Minimum        : 0 [+0]
 	Maximum        : 148 [+4]
 	Total          : 381.0 [+4.0]
 	Distribution   : 42 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	           0-1 : 0.048 : 0.048 :  2 [+0 ]	|||||
-	             2 : 0.357 : 0.405 : 15 [+0 ]	||||||||||||||||||||||||||||||||||||
+	           0-1 : 0.048 : 0.048 :  2 [+0 ]	||||
+	             2 : 0.357 : 0.405 : 15 [+0 ]	|||||||||||||||||||||||||||||||||||
 	             3 : 0.143 : 0.548 :  6 [+0 ]	||||||||||||||
 	             4 : 0.071 : 0.619 :  3 [+0 ]	|||||||
 	             5 : 0.071 : 0.690 :  3 [+0 ]	|||||||
 	             6 : 0.071 : 0.762 :  3 [+0 ]	|||||||
-	             7 : 0.048 : 0.810 :  2 [+0 ]	|||||
+	             7 : 0.048 : 0.810 :  2 [+0 ]	||||
 	            14 : 0.024 : 0.833 :  1 [+0 ]	||
 	            16 : 0.071 : 0.905 :  3 [+0 ]	|||||||
-	            18 : 0.048 : 0.952 :  2 [+0 ]	|||||
+	            18 : 0.048 : 0.952 :  2 [+0 ]	||||
 	            27 : 0.024 : 0.976 :  1 [+0 ]	||
 	           144 : 0.000 : 0.976 :  0 [-1 ]	
 	           148 : 0.024 : 1.000 :  1 [+1 ]	||

tests/system/test_boost_parts/test_workflow_view_second_touched_stdout.gold.txt

@@ -1,33 +1,33 @@
 ./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.8492462312 [-0.0230941944]
+	Average        : 1.84924623 [-0.02309419]
 	Minimum        : 0 [+0]
 	Maximum        : 37 [+1]
 	Total          : 368.0 [+16.0]
 	Distribution   : 199 [+11] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.608 : 0.608 : 121 [+5  ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             0 : 0.608 : 0.608 : 121 [+5  ]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	             1 : 0.131 : 0.739 :  26 [+4  ]	|||||||||||||
 	             2 : 0.070 : 0.809 :  14 [+0  ]	|||||||
 	             3 : 0.060 : 0.869 :  12 [+2  ]	||||||
-	             4 : 0.015 : 0.884 :   3 [-1  ]	||
-	             5 : 0.015 : 0.899 :   3 [-1  ]	||
-	             6 : 0.005 : 0.905 :   1 [+1  ]	|
-	             7 : 0.015 : 0.920 :   3 [+1  ]	||
-	             8 : 0.015 : 0.935 :   3 [+1  ]	||
+	             4 : 0.015 : 0.884 :   3 [-1  ]	|
+	             5 : 0.015 : 0.899 :   3 [-1  ]	|
+	             6 : 0.005 : 0.905 :   1 [+1  ]	
+	             7 : 0.015 : 0.920 :   3 [+1  ]	|
+	             8 : 0.015 : 0.935 :   3 [+1  ]	|
 	             9 : 0.010 : 0.945 :   2 [+0  ]	|
 	            10 : 0.010 : 0.955 :   2 [-2  ]	|
-	            11 : 0.005 : 0.960 :   1 [+1  ]	|
-	            12 : 0.005 : 0.965 :   1 [+0  ]	|
-	            13 : 0.005 : 0.970 :   1 [+0  ]	|
-	            16 : 0.005 : 0.975 :   1 [-1  ]	|
-	            17 : 0.005 : 0.980 :   1 [+0  ]	|
+	            11 : 0.005 : 0.960 :   1 [+1  ]	
+	            12 : 0.005 : 0.965 :   1 [+0  ]	
+	            13 : 0.005 : 0.970 :   1 [+0  ]	
+	            16 : 0.005 : 0.975 :   1 [-1  ]	
+	            17 : 0.005 : 0.980 :   1 [+0  ]	
 	            18 : 0.010 : 0.990 :   2 [+1  ]	|
-	            20 : 0.005 : 0.995 :   1 [+0  ]	|
+	            20 : 0.005 : 0.995 :   1 [+0  ]	
 	            36 : 0.000 : 0.995 :   0 [-1  ]	
-	            37 : 0.005 : 1.000 :   1 [+1  ]	|
+	            37 : 0.005 : 1.000 :   1 [+1  ]	
 
 ./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 16.0177304965 [-0.8214851898]
+	Average        : 16.0177305 [-0.82148519]
 	Minimum        : 0 [+0]
 	Maximum        : 220 [+6]
 	Total          : 4517.0 [+223.0]
@@ -37,21 +37,21 @@
 	             2 : 0.124 : 0.177 :  35 [+9  ]	||||||||||||
 	             3 : 0.053 : 0.230 :  15 [-3  ]	|||||
 	             4 : 0.060 : 0.291 :  17 [+7  ]	||||||
-	             5 : 0.089 : 0.379 :  25 [+7  ]	|||||||||
+	             5 : 0.089 : 0.379 :  25 [+7  ]	||||||||
 	             6 : 0.060 : 0.440 :  17 [-1  ]	||||||
-	             7 : 0.050 : 0.489 :  14 [-2  ]	|||||
+	             7 : 0.050 : 0.489 :  14 [-2  ]	||||
 	           8-9 : 0.074 : 0.564 :  21 [+3  ]	|||||||
-	            10 : 0.035 : 0.599 :  10 [+5  ]	||||
+	            10 : 0.035 : 0.599 :  10 [+5  ]	|||
 	            11 : 0.082 : 0.681 :  23 [+4  ]	||||||||
 	         12-13 : 0.043 : 0.723 :  12 [-9  ]	||||
-	         14-15 : 0.039 : 0.762 :  11 [-1  ]	||||
-	         16-18 : 0.028 : 0.791 :   8 [+4  ]	|||
-	         19-22 : 0.039 : 0.830 :  11 [-1  ]	||||
-	         23-26 : 0.039 : 0.869 :  11 [+3  ]	||||
-	         27-32 : 0.028 : 0.897 :   8 [-3  ]	|||
-	         38-50 : 0.028 : 0.926 :   8 [+1  ]	|||
+	         14-15 : 0.039 : 0.762 :  11 [-1  ]	|||
+	         16-18 : 0.028 : 0.791 :   8 [+4  ]	||
+	         19-22 : 0.039 : 0.830 :  11 [-1  ]	|||
+	         23-26 : 0.039 : 0.869 :  11 [+3  ]	|||
+	         27-32 : 0.028 : 0.897 :   8 [-3  ]	||
+	         38-50 : 0.028 : 0.926 :   8 [+1  ]	||
 	         51-71 : 0.025 : 0.950 :   7 [+0  ]	||
-	        73-100 : 0.028 : 0.979 :   8 [+2  ]	|||
+	        73-100 : 0.028 : 0.979 :   8 [+2  ]	||
 	       101-220 : 0.021 : 1.000 :   6 [-1  ]	||
 
 ./:: info: Directory content: