Browse Source

define the std.code.ratio.comments as lines_comments/lines_codes instead of lines_comments/(lines_comments+lines_codes)

Emmanuel Olivi 3 years ago
parent
commit
ad2b3589d0

+ 6 - 8
metrixpp/tests/general/test_basic/test_help_limit_default_stdout.gold.txt

@@ -35,10 +35,9 @@ Options:
                         select regions, which have got metric value less than
                         select regions, which have got metric value less than
                         the specified limit. This option can be specified
                         the specified limit. This option can be specified
                         multiple times, if it is necessary to apply several
                         multiple times, if it is necessary to apply several
-                        limits. Should be in the format:
-                        <namespace>:<field>:<limit-
-                        value>[:region_type[,region_type]], for example:
-                        'std.code.lines:comments:1', or
+                        limits. Should be in the format: <namespace>:<field
+                        >:<limit-value>[:region_type[,region_type]], for
+                        example: 'std.code.lines:comments:1', or
                         'std.code.lines:comments:1:function,class'. Region
                         'std.code.lines:comments:1:function,class'. Region
                         types is optional specifier, and if not defined the
                         types is optional specifier, and if not defined the
                         limit is applied to regions of all types.
                         limit is applied to regions of all types.
@@ -47,10 +46,9 @@ Options:
                         select regions, which have got metric value more than
                         select regions, which have got metric value more than
                         the specified limit. This option can be specified
                         the specified limit. This option can be specified
                         multiple times, if it is necessary to apply several
                         multiple times, if it is necessary to apply several
-                        limits. Should be in the format:
-                        <namespace>:<field>:<limit-
-                        value>[:region_type[,region_type]], for example:
-                        'std.code.complexity:cyclomatic:7', or
+                        limits. Should be in the format: <namespace>:<field
+                        >:<limit-value>[:region_type[,region_type]], for
+                        example: 'std.code.complexity:cyclomatic:7', or
                         'std.code.complexity:maxdepth:5:function'. Region
                         'std.code.complexity:maxdepth:5:function'. Region
                         types is optional specifier, and if not defined the
                         types is optional specifier, and if not defined the
                         limit is applied to regions of all types.
                         limit is applied to regions of all types.

+ 10 - 10
metrixpp/tests/general/test_basic/test_std_lines_metrics_view_nest_per_file_stdout.gold.txt

@@ -20,7 +20,7 @@
     	std.code.lines:comments: 1
     	std.code.lines:comments: 1
     	std.code.lines:preprocessor: 1
     	std.code.lines:preprocessor: 1
     	std.code.lines:total: 6
     	std.code.lines:total: 6
-    	std.code.ratio:comments: 0.2
+    	std.code.ratio:comments: 0.25
 
 
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
 .   .   ./simple.cpp:9: info: Metrics per 'A' region
         	Region name    : A
         	Region name    : A
@@ -44,7 +44,7 @@
             	std.code.lines:comments: 2
             	std.code.lines:comments: 2
             	std.code.lines:preprocessor: 0
             	std.code.lines:preprocessor: 0
             	std.code.lines:total: 12
             	std.code.lines:total: 12
-            	std.code.ratio:comments: 0.15384615384615385
+            	std.code.ratio:comments: 0.181818181818
 
 
 .   .   .   ./simple.cpp:26: info: Metrics per 'func' region
 .   .   .   ./simple.cpp:26: info: Metrics per 'func' region
             	Region name    : func
             	Region name    : func
@@ -80,7 +80,7 @@
                     	std.code.lines:comments: 1
                     	std.code.lines:comments: 1
                     	std.code.lines:preprocessor: 0
                     	std.code.lines:preprocessor: 0
                     	std.code.lines:total: 8
                     	std.code.lines:total: 8
-                    	std.code.ratio:comments: 0.125
+                    	std.code.ratio:comments: 0.142857142857
 
 
 .   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
 .   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
             	Region name    : func_to_be_removed_in_new_sources
             	Region name    : func_to_be_removed_in_new_sources
@@ -116,7 +116,7 @@
                     	std.code.lines:comments: 1
                     	std.code.lines:comments: 1
                     	std.code.lines:preprocessor: 0
                     	std.code.lines:preprocessor: 0
                     	std.code.lines:total: 8
                     	std.code.lines:total: 8
-                    	std.code.ratio:comments: 0.125
+                    	std.code.ratio:comments: 0.142857142857
 
 
 .   .   .   ./simple.cpp:58: info: Metrics per 'never' region
 .   .   .   ./simple.cpp:58: info: Metrics per 'never' region
             	Region name    : never
             	Region name    : never
@@ -183,15 +183,15 @@
 	            20 : 0.091 : 1.000 :  1	|||||||||
 	            20 : 0.091 : 1.000 :  1	|||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.0548951
+	Average        : 0.06523022
 	Minimum        : 0.0
 	Minimum        : 0.0
-	Maximum        : 0.2
-	Total          : 0.60384615
+	Maximum        : 0.25
+	Total          : 0.71753247
 	Distribution   : 11 regions in total (including 0 suppressed)
 	Distribution   : 11 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.636 : 0.636 :  7	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	        0.0000 : 0.636 : 0.636 :  7	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	        0.1250 : 0.182 : 0.818 :  2	||||||||||||||||||
-	        0.1538 : 0.091 : 0.909 :  1	|||||||||
-	        0.2000 : 0.091 : 1.000 :  1	|||||||||
+	        0.1429 : 0.182 : 0.818 :  2	||||||||||||||||||
+	        0.1818 : 0.091 : 0.909 :  1	|||||||||
+	        0.2500 : 0.091 : 1.000 :  1	|||||||||
 
 
 
 

