Coerce quantile scale domain to numbers.

mbostock · mbostock · commit eaed66d4b6cd · 2014-10-16T21:17:40.000-07:00
Also only coerce values to numbers once in d3.{mean,median}.
diff --git a/d3.js b/d3.js
@@ -88,14 +88,17 @@
     return s;
   };
   function d3_number(x) {
-    return x != null && !isNaN(x);
+    return x === null ? NaN : +x;
+  }
+  function d3_numeric(x) {
+    return !isNaN(x);
   }
   d3.mean = function(array, f) {
     var s = 0, n = array.length, a, i = -1, j = n;
     if (arguments.length === 1) {
-      while (++i < n) if (d3_number(a = array[i])) s += +a; else --j;
+      while (++i < n) if (d3_numeric(a = d3_number(array[i]))) s += a; else --j;
     } else {
-      while (++i < n) if (d3_number(a = f.call(array, array[i], i))) s += +a; else --j;
+      while (++i < n) if (d3_numeric(a = d3_number(f.call(array, array[i], i)))) s += a; else --j;
     }
     return j ? s / j : undefined;
   };
@@ -106,9 +109,9 @@
   d3.median = function(array, f) {
     var array1 = [], n = array.length, a, i = -1;
     if (arguments.length === 1) {
-      while (++i < n) if (d3_number(a = array[i])) array1.push(+a);
+      while (++i < n) if (d3_numeric(a = d3_number(array[i]))) array1.push(a);
     } else {
-      while (++i < n) if (d3_number(a = f.call(array, array[i], i))) array1.push(+a);
+      while (++i < n) if (d3_numeric(a = d3_number(f.call(array, array[i], i)))) array1.push(a);
     }
     return array1.length ? d3.quantile(array1.sort(d3_ascending), .5) : undefined;
   };
@@ -7687,7 +7690,7 @@
     }
     scale.domain = function(x) {
       if (!arguments.length) return domain;
-      domain = x.filter(d3_number).sort(d3_ascending);
+      domain = x.map(d3_number).filter(d3_numeric).sort(d3_ascending);
       return rescale();
     };
     scale.range = function(x) {
diff --git a/d3.min.js b/d3.min.js
diff --git a/src/arrays/mean.js b/src/arrays/mean.js
@@ -7,9 +7,9 @@ d3.mean = function(array, f) {
       i = -1,
       j = n;
   if (arguments.length === 1) {
-    while (++i < n) if (d3_number(a = array[i])) s += +a; else --j;
+    while (++i < n) if (d3_numeric(a = d3_number(array[i]))) s += a; else --j;
   } else {
-    while (++i < n) if (d3_number(a = f.call(array, array[i], i))) s += +a; else --j;
+    while (++i < n) if (d3_numeric(a = d3_number(f.call(array, array[i], i)))) s += a; else --j;
   }
   return j ? s / j : undefined;
 };
diff --git a/src/arrays/median.js b/src/arrays/median.js
@@ -9,9 +9,9 @@ d3.median = function(array, f) {
       i = -1;
 
   if (arguments.length === 1) {
-    while (++i < n) if (d3_number(a = array[i])) array1.push(+a);
+    while (++i < n) if (d3_numeric(a = d3_number(array[i]))) array1.push(a);
   } else {
-    while (++i < n) if (d3_number(a = f.call(array, array[i], i))) array1.push(+a);
+    while (++i < n) if (d3_numeric(a = d3_number(f.call(array, array[i], i)))) array1.push(a);
   }
 
   return array1.length ? d3.quantile(array1.sort(d3_ascending), .5) : undefined;
diff --git a/src/math/number.js b/src/math/number.js
@@ -1,3 +1,7 @@
 function d3_number(x) {
-  return x != null && !isNaN(x);
+  return x === null ? NaN : +x;
+}
+
+function d3_numeric(x) {
+  return !isNaN(x);
 }
diff --git a/src/scale/quantile.js b/src/scale/quantile.js
@@ -25,7 +25,7 @@ function d3_scale_quantile(domain, range) {
 
   scale.domain = function(x) {
     if (!arguments.length) return domain;
-    domain = x.filter(d3_number).sort(d3_ascending);
+    domain = x.map(d3_number).filter(d3_numeric).sort(d3_ascending);
     return rescale();
   };
 
diff --git a/test/arrays/mean-test.js b/test/arrays/mean-test.js
@@ -1,6 +1,7 @@
 var vows = require("vows"),
     load = require("../load"),
-    assert = require("../assert");
+    assert = require("../assert"),
+    OneTimeNumber = require("./one-time-number");
 
 var suite = vows.describe("d3.mean");
 
@@ -29,11 +30,16 @@ suite.addBatch({
       assert.equal(mean([[1, 2, 3, 4, 5], [2, 4, 6, 8, 10]], function(d) { return mean(d); }), 4.5);
       assert.equal(mean([1, 2, 3, 4, 5], function(d, i) { return i; }), 2);
     },
-    "coerces strings to numbers": function(mean) {
+    "coerces values to numbers": function(mean) {
       assert.equal(mean(["1"]), 1);
       assert.equal(mean(["5", "1", "2", "3", "4"]), 3);
       assert.equal(mean(["20", "3"]), 11.5);
       assert.equal(mean(["3", "20"]), 11.5);
+    },
+    "coerces values exactly once": function(mean) {
+      var array = [1, new OneTimeNumber(3)];
+      assert.equal(mean(array), 2);
+      assert.equal(mean(array), 1);
     }
   }
 });
diff --git a/test/arrays/median-test.js b/test/arrays/median-test.js
@@ -1,6 +1,7 @@
 var vows = require("vows"),
     load = require("../load"),
-    assert = require("../assert");
+    assert = require("../assert"),
+    OneTimeNumber = require("./one-time-number");
 
 var suite = vows.describe("d3.median");
 
@@ -40,6 +41,11 @@ suite.addBatch({
       assert.equal(median(["3", "20"]), 11.5);
       assert.equal(median(["2", "3", "20"]), 3);
       assert.equal(median(["20", "3", "2"]), 3);
+    },
+    "coerces values exactly once": function(median) {
+      var array = [1, new OneTimeNumber(3)];
+      assert.equal(median(array), 2);
+      assert.equal(median(array), 1);
     }
   }
 });
