fixed ratio calculation

mainline/ext/std/tools/view.py

@@ -323,10 +323,6 @@ def compress_dist(data, columns):
                         new_dist.append(next_bar)
                         next_bar = None
 
-            if sum_ratio < 0.995:
-                factor = 1.0 / sum_ratio
-                for each in new_dist:
-                    each['ratio'] *= factor
             data[namespace][field]['distribution-bars'] = new_dist
     return data
 

mainline/mpp/api.py

@@ -963,7 +963,7 @@ class Loader(object):
                     assert(float(data[field]['count'] != 0))
                     data[field]['distribution-bars'].append({'metric': each[0],
                                                              'count': each[1],
-                                                             'ratio': round((float(each[1]) / float(data[field]['count'])), 4)})
+                                                             'ratio': (float(each[1]) / float(data[field]['count']))})
                 result.set_data(name, field, data[field])
         return result
     

mainline/tests/general/test_basic/test_view_format_view_nest_per_file_stdout.gold.txt

@@ -94,10 +94,10 @@
             <std.code.complexity>
                 <cyclomatic count="6" max="3" avg="1.33333333333" total="8.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.1667" />
+                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.166666666667" />
                         <distribution-bar count="3" __diff__="0" metric="1" ratio="0.5" />
-                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.1667" />
-                        <distribution-bar count="1" __diff__="0" metric="3" ratio="0.1667" />
+                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.166666666667" />
+                        <distribution-bar count="1" __diff__="0" metric="3" ratio="0.166666666667" />
                     </distribution-bars>
                     <__diff__ count="2" max="0" avg="-0.166666666667" total="2.0" min="-1" />
                 </cyclomatic>

mainline/tests/general/test_basic/test_view_format_view_nest_stdout.gold.txt

@@ -12,10 +12,10 @@
             <std.code.complexity>
                 <cyclomatic count="7" max="3" avg="1.57142857143" total="11.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.1429" />
-                        <distribution-bar count="3" __diff__="0" metric="1" ratio="0.4286" />
-                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.1429" />
-                        <distribution-bar count="2" __diff__="1" metric="3" ratio="0.2857" />
+                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.142857142857" />
+                        <distribution-bar count="3" __diff__="0" metric="1" ratio="0.428571428571" />
+                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.142857142857" />
+                        <distribution-bar count="2" __diff__="1" metric="3" ratio="0.285714285714" />
                     </distribution-bars>
                     <__diff__ count="3" max="0" avg="0.0714285714286" total="5.0" min="-1" />
                 </cyclomatic>

mainline/tests/general/test_basic/test_workflow_view_second_per_file_stdout.gold.txt

@@ -74,10 +74,10 @@
             <std.code.complexity>
                 <cyclomatic count="6" max="3" avg="1.33333333333" total="8.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.1667" />
+                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.166666666667" />
                         <distribution-bar count="3" __diff__="0" metric="1" ratio="0.5" />
-                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.1667" />
-                        <distribution-bar count="1" __diff__="0" metric="3" ratio="0.1667" />
+                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.166666666667" />
+                        <distribution-bar count="1" __diff__="0" metric="3" ratio="0.166666666667" />
                     </distribution-bars>
                     <__diff__ count="2" max="0" avg="-0.166666666667" total="2.0" min="-1" />
                 </cyclomatic>

mainline/tests/general/test_basic/test_workflow_view_second_stdout.gold.txt

@@ -12,10 +12,10 @@
             <std.code.complexity>
                 <cyclomatic count="7" max="3" avg="1.57142857143" total="11.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.1429" />
-                        <distribution-bar count="3" __diff__="0" metric="1" ratio="0.4286" />
-                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.1429" />
-                        <distribution-bar count="2" __diff__="1" metric="3" ratio="0.2857" />
+                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.142857142857" />
+                        <distribution-bar count="3" __diff__="0" metric="1" ratio="0.428571428571" />
+                        <distribution-bar count="1" __diff__="0" metric="2" ratio="0.142857142857" />
+                        <distribution-bar count="2" __diff__="1" metric="3" ratio="0.285714285714" />
                     </distribution-bars>
                     <__diff__ count="3" max="0" avg="0.0714285714286" total="5.0" min="-1" />
                 </cyclomatic>

mainline/tests/general/test_std_code_cpp/test_parser_view_default_stdout.gold.txt

@@ -12,9 +12,9 @@
             <std.code.complexity>
                 <cyclomatic count="86" max="2" avg="0.197674418605" total="17.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="74" metric="0" ratio="0.8605" />
-                        <distribution-bar count="7" metric="1" ratio="0.0814" />
-                        <distribution-bar count="5" metric="2" ratio="0.0581" />
+                        <distribution-bar count="74" metric="0" ratio="0.860465116279" />
+                        <distribution-bar count="7" metric="1" ratio="0.0813953488372" />
+                        <distribution-bar count="5" metric="2" ratio="0.0581395348837" />
                     </distribution-bars>
                 </cyclomatic>
             </std.code.complexity>

mainline/tests/general/test_std_code_cs/test_parser_view_default_stdout.gold.txt

@@ -12,13 +12,13 @@
             <std.code.complexity>
                 <cyclomatic count="39" max="6" avg="1.15384615385" total="45.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="23" metric="0" ratio="0.5897" />
-                        <distribution-bar count="7" metric="1" ratio="0.1795" />
-                        <distribution-bar count="1" metric="2" ratio="0.0256" />
-                        <distribution-bar count="1" metric="3" ratio="0.0256" />
-                        <distribution-bar count="3" metric="4" ratio="0.0769" />
-                        <distribution-bar count="3" metric="5" ratio="0.0769" />
-                        <distribution-bar count="1" metric="6" ratio="0.0256" />
+                        <distribution-bar count="23" metric="0" ratio="0.589743589744" />
+                        <distribution-bar count="7" metric="1" ratio="0.179487179487" />
+                        <distribution-bar count="1" metric="2" ratio="0.025641025641" />
+                        <distribution-bar count="1" metric="3" ratio="0.025641025641" />
+                        <distribution-bar count="3" metric="4" ratio="0.0769230769231" />
+                        <distribution-bar count="3" metric="5" ratio="0.0769230769231" />
+                        <distribution-bar count="1" metric="6" ratio="0.025641025641" />
                     </distribution-bars>
                 </cyclomatic>
             </std.code.complexity>

mainline/tests/general/test_std_code_java/test_parser_view_default_stdout.gold.txt

@@ -12,12 +12,12 @@
             <std.code.complexity>
                 <cyclomatic count="119" max="6" avg="1.05882352941" total="126.0" min="0">
                     <distribution-bars>
-                        <distribution-bar count="58" metric="0" ratio="0.4874" />
-                        <distribution-bar count="31" metric="1" ratio="0.2605" />
-                        <distribution-bar count="15" metric="2" ratio="0.1261" />
-                        <distribution-bar count="8" metric="3" ratio="0.0672" />
-                        <distribution-bar count="1" metric="5" ratio="0.0084" />
-                        <distribution-bar count="6" metric="6" ratio="0.0504" />
+                        <distribution-bar count="58" metric="0" ratio="0.487394957983" />
+                        <distribution-bar count="31" metric="1" ratio="0.260504201681" />
+                        <distribution-bar count="15" metric="2" ratio="0.126050420168" />
+                        <distribution-bar count="8" metric="3" ratio="0.0672268907563" />
+                        <distribution-bar count="1" metric="5" ratio="0.00840336134454" />
+                        <distribution-bar count="6" metric="6" ratio="0.0504201680672" />
                     </distribution-bars>
                 </cyclomatic>
             </std.code.complexity>