+ 7 - 7
metrixpp/tests/general/test_basic/test_std_lines_metrics_view_txt_stdout.gold.txt

@@ -54,17 +54,17 @@
 	            20 : 0.062 : 1.000 :  1	||||||
 	            20 : 0.062 : 1.000 :  1	||||||
 
 
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.0770261
+	Average        : 0.10734578
 	Minimum        : 0.0
 	Minimum        : 0.0
-	Maximum        : 0.42857143
-	Total          : 1.23241758
+	Maximum        : 0.75
+	Total          : 1.71753247
 	Distribution   : 16 regions in total (including 0 suppressed)
 	Distribution   : 16 regions in total (including 0 suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.625 : 0.625 : 10	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 	        0.0000 : 0.625 : 0.625 : 10	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	        0.1250 : 0.125 : 0.750 :  2	||||||||||||
-	        0.1538 : 0.062 : 0.812 :  1	||||||
-	        0.2000 : 0.125 : 0.938 :  2	||||||||||||
-	        0.4286 : 0.062 : 1.000 :  1	||||||
+	        0.1429 : 0.125 : 0.750 :  2	||||||||||||
+	        0.1818 : 0.062 : 0.812 :  1	||||||
+	        0.2500 : 0.125 : 0.938 :  2	||||||||||||
+	        0.7500 : 0.062 : 1.000 :  1	||||||
 
 
 ./:: info: Directory content:
 ./:: info: Directory content:
 	File           : file_deleted_in_new_sources.cpp
 	File           : file_deleted_in_new_sources.cpp

+ 1 - 1
metrixpp/tests/general/test_basic/test_view_format_view_python_stdout.gold.txt

@@ -1 +1 @@
-{'view': [{'data': {'info': {'path': './', 'id': 1}, 'aggregated-data': {'std.code.complexity': {'cyclomatic': {'max': 3, 'min': 1, 'avg': 1.375, 'total': 11.0, 'count': 8, 'nonzero': False, 'distribution-bars': [{'count': 6, 'ratio': 0.75, 'metric': '1'}, {'count': 1, 'ratio': 0.125, 'metric': '2'}, {'count': 1, 'ratio': 0.125, 'metric': '3'}], 'sup': 0}}}, 'file-data': {}, 'subdirs': [], 'subfiles': ['file_deleted_in_new_sources.cpp', 'simple.cpp']}}]}
+{'view': [{'data': {'info': {'path': './', 'id': 1}, 'file-data': {}, 'subfiles': [u'file_deleted_in_new_sources.cpp', u'simple.cpp'], 'subdirs': [], 'aggregated-data': {'std.code.complexity': {'cyclomatic': {'count': 8, 'nonzero': False, 'avg': 1.375, 'min': 1, 'max': 3, 'distribution-bars': [{'count': 6, 'ratio': 0.75, 'metric': '1'}, {'count': 1, 'ratio': 0.125, 'metric': '2'}, {'count': 1, 'ratio': 0.125, 'metric': '3'}], 'sup': 0, 'total': 11.0}}}}}]}

+ 6 - 6
metrixpp/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:comments,std.code.lines:preprocessor,std.code.lines:total,std.code.ratio:comments,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.code.ratio:comments,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,0.0,,,,
 ./file_deleted_in_new_sources.cpp,__global__,global,,1,34,,0,0,0,0,0.0,,,,
-./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,4,3,0,7,0.42857142857142855,,,,
+./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,4,3,0,7,0.75,,,,
 ./file_deleted_in_new_sources.cpp,B,class,,9,22,,3,0,0,3,0.0,,,,
 ./file_deleted_in_new_sources.cpp,B,class,,9,22,,3,0,0,3,0.0,,,,
-./file_deleted_in_new_sources.cpp,B,function,,12,20,1,8,2,0,9,0.2,,,,
+./file_deleted_in_new_sources.cpp,B,function,,12,20,1,8,2,0,9,0.25,,,,
 ./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,7,0,0,7,0.0,,,,
 ./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,7,0,0,7,0.0,,,,
 ./file_deleted_in_new_sources.cpp,,file,,1,34,,,,,,,,,,
 ./file_deleted_in_new_sources.cpp,,file,,1,34,,,,,,,,,,
 ./simple.cpp,__global__,global,,1,90,,0,0,0,0,0.0,,,,
 ./simple.cpp,__global__,global,,1,90,,0,0,0,0,0.0,,,,
-./simple.cpp,hmm,namespace,,3,89,,4,1,1,6,0.2,,,,
+./simple.cpp,hmm,namespace,,3,89,,4,1,1,6,0.25,,,,
 ./simple.cpp,A,class,,9,87,,20,0,0,20,0.0,,,,
 ./simple.cpp,A,class,,9,87,,20,0,0,20,0.0,,,,
-./simple.cpp,A,function,,12,23,3,11,2,0,12,0.15384615384615385,,,,
+./simple.cpp,A,function,,12,23,3,11,2,0,12,0.181818181818,,,,
 ./simple.cpp,func,function,,26,40,1,5,0,0,5,0.0,,,,
 ./simple.cpp,func,function,,26,40,1,5,0,0,5,0.0,,,,
 ./simple.cpp,embeded,class,,28,38,,3,0,0,3,0.0,,,,
 ./simple.cpp,embeded,class,,28,38,,3,0,0,3,0.0,,,,
-./simple.cpp,embeded,function,,30,37,1,7,1,0,8,0.125,,,,
+./simple.cpp,embeded,function,,30,37,1,7,1,0,8,0.142857142857,,,,
 ./simple.cpp,func_to_be_removed_in_new_sources,function,,42,56,2,5,0,0,5,0.0,,,,
 ./simple.cpp,func_to_be_removed_in_new_sources,function,,42,56,2,5,0,0,5,0.0,,,,
 ./simple.cpp,embeded,class,,44,54,,3,0,0,3,0.0,,,,
 ./simple.cpp,embeded,class,,44,54,,3,0,0,3,0.0,,,,
-./simple.cpp,embeded,function,,46,53,1,7,1,0,8,0.125,,,,
+./simple.cpp,embeded,function,,46,53,1,7,1,0,8,0.142857142857,,,,
 ./simple.cpp,never,function,,58,65,1,7,0,0,7,0.0,,,,
 ./simple.cpp,never,function,,58,65,1,7,0,0,7,0.0,,,,
 ./simple.cpp,,file,,1,90,,,,,,,,,,
 ./simple.cpp,,file,,1,90,,,,,,,,,,

+ 8 - 8
metrixpp/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:comments,std.code.lines:preprocessor,std.code.lines:total,std.code.ratio:comments,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.code.ratio:comments,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,0.0,,,,
 ./simple.cpp,__global__,global,False,1,78,,0,0,0,0,0.0,,,,
-./simple.cpp,hmm,namespace,True,3,77,,4,1,2,7,0.2,,,,
+./simple.cpp,hmm,namespace,True,3,77,,4,1,2,7,0.25,,,,
 ./simple.cpp,A,class,True,10,75,,4,0,0,4,0.0,,,,
 ./simple.cpp,A,class,True,10,75,,4,0,0,4,0.0,,,,
-./simple.cpp,A,function,False,13,24,3,11,2,0,12,0.15384615384615385,,,,
+./simple.cpp,A,function,False,13,24,3,11,2,0,12,0.181818181818,,,,
 ./simple.cpp,func,function,False,26,42,1,5,0,0,5,0.0,,,,
 ./simple.cpp,func,function,False,26,42,1,5,0,0,5,0.0,,,,
 ./simple.cpp,embeded,class,False,28,40,,3,0,0,3,0.0,,,,
 ./simple.cpp,embeded,class,False,28,40,,3,0,0,3,0.0,,,,
-./simple.cpp,embeded,function,True,30,39,2,8,2,0,9,0.2,,,,
-./simple.cpp,never,function,True,44,51,1,7,1,0,7,0.125,,,,
-./simple.cpp,new_func,function,,53,56,0,3,1,0,4,0.25,,,,
+./simple.cpp,embeded,function,True,30,39,2,8,2,0,9,0.25,,,,
+./simple.cpp,never,function,True,44,51,1,7,1,0,7,0.142857142857,,,,
+./simple.cpp,new_func,function,,53,56,0,3,1,0,4,0.333333333333,,,,
 ./simple.cpp,new_func_complex,function,,58,62,1,5,0,0,5,0.0,,,,
 ./simple.cpp,new_func_complex,function,,58,62,1,5,0,0,5,0.0,,,,
-./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,8,1,0,9,0.1111111111111111,1,[std.code.complexity:cyclomatic],,
+./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,8,1,0,9,0.125,1,[std.code.complexity:cyclomatic],,
 ./simple.cpp,,file,True,1,78,,,,,,,,,,
 ./simple.cpp,,file,True,1,78,,,,,,,,,,
 ./simple2.cpp,__global__,global,,1,26,,0,0,0,0,0.0,,,,
 ./simple2.cpp,__global__,global,,1,26,,0,0,0,0,0.0,,,,
-./simple2.cpp,hmm,namespace,,3,25,,4,1,0,5,0.2,,,,
+./simple2.cpp,hmm,namespace,,3,25,,4,1,0,5,0.25,,,,
 ./simple2.cpp,New_A,class,,7,23,,3,0,0,3,0.0,,,,
 ./simple2.cpp,New_A,class,,7,23,,3,0,0,3,0.0,,,,
-./simple2.cpp,New_A,function,,10,21,3,10,2,0,12,0.16666666666666666,,,,
+./simple2.cpp,New_A,function,,10,21,3,10,2,0,12,0.2,,,,
 ./simple2.cpp,,file,,1,26,,,,,,,,,,
 ./simple2.cpp,,file,,1,26,,,,,,,,,,

+ 5 - 5
metrixpp/tests/general/test_basic/test_workflow_view_default_stdout.gold.txt

@@ -53,13 +53,13 @@
                 </total>
                 </total>
             </std.code.lines>
             </std.code.lines>
             <std.code.ratio>
             <std.code.ratio>
-                <comments avg="0.0770261" count="16" max="0.42857143" min="0.0" nonzero="False" sup="0" total="1.23241758">
+                <comments avg="0.10734578" count="16" max="0.75" min="0.0" nonzero="False" sup="0" total="1.71753247">
                     <distribution-bars>
                     <distribution-bars>
                         <distribution-bar count="10" metric="0.0000" ratio="0.625" />
                         <distribution-bar count="10" metric="0.0000" ratio="0.625" />
-                        <distribution-bar count="2" metric="0.1250" ratio="0.125" />
-                        <distribution-bar count="1" metric="0.1538" ratio="0.0625" />
-                        <distribution-bar count="2" metric="0.2000" ratio="0.125" />
-                        <distribution-bar count="1" metric="0.4286" ratio="0.0625" />
+                        <distribution-bar count="2" metric="0.1429" ratio="0.125" />
+                        <distribution-bar count="1" metric="0.1818" ratio="0.0625" />
+                        <distribution-bar count="2" metric="0.2500" ratio="0.125" />
+                        <distribution-bar count="1" metric="0.7500" ratio="0.0625" />
                     </distribution-bars>
                     </distribution-bars>
                 </comments>
                 </comments>
             </std.code.ratio>
             </std.code.ratio>

+ 15 - 15
metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_stdout.gold.txt

@@ -58,15 +58,15 @@
                 </total>
                 </total>
             </std.code.lines>
             </std.code.lines>
             <std.code.ratio>
             <std.code.ratio>
-                <comments avg="0.09454157" count="11" max="0.25" min="0.0" nonzero="False" sup="0" total="1.03995726">
-                    <__diff__ avg="0.03964646" count="0" max="0.05" min="0.0" nonzero="0" sup="0" total="0.43611111" />
+                <comments avg="0.11663715" count="11" max="0.33333333" min="0.0" nonzero="False" sup="0" total="1.28300866">
+                    <__diff__ avg="0.05140693" count="0" max="0.08333333" min="0.0" nonzero="0" sup="0" total="0.56547619" />
                     <distribution-bars>
                     <distribution-bars>
                         <distribution-bar __diff__="-2" count="5" metric="0.0000" ratio="0.45454545" />
                         <distribution-bar __diff__="-2" count="5" metric="0.0000" ratio="0.45454545" />
-                        <distribution-bar __diff__="1" count="1" metric="0.1111" ratio="0.09090909" />
-                        <distribution-bar __diff__="-1" count="1" metric="0.1250" ratio="0.09090909" />
-                        <distribution-bar __diff__="0" count="1" metric="0.1538" ratio="0.09090909" />
-                        <distribution-bar __diff__="1" count="2" metric="0.2000" ratio="0.18181818" />
-                        <distribution-bar __diff__="1" count="1" metric="0.2500" ratio="0.09090909" />
+                        <distribution-bar __diff__="1" count="1" metric="0.1250" ratio="0.09090909" />
+                        <distribution-bar __diff__="-1" count="1" metric="0.1429" ratio="0.09090909" />
+                        <distribution-bar __diff__="0" count="1" metric="0.1818" ratio="0.09090909" />
+                        <distribution-bar __diff__="1" count="2" metric="0.2500" ratio="0.18181818" />
+                        <distribution-bar __diff__="1" count="1" metric="0.3333" ratio="0.09090909" />
                     </distribution-bars>
                     </distribution-bars>
                 </comments>
                 </comments>
             </std.code.ratio>
             </std.code.ratio>
@@ -104,7 +104,7 @@
                         <std.code.lines code="4" comments="1" preprocessor="2" total="7">
                         <std.code.lines code="4" comments="1" preprocessor="2" total="7">
                             <__diff__ code="0" comments="0" preprocessor="1" total="1" />
                             <__diff__ code="0" comments="0" preprocessor="1" total="1" />
                         </std.code.lines>
                         </std.code.lines>
-                        <std.code.ratio comments="0.2">
+                        <std.code.ratio comments="0.25">
                             <__diff__ comments="0.0" />
                             <__diff__ comments="0.0" />
                         </std.code.ratio>
                         </std.code.ratio>
                     </data>
                     </data>
@@ -129,7 +129,7 @@
                         <std.code.lines code="11" comments="2" preprocessor="0" total="12">
                         <std.code.lines code="11" comments="2" preprocessor="0" total="12">
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                             <__diff__ code="0" comments="0" preprocessor="0" total="0" />
                         </std.code.lines>
                         </std.code.lines>
-                        <std.code.ratio comments="0.15384615">
+                        <std.code.ratio comments="0.18181818">
                             <__diff__ comments="0.0" />
                             <__diff__ comments="0.0" />
                         </std.code.ratio>
                         </std.code.ratio>
                     </data>
                     </data>
@@ -168,8 +168,8 @@
                         <std.code.lines code="8" comments="2" preprocessor="0" total="9">
                         <std.code.lines code="8" comments="2" preprocessor="0" total="9">
                             <__diff__ code="1" comments="1" preprocessor="0" total="1" />
                             <__diff__ code="1" comments="1" preprocessor="0" total="1" />
                         </std.code.lines>
                         </std.code.lines>
-                        <std.code.ratio comments="0.2">
-                            <__diff__ comments="0.075" />
+                        <std.code.ratio comments="0.25">
+                            <__diff__ comments="0.10714286" />
                         </std.code.ratio>
                         </std.code.ratio>
                     </data>
                     </data>
                     <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
                     <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
@@ -182,8 +182,8 @@
                         <std.code.lines code="7" comments="1" preprocessor="0" total="7">
                         <std.code.lines code="7" comments="1" preprocessor="0" total="7">
                             <__diff__ code="0" comments="1" preprocessor="0" total="0" />
                             <__diff__ code="0" comments="1" preprocessor="0" total="0" />
                         </std.code.lines>
                         </std.code.lines>
-                        <std.code.ratio comments="0.125">
-                            <__diff__ comments="0.125" />
+                        <std.code.ratio comments="0.14285714">
+                            <__diff__ comments="0.14285714" />
                         </std.code.ratio>
                         </std.code.ratio>
                     </data>
                     </data>
                     <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
                     <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
@@ -192,7 +192,7 @@
                     <data>
                     <data>
                         <std.code.complexity cyclomatic="0" />
                         <std.code.complexity cyclomatic="0" />
                         <std.code.lines code="3" comments="1" preprocessor="0" total="4" />
                         <std.code.lines code="3" comments="1" preprocessor="0" total="4" />
-                        <std.code.ratio comments="0.25" />
+                        <std.code.ratio comments="0.33333333" />
                     </data>
                     </data>
                     <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
                     <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
                 </region>
                 </region>
@@ -208,7 +208,7 @@
                     <data>
                     <data>
                         <std.code.complexity cyclomatic="2" />
                         <std.code.complexity cyclomatic="2" />
                         <std.code.lines code="8" comments="1" preprocessor="0" total="9" />
                         <std.code.lines code="8" comments="1" preprocessor="0" total="9" />
-                        <std.code.ratio comments="0.11111111" />
+                        <std.code.ratio comments="0.125" />
                         <std.suppress count="1" list="[std.code.complexity:cyclomatic]" />
                         <std.suppress count="1" list="[std.code.complexity:cyclomatic]" />
                     </data>
                     </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" />
                     <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" />

+ 14 - 14
metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stdout.gold.txt

@@ -20,7 +20,7 @@
 	std.code.lines:comments: 1 [+0]
 	std.code.lines:comments: 1 [+0]
 	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:total: 7 [+1]
 	std.code.lines:total: 7 [+1]
-	std.code.ratio:comments: 0.2 [+0.0]
+	std.code.ratio:comments: 0.25 [+0.0]
 
 
 ./simple.cpp:10: info: Metrics per 'A' region
 ./simple.cpp:10: info: Metrics per 'A' region
 	Region name    : A
 	Region name    : A
@@ -45,7 +45,7 @@
 	std.code.lines:comments: 2 [+0]
 	std.code.lines:comments: 2 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 12 [+0]
 	std.code.lines:total: 12 [+0]
-	std.code.ratio:comments: 0.15384615384615385 [+0.0]
+	std.code.ratio:comments: 0.181818181818 [+0.0]
 
 
 ./simple.cpp:26: info: Metrics per 'func' region
 ./simple.cpp:26: info: Metrics per 'func' region
 	Region name    : func
 	Region name    : func
@@ -83,7 +83,7 @@
 	std.code.lines:comments: 2 [+1]
 	std.code.lines:comments: 2 [+1]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 9 [+1]
 	std.code.lines:total: 9 [+1]
-	std.code.ratio:comments: 0.2 [+0.07500000000000001]
+	std.code.ratio:comments: 0.25 [+0.107142857143]
 
 
 ./simple.cpp:44: info: Metrics per 'never' region
 ./simple.cpp:44: info: Metrics per 'never' region
 	Region name    : never
 	Region name    : never
@@ -96,7 +96,7 @@
 	std.code.lines:comments: 1 [+1]
 	std.code.lines:comments: 1 [+1]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 7 [+0]
 	std.code.lines:total: 7 [+0]
-	std.code.ratio:comments: 0.125 [+0.125]
+	std.code.ratio:comments: 0.142857142857 [+0.142857142857]
 
 
 ./simple.cpp:53: info: Metrics per 'new_func' region
 ./simple.cpp:53: info: Metrics per 'new_func' region
 	Region name    : new_func
 	Region name    : new_func
@@ -109,7 +109,7 @@
 	std.code.lines:comments: 1
 	std.code.lines:comments: 1
 	std.code.lines:preprocessor: 0
 	std.code.lines:preprocessor: 0
 	std.code.lines:total: 4
 	std.code.lines:total: 4
-	std.code.ratio:comments: 0.25
+	std.code.ratio:comments: 0.333333333333
 
 
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
 	Region name    : new_func_complex
 	Region name    : new_func_complex
@@ -135,7 +135,7 @@
 	std.code.lines:comments: 1
 	std.code.lines:comments: 1
 	std.code.lines:preprocessor: 0
 	std.code.lines:preprocessor: 0
 	std.code.lines:total: 9
 	std.code.lines:total: 9
-	std.code.ratio:comments: 0.1111111111111111
+	std.code.ratio:comments: 0.125
 	std.suppress:count: 1
 	std.suppress:count: 1
 	std.suppress:list: [std.code.complexity:cyclomatic]
 	std.suppress:list: [std.code.complexity:cyclomatic]
 
 
@@ -206,18 +206,18 @@
 	            12 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
 	            12 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.09454157 [+0.03964646]
+	Average        : 0.11663715 [+0.05140693]
 	Minimum        : 0.0 [+0.0]
 	Minimum        : 0.0 [+0.0]
-	Maximum        : 0.25 [+0.05]
-	Total          : 1.03995726 [+0.43611111]
+	Maximum        : 0.33333333 [+0.08333333]
+	Total          : 1.28300866 [+0.56547619]
 	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
 	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.455 : 0.455 :  5 [-2 ]	|||||||||||||||||||||||||||||||||||||||||||||
 	        0.0000 : 0.455 : 0.455 :  5 [-2 ]	|||||||||||||||||||||||||||||||||||||||||||||
-	        0.1111 : 0.091 : 0.545 :  1 [+1 ]	|||||||||
-	        0.1250 : 0.091 : 0.636 :  1 [-1 ]	|||||||||
-	        0.1538 : 0.091 : 0.727 :  1 [+0 ]	|||||||||
-	        0.2000 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
-	        0.2500 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+	        0.1250 : 0.091 : 0.545 :  1 [+1 ]	|||||||||
+	        0.1429 : 0.091 : 0.636 :  1 [-1 ]	|||||||||
+	        0.1818 : 0.091 : 0.727 :  1 [+0 ]	|||||||||
+	        0.2500 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
+	        0.3333 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)
 	Average        : 1.0 [+1.0] (excluding zero metric values)

