sankey: forEach -> for loops, no FX on link hover if concentrationscale

Author: antoinerg

src/traces/sankey/plot.js

@@ -72,13 +72,21 @@ function linkHoveredStyle(d, sankey, visitNodes, sankeyLink) {
 
     var label = sankeyLink.datum().link.label;
 
-    sankeyLink.style('fill-opacity', 0.4);
+    sankeyLink.style('fill-opacity', function(l) {
+        if(!l.link.concentrationscale) {
+            return 0.4;
+        }
+    });
 
     if(label) {
         ownTrace(sankey, d)
             .selectAll('.' + cn.sankeyLink)
             .filter(function(l) {return l.link.label === label;})
-            .style('fill-opacity', 0.4);
+            .style('fill-opacity', function(l) {
+                if(!l.link.concentrationscale) {
+                    return 0.4;
+                }
+            });
     }
 
     if(visitNodes) {
@@ -143,6 +151,7 @@ module.exports = function plot(gd, calcData) {
 
     var sourceLabel = _(gd, 'source:') + ' ';
     var targetLabel = _(gd, 'target:') + ' ';
+    var concentrationLabel = _(gd, 'concentration:') + ' ';
     var incomingLabel = _(gd, 'incoming flow count:') + ' ';
     var outgoingLabel = _(gd, 'outgoing flow count:') + ' ';
 
@@ -172,7 +181,8 @@ module.exports = function plot(gd, calcData) {
             text: [
                 d.link.label || '',
                 sourceLabel + d.link.source.label,
-                targetLabel + d.link.target.label
+                targetLabel + d.link.target.label,
+                d.link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(d.link.flow.labelConcentration) : ''
             ].filter(renderableValuePresent).join('<br>'),
             color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(d.tinyColorHue, 1),
             borderColor: castHoverOption(obj, 'bordercolor'),
@@ -190,7 +200,9 @@ module.exports = function plot(gd, calcData) {
             gd: gd
         });
 
-        makeTranslucent(tooltip, 0.65);
+        if(!d.link.concentrationscale) {
+            makeTranslucent(tooltip, 0.65);
+        }
         makeTextContrasty(tooltip);
     };
 

src/traces/sankey/render.js

@@ -69,53 +69,68 @@ function sankeyModel(layout, d, traceIndex) {
     }
 
     function computeLinkConcentrations() {
-        graph.nodes.forEach(function(node) {
+        var i, j, k;
+        for(i = 0; i < graph.nodes.length; i++) {
+            var node = graph.nodes[i];
             // Links connecting the same two nodes are part of a flow
             var flows = {};
-            node.targetLinks.forEach(function(link) {
-                var flowKey = link.source.pointNumber + ':' + link.target.pointNumber;
+            var flowKey;
+            var link;
+            for(j = 0; j < node.targetLinks.length; j++) {
+                link = node.targetLinks[j];
+                flowKey = link.source.pointNumber + ':' + link.target.pointNumber;
                 if(!flows.hasOwnProperty(flowKey)) flows[flowKey] = [];
                 flows[flowKey].push(link);
-            });
+            }
 
             // Compute statistics for each flow
-            Object.keys(flows).forEach(function(flowKey) {
+            var keys = Object.keys(flows);
+            for(j = 0; j < keys.length; j++) {
+                flowKey = keys[j];
                 var flowLinks = flows[flowKey];
 
                 // Find the total size of the flow and total size per label
                 var total = 0;
                 var totalPerLabel = {};
-                flowLinks.forEach(function(link) {
+                for(k = 0; k < flowLinks.length; k++) {
+                    link = flowLinks[k];
                     if(!totalPerLabel[link.label]) totalPerLabel[link.label] = 0;
                     totalPerLabel[link.label] += link.value;
                     total += link.value;
-                });
+                }
 
                 // Find the ratio of the link's value and the size of the flow
-                flowLinks.forEach(function(link) {
+                for(k = 0; k < flowLinks.length; k++) {
+                    link = flowLinks[k];
                     link.flow = {
                         value: total,
                         labelConcentration: totalPerLabel[link.label] / total,
                         concentration: link.value / total,
                         links: flowLinks
                     };
-                });
-            });
+                }
+            }
 
             // Gather statistics of all links at current node
-            var totalOutflow = sum(node.sourceLinks, function(n) {
-                return n.value;
-            });
-            node.sourceLinks.forEach(function(link) {
+            var totalOutflow = 0;
+            for(j = 0; j < node.sourceLinks.length; j++) {
+                totalOutflow += node.sourceLinks[j].value;
+            }
+            for(j = 0; j < node.sourceLinks.length; j++) {
+                link = node.sourceLinks[j];
                 link.concentrationOut = link.value / totalOutflow;
-            });
-            var totalInflow = sum(node.targetLinks, function(n) {
-                return n.value;
-            });
-            node.targetLinks.forEach(function(link) {
+            }
+
+            var totalInflow = 0;
+            for(j = 0; j < node.targetLinks.length; j++) {
+                totalInflow += node.targetLinks[j].value;
+            }
+
+            for(j = 0; j < node.targetLinks.length; j++) {
+                link = node.targetLinks[j];
                 link.concenrationIn = link.value / totalInflow;
-            });
-        });
+            }
+        }
     }
     computeLinkConcentrations();
 

test/image/baselines/sankey_link_concentration.png

@@ -8,6 +8,7 @@
                   "color": "white",
                   "width": 2
                 },
+                "color": "black",
                 "label": ["process0", "process1", "process2", "process3", "process4"]
             },
             "link": {
@@ -30,7 +31,7 @@
                     10, 5, 10, 20,
                     0, 10, 10, 10,
                     15, 5,
-                    5
+                    20
 
                 ],
                 "label": [