From b3ebf9eec32a84ce5b8f157370a58d1ad66ef236 Mon Sep 17 00:00:00 2001 From: xiani Date: Tue, 1 Nov 2016 18:03:06 +0200 Subject: [PATCH 1/2] betweenness-centrality.js: fixed "max"(undefined) was never greater anything betweenness-centrality.js: betweennessNormalized() if max is zero - return zero closeness-centrality.js: closeness() if max is zero - return zero --- src/collection/algorithms/betweenness-centrality.js | 5 ++++- src/collection/algorithms/closeness-centrality.js | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/collection/algorithms/betweenness-centrality.js b/src/collection/algorithms/betweenness-centrality.js index 980f59fb2..a803ca23a 100644 --- a/src/collection/algorithms/betweenness-centrality.js +++ b/src/collection/algorithms/betweenness-centrality.js @@ -27,7 +27,7 @@ var elesfn = ({ var V = this.nodes(); var A = {}; var _C = {}; - var max; + var max = 0; var C = { set: function( key, val ){ _C[ key ] = val; @@ -165,6 +165,9 @@ var elesfn = ({ }, betweennessNormalized: function( node ){ + if ( max == 0 ) + return 0; + if( is.string( node ) ){ var node = cy.filter( node ).id(); } else { diff --git a/src/collection/algorithms/closeness-centrality.js b/src/collection/algorithms/closeness-centrality.js index 6aa6b5dd0..7e2f43971 100644 --- a/src/collection/algorithms/closeness-centrality.js +++ b/src/collection/algorithms/closeness-centrality.js @@ -47,6 +47,9 @@ var elesfn = ({ return { closeness: function( node ){ + if( maxCloseness == 0 ) + return 0; + if( is.string( node ) ){ // from is a selector string var node = (cy.filter( node )[0]).id(); From 27ccaa32d4700b10ba270b0ddbd2d24caa04a1c6 Mon Sep 17 00:00:00 2001 From: xiani Date: Tue, 1 Nov 2016 18:39:58 +0200 Subject: [PATCH 2/2] if max is zero - return zero --- src/collection/algorithms/degree-centrality.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/collection/algorithms/degree-centrality.js b/src/collection/algorithms/degree-centrality.js index 06186405d..e22817e7b 100644 --- a/src/collection/algorithms/degree-centrality.js +++ b/src/collection/algorithms/degree-centrality.js @@ -36,6 +36,9 @@ var elesfn = ({ return { degree: function( node ){ + if( maxDegree == 0 ) + return 0; + if( is.string( node ) ){ // from is a selector string var node = (cy.filter( node )[0]).id(); @@ -70,6 +73,9 @@ var elesfn = ({ return { indegree: function( node ){ + if ( maxIndegree == 0 ) + return 0; + if( is.string( node ) ){ // from is a selector string var node = (cy.filter( node )[0]).id(); @@ -81,6 +87,9 @@ var elesfn = ({ return indegrees[ node ] / maxIndegree; }, outdegree: function( node ){ + if ( maxOutdegree == 0 ) + return 0; + if( is.string( node ) ){ // from is a selector string var node = (cy.filter( node )[0]).id();