+ 11 - 11
metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stdout.gold.txt

@@ -20,7 +20,7 @@
 	std.code.lines:comments: 1 [+0]
 	std.code.lines:comments: 1 [+0]
 	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:total: 7 [+1]
 	std.code.lines:total: 7 [+1]
-	std.code.ratio:comments: 0.2 [+0.0]
+	std.code.ratio:comments: 0.25 [+0.0]
 
 
 ./simple.cpp:10: info: Metrics per 'A' region
 ./simple.cpp:10: info: Metrics per 'A' region
 	Region name    : A
 	Region name    : A
@@ -45,7 +45,7 @@
 	std.code.lines:comments: 2 [+0]
 	std.code.lines:comments: 2 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 12 [+0]
 	std.code.lines:total: 12 [+0]
-	std.code.ratio:comments: 0.15384615384615385 [+0.0]
+	std.code.ratio:comments: 0.181818181818 [+0.0]
 
 
 ./simple.cpp:26: info: Metrics per 'func' region
 ./simple.cpp:26: info: Metrics per 'func' region
 	Region name    : func
 	Region name    : func
@@ -83,7 +83,7 @@
 	std.code.lines:comments: 2 [+1]
 	std.code.lines:comments: 2 [+1]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 9 [+1]
 	std.code.lines:total: 9 [+1]
