Merge pull request #626 from brycethomas/master

Fixes calculation of clustering coefficient on graph (Issue #625)
gephi · May 20, 2012 · 00d4318 · 00d4318
2 parents 77a0699 + 16c7da7
commit 00d4318
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/StatisticsPlugin/src/org/gephi/statistics/plugin/ClusteringCoefficient.java b/StatisticsPlugin/src/org/gephi/statistics/plugin/ClusteringCoefficient.java
@@ -458,8 +458,10 @@ public void triangles(HierarchicalGraph hgraph) {
         //Results and average
         avgClusteringCoeff = 0;
         totalTriangles = 0;
+        int numNodesDegreeGreaterThanOne = 0;
         for (int v = 0; v < N; v++) {
             if (network[v].length() > 1) {
+                numNodesDegreeGreaterThanOne++;
                 double cc = triangles[v];
                 totalTriangles += triangles[v];
                 cc /= (network[v].length() * (network[v].length() - 1));
@@ -477,7 +479,7 @@ public void triangles(HierarchicalGraph hgraph) {
             }
         }
         totalTriangles /= 3;
-        avgClusteringCoeff /= N;
+        avgClusteringCoeff /= numNodesDegreeGreaterThanOne;
 
         hgraph.readUnlock();
     }
@@ -524,8 +526,6 @@ private void bruteForce(HierarchicalGraph hgraph, AttributeModel attributeModel)
     }
     nodeCC /= 2.0;
 
-
-
     if (neighborhood > 1) {
     float cc = nodeCC / (.5f * neighborhood * (neighborhood - 1));
     if (isDirected) {