Skip to content

Commit 8ad35ce

Browse files
mbostockmbostock
committed
Merge branch 'fix-format-round' into 3.0.6
2 parents ed71f47 + 2e24cf9 commit 8ad35ce

6 files changed

Lines changed: 36 additions & 20 deletions

File tree

‎d3.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,11 +633,11 @@ d3 = function() {
633633
return x.toFixed(p);
634634
},
635635
r: function(x, p) {
636-
return d3.round(x, p = d3_format_precision(x, p)).toFixed(Math.max(0, Math.min(20, p)));
636+
return (x = d3.round(x, d3_format_precision(x, p))).toFixed(Math.max(0, Math.min(20, d3_format_precision(x * (1 + 1e-15), p))));
637637
}
638638
});
639639
function d3_format_precision(x, p) {
640-
return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1);
640+
return p - (x ? Math.ceil(Math.log(x) / Math.LN10) : 1);
641641
}
642642
function d3_format_typeDefault(x) {
643643
return x + "";
@@ -655,7 +655,7 @@ d3 = function() {
655655
return t.reverse().join(d3_format_thousandsSeparator || "") + f;
656656
};
657657
}
658-
var d3_formatPrefixes = [ "y", "z", "a", "f", "p", "n", "μ", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y" ].map(d3_formatPrefix);
658+
var d3_formatPrefixes = [ "y", "z", "a", "f", "p", "n", "µ", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y" ].map(d3_formatPrefix);
659659
d3.formatPrefix = function(value, precision) {
660660
var i = 0;
661661
if (value) {

‎d3.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/format.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ var d3_format_types = d3.map({
9595
g: function(x, p) { return x.toPrecision(p); },
9696
e: function(x, p) { return x.toExponential(p); },
9797
f: function(x, p) { return x.toFixed(p); },
98-
r: function(x, p) { return d3.round(x, p = d3_format_precision(x, p)).toFixed(Math.max(0, Math.min(20, p))); }
98+
r: function(x, p) { return (x = d3.round(x, d3_format_precision(x, p))).toFixed(Math.max(0, Math.min(20, d3_format_precision(x * (1 + 1e-15), p)))); }
9999
});
100100

101101
function d3_format_precision(x, p) {
102-
return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1);
102+
return p - (x ? Math.ceil(Math.log(x) / Math.LN10) : 1);
103103
}
104104

105105
function d3_format_typeDefault(x) {

‎src/core/formatPrefix.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var d3_formatPrefixes = ["y","z","a","f","p","n","μ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
1+
var d3_formatPrefixes = ["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
22

33
d3.formatPrefix = function(value, precision) {
44
var i = 0;

‎test/core/format-test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ suite.addBatch({
8080
assert.strictEqual(f(1000), "1k");
8181
assert.strictEqual(f(1400), "1.4k");
8282
assert.strictEqual(f(1500.5), "1.5005k");
83-
assert.strictEqual(f(.000001), "1μ");
83+
assert.strictEqual(f(.000001), "1µ");
8484
},
8585
"can output SI prefix notation with appropriate rounding": function(format) {
8686
var f = format(".3s");
@@ -95,7 +95,7 @@ suite.addBatch({
9595
assert.strictEqual(f(145500000), "146M");
9696
assert.strictEqual(f(145999999.999999347), "146M");
9797
assert.strictEqual(f(1e26), "100Y");
98-
assert.strictEqual(f(.000001), "1.00μ");
98+
assert.strictEqual(f(.000001), "1.00µ");
9999
assert.strictEqual(f(.009995), "0.0100");
100100
var f = format(".4s");
101101
assert.strictEqual(f(999.5), "999.5");
@@ -126,7 +126,9 @@ suite.addBatch({
126126
"can round to significant digits": function(format) {
127127
assert.strictEqual(format(".2r")(0), "0.0");
128128
assert.strictEqual(format(".1r")(0.049), "0.05");
129+
assert.strictEqual(format(".1r")(-0.049), "-0.05");
129130
assert.strictEqual(format(".1r")(0.49), "0.5");
131+
assert.strictEqual(format(".1r")(-0.49), "-0.5");
130132
assert.strictEqual(format(".2r")(0.449), "0.45");
131133
assert.strictEqual(format(".3r")(0.4449), "0.445");
132134
assert.strictEqual(format(".3r")(1.00), "1.00");
@@ -139,6 +141,12 @@ suite.addBatch({
139141
assert.strictEqual(format(".4r")(123.45), "123.5");
140142
assert.strictEqual(format(".5r")(123.45), "123.45");
141143
assert.strictEqual(format(".6r")(123.45), "123.450");
144+
assert.strictEqual(format(".1r")(.9), "0.9");
145+
assert.strictEqual(format(".1r")(.09), "0.09");
146+
assert.strictEqual(format(".1r")(.949), "0.9");
147+
assert.strictEqual(format(".1r")(.0949), "0.09");
148+
assert.strictEqual(format(".10r")(.9999999999), "0.9999999999");
149+
assert.strictEqual(format(".15r")(.999999999999999), "0.999999999999999");
142150
},
143151
"can round very small numbers": function(format) {
144152
var f = format(".2r");

‎test/core/formatPrefix-test.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ suite.addBatch({
1818
assert.equal(prefix(1e-03).symbol, "m");
1919
assert.equal(prefix(1e-04).symbol, "m");
2020
assert.equal(prefix(1e-05).symbol, "m");
21-
assert.equal(prefix(1e-06).symbol, "μ");
22-
assert.equal(prefix(1e-07).symbol, "μ");
23-
assert.equal(prefix(1e-08).symbol, "μ");
21+
assert.equal(prefix(1e-06).symbol, "µ");
22+
assert.equal(prefix(1e-07).symbol, "µ");
23+
assert.equal(prefix(1e-08).symbol, "µ");
2424
assert.equal(prefix(1e-09).symbol, "n");
2525
assert.equal(prefix(1e-10).symbol, "n");
2626
assert.equal(prefix(1e-11).symbol, "n");
@@ -76,7 +76,7 @@ suite.addBatch({
7676
assert.equal(prefix(-0).symbol, "");
7777
assert.equal(prefix(-1e-00).symbol, "");
7878
assert.equal(prefix(-1e-03).symbol, "m");
79-
assert.equal(prefix(-1e-06).symbol, "μ");
79+
assert.equal(prefix(-1e-06).symbol, "µ");
8080
assert.equal(prefix(-1e-09).symbol, "n");
8181
assert.equal(prefix(-1e-12).symbol, "p");
8282
assert.equal(prefix(-1e-15).symbol, "f");
@@ -96,10 +96,18 @@ suite.addBatch({
9696
assert.equal(prefix(-1e27).symbol, "Y");
9797
},
9898
"considers the effect of rounding based on precision": function(prefix) {
99-
assert.equal(prefix(999.5, 3).symbol, "k");
100-
assert.equal(prefix(999.5, 4).symbol, "");
101-
assert.equal(prefix(.009995, 3).symbol, "");
102-
assert.equal(prefix(.009995, 4).symbol, "m");
99+
assert.equal(prefix(999.5000000, 4).symbol, "");
100+
assert.equal(prefix(999.5000000, 3).symbol, "k");
101+
assert.equal(prefix(995.0000000, 3).symbol, "");
102+
assert.equal(prefix(995.0000000, 2).symbol, "k");
103+
assert.equal(prefix(950.0000000, 2).symbol, "");
104+
assert.equal(prefix(950.0000000, 1).symbol, "k");
105+
assert.equal(prefix(0.000009995, 4).symbol, "µ");
106+
assert.equal(prefix(0.000009995, 3).symbol, "m");
107+
assert.equal(prefix(0.000009950, 3).symbol, "µ");
108+
assert.equal(prefix(0.000009950, 2).symbol, "m");
109+
assert.equal(prefix(0.000009500, 2).symbol, "µ");
110+
assert.equal(prefix(0.000009500, 1).symbol, "m");
103111
}
104112
}
105113
});

0 commit comments

Comments
 (0)