-	std.code.ratio:comments: 0.2 [+0.07500000000000001]
+	std.code.ratio:comments: 0.25 [+0.107142857143]
 
 
 ./simple.cpp:44: info: Metrics per 'never' region
 ./simple.cpp:44: info: Metrics per 'never' region
 	Region name    : never
 	Region name    : never
@@ -96,7 +96,7 @@
 	std.code.lines:comments: 1 [+1]
 	std.code.lines:comments: 1 [+1]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 7 [+0]
 	std.code.lines:total: 7 [+0]
-	std.code.ratio:comments: 0.125 [+0.125]
+	std.code.ratio:comments: 0.142857142857 [+0.142857142857]
 
 
 ./simple.cpp:53: info: Metrics per 'new_func' region
 ./simple.cpp:53: info: Metrics per 'new_func' region
 	Region name    : new_func
 	Region name    : new_func
@@ -109,7 +109,7 @@
 	std.code.lines:comments: 1
 	std.code.lines:comments: 1
 	std.code.lines:preprocessor: 0
 	std.code.lines:preprocessor: 0
 	std.code.lines:total: 4
 	std.code.lines:total: 4
-	std.code.ratio:comments: 0.25
+	std.code.ratio:comments: 0.333333333333
 
 
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
 	Region name    : new_func_complex
 	Region name    : new_func_complex
