fix(visitor): do not undercount a class' complexity

Fixes #156.
rubik · Jan 26, 2019 · 1981e2e · 1981e2e
1 parent 4c95e0a
commit 1981e2e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/radon/tests/test_complexity_visitor.py b/radon/tests/test_complexity_visitor.py
@@ -356,7 +356,7 @@ def n(self, k):
              while self.m(k) < k:
                  k -= self.m(k ** 2 - min(self.m(j) for j in range(k ** 4)))
              return k
-     ''', (6, 4, 3)),
+     ''', (8, 4, 3)),
 
     ('''
      class B(object):
@@ -377,7 +377,7 @@ def test(self, func):
              elif a > self.ATTR ** 2:
                  yield self.__iter__()
              yield iter(a)
-     ''', (5, 1, 3)),
+     ''', (7, 1, 3)),
 ]
 
 
@@ -435,7 +435,7 @@ def inner(n):
          if a < b:
              b, a = a, inner(b)
          return a, b
-     ''', (3, 1, 2, 6)),
+     ''', (3, 1, 3, 7)),
 
     ('''
      class f(object):

diff --git a/radon/tests/test_other_metrics.py b/radon/tests/test_other_metrics.py
@@ -115,10 +115,10 @@ def m(self, j):
     # CC = 4
     # LLOC = 9
     # CM % = 38.46153846153847
-    (second_mi, 94.10928035154717, True),
+    (second_mi, 93.84027450359395, True),
 
     # CM % = 15.384615384615385
-    (second_mi, 89.11076918364455, False),
+    (second_mi, 88.84176333569131, False),
 ]
 
 

diff --git a/radon/visitors.py b/radon/visitors.py
@@ -272,7 +272,8 @@ def visit_ClassDef(self, node):
             visitor.visit(child)
             methods.extend(visitor.functions)
             body_complexity += (visitor.complexity +
-                                visitor.functions_complexity)
+                                visitor.functions_complexity +
+                                len(visitor.functions))
             visitors_max_lines.append(visitor.max_line)
             inner_classes.extend(visitor.classes)