Fix #1455

mbastian · mbastian · commit 99ed41cc78fe · 2016-10-23T17:46:38.000+02:00
diff --git a/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/Degree.java b/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/Degree.java
@@ -171,7 +171,7 @@ protected double calculateAverageDegree(Graph graph, boolean isDirected, boolean
             Progress.progress(progress);
         }
 
-        averageDegree /= graph.getNodeCount();
+        averageDegree /=  (isDirected ? 2.0 : 1.0) * graph.getNodeCount();
 
         return averageDegree;
     }
diff --git a/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/WeightedDegree.java b/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/WeightedDegree.java
@@ -150,7 +150,7 @@ public double calculateAverageWeightedDegree(Graph graph, boolean isDirected, bo
             Progress.progress(progress);
         }
 
-        averageWeightedDegree /= graph.getNodeCount();
+        averageWeightedDegree /= (isDirected ? 2.0 : 1.0) * graph.getNodeCount();
 
         return averageWeightedDegree;
 
diff --git a/modules/StatisticsPlugin/src/main/nbm/manifest.mf b/modules/StatisticsPlugin/src/main/nbm/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Essential-Module: true
 OpenIDE-Module-Localizing-Bundle: org/gephi/statistics/plugin/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9.1.3
+OpenIDE-Module-Specification-Version: 0.9.1.4
 OpenIDE-Module-Display-Category: Plugin
 OpenIDE-Module-Name: Statistics Plugin
diff --git a/modules/StatisticsPlugin/src/test/java/org/gephi/statistics/plugin/DegreeNGTest.java b/modules/StatisticsPlugin/src/test/java/org/gephi/statistics/plugin/DegreeNGTest.java
@@ -176,7 +176,7 @@ public void testDirectedPathGraphDegree() {
         assertEquals(inDegree1, 0);
         assertEquals(inDegree2, 1);
         assertEquals(outDegree1, 1);
-        assertEquals(avDegree, 1.0);
+        assertEquals(avDegree, 0.5);
     }
 
     @Test
@@ -194,7 +194,7 @@ public void testDirectedCyclicGraphDegree() {
         assertEquals(inDegree3, 1);
         assertEquals(degree1, 2);
         assertEquals(outDegree5, 1);
-        assertEquals(avDegree, 2.0);
+        assertEquals(avDegree, 1.0);
     }
 
     @Test
diff --git a/modules/StatisticsPlugin/src/test/java/org/gephi/statistics/plugin/WeightedDegreeNGTest.java b/modules/StatisticsPlugin/src/test/java/org/gephi/statistics/plugin/WeightedDegreeNGTest.java
@@ -181,7 +181,7 @@ public void testDirectedPathGraphDegree() {
         assertEquals(inDegree1, 0.0);
         assertEquals(inDegree2, 1.0);
         assertEquals(outDegree1, 1.0);
-        assertEquals(avDegree, 1.0);
+        assertEquals(avDegree, 0.5);
     }
 
     @Test
@@ -200,7 +200,7 @@ public void testDirectedCyclicGraphDegree() {
         assertEquals(inDegree3, 1.0);
         assertEquals(degree1, 2.0);
         assertEquals(outDegree5, 1.0);
-        assertEquals(avDegree, 2.0);
+        assertEquals(avDegree, 1.0);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ protected double calculateAverageDegree(Graph graph, boolean isDirected, boolean`
`171`	`171`	`Progress.progress(progress);`
`172`	`172`	`}`
`173`	`173`
`174`		`- averageDegree /= graph.getNodeCount();`
	`174`	`+ averageDegree /= (isDirected ? 2.0 : 1.0) * graph.getNodeCount();`
`175`	`175`
`176`	`176`	`return averageDegree;`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public double calculateAverageWeightedDegree(Graph graph, boolean isDirected, bo`
`150`	`150`	`Progress.progress(progress);`
`151`	`151`	`}`
`152`	`152`
`153`		`- averageWeightedDegree /= graph.getNodeCount();`
	`153`	`+ averageWeightedDegree /= (isDirected ? 2.0 : 1.0) * graph.getNodeCount();`
`154`	`154`
`155`	`155`	`return averageWeightedDegree;`
`156`	`156`