Skip to content

Commit

Permalink
don't flatten linear ranging until < 1e-24 (follow-up to b2433b4)
Browse files Browse the repository at this point in the history
  • Loading branch information
@leeoniya
leeoniya committed Aug 31, 2024
1 parent 91de800 commit a4edb29
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
10 changes: 5 additions & 5 deletions dist/uPlot.cjs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,15 +393,15 @@ function _rangeNum(_min, _max, cfg) {
// if (delta > 0 && delta < abs(_max) / 1e3)
// delta = 0;

// treat data as flat if delta is less than 1 billionth
// treat data as flat if delta is less than 1e-24
// or range is 11+ orders of magnitude below raw values, e.g. 99999999.99999996 - 100000000.00000004
if (delta < 1e-9 || scalarMagDelta > 10) {
if (delta < 1e-24 || scalarMagDelta > 10) {
delta = 0;

// if soft mode is 2 and all vals are flat at 0, avoid the 0.1 * 1e3 fallback
// this prevents 0,0,0 from ranging to -100,100 when softMin/softMax are -1,1
if (_min == 0 || _max == 0) {
delta = 1e-9;
delta = 1e-24;

if (softMinMode == 2 && softMin != inf)
padMin = 0;
Expand All @@ -416,12 +416,12 @@ function _rangeNum(_min, _max, cfg) {
let base = pow(10, floor(mag));

let _padMin = nonZeroDelta * (delta == 0 ? (_min == 0 ? .1 : 1) : padMin);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 9);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 24);
let _softMin = _min >= softMin && (softMinMode == 1 || softMinMode == 3 && _newMin <= softMin || softMinMode == 2 && _newMin >= softMin) ? softMin : inf;
let minLim = max(hardMin, _newMin < _softMin && _min >= _softMin ? _softMin : min(_softMin, _newMin));

let _padMax = nonZeroDelta * (delta == 0 ? (_max == 0 ? .1 : 1) : padMax);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 9);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 24);
let _softMax = _max <= softMax && (softMaxMode == 1 || softMaxMode == 3 && _newMax >= softMax || softMaxMode == 2 && _newMax <= softMax) ? softMax : -inf;
let maxLim = min(hardMax, _newMax > _softMax && _max <= _softMax ? _softMax : max(_softMax, _newMax));

Expand Down
10 changes: 5 additions & 5 deletions dist/uPlot.esm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,15 @@ function _rangeNum(_min, _max, cfg) {
// if (delta > 0 && delta < abs(_max) / 1e3)
// delta = 0;

// treat data as flat if delta is less than 1 billionth
// treat data as flat if delta is less than 1e-24
// or range is 11+ orders of magnitude below raw values, e.g. 99999999.99999996 - 100000000.00000004
if (delta < 1e-9 || scalarMagDelta > 10) {
if (delta < 1e-24 || scalarMagDelta > 10) {
delta = 0;

// if soft mode is 2 and all vals are flat at 0, avoid the 0.1 * 1e3 fallback
// this prevents 0,0,0 from ranging to -100,100 when softMin/softMax are -1,1
if (_min == 0 || _max == 0) {
delta = 1e-9;
delta = 1e-24;

if (softMinMode == 2 && softMin != inf)
padMin = 0;
Expand All @@ -414,12 +414,12 @@ function _rangeNum(_min, _max, cfg) {
let base = pow(10, floor(mag));

let _padMin = nonZeroDelta * (delta == 0 ? (_min == 0 ? .1 : 1) : padMin);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 9);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 24);
let _softMin = _min >= softMin && (softMinMode == 1 || softMinMode == 3 && _newMin <= softMin || softMinMode == 2 && _newMin >= softMin) ? softMin : inf;
let minLim = max(hardMin, _newMin < _softMin && _min >= _softMin ? _softMin : min(_softMin, _newMin));

let _padMax = nonZeroDelta * (delta == 0 ? (_max == 0 ? .1 : 1) : padMax);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 9);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 24);
let _softMax = _max <= softMax && (softMaxMode == 1 || softMaxMode == 3 && _newMax >= softMax || softMaxMode == 2 && _newMax <= softMax) ? softMax : -inf;
let maxLim = min(hardMax, _newMax > _softMax && _max <= _softMax ? _softMax : max(_softMax, _newMax));

Expand Down
10 changes: 5 additions & 5 deletions dist/uPlot.iife.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@ var uPlot = (function () {
// if (delta > 0 && delta < abs(_max) / 1e3)
// delta = 0;

// treat data as flat if delta is less than 1 billionth
// treat data as flat if delta is less than 1e-24
// or range is 11+ orders of magnitude below raw values, e.g. 99999999.99999996 - 100000000.00000004
if (delta < 1e-9 || scalarMagDelta > 10) {
if (delta < 1e-24 || scalarMagDelta > 10) {
delta = 0;

// if soft mode is 2 and all vals are flat at 0, avoid the 0.1 * 1e3 fallback
// this prevents 0,0,0 from ranging to -100,100 when softMin/softMax are -1,1
if (_min == 0 || _max == 0) {
delta = 1e-9;
delta = 1e-24;

if (softMinMode == 2 && softMin != inf)
padMin = 0;
Expand All @@ -417,12 +417,12 @@ var uPlot = (function () {
let base = pow(10, floor(mag));

let _padMin = nonZeroDelta * (delta == 0 ? (_min == 0 ? .1 : 1) : padMin);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 9);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 24);
let _softMin = _min >= softMin && (softMinMode == 1 || softMinMode == 3 && _newMin <= softMin || softMinMode == 2 && _newMin >= softMin) ? softMin : inf;
let minLim = max(hardMin, _newMin < _softMin && _min >= _softMin ? _softMin : min(_softMin, _newMin));

let _padMax = nonZeroDelta * (delta == 0 ? (_max == 0 ? .1 : 1) : padMax);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 9);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 24);
let _softMax = _max <= softMax && (softMaxMode == 1 || softMaxMode == 3 && _newMax >= softMax || softMaxMode == 2 && _newMax <= softMax) ? softMax : -inf;
let maxLim = min(hardMax, _newMax > _softMax && _max <= _softMax ? _softMax : max(_softMax, _newMax));

Expand Down
2 changes: 1 addition & 1 deletion dist/uPlot.iife.min.js
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@ function _rangeNum(_min, _max, cfg) {
// if (delta > 0 && delta < abs(_max) / 1e3)
// delta = 0;

// treat data as flat if delta is less than 1 billionth
// treat data as flat if delta is less than 1e-24
// or range is 11+ orders of magnitude below raw values, e.g. 99999999.99999996 - 100000000.00000004
if (delta < 1e-9 || scalarMagDelta > 10) {
if (delta < 1e-24 || scalarMagDelta > 10) {
delta = 0;

// if soft mode is 2 and all vals are flat at 0, avoid the 0.1 * 1e3 fallback
// this prevents 0,0,0 from ranging to -100,100 when softMin/softMax are -1,1
if (_min == 0 || _max == 0) {
delta = 1e-9;
delta = 1e-24;

if (softMinMode == 2 && softMin != inf)
padMin = 0;
Expand All @@ -242,12 +242,12 @@ function _rangeNum(_min, _max, cfg) {
let base = pow(10, floor(mag));

let _padMin = nonZeroDelta * (delta == 0 ? (_min == 0 ? .1 : 1) : padMin);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 9);
let _newMin = roundDec(incrRoundDn(_min - _padMin, base/10), 24);
let _softMin = _min >= softMin && (softMinMode == 1 || softMinMode == 3 && _newMin <= softMin || softMinMode == 2 && _newMin >= softMin) ? softMin : inf;
let minLim = max(hardMin, _newMin < _softMin && _min >= _softMin ? _softMin : min(_softMin, _newMin));

let _padMax = nonZeroDelta * (delta == 0 ? (_max == 0 ? .1 : 1) : padMax);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 9);
let _newMax = roundDec(incrRoundUp(_max + _padMax, base/10), 24);
let _softMax = _max <= softMax && (softMaxMode == 1 || softMaxMode == 3 && _newMax >= softMax || softMaxMode == 2 && _newMax <= softMax) ? softMax : -inf;
let maxLim = min(hardMax, _newMax > _softMax && _max <= _softMax ? _softMax : max(_softMax, _newMax));

Expand Down

0 comments on commit a4edb29

Please sign in to comment.