@@ -135,7 +135,7 @@
 	std.code.lines:comments: 1
 	std.code.lines:comments: 1
 	std.code.lines:preprocessor: 0
 	std.code.lines:preprocessor: 0
 	std.code.lines:total: 9
 	std.code.lines:total: 9
-	std.code.ratio:comments: 0.1111111111111111
+	std.code.ratio:comments: 0.125
 	std.suppress:count: 1
 	std.suppress:count: 1
 	std.suppress:list: [std.code.complexity:cyclomatic]
 	std.suppress:list: [std.code.complexity:cyclomatic]
 
 
@@ -192,15 +192,15 @@
 	             9 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
 	             9 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.12037037 [+0.12037037]
+	Average        : 0.15277778 [+0.15277778]
 	Minimum        : 0.0 [+0.0]
 	Minimum        : 0.0 [+0.0]
-	Maximum        : 0.25 [+0.25]
-	Total          : 0.36111111 [+0.36111111]
+	Maximum        : 0.33333333 [+0.33333333]
+	Total          : 0.45833333 [+0.45833333]
 	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
 	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
 	        0.0000 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	        0.1111 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	        0.2500 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	        0.1250 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	        0.3333 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)
 	Average        : 1.0 [+1.0] (excluding zero metric values)

+ 13 - 13
metrixpp/tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stdout.gold.txt