diff --git a/test/arrays/one-time-number.js b/test/arrays/one-time-number.js
@@ -0,0 +1,11 @@
+module.exports = OneTimeNumber;
+
+function OneTimeNumber(value) {
+  this.value = value;
+}
+
+OneTimeNumber.prototype.valueOf = function() {
+  var v = this.value;
+  this.value = NaN;
+  return v;
+};
diff --git a/test/scale/quantile-test.js b/test/scale/quantile-test.js
@@ -29,6 +29,14 @@ suite.addBatch({
       var x = quantile().domain([6, 3, 7, 8, 8, 13, 20, 15, 16, 10]);
       assert.deepEqual(x.domain(), [3, 6, 7, 8, 8, 10, 13, 15, 16, 20]);
     },
+    "domain values are coerced to numbers": function(quantile) {
+      var x = quantile().domain(["6", "13", "20"]);
+      assert.deepEqual(x.domain(), [6, 13, 20]);
+    },
+    "domain values are allowed to be zero": function(quantile) {
+      var x = quantile().domain([1, 2, 0, 0, null]);
+      assert.deepEqual(x.domain(), [0, 0, 1, 2]);
+    },
     "non-numeric domain values are ignored": function(quantile) {
       var x = quantile().domain([6, 3, NaN, undefined, 7, 8, 8, 13, null, 20, 15, 16, 10, NaN]);
       assert.deepEqual(x.domain(), [3, 6, 7, 8, 8, 10, 13, 15, 16, 20]);

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
`1`	`1`	`function d3_number(x) {`
`2`		`- return x != null && !isNaN(x);`
	`2`	`+ return x === null ? NaN : +x;`
	`3`	`+}`
	`4`	`+`
	`5`	`+function d3_numeric(x) {`
	`6`	`+ return !isNaN(x);`
`3`	`7`	`}`