Removed NBM graph and improved dependencies graph with measurement of relative framework size and strongest coupled dependency

Author: matsoftware

swift_code_metrics/_graphics.py

@@ -1,10 +1,10 @@
 import string
 
 import matplotlib.pyplot as plt
-from math import ceil
 import os
-
+from functional import seq
 from adjustText import adjust_text
+from math import ceil
 import pygraphviz as pgv
 
 
@@ -63,12 +63,14 @@ def scattered_plot(self, title, x_label, y_label, data, bands):
 
         self.__render(plt, title)
 
-    def directed_graph(self, title, list_of_edges):
+    def directed_graph(self, title, list_of_nodes, list_of_edges):
         dir_graph = pgv.AGraph(directed=True, strict=True, rankdir='TD', name=title)
         dir_graph.node_attr['shape'] = 'rectangle'
-        dir_graph.node_attr['size'] = '10'
-        for e in list_of_edges:
-            dir_graph.add_edge(e[0], e[1], label=e[2], color=e[3], fontcolor=e[3])
+
+        seq(list_of_nodes).for_each(lambda n: dir_graph.add_node(n[0],
+                                                                 penwidth=ceil((n[1] + 1) / 2), width=(n[1] + 1)))
+        seq(list_of_edges).for_each(
+            lambda e: dir_graph.add_edge(e[0], e[1], label=e[2], penwidth=e[3], color=e[4], fontcolor=e[4]))
 
         dir_graph.layout('dot')
         try:

swift_code_metrics/_presenter.py

@@ -1,5 +1,9 @@
+from swift_code_metrics._helpers import ReportingHelpers
 from swift_code_metrics._metrics import Metrics
 from ._graphics import Graph
+from functional import seq
+from math import ceil
+
 
 class GraphPresenter:
     def __init__(self, artifacts_path):
@@ -61,33 +65,34 @@ def distance_from_main_sequence_plot(self, list_of_frameworks, x_ax_f_framework,
                                   scattered_data,
                                   bands)
 
-    def dependency_graph(self, list_of_frameworks):
+    def dependency_graph(self, list_of_frameworks, total_code, total_imports):
         """
         Renders the Frameworks dependency graph.
         """
 
-        internal_edges = list()
-        external_edges = list()
+        nodes = seq(list_of_frameworks).map(lambda fr: (fr.name, ceil(10 * fr.loc / total_code))).list()
 
-        for f in list_of_frameworks:
-            # Internal dependencies graph
-            internal_dep = Metrics.internal_dependencies(f, list_of_frameworks)
-            for ind in internal_dep:
-                internal_edges.append((ind.name, ind.dependent_framework, ind.number_of_imports, 'forestgreen'))
+        internal_edges = seq(list_of_frameworks) \
+            .flat_map(lambda fr: Metrics.internal_dependencies(fr, list_of_frameworks)) \
+            .map(lambda ind: GraphPresenter.__make_edge(ind, total_imports, 'forestgreen'))
 
-            # External dependencies graph
-            external_dep = Metrics.external_dependencies(f, list_of_frameworks)
-            for ed in external_dep:
-                external_edges.append((f.name, ed.dependent_framework, ed.number_of_imports, 'orangered'))
+        external_edges = seq(list_of_frameworks) \
+            .flat_map(lambda fr: Metrics.external_dependencies(fr, list_of_frameworks)) \
+            .map(lambda ed: GraphPresenter.__make_edge(ed, total_imports, 'orangered'))
 
-        self.__render_directed_graph('Internal dependencies graph', internal_edges)
-        self.__render_directed_graph('External dependencies graph', external_edges)
+        self.__render_directed_graph('Internal dependencies graph', nodes, internal_edges)
+        self.__render_directed_graph('External dependencies graph', nodes, external_edges)
 
         # Total
-        self.__render_directed_graph('Dependencies graph', internal_edges + external_edges)
+        self.__render_directed_graph('Dependencies graph', nodes, internal_edges + external_edges)
+
+    @staticmethod
+    def __make_edge(dep, total_imports, color):
+        return (dep.name, dep.dependent_framework, dep.number_of_imports,
+                ceil(10 * dep.number_of_imports / total_imports), color)
 
-    def __render_directed_graph(self, title, edges):
+    def __render_directed_graph(self, title, nodes, edges):
         try:
-            self.graph.directed_graph(title, edges)
+            self.graph.directed_graph(title, nodes, edges)
         except ValueError:
             print('Please ensure that you have Graphviz (https://www.graphviz.org/download) installed.')

swift_code_metrics/scm.py

@@ -10,7 +10,6 @@
 
 
 def main():
-
     CLI = ArgumentParser(description='Analyzes the code metrics of a Swift project.')
     CLI.add_argument(
         '--source',
@@ -80,7 +79,7 @@ def main():
         'N. of classes and structs': lambda fr: fr.number_of_concrete_data_structures,
         'Lines Of Code - LOC': lambda fr: fr.loc,
         'Number Of Comments - NOC': lambda fr: fr.noc,
-        'N. of methods - NBM': lambda fr: fr.number_of_methods,
+        'N. of imports - NOI': lambda fr: fr.number_of_imports
     }
 
     tests_reports_sorted_data = {
@@ -96,8 +95,10 @@ def main():
                                                      lambda fr: analyzer.instability(fr),
                                                      lambda fr: analyzer.abstractness(fr))
 
-    # Internal dependency graph
-    graph_presenter.dependency_graph(non_test_frameworks)
+    # Dependency graph
+    graph_presenter.dependency_graph(non_test_frameworks,
+                                     analyzer.report.non_test_framework_aggregate.loc,
+                                     analyzer.report.non_test_framework_aggregate.n_o_i)
 
     # Code distribution
     graph_presenter.pie_plot('Code distribution', non_test_frameworks,