@@ -20,7 +20,7 @@
 	std.code.lines:comments: 1 [+0]
 	std.code.lines:comments: 1 [+0]
 	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:preprocessor: 2 [+1]
 	std.code.lines:total: 7 [+1]
 	std.code.lines:total: 7 [+1]
-	std.code.ratio:comments: 0.2 [+0.0]
+	std.code.ratio:comments: 0.25 [+0.0]
 
 
 ./simple.cpp:10: info: Metrics per 'A' region
 ./simple.cpp:10: info: Metrics per 'A' region
 	Region name    : A
 	Region name    : A
@@ -45,7 +45,7 @@
 	std.code.lines:comments: 2 [+0]
 	std.code.lines:comments: 2 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 12 [+0]
 	std.code.lines:total: 12 [+0]
-	std.code.ratio:comments: 0.15384615384615385 [+0.0]
+	std.code.ratio:comments: 0.181818181818 [+0.0]
 
 
 ./simple.cpp:26: info: Metrics per 'func' region
 ./simple.cpp:26: info: Metrics per 'func' region
 	Region name    : func
 	Region name    : func
@@ -83,7 +83,7 @@
 	std.code.lines:comments: 2 [+1]
 	std.code.lines:comments: 2 [+1]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 9 [+1]
 	std.code.lines:total: 9 [+1]
-	std.code.ratio:comments: 0.2 [+0.07500000000000001]
+	std.code.ratio:comments: 0.25 [+0.107142857143]
 
 
 ./simple.cpp:44: info: Metrics per 'never' region
 ./simple.cpp:44: info: Metrics per 'never' region
 	Region name    : never
 	Region name    : never
@@ -96,7 +96,7 @@
 	std.code.lines:comments: 1 [+1]
 	std.code.lines:comments: 1 [+1]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:preprocessor: 0 [+0]
 	std.code.lines:total: 7 [+0]
 	std.code.lines:total: 7 [+0]
