Finish up node community statistics

pydtn/community.py

@@ -135,6 +135,7 @@ class Community:
     def local_popularity(self, node):
         """Return local popularity of a node."""
         graph = self.graph_old
+
         if node not in graph:
             return 0
 
@@ -147,6 +148,7 @@ class Community:
     def global_popularity(self, node):
         """Return global popularity of a node."""
         graph = self.graph_old
+
         if node not in graph:
             return 0
 
@@ -159,27 +161,43 @@ class Community:
     def unique_interactions(self, node):
         """Unique interactions for a node within it's community."""
         graph = self.graph_old
+
         if node not in graph:
             return 0
+
         return len(
             other
             for other in node.community
-            if other in graph[node]
+            if graph.has_edge(node, node)
         )
 
     def community_betweenness(self, node_a, node_b):
         """Return community betweenness for 2 nodes."""
+        graph = self.graph_old
         community_a = self[node_a]
         community_b = self[node_b]
 
         if community_a == community_b:
             return float('inf')
 
+        return sum(
+            graph[a][b]['duration']
+            for a, b in product(community_a, community_b)
+            if graph.has_edge(a, b)
+        )
+
+    def nodal_contribution_factor(self, node_a, node_b):
+        """Return nodal contribution factor of node_a in node_b's community."""
         graph = self.graph_old
+        community_b = self[node_b]
+
+        if node_a not in graph or node_a in community_b:
+            return 0
+
         return sum(
-            graph[node_a][node_b]['duration']
-            for node_a, node_b in product(community_a, community_b)
-            if node_a in graph and node_b in graph[node_a]
+            graph[node_a][b]['duration']
+            for b in community_b
+            if graph.has_edge(node_a, b)
         )