-	std.code.ratio:comments: 0.125 [+0.125]
+	std.code.ratio:comments: 0.142857142857 [+0.142857142857]
 
 
 ./simple.cpp:53: info: Metrics per 'new_func' region
 ./simple.cpp:53: info: Metrics per 'new_func' region
 	Region name    : new_func
 	Region name    : new_func
@@ -109,7 +109,7 @@
 	std.code.lines:comments: 1
 	std.code.lines:comments: 1
 	std.code.lines:preprocessor: 0
 	std.code.lines:preprocessor: 0
 	std.code.lines:total: 4
 	std.code.lines:total: 4
-	std.code.ratio:comments: 0.25
+	std.code.ratio:comments: 0.333333333333
 
 
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
 ./simple.cpp:58: info: Metrics per 'new_func_complex' region
 	Region name    : new_func_complex
 	Region name    : new_func_complex
@@ -135,7 +135,7 @@
 	std.code.lines:comments: 1
 	std.code.lines:comments: 1
 	std.code.lines:preprocessor: 0
 	std.code.lines:preprocessor: 0
 	std.code.lines:total: 9
 	std.code.lines:total: 9
-	std.code.ratio:comments: 0.1111111111111111
+	std.code.ratio:comments: 0.125
 	std.suppress:count: 1
 	std.suppress:count: 1
 	std.suppress:list: [std.code.complexity:cyclomatic]
 	std.suppress:list: [std.code.complexity:cyclomatic]
 
 
@@ -201,17 +201,17 @@
 	             9 : 0.286 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||
 	             9 : 0.286 : 1.000 : 2 [+2]	||||||||||||||||||||||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./simple.cpp:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.1265873 [+0.06230159]
+	Average        : 0.15731293 [+0.08078231]
 	Minimum        : 0.0 [+0.0]
 	Minimum        : 0.0 [+0.0]
-	Maximum        : 0.25 [+0.05]
-	Total          : 0.88611111 [+0.43611111]
+	Maximum        : 0.33333333 [+0.08333333]
+	Total          : 1.10119048 [+0.56547619]
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.286 : 0.286 : 2 [-2]	||||||||||||||||||||||||||||
 	        0.0000 : 0.286 : 0.286 : 2 [-2]	||||||||||||||||||||||||||||
-	        0.1111 : 0.143 : 0.429 : 1 [+1]	||||||||||||||
-	        0.1250 : 0.143 : 0.571 : 1 [-1]	||||||||||||||
-	        0.2000 : 0.286 : 0.857 : 2 [+1]	||||||||||||||||||||||||||||
-	        0.2500 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+	        0.1250 : 0.143 : 0.429 : 1 [+1]	||||||||||||||
+	        0.1429 : 0.143 : 0.571 : 1 [-1]	||||||||||||||
+	        0.2500 : 0.286 : 0.857 : 2 [+1]	||||||||||||||||||||||||||||
+	        0.3333 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
 
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 ./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)
 	Average        : 1.0 [+1.0] (excluding zero metric values)

+ 8 - 8
metrixpp/tests/general/test_basic/test_workflow_view_second_stdout.gold.txt

@@ -59,16 +59,16 @@
                 </total>
                 </total>
             </std.code.lines>
             </std.code.lines>
             <std.code.ratio>
             <std.code.ratio>
-                <comments avg="0.09377493" count="15" max="0.25" min="0.0" nonzero="False" sup="0" total="1.40662393">
-                    <__diff__ avg="0.01674883" count="-1" max="-0.17857143" min="0.0" nonzero="0" sup="0" total="0.17420635" />
+                <comments avg="0.11553391" count="15" max="0.33333333" min="0.0" nonzero="False" sup="0" total="1.73300866">
+                    <__diff__ avg="0.00818813" count="-1" max="-0.41666667" min="0.0" nonzero="0" sup="0" total="0.01547619" />
                     <distribution-bars>
                     <distribution-bars>
                         <distribution-bar __diff__="-3" count="7" metric="0.0000" ratio="0.46666667" />
                         <distribution-bar __diff__="-3" count="7" metric="0.0000" ratio="0.46666667" />
-                        <distribution-bar __diff__="1" count="1" metric="0.1111" ratio="0.06666667" />
-                        <distribution-bar __diff__="-1" count="1" metric="0.1250" ratio="0.06666667" />
-                        <distribution-bar __diff__="0" count="1" metric="0.1538" ratio="0.06666667" />
-                        <distribution-bar __diff__="1" count="1" metric="0.1667" ratio="0.06666667" />
-                        <distribution-bar __diff__="1" count="3" metric="0.2000" ratio="0.2" />
-                        <distribution-bar __diff__="1" count="1" metric="0.2500" ratio="0.06666667" />
+                        <distribution-bar __diff__="1" count="1" metric="0.1250" ratio="0.06666667" />
+                        <distribution-bar __diff__="-1" count="1" metric="0.1429" ratio="0.06666667" />
+                        <distribution-bar __diff__="0" count="1" metric="0.1818" ratio="0.06666667" />
+                        <distribution-bar __diff__="1" count="1" metric="0.2000" ratio="0.06666667" />
+                        <distribution-bar __diff__="1" count="3" metric="0.2500" ratio="0.2" />
+                        <distribution-bar __diff__="1" count="1" metric="0.3333" ratio="0.06666667" />
                     </distribution-bars>
                     </distribution-bars>
                 </comments>
                 </comments>
             </std.code.ratio>
             </std.code.ratio>

+ 9 - 9
metrixpp/tests/general/test_basic/test_workflow_view_second_txt_all_stdout.gold.txt

@@ -66,19 +66,19 @@
 	            12 : 0.133 : 1.000 :  2 [+1 ]	|||||||||||||
 	            12 : 0.133 : 1.000 :  2 [+1 ]	|||||||||||||
 
 
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.09377493 [+0.01674883]
+	Average        : 0.11553391 [+0.00818813]
 	Minimum        : 0.0 [+0.0]
 	Minimum        : 0.0 [+0.0]
-	Maximum        : 0.25 [-0.17857143]
-	Total          : 1.40662393 [+0.17420635]
+	Maximum        : 0.33333333 [-0.41666667]
+	Total          : 1.73300866 [+0.01547619]
 	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
 	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.467 : 0.467 :  7 [-3 ]	||||||||||||||||||||||||||||||||||||||||||||||
 	        0.0000 : 0.467 : 0.467 :  7 [-3 ]	||||||||||||||||||||||||||||||||||||||||||||||
-	        0.1111 : 0.067 : 0.533 :  1 [+1 ]	||||||
-	        0.1250 : 0.067 : 0.600 :  1 [-1 ]	||||||
-	        0.1538 : 0.067 : 0.667 :  1 [+0 ]	||||||
-	        0.1667 : 0.067 : 0.733 :  1 [+1 ]	||||||
-	        0.2000 : 0.200 : 0.933 :  3 [+1 ]	||||||||||||||||||||
-	        0.2500 : 0.067 : 1.000 :  1 [+1 ]	||||||
+	        0.1250 : 0.067 : 0.533 :  1 [+1 ]	||||||
+	        0.1429 : 0.067 : 0.600 :  1 [-1 ]	||||||
+	        0.1818 : 0.067 : 0.667 :  1 [+0 ]	||||||
+	        0.2000 : 0.067 : 0.733 :  1 [+1 ]	||||||
+	        0.2500 : 0.200 : 0.933 :  3 [+1 ]	||||||||||||||||||||
+	        0.3333 : 0.067 : 1.000 :  1 [+1 ]	||||||
 
 
 ./:: info: Overall metrics for 'std.suppress:count' metric
 ./:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)
 	Average        : 1.0 [+1.0] (excluding zero metric values)

+ 7 - 7
metrixpp/tests/general/test_basic/test_workflow_view_second_txt_new_stdout.gold.txt

@@ -59,17 +59,17 @@
 	            12 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 	            12 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
 
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.10396825 [+0.10396825]
+	Average        : 0.1297619 [+0.1297619]
 	Minimum        : 0.0 [+0.0]
 	Minimum        : 0.0 [+0.0]
-	Maximum        : 0.25 [+0.25]
-	Total          : 0.72777778 [+0.72777778]
+	Maximum        : 0.33333333 [+0.33333333]
+	Total          : 0.90833333 [+0.90833333]
 	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
 	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.429 : 0.429 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||
 	        0.0000 : 0.429 : 0.429 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||
-	        0.1111 : 0.143 : 0.571 : 1 [+1]	||||||||||||||
-	        0.1667 : 0.143 : 0.714 : 1 [+1]	||||||||||||||
-	        0.2000 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
-	        0.2500 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+	        0.1250 : 0.143 : 0.571 : 1 [+1]	||||||||||||||
+	        0.2000 : 0.143 : 0.714 : 1 [+1]	||||||||||||||
+	        0.2500 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
+	        0.3333 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
 
 
 ./:: info: Overall metrics for 'std.suppress:count' metric
 ./:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)
 	Average        : 1.0 [+1.0] (excluding zero metric values)

+ 8 - 8
metrixpp/tests/general/test_basic/test_workflow_view_second_txt_touched_stdout.gold.txt

@@ -65,18 +65,18 @@
 	            12 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 	            12 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
 ./:: info: Overall metrics for 'std.code.ratio:comments' metric
-	Average        : 0.11388889 [+0.02400794]
+	Average        : 0.14101732 [+0.01304113]
 	Minimum        : 0.0 [+0.0]
 	Minimum        : 0.0 [+0.0]
-	Maximum        : 0.25 [-0.17857143]
-	Total          : 1.25277778 [+0.17420635]
+	Maximum        : 0.33333333 [-0.41666667]
+	Total          : 1.55119048 [+0.01547619]
 	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
 	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
 	  Metric value : Ratio : R-sum : Number of regions
 	  Metric value : Ratio : R-sum : Number of regions
 	        0.0000 : 0.364 : 0.364 :  4 [-3 ]	||||||||||||||||||||||||||||||||||||
 	        0.0000 : 0.364 : 0.364 :  4 [-3 ]	||||||||||||||||||||||||||||||||||||
-	        0.1111 : 0.091 : 0.455 :  1 [+1 ]	|||||||||
-	        0.1250 : 0.091 : 0.545 :  1 [-1 ]	|||||||||
-	        0.1667 : 0.091 : 0.636 :  1 [+1 ]	|||||||||
-	        0.2000 : 0.273 : 0.909 :  3 [+1 ]	|||||||||||||||||||||||||||
-	        0.2500 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+	        0.1250 : 0.091 : 0.455 :  1 [+1 ]	|||||||||
+	        0.1429 : 0.091 : 0.545 :  1 [-1 ]	|||||||||
+	        0.2000 : 0.091 : 0.636 :  1 [+1 ]	|||||||||
+	        0.2500 : 0.273 : 0.909 :  3 [+1 ]	|||||||||||||||||||||||||||
+	        0.3333 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
 
 
 ./:: info: Overall metrics for 'std.suppress:count' metric
 ./:: info: Overall metrics for 'std.suppress:count' metric
 	Average        : 1.0 [+1.0] (excluding zero metric values)
 	Average        : 1.0 [+1.0] (excluding zero metric values)