1
0
mirror of https://github.com/MikeMcl/decimal.js.git synced 2024-10-27 20:34:12 +00:00

Compare commits

..

47 Commits

Author SHA1 Message Date
Michael Mclaughlin
7f01abd83d v10.4.3 2022-12-04 13:02:11 +00:00
Michael M
0f148f9787
Merge pull request #211 from jon-ressio/feature/no-toStringTag
Remove toStringTag declaration for type compatibility
2022-12-04 12:56:21 +00:00
Jon Stelly
858501020d
Remove toStringTag declaration for type compatibility
- Allows Decimal to be type compatible with multiple Decimal.js imports
- Resolves: https://github.com/prisma/prisma/issues/16397
2022-11-29 22:45:58 -06:00
Michael Mclaughlin
25c4a107aa v10.4.2 2022-10-12 21:18:09 +01:00
Michael M
063e5fb7e9
#209 Correct return type 2022-10-07 18:09:07 +01:00
Michael M
65e63cedc4
#209 Correct return type 2022-10-07 18:08:28 +01:00
Michael Mclaughlin
3dcadc7351 v10.4.1 2022-09-16 23:02:17 +01:00
Michael M
d2e36c6524
#205 Add './decimal' subpath to exports 2022-09-16 22:57:34 +01:00
Michael Mclaughlin
f8b93e0bfa v10.4.0 2022-08-14 18:25:23 +01:00
Michael M
f03f8686b6
Merge pull request #201 from UPONU-GmbH/master
Fix typescript 4.7 / node16 import/type resolution
2022-08-14 18:09:19 +01:00
Michael M
61eef6711d
Merge pull request #203 from mhmdanas/preserve-license-comment--with-bundler
Preserve license comment after bundling
2022-08-02 21:14:59 +01:00
mhmdanas
1e72c7b1f8 Preserve license comment after bundling
The `/!* ... */` syntax is widely recognized by bundlers, and such
comments are preserved in the bundle, which is important for license
comments such at these ones.
2022-07-21 01:28:34 +03:00
Marcel Link
0bc3fdbdaa
Fix typescript 4.7 / node16 import/type resolution 2022-06-01 01:58:01 +02:00
Michael M
edadaf8f93
Correct typo 2022-05-23 21:42:54 +01:00
Michael M
31ebcc8250
Merge pull request #198 from dmarkow/master
Use type predicate on isDecimal
2022-04-08 17:15:43 +01:00
Dylan Markow
a699f6b256 Use type predicate on isDecimal 2022-04-08 08:38:17 -05:00
Michael Mclaughlin
1bcf067429 v10.3.1 2021-06-25 12:55:36 +01:00
Michael Mclaughlin
00d5e300d7 Remove minified. Refresh README 2021-06-25 12:46:39 +01:00
Michael Mclaughlin
220f11c498 v10.3.0 2021-06-22 19:20:14 +01:00
Michael Mclaughlin
c29c80c6e3 Support underscores as separators 2021-06-22 13:22:53 +01:00
Michael Mclaughlin
69e91fecd2 Update definitions with sum and clamp 2021-06-22 12:50:27 +01:00
Michael Mclaughlin
d102ead7af #101 Add clamp method 2021-06-22 12:15:13 +01:00
Michael Mclaughlin
ac0711318f #161 Fix Decimal instances deemed plain objects 2021-06-22 10:53:21 +01:00
Michael Mclaughlin
66a21ee9d1 #100 Add Decimal.sum method 2021-06-22 10:13:28 +01:00
Michael Mclaughlin
0e0dcaec27 #146 Symbol.for to Symbol['for'] 2021-06-21 18:31:41 +01:00
Michael Mclaughlin
04c6c6f115 #132 Fix possible infinite loop when minE is very low 2021-06-21 18:17:53 +01:00
Michael M
6e5a599fcc
Merge pull request #180 from m93a/patch-isdecimal
Make the constructor accept different instances of Decimal
2021-06-09 18:43:39 +01:00
Michal Grno
498327d8d4 Decimal(v) now works even if v is from a different instance of Decimal 2021-06-09 16:19:34 +02:00
Michael M
6545e24c24
Merge pull request #169 from 2color/patch-1
Use https in links
2021-02-16 17:26:58 +00:00
Daniel Norman
26b348f383
Use https in links 2021-02-16 13:37:43 +01:00
Michael Mclaughlin
be7d6b05ab v10.2.1 2020-09-28 22:28:15 +01:00
Michael Mclaughlin
e70384ea7e Correct sqrt initial estimate 2020-09-28 21:58:18 +01:00
Michael M
11699c1d1c
Merge pull request #149 from Mazuh/patch-2
update api docs to warn about isNegative pitfall
2020-05-26 20:39:41 +01:00
Michael M
023981df23
Merge pull request #150 from MikeMcl/revert-148-patch-1
Revert "advice about negative zeroes on README"
2020-05-26 20:39:20 +01:00
Michael M
24726f5950
Revert "advice about negative zeroes on README" 2020-05-26 20:39:05 +01:00
Michael M
b53a593401
Merge pull request #148 from Mazuh/patch-1
Advice about negative zero
2020-05-26 20:37:45 +01:00
Marcell Guilherme Costa da Silva
39991b8249
update api docs to warn about isNegative pitfall 2020-05-24 17:06:11 -03:00
Marcell Guilherme Costa da Silva
a56f15f374
advice about negative zeroes on README 2020-05-07 01:01:50 -03:00
Michael M
5a6e1384d8
Merge pull request #135 from eliottvincent/master
#134 Correct documentation examples
2019-07-25 10:40:28 +01:00
Eliott Vincent
b75e2fdc45 #134 Correct documentation examples 2019-07-25 09:31:07 +02:00
Michael Mclaughlin
30828c01a6 v10.2.0 2019-05-08 17:05:51 +01:00
Michael Mclaughlin
3f9eeb0897 #128 Accept + prefix 2019-05-08 17:05:12 +01:00
Michael Mclaughlin
f468de8e79 #128 Add tinyPow to workaround V8 Math.pow change 2019-05-08 16:16:42 +01:00
Michael M
fe487dc39e
Merge pull request #129 from zgayjjf/patch-1
docs: typo fixed
2019-05-08 15:58:12 +01:00
jeffjing
0a81a6758a
docs: typo fixed
Related to [#73](https://github.com/MikeMcl/decimal.js/pull/73/files)
2019-05-08 21:13:01 +08:00
Michael M
f0dc751067
Merge pull request #127 from harrysarson/patch-1
Check node 12 in CI
2019-04-29 23:17:42 +01:00
Harry Sarson
6c6fbe7cac
Check node 12 in CI 2019-04-29 16:42:27 +01:00
17 changed files with 588 additions and 177 deletions

View File

@ -1,6 +1,13 @@
language: node_js language: node_js
node_js: node_js:
- "node" - "node"
- "18"
- "17"
- "16"
- "15"
- "14"
- "13"
- "12"
- "11" - "11"
- "10" - "10"
- "9" - "9"

View File

@ -1,3 +1,49 @@
#### 10.4.3
* 04/12/2022
* #211 Remove `toStringTag` declaration for type compatibility.
#### 10.4.2
* 12/10/2022
* #209 Correct return type.
#### 10.4.1
* 16/09/2022
* #205 Add './decimal' subpath to *package.json* `exports`.
#### 10.4.0
* 14/08/2022
* #201 Add `exports` field to *package.json*.
* #203 Preserve license comment after bundling.
* #198 Use type predicate on `isDecimal`.
#### 10.3.1
* 25/06/2021
* Remove minified versions. Refresh *README*.
#### 10.3.0
* 22/06/2021
* Support underscores as separators.
* #101 Add `Decimal.clamp` method.
* #161 Fix Decimal instances deemed plain objects.
* #100 Add `Decimal.sum` method.
* #146 `Symbol.for` to `Symbol['for']` for IE8.
* #132 Fix possible infinite loop when `minE` is very low.
* #180 Accept Decimals of different origin.
* Update Typescript definitions.
* Update minification examples in *README*.
* Add minified versions for both *decimal.js* and *decimal.mjs*.
* Add *files* field to *package.json*, and remove build script.
#### 10.2.1
* 28/09/2020
* Correct `sqrt` initial estimate.
#### 10.2.0
* 08/05/2019
* #128 Workaround V8 `Math.pow` change.
* #93 Accept `+` prefix when parsing string values.
* #129 Fix typo.
#### 10.1.1 #### 10.1.1
* 27/02/2019 * 27/02/2019
* Check `Symbol` properly. * Check `Symbol` properly.

View File

@ -1,6 +1,6 @@
The MIT Licence. The MIT Licence.
Copyright (c) 2019 Michael Mclaughlin Copyright (c) 2022 Michael Mclaughlin
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the

149
README.md
View File

@ -2,6 +2,8 @@
An arbitrary-precision Decimal type for JavaScript. An arbitrary-precision Decimal type for JavaScript.
[![npm version](https://img.shields.io/npm/v/decimal.js.svg)](https://www.npmjs.com/package/decimal.js)
[![npm downloads](https://img.shields.io/npm/dw/decimal.js)](https://www.npmjs.com/package/decimal.js)
[![Build Status](https://travis-ci.org/MikeMcl/decimal.js.svg)](https://travis-ci.org/MikeMcl/decimal.js) [![Build Status](https://travis-ci.org/MikeMcl/decimal.js.svg)](https://travis-ci.org/MikeMcl/decimal.js)
[![CDNJS](https://img.shields.io/cdnjs/v/decimal.js.svg)](https://cdnjs.com/libraries/decimal.js) [![CDNJS](https://img.shields.io/cdnjs/v/decimal.js.svg)](https://cdnjs.com/libraries/decimal.js)
@ -16,7 +18,8 @@ An arbitrary-precision Decimal type for JavaScript.
- Faster, smaller, and perhaps easier to use than JavaScript versions of Java's BigDecimal - Faster, smaller, and perhaps easier to use than JavaScript versions of Java's BigDecimal
- No dependencies - No dependencies
- Wide platform compatibility: uses JavaScript 1.5 (ECMAScript 3) features only - Wide platform compatibility: uses JavaScript 1.5 (ECMAScript 3) features only
- Comprehensive [documentation](http://mikemcl.github.io/decimal.js/) and test set - Comprehensive [documentation](https://mikemcl.github.io/decimal.js/) and test set
- Used under the hood by [math.js](https://github.com/josdejong/mathjs)
- Includes a TypeScript declaration file: *decimal.d.ts* - Includes a TypeScript declaration file: *decimal.d.ts*
![API](https://raw.githubusercontent.com/MikeMcl/decimal.js/gh-pages/API.png) ![API](https://raw.githubusercontent.com/MikeMcl/decimal.js/gh-pages/API.png)
@ -30,51 +33,43 @@ This library also adds the trigonometric functions, among others, and supports n
which makes it a significantly larger library than *bignumber.js* and the even smaller which makes it a significantly larger library than *bignumber.js* and the even smaller
[big.js](https://github.com/MikeMcl/big.js/). [big.js](https://github.com/MikeMcl/big.js/).
For a lighter version of this library without the trigonometric functions see [decimal.js-light](https://github.com/MikeMcl/decimal.js-light/). For a lighter version of this library without the trigonometric functions see
[decimal.js-light](https://github.com/MikeMcl/decimal.js-light/).
## Load ## Load
The library is the single JavaScript file *decimal.js* (or minified, *decimal.min.js*). The library is the single JavaScript file *decimal.js* or ES module *decimal.mjs*.
Browser: Browser:
```html ```html
<script src='path/to/decimal.js'></script> <script src='path/to/decimal.js'></script>
<script type="module">
import Decimal from './path/to/decimal.mjs';
...
</script>
``` ```
[Node.js](http://nodejs.org): [Node.js](https://nodejs.org):
```bash ```bash
$ npm install --save decimal.js npm install decimal.js
``` ```
```js ```js
var Decimal = require('decimal.js'); const Decimal = require('decimal.js');
```
ES6 module (*decimal.mjs*): import Decimal from 'decimal.js';
```js
//import Decimal from 'decimal.js';
import {Decimal} from 'decimal.js'; import {Decimal} from 'decimal.js';
``` ```
AMD loader libraries such as [requireJS](http://requirejs.org/):
```js
require(['decimal'], function(Decimal) {
// Use Decimal here in local scope. No global Decimal.
});
```
## Use ## Use
*In all examples below, `var`, semicolons and `toString` calls are not shown. *In all examples below, semicolons and `toString` calls are not shown.
If a commented-out value is in quotes it means `toString` has been called on the preceding expression.* If a commented-out value is in quotes it means `toString` has been called on the preceding expression.*
The library exports a single function object, `Decimal`, the constructor of Decimal instances. The library exports a single constructor function, `Decimal`, which expects a single argument that is a number, string or Decimal instance.
It accepts a value of type number, string or Decimal.
```js ```js
x = new Decimal(123.4567) x = new Decimal(123.4567)
@ -83,7 +78,29 @@ z = new Decimal(x)
x.equals(y) && y.equals(z) && x.equals(z) // true x.equals(y) && y.equals(z) && x.equals(z) // true
``` ```
A value can also be in binary, hexadecimal or octal if the appropriate prefix is included. If using values with more than a few digits, it is recommended to pass strings rather than numbers to avoid a potential loss of precision.
```js
// Precision loss from using numeric literals with more than 15 significant digits.
new Decimal(1.0000000000000001) // '1'
new Decimal(88259496234518.57) // '88259496234518.56'
new Decimal(99999999999999999999) // '100000000000000000000'
// Precision loss from using numeric literals outside the range of Number values.
new Decimal(2e+308) // 'Infinity'
new Decimal(1e-324) // '0'
// Precision loss from the unexpected result of arithmetic with Number values.
new Decimal(0.7 + 0.1) // '0.7999999999999999'
```
As with JavaScript numbers, strings can contain underscores as separators to improve readability.
```js
x = new Decimal('2_147_483_647')
```
String values in binary, hexadecimal or octal notation are also accepted if the appropriate prefix is included.
```js ```js
x = new Decimal('0xff.f') // '255.9375' x = new Decimal('0xff.f') // '255.9375'
@ -92,15 +109,13 @@ z = x.plus(y) // '427.9375'
z.toBinary() // '0b110101011.1111' z.toBinary() // '0b110101011.1111'
z.toBinary(13) // '0b1.101010111111p+8' z.toBinary(13) // '0b1.101010111111p+8'
```
Using binary exponential notation to create a Decimal with the value of `Number.MAX_VALUE`: // Using binary exponential notation to create a Decimal with the value of `Number.MAX_VALUE`.
```js
x = new Decimal('0b1.1111111111111111111111111111111111111111111111111111p+1023') x = new Decimal('0b1.1111111111111111111111111111111111111111111111111111p+1023')
// '1.7976931348623157081e+308'
``` ```
A Decimal is immutable in the sense that it is not changed by its methods. Decimal instances are immutable in the sense that they are not changed by their methods.
```js ```js
0.3 - 0.1 // 0.19999999999999998 0.3 - 0.1 // 0.19999999999999998
@ -119,27 +134,28 @@ x.times('1.23456780123456789e+9').plus(9876.5432321).dividedBy('4444562598.11177
Many method names have a shorter alias. Many method names have a shorter alias.
```js ```js
x.squareRoot().dividedBy(y).toPower(3).equals(x.sqrt().div(y).pow(3)) // true x.squareRoot().dividedBy(y).toPower(3).equals(x.sqrt().div(y).pow(3)) // true
x.cmp(y.mod(z).neg()) == 1 && x.comparedTo(y.modulo(z).negated()) == 1 // true x.comparedTo(y.modulo(z).negated() === x.cmp(y.mod(z).neg()) // true
``` ```
Like JavaScript's Number type, there are `toExponential`, `toFixed` and `toPrecision` methods, Most of the methods of JavaScript's `Number.prototype` and `Math` objects are replicated.
```js ```js
x = new Decimal(255.5) x = new Decimal(255.5)
x.toExponential(5) // '2.55500e+2' x.toExponential(5) // '2.55500e+2'
x.toFixed(5) // '255.50000' x.toFixed(5) // '255.50000'
x.toPrecision(5) // '255.50' x.toPrecision(5) // '255.50'
```
and almost all of the methods of JavaScript's Math object are also replicated.
```js
Decimal.sqrt('6.98372465832e+9823') // '8.3568682281821340204e+4911' Decimal.sqrt('6.98372465832e+9823') // '8.3568682281821340204e+4911'
Decimal.pow(2, 0.0979843) // '1.0702770511687781839' Decimal.pow(2, 0.0979843) // '1.0702770511687781839'
// Using `toFixed()` to avoid exponential notation:
x = new Decimal('0.0000001')
x.toString() // '1e-7'
x.toFixed() // '0.0000001'
``` ```
There are `isNaN` and `isFinite` methods, as `NaN` and `Infinity` are valid `Decimal` values, And there are `isNaN` and `isFinite` methods, as `NaN` and `Infinity` are valid `Decimal` values.
```js ```js
x = new Decimal(NaN) // 'NaN' x = new Decimal(NaN) // 'NaN'
@ -147,7 +163,7 @@ y = new Decimal(Infinity) // 'Infinity'
x.isNaN() && !y.isNaN() && !x.isFinite() && !y.isFinite() // true x.isNaN() && !y.isNaN() && !x.isFinite() && !y.isFinite() // true
``` ```
and a `toFraction` method with an optional *maximum denominator* argument There is also a `toFraction` method with an optional *maximum denominator* argument.
```js ```js
z = new Decimal(355) z = new Decimal(355)
@ -156,27 +172,27 @@ pi.toFraction() // [ '7853982301', '2500000000' ]
pi.toFraction(1000) // [ '355', '113' ] pi.toFraction(1000) // [ '355', '113' ]
``` ```
All calculations are rounded according to the number of significant digits and rounding mode All calculations are rounded according to the number of significant digits and rounding mode specified
specified by the `precision` and `rounding` properties of the Decimal constructor. by the `precision` and `rounding` properties of the Decimal constructor.
For advanced usage, multiple Decimal constructors can be created, each with their own independent configuration which For advanced usage, multiple Decimal constructors can be created, each with their own independent
applies to all Decimal numbers created from it. configuration which applies to all Decimal numbers created from it.
```js ```js
// Set the precision and rounding of the default Decimal constructor // Set the precision and rounding of the default Decimal constructor
Decimal.set({ precision: 5, rounding: 4 }) Decimal.set({ precision: 5, rounding: 4 })
// Create another Decimal constructor, optionally passing in a configuration object // Create another Decimal constructor, optionally passing in a configuration object
Decimal9 = Decimal.clone({ precision: 9, rounding: 1 }) Dec = Decimal.clone({ precision: 9, rounding: 1 })
x = new Decimal(5) x = new Decimal(5)
y = new Decimal9(5) y = new Dec(5)
x.div(3) // '1.6667' x.div(3) // '1.6667'
y.div(3) // '1.66666666' y.div(3) // '1.66666666'
``` ```
The value of a Decimal is stored in a floating point format in terms of its digits, exponent and sign. The value of a Decimal is stored in a floating point format in terms of its digits, exponent and sign, but these properties should be considered read-only.
```js ```js
x = new Decimal(-12345.67); x = new Decimal(-12345.67);
@ -189,47 +205,42 @@ For further information see the [API](http://mikemcl.github.io/decimal.js/) refe
## Test ## Test
The library can be tested using Node.js or a browser. To run the tests using Node.js from the root directory:
The *test* directory contains the file *test.js* which runs all the tests when executed by Node,
and the file *test.html* which runs all the tests when opened in a browser.
To run all the tests, from a command-line at the root directory using npm
```bash ```bash
$ npm test npm test
``` ```
or at the *test* directory using Node Each separate test module can also be executed individually, for example:
```bash ```bash
$ node test node test/modules/toFraction
``` ```
Each separate test module can also be executed individually, for example, at the *test/modules* directory To run the tests in a browser, open *test/test.html*.
```bash ## Minify
$ node toFraction
```
## Build Two minification examples:
For Node, if [uglify-js](https://github.com/mishoo/UglifyJS2) is installed Using [uglify-js](https://github.com/mishoo/UglifyJS) to minify the *decimal.js* file:
```bash ```bash
npm install uglify-js -g npm install uglify-js -g
uglifyjs decimal.js --source-map url=decimal.min.js.map -c -m -o decimal.min.js
``` ```
then Using [terser](https://github.com/terser/terser) to minify the ES module version, *decimal.mjs*:
```bash ```bash
npm run build npm install terser -g
terser decimal.mjs --source-map url=decimal.min.mjs.map -c -m --toplevel -o decimal.min.mjs
``` ```
will create *decimal.min.js*, and a source map will also be added to the *doc* directory. ```js
import Decimal from './decimal.min.mjs';
```
## Licence ## Licence
MIT. [The MIT Licence (Expat).](LICENCE.md)
See *LICENCE.md*

10
decimal.d.ts vendored
View File

@ -56,7 +56,6 @@ export declare class Decimal {
readonly d: number[]; readonly d: number[];
readonly e: number; readonly e: number;
readonly s: number; readonly s: number;
private readonly name: string;
constructor(n: Decimal.Value); constructor(n: Decimal.Value);
@ -65,6 +64,9 @@ export declare class Decimal {
ceil(): Decimal; ceil(): Decimal;
clampedTo(min: Decimal.Value, max: Decimal.Value): Decimal;
clamp(min: Decimal.Value, max: Decimal.Value): Decimal;
comparedTo(n: Decimal.Value): number; comparedTo(n: Decimal.Value): number;
cmp(n: Decimal.Value): number; cmp(n: Decimal.Value): number;
@ -239,6 +241,7 @@ export declare class Decimal {
static atan2(y: Decimal.Value, x: Decimal.Value): Decimal; static atan2(y: Decimal.Value, x: Decimal.Value): Decimal;
static cbrt(n: Decimal.Value): Decimal; static cbrt(n: Decimal.Value): Decimal;
static ceil(n: Decimal.Value): Decimal; static ceil(n: Decimal.Value): Decimal;
static clamp(n: Decimal.Value, min: Decimal.Value, max: Decimal.Value): Decimal;
static clone(object?: Decimal.Config): Decimal.Constructor; static clone(object?: Decimal.Config): Decimal.Constructor;
static config(object: Decimal.Config): Decimal.Constructor; static config(object: Decimal.Config): Decimal.Constructor;
static cos(n: Decimal.Value): Decimal; static cos(n: Decimal.Value): Decimal;
@ -247,7 +250,7 @@ export declare class Decimal {
static exp(n: Decimal.Value): Decimal; static exp(n: Decimal.Value): Decimal;
static floor(n: Decimal.Value): Decimal; static floor(n: Decimal.Value): Decimal;
static hypot(...n: Decimal.Value[]): Decimal; static hypot(...n: Decimal.Value[]): Decimal;
static isDecimal(object: any): boolean static isDecimal(object: any): object is Decimal;
static ln(n: Decimal.Value): Decimal; static ln(n: Decimal.Value): Decimal;
static log(n: Decimal.Value, base?: Decimal.Value): Decimal; static log(n: Decimal.Value, base?: Decimal.Value): Decimal;
static log2(n: Decimal.Value): Decimal; static log2(n: Decimal.Value): Decimal;
@ -261,11 +264,12 @@ export declare class Decimal {
static random(significantDigits?: number): Decimal; static random(significantDigits?: number): Decimal;
static round(n: Decimal.Value): Decimal; static round(n: Decimal.Value): Decimal;
static set(object: Decimal.Config): Decimal.Constructor; static set(object: Decimal.Config): Decimal.Constructor;
static sign(n: Decimal.Value): Decimal; static sign(n: Decimal.Value): number;
static sin(n: Decimal.Value): Decimal; static sin(n: Decimal.Value): Decimal;
static sinh(n: Decimal.Value): Decimal; static sinh(n: Decimal.Value): Decimal;
static sqrt(n: Decimal.Value): Decimal; static sqrt(n: Decimal.Value): Decimal;
static sub(x: Decimal.Value, y: Decimal.Value): Decimal; static sub(x: Decimal.Value, y: Decimal.Value): Decimal;
static sum(...n: Decimal.Value[]): Decimal;
static tan(n: Decimal.Value): Decimal; static tan(n: Decimal.Value): Decimal;
static tanh(n: Decimal.Value): Decimal; static tanh(n: Decimal.Value): Decimal;
static trunc(n: Decimal.Value): Decimal; static trunc(n: Decimal.Value): Decimal;

10
decimal.global.d.ts vendored
View File

@ -77,7 +77,6 @@ export declare class Decimal {
readonly d: number[]; readonly d: number[];
readonly e: number; readonly e: number;
readonly s: number; readonly s: number;
private readonly name: string;
constructor(n: DecimalValue); constructor(n: DecimalValue);
@ -86,6 +85,9 @@ export declare class Decimal {
ceil(): Decimal; ceil(): Decimal;
clampedTo(min: Decimal.Value, max: Decimal.Value): Decimal;
clamp(min: Decimal.Value, max: Decimal.Value): Decimal;
comparedTo(n: DecimalValue): number; comparedTo(n: DecimalValue): number;
cmp(n: DecimalValue): number; cmp(n: DecimalValue): number;
@ -260,6 +262,7 @@ export declare class Decimal {
static atan2(y: DecimalValue, x: DecimalValue): Decimal; static atan2(y: DecimalValue, x: DecimalValue): Decimal;
static cbrt(n: DecimalValue): Decimal; static cbrt(n: DecimalValue): Decimal;
static ceil(n: DecimalValue): Decimal; static ceil(n: DecimalValue): Decimal;
static clamp(n: Decimal.Value, min: Decimal.Value, max: Decimal.Value): Decimal;
static clone(object?: DecimalConfig): DecimalConstructor; static clone(object?: DecimalConfig): DecimalConstructor;
static config(object: DecimalConfig): DecimalConstructor; static config(object: DecimalConfig): DecimalConstructor;
static cos(n: DecimalValue): Decimal; static cos(n: DecimalValue): Decimal;
@ -268,7 +271,7 @@ export declare class Decimal {
static exp(n: DecimalValue): Decimal; static exp(n: DecimalValue): Decimal;
static floor(n: DecimalValue): Decimal; static floor(n: DecimalValue): Decimal;
static hypot(...n: DecimalValue[]): Decimal; static hypot(...n: DecimalValue[]): Decimal;
static isDecimal(object: any): boolean static isDecimal(object: any): object is Decimal;
static ln(n: DecimalValue): Decimal; static ln(n: DecimalValue): Decimal;
static log(n: DecimalValue, base?: DecimalValue): Decimal; static log(n: DecimalValue, base?: DecimalValue): Decimal;
static log2(n: DecimalValue): Decimal; static log2(n: DecimalValue): Decimal;
@ -282,11 +285,12 @@ export declare class Decimal {
static random(significantDigits?: number): Decimal; static random(significantDigits?: number): Decimal;
static round(n: DecimalValue): Decimal; static round(n: DecimalValue): Decimal;
static set(object: DecimalConfig): DecimalConstructor; static set(object: DecimalConfig): DecimalConstructor;
static sign(n: DecimalValue): Decimal; static sign(n: DecimalValue): number;
static sin(n: DecimalValue): Decimal; static sin(n: DecimalValue): Decimal;
static sinh(n: DecimalValue): Decimal; static sinh(n: DecimalValue): Decimal;
static sqrt(n: DecimalValue): Decimal; static sqrt(n: DecimalValue): Decimal;
static sub(x: DecimalValue, y: DecimalValue): Decimal; static sub(x: DecimalValue, y: DecimalValue): Decimal;
static sum(...n: Decimal.Value[]): Decimal;
static tan(n: DecimalValue): Decimal; static tan(n: DecimalValue): Decimal;
static tanh(n: DecimalValue): Decimal; static tanh(n: DecimalValue): Decimal;
static trunc(n: DecimalValue): Decimal; static trunc(n: DecimalValue): Decimal;

View File

@ -2,11 +2,11 @@
'use strict'; 'use strict';
/* /*!
* decimal.js v10.1.1 * decimal.js v10.4.3
* An arbitrary-precision Decimal type for JavaScript. * An arbitrary-precision Decimal type for JavaScript.
* https://github.com/MikeMcl/decimal.js * https://github.com/MikeMcl/decimal.js
* Copyright (c) 2019 Michael Mclaughlin <M8ch88l@gmail.com> * Copyright (c) 2022 Michael Mclaughlin <M8ch88l@gmail.com>
* MIT Licence * MIT Licence
*/ */
@ -105,6 +105,7 @@
invalidArgument = decimalError + 'Invalid argument: ', invalidArgument = decimalError + 'Invalid argument: ',
precisionLimitExceeded = decimalError + 'Precision limit exceeded', precisionLimitExceeded = decimalError + 'Precision limit exceeded',
cryptoUnavailable = decimalError + 'crypto unavailable', cryptoUnavailable = decimalError + 'crypto unavailable',
tag = '[object Decimal]',
mathfloor = Math.floor, mathfloor = Math.floor,
mathpow = Math.pow, mathpow = Math.pow,
@ -122,7 +123,7 @@
PI_PRECISION = PI.length - 1, PI_PRECISION = PI.length - 1,
// Decimal.prototype object // Decimal.prototype object
P = { name: '[object Decimal]' }; P = { toStringTag: tag };
// Decimal prototype methods // Decimal prototype methods
@ -131,6 +132,7 @@
/* /*
* absoluteValue abs * absoluteValue abs
* ceil * ceil
* clampedTo clamp
* comparedTo cmp * comparedTo cmp
* cosine cos * cosine cos
* cubeRoot cbrt * cubeRoot cbrt
@ -212,6 +214,27 @@
}; };
/*
* Return a new Decimal whose value is the value of this Decimal clamped to the range
* delineated by `min` and `max`.
*
* min {number|string|Decimal}
* max {number|string|Decimal}
*
*/
P.clampedTo = P.clamp = function (min, max) {
var k,
x = this,
Ctor = x.constructor;
min = new Ctor(min);
max = new Ctor(max);
if (!min.s || !max.s) return new Ctor(NaN);
if (min.gt(max)) throw Error(invalidArgument + max);
k = x.cmp(min);
return k < 0 ? min : x.cmp(max) > 0 ? max : new Ctor(x);
};
/* /*
* Return * Return
* 1 if the value of this Decimal is greater than the value of `y`, * 1 if the value of this Decimal is greater than the value of `y`,
@ -317,7 +340,7 @@
external = false; external = false;
// Initial estimate. // Initial estimate.
s = x.s * Math.pow(x.s * x, 1 / 3); s = x.s * mathpow(x.s * x, 1 / 3);
// Math.cbrt underflow/overflow? // Math.cbrt underflow/overflow?
// Pass x to Math.pow as integer, then adjust the exponent of the result. // Pass x to Math.pow as integer, then adjust the exponent of the result.
@ -327,7 +350,7 @@
// Adjust n exponent so it is a multiple of 3 away from x exponent. // Adjust n exponent so it is a multiple of 3 away from x exponent.
if (s = (e - n.length + 1) % 3) n += (s == 1 || s == -2 ? '0' : '00'); if (s = (e - n.length + 1) % 3) n += (s == 1 || s == -2 ? '0' : '00');
s = Math.pow(n, 1 / 3); s = mathpow(n, 1 / 3);
// Rarely, e may be one less than the result exponent value. // Rarely, e may be one less than the result exponent value.
e = mathfloor((e + 1) / 3) - (e % 3 == (e < 0 ? -1 : 2)); e = mathfloor((e + 1) / 3) - (e % 3 == (e < 0 ? -1 : 2));
@ -546,7 +569,7 @@
// TODO? Estimation reused from cosine() and may not be optimal here. // TODO? Estimation reused from cosine() and may not be optimal here.
if (len < 32) { if (len < 32) {
k = Math.ceil(len / 3); k = Math.ceil(len / 3);
n = Math.pow(4, -k).toString(); n = (1 / tinyPow(4, k)).toString();
} else { } else {
k = 16; k = 16;
n = '2.3283064365386962890625e-10'; n = '2.3283064365386962890625e-10';
@ -626,8 +649,7 @@
k = 1.4 * Math.sqrt(len); k = 1.4 * Math.sqrt(len);
k = k > 16 ? 16 : k | 0; k = k > 16 ? 16 : k | 0;
x = x.times(Math.pow(5, -k)); x = x.times(1 / tinyPow(5, k));
x = taylorSeries(Ctor, 2, x, x, true); x = taylorSeries(Ctor, 2, x, x, true);
// Reverse argument reduction // Reverse argument reduction
@ -1729,7 +1751,7 @@
e = mathfloor((e + 1) / 2) - (e < 0 || e % 2); e = mathfloor((e + 1) / 2) - (e < 0 || e % 2);
if (s == 1 / 0) { if (s == 1 / 0) {
n = '1e' + e; n = '5e' + e;
} else { } else {
n = s.toExponential(); n = s.toExponential();
n = n.slice(0, n.indexOf('e') + 1) + e; n = n.slice(0, n.indexOf('e') + 1) + e;
@ -2446,18 +2468,6 @@
}; };
/*
// Add aliases to match BigDecimal method names.
// P.add = P.plus;
P.subtract = P.minus;
P.multiply = P.times;
P.divide = P.div;
P.remainder = P.mod;
P.compareTo = P.cmp;
P.negate = P.neg;
*/
// Helper functions for Decimal.prototype (P) and/or Decimal methods, and their callers. // Helper functions for Decimal.prototype (P) and/or Decimal methods, and their callers.
@ -2629,16 +2639,18 @@
* *
*/ */
function cosine(Ctor, x) { function cosine(Ctor, x) {
var k, y, var k, len, y;
len = x.d.length;
if (x.isZero()) return x;
// Argument reduction: cos(4x) = 8*(cos^4(x) - cos^2(x)) + 1 // Argument reduction: cos(4x) = 8*(cos^4(x) - cos^2(x)) + 1
// i.e. cos(x) = 8*(cos^4(x/4) - cos^2(x/4)) + 1 // i.e. cos(x) = 8*(cos^4(x/4) - cos^2(x/4)) + 1
// Estimate the optimum number of times to use the argument reduction. // Estimate the optimum number of times to use the argument reduction.
len = x.d.length;
if (len < 32) { if (len < 32) {
k = Math.ceil(len / 3); k = Math.ceil(len / 3);
y = Math.pow(4, -k).toString(); y = (1 / tinyPow(4, k)).toString();
} else { } else {
k = 16; k = 16;
y = '2.3283064365386962890625e-10'; y = '2.3283064365386962890625e-10';
@ -3587,7 +3599,10 @@
function parseOther(x, str) { function parseOther(x, str) {
var base, Ctor, divisor, i, isFloat, len, p, xd, xe; var base, Ctor, divisor, i, isFloat, len, p, xd, xe;
if (str === 'Infinity' || str === 'NaN') { if (str.indexOf('_') > -1) {
str = str.replace(/(\d)_(?=\d)/g, '$1');
if (isDecimal.test(str)) return parseDecimal(x, str);
} else if (str === 'Infinity' || str === 'NaN') {
if (!+str) x.s = NaN; if (!+str) x.s = NaN;
x.e = NaN; x.e = NaN;
x.d = null; x.d = null;
@ -3649,7 +3664,7 @@
if (isFloat) x = divide(x, divisor, len * 4); if (isFloat) x = divide(x, divisor, len * 4);
// Multiply by the binary exponent part if present. // Multiply by the binary exponent part if present.
if (p) x = x.times(Math.abs(p) < 54 ? Math.pow(2, p) : Decimal.pow(2, p)); if (p) x = x.times(Math.abs(p) < 54 ? mathpow(2, p) : Decimal.pow(2, p));
external = true; external = true;
return x; return x;
@ -3665,7 +3680,9 @@
var k, var k,
len = x.d.length; len = x.d.length;
if (len < 3) return taylorSeries(Ctor, 2, x, x); if (len < 3) {
return x.isZero() ? x : taylorSeries(Ctor, 2, x, x);
}
// Argument reduction: sin(5x) = 16*sin^5(x) - 20*sin^3(x) + 5*sin(x) // Argument reduction: sin(5x) = 16*sin^5(x) - 20*sin^3(x) + 5*sin(x)
// i.e. sin(x) = 16*sin^5(x/5) - 20*sin^3(x/5) + 5*sin(x/5) // i.e. sin(x) = 16*sin^5(x/5) - 20*sin^3(x/5) + 5*sin(x/5)
@ -3675,8 +3692,7 @@
k = 1.4 * Math.sqrt(len); k = 1.4 * Math.sqrt(len);
k = k > 16 ? 16 : k | 0; k = k > 16 ? 16 : k | 0;
// Max k before Math.pow precision loss is 22 x = x.times(1 / tinyPow(5, k));
x = x.times(Math.pow(5, -k));
x = taylorSeries(Ctor, 2, x, x); x = taylorSeries(Ctor, 2, x, x);
// Reverse argument reduction // Reverse argument reduction
@ -3729,6 +3745,14 @@
} }
// Exponent e must be positive and non-zero.
function tinyPow(b, e) {
var n = b;
while (--e) n *= b;
return n;
}
// Return the absolute value of `x` reduced to less than or equal to half pi. // Return the absolute value of `x` reduced to less than or equal to half pi.
function toLessThanHalfPi(Ctor, x) { function toLessThanHalfPi(Ctor, x) {
var t, var t,
@ -3924,6 +3948,7 @@
* atan2 * atan2
* cbrt * cbrt
* ceil * ceil
* clamp
* clone * clone
* config * config
* cos * cos
@ -3949,6 +3974,7 @@
* sinh * sinh
* sqrt * sqrt
* sub * sub
* sum
* tan * tan
* tanh * tanh
* trunc * trunc
@ -4142,6 +4168,19 @@
} }
/*
* Return a new Decimal whose value is `x` clamped to the range delineated by `min` and `max`.
*
* x {number|string|Decimal}
* min {number|string|Decimal}
* max {number|string|Decimal}
*
*/
function clamp(x, min, max) {
return new this(x).clamp(min, max);
}
/* /*
* Configure global settings for a Decimal constructor. * Configure global settings for a Decimal constructor.
* *
@ -4255,7 +4294,7 @@
x.constructor = Decimal; x.constructor = Decimal;
// Duplicate. // Duplicate.
if (v instanceof Decimal) { if (isDecimalInstance(v)) {
x.s = v.s; x.s = v.s;
if (external) { if (external) {
@ -4335,10 +4374,12 @@
} }
// Minus sign? // Minus sign?
if (v.charCodeAt(0) === 45) { if ((i = v.charCodeAt(0)) === 45) {
v = v.slice(1); v = v.slice(1);
x.s = -1; x.s = -1;
} else { } else {
// Plus sign?
if (i === 43) v = v.slice(1);
x.s = 1; x.s = 1;
} }
@ -4373,6 +4414,7 @@
Decimal.atan2 = atan2; Decimal.atan2 = atan2;
Decimal.cbrt = cbrt; // ES6 Decimal.cbrt = cbrt; // ES6
Decimal.ceil = ceil; Decimal.ceil = ceil;
Decimal.clamp = clamp;
Decimal.cos = cos; Decimal.cos = cos;
Decimal.cosh = cosh; // ES6 Decimal.cosh = cosh; // ES6
Decimal.div = div; Decimal.div = div;
@ -4395,6 +4437,7 @@
Decimal.sinh = sinh; // ES6 Decimal.sinh = sinh; // ES6
Decimal.sqrt = sqrt; Decimal.sqrt = sqrt;
Decimal.sub = sub; Decimal.sub = sub;
Decimal.sum = sum;
Decimal.tan = tan; Decimal.tan = tan;
Decimal.tanh = tanh; // ES6 Decimal.tanh = tanh; // ES6
Decimal.trunc = trunc; // ES6 Decimal.trunc = trunc; // ES6
@ -4455,6 +4498,8 @@
* *
* hypot(a, b, ...) = sqrt(a^2 + b^2 + ...) * hypot(a, b, ...) = sqrt(a^2 + b^2 + ...)
* *
* arguments {number|string|Decimal}
*
*/ */
function hypot() { function hypot() {
var i, n, var i, n,
@ -4487,7 +4532,7 @@
* *
*/ */
function isDecimalInstance(obj) { function isDecimalInstance(obj) {
return obj instanceof Decimal || obj && obj.name === '[object Decimal]' || false; return obj instanceof Decimal || obj && obj.toStringTag === tag || false;
} }
@ -4729,6 +4774,8 @@
* -0 if x is -0, * -0 if x is -0,
* NaN otherwise * NaN otherwise
* *
* x {number|string|Decimal}
*
*/ */
function sign(x) { function sign(x) {
x = new this(x); x = new this(x);
@ -4785,6 +4832,28 @@
} }
/*
* Return a new Decimal whose value is the sum of the arguments, rounded to `precision`
* significant digits using rounding mode `rounding`.
*
* Only the result is rounded, not the intermediate calculations.
*
* arguments {number|string|Decimal}
*
*/
function sum() {
var i = 0,
args = arguments,
x = new this(args[i]);
external = false;
for (; x.s && ++i < args.length;) x = x.plus(args[i]);
external = true;
return finalise(x, this.precision, this.rounding);
}
/* /*
* Return a new Decimal whose value is the tangent of `x`, rounded to `precision` significant * Return a new Decimal whose value is the tangent of `x`, rounded to `precision` significant
* digits using rounding mode `rounding`. * digits using rounding mode `rounding`.
@ -4822,7 +4891,7 @@
// Create and configure initial Decimal constructor. // Create and configure initial Decimal constructor.
Decimal = clone(DEFAULTS); Decimal = clone(DEFAULTS);
Decimal.prototype.constructor = Decimal;
Decimal['default'] = Decimal.Decimal = Decimal; Decimal['default'] = Decimal.Decimal = Decimal;
// Create the internal constants from their string values. // Create the internal constants from their string values.
@ -4842,7 +4911,7 @@
// Node and other environments that support module.exports. // Node and other environments that support module.exports.
} else if (typeof module != 'undefined' && module.exports) { } else if (typeof module != 'undefined' && module.exports) {
if (typeof Symbol == 'function' && typeof Symbol.iterator == 'symbol') { if (typeof Symbol == 'function' && typeof Symbol.iterator == 'symbol') {
P[Symbol.for('nodejs.util.inspect.custom')] = P.toString; P[Symbol['for']('nodejs.util.inspect.custom')] = P.toString;
P[Symbol.toStringTag] = 'Decimal'; P[Symbol.toStringTag] = 'Decimal';
} }

3
decimal.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
/* /*!
* decimal.js v10.1.1 * decimal.js v10.4.3
* An arbitrary-precision Decimal type for JavaScript. * An arbitrary-precision Decimal type for JavaScript.
* https://github.com/MikeMcl/decimal.js * https://github.com/MikeMcl/decimal.js
* Copyright (c) 2019 Michael Mclaughlin <M8ch88l@gmail.com> * Copyright (c) 2022 Michael Mclaughlin <M8ch88l@gmail.com>
* MIT Licence * MIT Licence
*/ */
@ -101,6 +101,7 @@ var EXP_LIMIT = 9e15, // 0 to 9e15
invalidArgument = decimalError + 'Invalid argument: ', invalidArgument = decimalError + 'Invalid argument: ',
precisionLimitExceeded = decimalError + 'Precision limit exceeded', precisionLimitExceeded = decimalError + 'Precision limit exceeded',
cryptoUnavailable = decimalError + 'crypto unavailable', cryptoUnavailable = decimalError + 'crypto unavailable',
tag = '[object Decimal]',
mathfloor = Math.floor, mathfloor = Math.floor,
mathpow = Math.pow, mathpow = Math.pow,
@ -118,7 +119,7 @@ var EXP_LIMIT = 9e15, // 0 to 9e15
PI_PRECISION = PI.length - 1, PI_PRECISION = PI.length - 1,
// Decimal.prototype object // Decimal.prototype object
P = { name: '[object Decimal]' }; P = { toStringTag: tag };
// Decimal prototype methods // Decimal prototype methods
@ -127,6 +128,7 @@ var EXP_LIMIT = 9e15, // 0 to 9e15
/* /*
* absoluteValue abs * absoluteValue abs
* ceil * ceil
* clampedTo clamp
* comparedTo cmp * comparedTo cmp
* cosine cos * cosine cos
* cubeRoot cbrt * cubeRoot cbrt
@ -208,6 +210,27 @@ P.ceil = function () {
}; };
/*
* Return a new Decimal whose value is the value of this Decimal clamped to the range
* delineated by `min` and `max`.
*
* min {number|string|Decimal}
* max {number|string|Decimal}
*
*/
P.clampedTo = P.clamp = function (min, max) {
var k,
x = this,
Ctor = x.constructor;
min = new Ctor(min);
max = new Ctor(max);
if (!min.s || !max.s) return new Ctor(NaN);
if (min.gt(max)) throw Error(invalidArgument + max);
k = x.cmp(min);
return k < 0 ? min : x.cmp(max) > 0 ? max : new Ctor(x);
};
/* /*
* Return * Return
* 1 if the value of this Decimal is greater than the value of `y`, * 1 if the value of this Decimal is greater than the value of `y`,
@ -313,7 +336,7 @@ P.cubeRoot = P.cbrt = function () {
external = false; external = false;
// Initial estimate. // Initial estimate.
s = x.s * Math.pow(x.s * x, 1 / 3); s = x.s * mathpow(x.s * x, 1 / 3);
// Math.cbrt underflow/overflow? // Math.cbrt underflow/overflow?
// Pass x to Math.pow as integer, then adjust the exponent of the result. // Pass x to Math.pow as integer, then adjust the exponent of the result.
@ -323,7 +346,7 @@ P.cubeRoot = P.cbrt = function () {
// Adjust n exponent so it is a multiple of 3 away from x exponent. // Adjust n exponent so it is a multiple of 3 away from x exponent.
if (s = (e - n.length + 1) % 3) n += (s == 1 || s == -2 ? '0' : '00'); if (s = (e - n.length + 1) % 3) n += (s == 1 || s == -2 ? '0' : '00');
s = Math.pow(n, 1 / 3); s = mathpow(n, 1 / 3);
// Rarely, e may be one less than the result exponent value. // Rarely, e may be one less than the result exponent value.
e = mathfloor((e + 1) / 3) - (e % 3 == (e < 0 ? -1 : 2)); e = mathfloor((e + 1) / 3) - (e % 3 == (e < 0 ? -1 : 2));
@ -542,7 +565,7 @@ P.hyperbolicCosine = P.cosh = function () {
// TODO? Estimation reused from cosine() and may not be optimal here. // TODO? Estimation reused from cosine() and may not be optimal here.
if (len < 32) { if (len < 32) {
k = Math.ceil(len / 3); k = Math.ceil(len / 3);
n = Math.pow(4, -k).toString(); n = (1 / tinyPow(4, k)).toString();
} else { } else {
k = 16; k = 16;
n = '2.3283064365386962890625e-10'; n = '2.3283064365386962890625e-10';
@ -622,8 +645,7 @@ P.hyperbolicSine = P.sinh = function () {
k = 1.4 * Math.sqrt(len); k = 1.4 * Math.sqrt(len);
k = k > 16 ? 16 : k | 0; k = k > 16 ? 16 : k | 0;
x = x.times(Math.pow(5, -k)); x = x.times(1 / tinyPow(5, k));
x = taylorSeries(Ctor, 2, x, x, true); x = taylorSeries(Ctor, 2, x, x, true);
// Reverse argument reduction // Reverse argument reduction
@ -1725,7 +1747,7 @@ P.squareRoot = P.sqrt = function () {
e = mathfloor((e + 1) / 2) - (e < 0 || e % 2); e = mathfloor((e + 1) / 2) - (e < 0 || e % 2);
if (s == 1 / 0) { if (s == 1 / 0) {
n = '1e' + e; n = '5e' + e;
} else { } else {
n = s.toExponential(); n = s.toExponential();
n = n.slice(0, n.indexOf('e') + 1) + e; n = n.slice(0, n.indexOf('e') + 1) + e;
@ -2442,18 +2464,6 @@ P.valueOf = P.toJSON = function () {
}; };
/*
// Add aliases to match BigDecimal method names.
// P.add = P.plus;
P.subtract = P.minus;
P.multiply = P.times;
P.divide = P.div;
P.remainder = P.mod;
P.compareTo = P.cmp;
P.negate = P.neg;
*/
// Helper functions for Decimal.prototype (P) and/or Decimal methods, and their callers. // Helper functions for Decimal.prototype (P) and/or Decimal methods, and their callers.
@ -2625,16 +2635,18 @@ function convertBase(str, baseIn, baseOut) {
* *
*/ */
function cosine(Ctor, x) { function cosine(Ctor, x) {
var k, y, var k, len, y;
len = x.d.length;
if (x.isZero()) return x;
// Argument reduction: cos(4x) = 8*(cos^4(x) - cos^2(x)) + 1 // Argument reduction: cos(4x) = 8*(cos^4(x) - cos^2(x)) + 1
// i.e. cos(x) = 8*(cos^4(x/4) - cos^2(x/4)) + 1 // i.e. cos(x) = 8*(cos^4(x/4) - cos^2(x/4)) + 1
// Estimate the optimum number of times to use the argument reduction. // Estimate the optimum number of times to use the argument reduction.
len = x.d.length;
if (len < 32) { if (len < 32) {
k = Math.ceil(len / 3); k = Math.ceil(len / 3);
y = Math.pow(4, -k).toString(); y = (1 / tinyPow(4, k)).toString();
} else { } else {
k = 16; k = 16;
y = '2.3283064365386962890625e-10'; y = '2.3283064365386962890625e-10';
@ -3583,7 +3595,10 @@ function parseDecimal(x, str) {
function parseOther(x, str) { function parseOther(x, str) {
var base, Ctor, divisor, i, isFloat, len, p, xd, xe; var base, Ctor, divisor, i, isFloat, len, p, xd, xe;
if (str === 'Infinity' || str === 'NaN') { if (str.indexOf('_') > -1) {
str = str.replace(/(\d)_(?=\d)/g, '$1');
if (isDecimal.test(str)) return parseDecimal(x, str);
} else if (str === 'Infinity' || str === 'NaN') {
if (!+str) x.s = NaN; if (!+str) x.s = NaN;
x.e = NaN; x.e = NaN;
x.d = null; x.d = null;
@ -3645,7 +3660,7 @@ function parseOther(x, str) {
if (isFloat) x = divide(x, divisor, len * 4); if (isFloat) x = divide(x, divisor, len * 4);
// Multiply by the binary exponent part if present. // Multiply by the binary exponent part if present.
if (p) x = x.times(Math.abs(p) < 54 ? Math.pow(2, p) : Decimal.pow(2, p)); if (p) x = x.times(Math.abs(p) < 54 ? mathpow(2, p) : Decimal.pow(2, p));
external = true; external = true;
return x; return x;
@ -3661,7 +3676,9 @@ function sine(Ctor, x) {
var k, var k,
len = x.d.length; len = x.d.length;
if (len < 3) return taylorSeries(Ctor, 2, x, x); if (len < 3) {
return x.isZero() ? x : taylorSeries(Ctor, 2, x, x);
}
// Argument reduction: sin(5x) = 16*sin^5(x) - 20*sin^3(x) + 5*sin(x) // Argument reduction: sin(5x) = 16*sin^5(x) - 20*sin^3(x) + 5*sin(x)
// i.e. sin(x) = 16*sin^5(x/5) - 20*sin^3(x/5) + 5*sin(x/5) // i.e. sin(x) = 16*sin^5(x/5) - 20*sin^3(x/5) + 5*sin(x/5)
@ -3671,8 +3688,7 @@ function sine(Ctor, x) {
k = 1.4 * Math.sqrt(len); k = 1.4 * Math.sqrt(len);
k = k > 16 ? 16 : k | 0; k = k > 16 ? 16 : k | 0;
// Max k before Math.pow precision loss is 22 x = x.times(1 / tinyPow(5, k));
x = x.times(Math.pow(5, -k));
x = taylorSeries(Ctor, 2, x, x); x = taylorSeries(Ctor, 2, x, x);
// Reverse argument reduction // Reverse argument reduction
@ -3725,6 +3741,14 @@ function taylorSeries(Ctor, n, x, y, isHyperbolic) {
} }
// Exponent e must be positive and non-zero.
function tinyPow(b, e) {
var n = b;
while (--e) n *= b;
return n;
}
// Return the absolute value of `x` reduced to less than or equal to half pi. // Return the absolute value of `x` reduced to less than or equal to half pi.
function toLessThanHalfPi(Ctor, x) { function toLessThanHalfPi(Ctor, x) {
var t, var t,
@ -3920,6 +3944,7 @@ function truncate(arr, len) {
* atan2 * atan2
* cbrt * cbrt
* ceil * ceil
* clamp
* clone * clone
* config * config
* cos * cos
@ -3945,6 +3970,7 @@ function truncate(arr, len) {
* sinh * sinh
* sqrt * sqrt
* sub * sub
* sum
* tan * tan
* tanh * tanh
* trunc * trunc
@ -4138,6 +4164,19 @@ function ceil(x) {
} }
/*
* Return a new Decimal whose value is `x` clamped to the range delineated by `min` and `max`.
*
* x {number|string|Decimal}
* min {number|string|Decimal}
* max {number|string|Decimal}
*
*/
function clamp(x, min, max) {
return new this(x).clamp(min, max);
}
/* /*
* Configure global settings for a Decimal constructor. * Configure global settings for a Decimal constructor.
* *
@ -4251,7 +4290,7 @@ function clone(obj) {
x.constructor = Decimal; x.constructor = Decimal;
// Duplicate. // Duplicate.
if (v instanceof Decimal) { if (isDecimalInstance(v)) {
x.s = v.s; x.s = v.s;
if (external) { if (external) {
@ -4331,10 +4370,12 @@ function clone(obj) {
} }
// Minus sign? // Minus sign?
if (v.charCodeAt(0) === 45) { if ((i = v.charCodeAt(0)) === 45) {
v = v.slice(1); v = v.slice(1);
x.s = -1; x.s = -1;
} else { } else {
// Plus sign?
if (i === 43) v = v.slice(1);
x.s = 1; x.s = 1;
} }
@ -4369,6 +4410,7 @@ function clone(obj) {
Decimal.atan2 = atan2; Decimal.atan2 = atan2;
Decimal.cbrt = cbrt; // ES6 Decimal.cbrt = cbrt; // ES6
Decimal.ceil = ceil; Decimal.ceil = ceil;
Decimal.clamp = clamp;
Decimal.cos = cos; Decimal.cos = cos;
Decimal.cosh = cosh; // ES6 Decimal.cosh = cosh; // ES6
Decimal.div = div; Decimal.div = div;
@ -4391,6 +4433,7 @@ function clone(obj) {
Decimal.sinh = sinh; // ES6 Decimal.sinh = sinh; // ES6
Decimal.sqrt = sqrt; Decimal.sqrt = sqrt;
Decimal.sub = sub; Decimal.sub = sub;
Decimal.sum = sum;
Decimal.tan = tan; Decimal.tan = tan;
Decimal.tanh = tanh; // ES6 Decimal.tanh = tanh; // ES6
Decimal.trunc = trunc; // ES6 Decimal.trunc = trunc; // ES6
@ -4451,6 +4494,8 @@ function floor(x) {
* *
* hypot(a, b, ...) = sqrt(a^2 + b^2 + ...) * hypot(a, b, ...) = sqrt(a^2 + b^2 + ...)
* *
* arguments {number|string|Decimal}
*
*/ */
function hypot() { function hypot() {
var i, n, var i, n,
@ -4483,7 +4528,7 @@ function hypot() {
* *
*/ */
function isDecimalInstance(obj) { function isDecimalInstance(obj) {
return obj instanceof Decimal || obj && obj.name === '[object Decimal]' || false; return obj instanceof Decimal || obj && obj.toStringTag === tag || false;
} }
@ -4725,6 +4770,8 @@ function round(x) {
* -0 if x is -0, * -0 if x is -0,
* NaN otherwise * NaN otherwise
* *
* x {number|string|Decimal}
*
*/ */
function sign(x) { function sign(x) {
x = new this(x); x = new this(x);
@ -4781,6 +4828,28 @@ function sub(x, y) {
} }
/*
* Return a new Decimal whose value is the sum of the arguments, rounded to `precision`
* significant digits using rounding mode `rounding`.
*
* Only the result is rounded, not the intermediate calculations.
*
* arguments {number|string|Decimal}
*
*/
function sum() {
var i = 0,
args = arguments,
x = new this(args[i]);
external = false;
for (; x.s && ++i < args.length;) x = x.plus(args[i]);
external = true;
return finalise(x, this.precision, this.rounding);
}
/* /*
* Return a new Decimal whose value is the tangent of `x`, rounded to `precision` significant * Return a new Decimal whose value is the tangent of `x`, rounded to `precision` significant
* digits using rounding mode `rounding`. * digits using rounding mode `rounding`.
@ -4820,7 +4889,7 @@ P[Symbol.for('nodejs.util.inspect.custom')] = P.toString;
P[Symbol.toStringTag] = 'Decimal'; P[Symbol.toStringTag] = 'Decimal';
// Create and configure initial Decimal constructor. // Create and configure initial Decimal constructor.
export var Decimal = clone(DEFAULTS); export var Decimal = P.constructor = clone(DEFAULTS);
// Create the internal constants from their string values. // Create the internal constants from their string values.
LN10 = new Decimal(LN10); LN10 = new Decimal(LN10);

View File

@ -76,6 +76,7 @@ li span{float:right;margin-right:10px;color:#c0c0c0}
<li><a href="#Datan2" >atan2</a></li> <li><a href="#Datan2" >atan2</a></li>
<li><a href="#Dcbrt" >cbrt</a></li> <li><a href="#Dcbrt" >cbrt</a></li>
<li><a href="#Dceil" >ceil</a></li> <li><a href="#Dceil" >ceil</a></li>
<li><a href="#Dclamp" >clamp</a></li>
<li><a href="#Dclone" >clone</a></li> <li><a href="#Dclone" >clone</a></li>
<li><a href="#Dcos" >cos</a></li> <li><a href="#Dcos" >cos</a></li>
<li><a href="#Dcosh" >cosh</a></li> <li><a href="#Dcosh" >cosh</a></li>
@ -102,6 +103,7 @@ li span{float:right;margin-right:10px;color:#c0c0c0}
<li><a href="#Dsinh" >sinh</a></li> <li><a href="#Dsinh" >sinh</a></li>
<li><a href="#Dsqrt" >sqrt</a></li> <li><a href="#Dsqrt" >sqrt</a></li>
<li><a href="#Dsub" >sub</a></li> <li><a href="#Dsub" >sub</a></li>
<li><a href="#Dsum" >sum</a></li>
<li><a href="#Dtan" >tan</a></li> <li><a href="#Dtan" >tan</a></li>
<li><a href="#Dtanh" >tanh</a></li> <li><a href="#Dtanh" >tanh</a></li>
<li><a href="#Dtrunc" >trunc</a></li> <li><a href="#Dtrunc" >trunc</a></li>
@ -137,6 +139,7 @@ li span{float:right;margin-right:10px;color:#c0c0c0}
<li><a href="#abs" >absoluteValue </a><span>abs</span> </li> <li><a href="#abs" >absoluteValue </a><span>abs</span> </li>
<li><a href="#ceil" >ceil </a> </li> <li><a href="#ceil" >ceil </a> </li>
<li><a href="#cmp" >comparedTo </a><span>cmp</span> </li> <li><a href="#cmp" >comparedTo </a><span>cmp</span> </li>
<li><a href="#clamp" >clampedTo </a><span>clamp</span> </li>
<li><a href="#cos" >cosine </a><span>cos</span> </li> <li><a href="#cos" >cosine </a><span>cos</span> </li>
<li><a href="#cbrt" >cubeRoot </a><span>cbrt</span> </li> <li><a href="#cbrt" >cubeRoot </a><span>cbrt</span> </li>
<li><a href="#dp" >decimalPlaces </a><span>dp</span> </li> <li><a href="#dp" >decimalPlaces </a><span>dp</span> </li>
@ -298,6 +301,7 @@ new Decimal('0xff.8') // '255.5'
new Decimal(0.046875) // '0.046875' new Decimal(0.046875) // '0.046875'
new Decimal('0.046875000000') // '0.046875' new Decimal('0.046875000000') // '0.046875'
new Decimal('0.046_875_000_000') // '0.046875'
new Decimal(4.6875e-2) // '0.046875' new Decimal(4.6875e-2) // '0.046875'
new Decimal('468.75e-4') // '0.046875' new Decimal('468.75e-4') // '0.046875'
@ -436,6 +440,16 @@ a.equals(b) // true</pre>
<h5 id="Dclamp">clamp<code class='inset'>.clamp(min, max) <i>&rArr; Decimal</i></code></h5>
<p>
<code>min</code>: <i>number|string|Decimal</i><br />
<code>max</code>: <i>number|string|Decimal</i>
</p>
<p>See <code><a href='#clamp'>clampedTo</a></code>.</p>
<pre>Decimal.clamp(10.1, 0, 10) // '10'</pre>
<h5 id="Dclone"> <h5 id="Dclone">
clone clone
<code class='inset'>.clone([object]) <i>&rArr; Decimal constructor</i></code> <code class='inset'>.clone([object]) <i>&rArr; Decimal constructor</i></code>
@ -601,7 +615,7 @@ a.equals(b) // true</pre>
<h5 id="Dmax"> <h5 id="Dmax">
max<code class='inset'>.max([x [, y, ...]]) <i>&rArr; Decimal</i></code> max<code class='inset'>.max(x [, y, ...]) <i>&rArr; Decimal</i></code>
</h5> </h5>
<p> <p>
<code>x</code>: <i>number|string|Decimal</i><br /> <code>x</code>: <i>number|string|Decimal</i><br />
@ -613,7 +627,7 @@ a.equals(b) // true</pre>
<h5 id="Dmin"> <h5 id="Dmin">
min<code class='inset'>.min([x [, y, ...]]) <i>&rArr; Decimal</i></code> min<code class='inset'>.min(x [, y, ...]) <i>&rArr; Decimal</i></code>
</h5> </h5>
<p> <p>
<code>x</code>: <i>number|string|Decimal</i><br /> <code>x</code>: <i>number|string|Decimal</i><br />
@ -833,7 +847,7 @@ a.equals(b) // true</pre>
<h5 id="Dsub">sub<code class='inset'>.sub(x, y) <i>&rArr; Decimal</i></code></h5> <h5 id="Dsub">sub<code class='inset'>.sub(x, y) <i>&rArr; Decimal</i></code></h5>
<p> <p>
<code>x</code>: <i>number|string|Decimal</i><br /> <code>x</code>: <i>number|string|Decimal</i><br />
<code>y</code>: <i>number|string|Decimal</i> <code>y</code>: <i>number|string|Decimal</i>
@ -845,7 +859,26 @@ a.equals(b) // true</pre>
<h5 id="Dtan">tan<code class='inset'>.tan(x) <i>&rArr; Decimal</i></code></h5> <h5 id="Dsum">sum<code class='inset'>.sum(x [, y, ...]) <i>&rArr; Decimal</i></code></h5>
<p>
<code>x</code>: <i>number|string|Decimal</i><br />
<code>y</code>: <i>number|string|Decimal</i>
</p>
<p>
Returns a new Decimal whose value is the sum of the <code>arguments</code>,
rounded to <a href='#precision'><code>precision</code></a> significant digits using
rounding mode <a href='#rounding'><code>rounding</code></a>.<br />
Only the result is rounded, not the intermediate summations.
</p>
<pre>
x = 5
y = '16'
z = new Decimal(-11)
Decimal.sum(x, y, z) // '10'</pre>
<h5 id="Dtan">tan<code class='inset'>.tan(x) <i>&rArr; Decimal</i></code></h5>
<p><code>x</code>: <i>number|string|Decimal</i></p> <p><code>x</code>: <i>number|string|Decimal</i></p>
<p>See <code><a href='#tan'>tangent</a></code>.</p> <p>See <code><a href='#tan'>tangent</a></code>.</p>
<pre>a = Decimal.tan(x) <pre>a = Decimal.tan(x)
@ -910,8 +943,11 @@ Decimal.precision = 0
All functions which return a Decimal will round the return value to <code>precision</code> All functions which return a Decimal will round the return value to <code>precision</code>
significant digits except <a href='#decimal'><code>Decimal</code></a>, significant digits except <a href='#decimal'><code>Decimal</code></a>,
<a href='#abs'><code>absoluteValue</code></a>, <a href='#abs'><code>absoluteValue</code></a>,
<a href='#ceil'><code>ceil</code></a>, <a href='#floor'><code>floor</code></a>, <a href='#ceil'><code>ceil</code></a>,
<a href='#neg'><code>negated</code></a>, <a href='#round'><code>round</code></a>, <a href='#clamp'><code>clampedTo</code></a>,
<a href='#floor'><code>floor</code></a>,
<a href='#neg'><code>negated</code></a>,
<a href='#round'><code>round</code></a>,
<a href='#toDP'><code>toDecimalPlaces</code></a>, <a href='#toDP'><code>toDecimalPlaces</code></a>,
<a href='#toNearest'><code>toNearest</code></a> and <a href='#toNearest'><code>toNearest</code></a> and
<a href='#trunc'><code>truncated</code></a>. <a href='#trunc'><code>truncated</code></a>.
@ -973,7 +1009,7 @@ new Decimal('1e-500') // '1e-500'
new Decimal('9.9e-501') // '0' new Decimal('9.9e-501') // '0'
Decimal.set({ minE: -3 }) Decimal.set({ minE: -3 })
new Decimal(0.001) // '0.01' e is -3 new Decimal(0.001) // '0.001' e is -3
new Decimal(0.0001) // '0' e is -4</pre> new Decimal(0.0001) // '0' e is -4</pre>
<p> <p>
The smallest possible magnitude of a non-zero Decimal is <code>1e-9000000000000000</code> The smallest possible magnitude of a non-zero Decimal is <code>1e-9000000000000000</code>
@ -1244,6 +1280,28 @@ y.ceil() // '-1'</pre>
<h5 id="clamp">clampedTo<code class='inset'>.clamp(min, max) <i>&rArr; Decimal</i></code></h5>
<p>
<code>min</code>: <i>number|string|Decimal</i><br />
<code>max</code>: <i>number|string|Decimal</i>
</p>
<p>
Returns a new Decimal whose value is the value of this Decimal clamped to the range
delineated by <code>min</code> and <code>max</code>.
</p>
<p>
The return value is not affected by the value of the
<a href='#precision'><code>precision</code></a> setting.
</p>
<pre>
x = new Decimal(5)
min = new Decimal(100)
max = new Decimal(Infinity)
x.clampedTo(min, max) // '100'
x.clamp(-10, -0.1) // '-0.1'</pre>
<h5 id="cmp">comparedTo<code class='inset'>.cmp(x) <i>&rArr; number</i></code></h5> <h5 id="cmp">comparedTo<code class='inset'>.cmp(x) <i>&rArr; number</i></code></h5>
<p><code>x</code>: <i>number|string|Decimal</i></p> <p><code>x</code>: <i>number|string|Decimal</i></p>
<table> <table>
@ -1613,10 +1671,6 @@ x = new Decimal(1)
x.isFinite() // true x.isFinite() // true
y = new Decimal(Infinity) y = new Decimal(Infinity)
y.isFinite() // false</pre> y.isFinite() // false</pre>
<p>
Note: The native method <code>isFinite()</code> can be used if
<code>n &lt;= Number.MAX_VALUE</code>.
</p>
@ -1643,7 +1697,6 @@ x = new Decimal(NaN)
x.isNaN() // true x.isNaN() // true
y = new Decimal('Infinity') y = new Decimal('Infinity')
y.isNaN() // false</pre> y.isNaN() // false</pre>
<p>Note: The native method <code>isNaN()</code> can also be used.</p>
@ -1657,7 +1710,14 @@ x = new Decimal(-0)
x.isNegative() // true x.isNegative() // true
y = new Decimal(2) y = new Decimal(2)
y.isNeg // false</pre> y.isNeg // false</pre>
<p>Note: <code>n &lt; 0</code> can be used if <code>n &lt;= -Number.MIN_VALUE</code>.</p> <p>Note that zero is signed.</p>
<pre>
new Decimal(0).valueOf() // '0'
new Decimal(0).isNegative() // false
new Decimal(0).negated().valueOf() // '-0'
new Decimal(0).negated().isNegative() // true
new Decimal(-0).isNegative() // true
</pre>
@ -1671,7 +1731,6 @@ x = new Decimal(0)
x.isPositive() // true x.isPositive() // true
y = new Decimal(-2) y = new Decimal(-2)
y.isPos // false</pre> y.isPos // false</pre>
<p>Note: <code>n &lt; 0</code> can be used if <code>n &lt;= -Number.MIN_VALUE</code>.</p>
@ -1685,7 +1744,6 @@ x = new Decimal(-0)
x.isZero() && x.isNeg() // true x.isZero() && x.isNeg() // true
y = new Decimal(Infinity) y = new Decimal(Infinity)
y.isZero() // false</pre> y.isZero() // false</pre>
<p>Note: <code>n == 0</code> can be used if <code>n &gt;= Number.MIN_VALUE</code>.</p>
@ -2050,7 +2108,7 @@ x.toBinary(1) // '0b1p+8'</pre>
<pre> <pre>
x = new Decimal(12.34567) x = new Decimal(12.34567)
x.toDecimalPlaces(0) // '12' x.toDecimalPlaces(0) // '12'
x.toDecimalPlaces(1, Decimal.ROUND_UP) // '12.3' x.toDecimalPlaces(1, Decimal.ROUND_UP) // '12.4'
y = new Decimal(9876.54321) y = new Decimal(9876.54321)
y.toDP(3) // '9876.543' y.toDP(3) // '9876.543'
@ -2388,8 +2446,8 @@ x.toPrecision() // '45.6'
y.toPrecision() // '45.6' y.toPrecision() // '45.6'
x.toPrecision(1) // '5e+1' x.toPrecision(1) // '5e+1'
y.toPrecision(1) // '5e+1' y.toPrecision(1) // '5e+1'
y.toPrecision(2, Decimal.ROUND_UP) // '4.6e+1' y.toPrecision(2, Decimal.ROUND_UP) // '46'
y.toPrecision(2, Decimal.DOWN) // '4.5e+1' y.toPrecision(2, Decimal.ROUND_DOWN) // '45'
x.toPrecision(5) // '45.600' x.toPrecision(5) // '45.600'
y.toPrecision(5) // '45.600'</pre> y.toPrecision(5) // '45.600'</pre>

View File

@ -1,7 +1,7 @@
{ {
"name": "decimal.js", "name": "decimal.js",
"description": "An arbitrary-precision Decimal type for JavaScript.", "description": "An arbitrary-precision Decimal type for JavaScript.",
"version": "10.1.1", "version": "10.4.3",
"keywords": [ "keywords": [
"arbitrary", "arbitrary",
"precision", "precision",
@ -23,14 +23,33 @@
"main": "decimal", "main": "decimal",
"module": "decimal.mjs", "module": "decimal.mjs",
"browser": "decimal.js", "browser": "decimal.js",
"exports": {
".": {
"types": "./decimal.d.ts",
"import": "./decimal.mjs",
"require": "./decimal.js"
},
"./decimal.mjs": "./decimal.mjs",
"./decimal.js": "./decimal.js",
"./package.json": "./package.json",
"./decimal": {
"types": "./decimal.d.ts",
"import": "./decimal.mjs",
"require": "./decimal.js"
}
},
"author": { "author": {
"name": "Michael Mclaughlin", "name": "Michael Mclaughlin",
"email": "M8ch88l@gmail.com" "email": "M8ch88l@gmail.com"
}, },
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"test": "node ./test/test.js", "test": "node ./test/test.js"
"build": "uglifyjs decimal.js --source-map url=decimal.min.js.map -c -m -o decimal.min.js"
}, },
"types": "decimal.d.ts" "types": "decimal.d.ts",
"files": [
"decimal.js",
"decimal.mjs",
"decimal.d.ts"
]
} }

View File

@ -124,6 +124,7 @@ T('Decimal', function () {
t('0', '0b0'); t('0', '0b0');
t('0', '0B0'); t('0', '0B0');
t('-5', '-0b101'); t('-5', '-0b101');
t('5', '+0b101');
t('1.5', '0b1.1'); t('1.5', '0b1.1');
t('-1.5', '-0b1.1'); t('-1.5', '-0b1.1');
@ -139,6 +140,7 @@ T('Decimal', function () {
// Octal. // Octal.
t('8', '0o10'); t('8', '0o10');
t('-8.5', '-0O010.4'); t('-8.5', '-0O010.4');
t('8.5', '+0O010.4');
t('-262144.000000059604644775390625', '-0o1000000.00000001'); t('-262144.000000059604644775390625', '-0o1000000.00000001');
t('572315667420.390625', '0o10250053005734.31'); t('572315667420.390625', '0o10250053005734.31');
@ -146,6 +148,7 @@ T('Decimal', function () {
t('1', '0x00001'); t('1', '0x00001');
t('255', '0xff'); t('255', '0xff');
t('-15.5', '-0Xf.8'); t('-15.5', '-0Xf.8');
t('15.5', '+0Xf.8');
t('-16777216.00000000023283064365386962890625', '-0x1000000.00000001'); t('-16777216.00000000023283064365386962890625', '-0x1000000.00000001');
t('325927753012307620476767402981591827744994693483231017778102969592507', '0xc16de7aa5bf90c3755ef4dea45e982b351b6e00cd25a82dcfe0646abb'); t('325927753012307620476767402981591827744994693483231017778102969592507', '0xc16de7aa5bf90c3755ef4dea45e982b351b6e00cd25a82dcfe0646abb');
@ -156,14 +159,18 @@ T('Decimal', function () {
} }
t('NaN', NaN); t('NaN', NaN);
t('NaN', -NaN);
t('NaN', 'NaN'); t('NaN', 'NaN');
t('NaN', '-NaN'); t('NaN', '-NaN');
t('NaN', '+NaN');
tx(function () {new Decimal(' NaN')}, "' NaN'"); tx(function () {new Decimal(' NaN')}, "' NaN'");
tx(function () {new Decimal('NaN ')}, "'NaN '"); tx(function () {new Decimal('NaN ')}, "'NaN '");
tx(function () {new Decimal(' NaN ')}, "' NaN '"); tx(function () {new Decimal(' NaN ')}, "' NaN '");
tx(function () {new Decimal('+NaN')}, "'+NaN'"); tx(function () {new Decimal(' -NaN')}, "' -NaN'");
tx(function () {new Decimal(' +NaN')}, "' +NaN'"); tx(function () {new Decimal(' +NaN')}, "' +NaN'");
tx(function () {new Decimal('-NaN ')}, "'-NaN '");
tx(function () {new Decimal('+NaN ')}, "'+NaN '");
tx(function () {new Decimal('.NaN')}, "'.NaN'"); tx(function () {new Decimal('.NaN')}, "'.NaN'");
tx(function () {new Decimal('NaN.')}, "'NaN.'"); tx(function () {new Decimal('NaN.')}, "'NaN.'");
@ -171,11 +178,12 @@ T('Decimal', function () {
t('-Infinity', -Infinity); t('-Infinity', -Infinity);
t('Infinity', 'Infinity'); t('Infinity', 'Infinity');
t('-Infinity', '-Infinity'); t('-Infinity', '-Infinity');
t('Infinity', '+Infinity');
tx(function () {new Decimal(' Infinity')}, "' Infinity '"); tx(function () {new Decimal(' Infinity')}, "' Infinity '");
tx(function () {new Decimal('Infinity ')}, "'Infinity '"); tx(function () {new Decimal('Infinity ')}, "'Infinity '");
tx(function () {new Decimal(' Infinity ')}, "' Infinity '"); tx(function () {new Decimal(' Infinity ')}, "' Infinity '");
tx(function () {new Decimal('+Infinity')}, "'+Infinity'"); tx(function () {new Decimal(' -Infinity')}, "' -Infinity'");
tx(function () {new Decimal(' +Infinity')}, "' +Infinity'"); tx(function () {new Decimal(' +Infinity')}, "' +Infinity'");
tx(function () {new Decimal('.Infinity')}, "'.Infinity'"); tx(function () {new Decimal('.Infinity')}, "'.Infinity'");
tx(function () {new Decimal('Infinity.')}, "'Infinity.'"); tx(function () {new Decimal('Infinity.')}, "'Infinity.'");
@ -197,7 +205,7 @@ T('Decimal', function () {
tx(function () {new Decimal('0-')}, "'0-'"); tx(function () {new Decimal('0-')}, "'0-'");
tx(function () {new Decimal(' -0')}, "' -0'"); tx(function () {new Decimal(' -0')}, "' -0'");
tx(function () {new Decimal('-0 ')}, "'-0 '"); tx(function () {new Decimal('-0 ')}, "'-0 '");
tx(function () {new Decimal('+0')}, "'+0'"); tx(function () {new Decimal('+0 ')}, "'+0 '");
tx(function () {new Decimal(' +0')}, "' +0'"); tx(function () {new Decimal(' +0')}, "' +0'");
tx(function () {new Decimal(' .0')}, "' .0'"); tx(function () {new Decimal(' .0')}, "' .0'");
tx(function () {new Decimal('0. ')}, "'0. '"); tx(function () {new Decimal('0. ')}, "'0. '");
@ -222,12 +230,16 @@ T('Decimal', function () {
t('0.1', '.1'); t('0.1', '.1');
t('0.1', '.1'); t('0.1', '.1');
t('-0.1', '-.1'); t('-0.1', '-.1');
t('0.1', '+.1');
t('1', '1.'); t('1', '1.');
t('1', '1.0'); t('1', '1.0');
t('-1', '-1.'); t('-1', '-1.');
t('1', '+1.');
t('-1', '-1.0000'); t('-1', '-1.0000');
t('1', '1.0000');
t('1', '1.00000000'); t('1', '1.00000000');
t('-1', '-1.000000000000000000000000'); t('-1', '-1.000000000000000000000000');
t('1', '+1.000000000000000000000000');
tx(function () {new Decimal(' 1')}, "' 1'"); tx(function () {new Decimal(' 1')}, "' 1'");
tx(function () {new Decimal('1 ')}, "'1 '"); tx(function () {new Decimal('1 ')}, "'1 '");
@ -235,8 +247,8 @@ T('Decimal', function () {
tx(function () {new Decimal('1-')}, "'1-'"); tx(function () {new Decimal('1-')}, "'1-'");
tx(function () {new Decimal(' -1')}, "' -1'"); tx(function () {new Decimal(' -1')}, "' -1'");
tx(function () {new Decimal('-1 ')}, "'-1 '"); tx(function () {new Decimal('-1 ')}, "'-1 '");
tx(function () {new Decimal('+1')}, "'+1'");
tx(function () {new Decimal(' +1')}, "' +1'"); tx(function () {new Decimal(' +1')}, "' +1'");
tx(function () {new Decimal('+1 ')}, "'+1'");
tx(function () {new Decimal('.1.')}, "'.1.'"); tx(function () {new Decimal('.1.')}, "'.1.'");
tx(function () {new Decimal('+-1')}, "'+-1'"); tx(function () {new Decimal('+-1')}, "'+-1'");
tx(function () {new Decimal('-+1')}, "'-+1'"); tx(function () {new Decimal('-+1')}, "'-+1'");
@ -262,8 +274,9 @@ T('Decimal', function () {
t('123.456789', 123.456789); t('123.456789', 123.456789);
t('-123.456789', -123.456789); t('-123.456789', -123.456789);
t('123.456789', '123.456789');
t('-123.456789', '-123.456789'); t('-123.456789', '-123.456789');
t('123.456789', '123.456789');
t('123.456789', '+123.456789');
tx(function () {new Decimal(void 0)}, "void 0"); tx(function () {new Decimal(void 0)}, "void 0");
tx(function () {new Decimal('undefined')}, "'undefined'"); tx(function () {new Decimal('undefined')}, "'undefined'");
@ -282,7 +295,9 @@ T('Decimal', function () {
tx(function () {new Decimal('ff')}, "'ff'"); tx(function () {new Decimal('ff')}, "'ff'");
tx(function () {new Decimal('0xg')}, "'oxg'"); tx(function () {new Decimal('0xg')}, "'oxg'");
tx(function () {new Decimal('0Xfi')}, "'0Xfi'"); tx(function () {new Decimal('0Xfi')}, "'0Xfi'");
tx(function () {new Decimal('++45')}, "'++45'");
tx(function () {new Decimal('--45')}, "'--45'"); tx(function () {new Decimal('--45')}, "'--45'");
tx(function () {new Decimal('9.99--')}, "'9.99--'"); tx(function () {new Decimal('9.99--')}, "'9.99--'");
tx(function () {new Decimal('9.99++')}, "'9.99++'");
tx(function () {new Decimal('0 0')}, "'0 0'"); tx(function () {new Decimal('0 0')}, "'0 0'");
}); });

45
test/modules/clamp.js Normal file
View File

@ -0,0 +1,45 @@
if (typeof T === 'undefined') require('../setup');
T('clamp', function () {
function t(x, min, max, expected) {
//T.assertEqual(expected, new Decimal(x).clampedTo(min, max).valueOf());
T.assertEqual(expected, new Decimal(x).clamp(min, max).valueOf());
//T.assertEqual(expected, Decimal.clamp(x, min, max).valueOf());
}
t('-0', '0', '0', '-0');
t('-0', '-0', '0', '-0');
t('-0', '0', '-0', '-0');
t('-0', '-0', '-0', '-0');
t('0', '0', '0', '0');
t('0', '-0', '0', '0');
t('0', '0', '-0', '0');
t('0', '-0', '-0', '0');
t(0, 0, 1, '0');
t(-1, 0, 1, '0');
t(-2, 0, 1, '0');
t(1, 0, 1, '1');
t(2, 0, 1, '1');
t(1, 1, 1, '1');
t(-1, 1, 1, '1');
t(-1, -1, 1, '-1');
t(2, 1, 2, '2');
t(3, 1, 2, '2');
t(1, 0, 1, '1');
t(2, 0, 1, '1');
t(Infinity, 0, 1, '1');
t(0, -Infinity, 0, '0');
t(-Infinity, 0, 1, '0');
t(-Infinity, -Infinity, Infinity, '-Infinity');
t(Infinity, -Infinity, Infinity, 'Infinity');
t(0, 1, Infinity, '1');
t(0, NaN, 1, 'NaN');
t(0, 0, NaN, 'NaN');
t(NaN, 0, 1, 'NaN');
});

64
test/modules/sum.js Normal file
View File

@ -0,0 +1,64 @@
if (typeof T === 'undefined') require('../setup');
T('sum', function () {
var expected;
function t() {
T.assertEqualDecimal(expected, Decimal.sum.apply(Decimal, arguments));
}
expected = new Decimal(0);
t('0');
t('0', new Decimal(0));
t(1, 0, '-1');
t(0, new Decimal('-10'), 0, 0, 0, 0, 0, 10);
t(11, -11);
t(1, '2', new Decimal(3), new Decimal('4'), -10);
t(new Decimal(-10), '9', new Decimal(0.01), 0.99);
expected = new Decimal(10);
t('10');
t('0', new Decimal('10'));
t(10, 0);
t(0, 0, 0, 0, 0, 0, 10);
t(11, -1);
t(1, '2', new Decimal(3), new Decimal('4'));
t('9', new Decimal(0.01), 0.99);
expected = new Decimal(600);
t(100, 200, 300);
t('100', '200', '300');
t(new Decimal(100), new Decimal(200), new Decimal(300));
t(100, '200', new Decimal(300));
t(99.9, 200.05, 300.05);
expected = new Decimal(NaN);
t(NaN);
t('1', NaN);
t(100, 200, NaN);
t(NaN, 0, '9', new Decimal(0), 11, Infinity);
t(0, new Decimal('-Infinity'), '9', new Decimal(NaN), 11);
t(4, '-Infinity', 0, '9', new Decimal(0), Infinity, 2);
expected = new Decimal(Infinity);
t(Infinity);
t(1, '1e10000000000000000000000000000000000000000', '4');
t(100, 200, 'Infinity');
t(0, new Decimal('Infinity'), '9', new Decimal(0), 11);
t(0, '9', new Decimal(0), 11, Infinity);
t(4, new Decimal(Infinity), 0, '9', new Decimal(0), Infinity, 2);
expected = new Decimal(-Infinity);
t(-Infinity);
t(1, '-1e10000000000000000000000000000000000000000', '4');
t(100, 200, '-Infinity');
t(0, new Decimal('-Infinity'), '9', new Decimal(0), 11);
t(0, '9', new Decimal(0), 11, -Infinity);
t(4, new Decimal(-Infinity), 0, '9', new Decimal(0), -Infinity, 2);
});

View File

@ -28,6 +28,7 @@
'atanh', 'atanh',
'cbrt', 'cbrt',
'ceil', 'ceil',
'clamp',
'clone', 'clone',
'cmp', 'cmp',
'config', 'config',
@ -59,6 +60,7 @@
'sin', 'sin',
'sinh', 'sinh',
'sqrt', 'sqrt',
'sum',
'tan', 'tan',
'tanh', 'tanh',
'times', 'times',

View File

@ -15,6 +15,7 @@ console.log('\n Testing decimal.js\n');
'atanh', 'atanh',
'cbrt', 'cbrt',
'ceil', 'ceil',
'clamp',
'clone', 'clone',
'cmp', 'cmp',
'config', 'config',
@ -46,6 +47,7 @@ console.log('\n Testing decimal.js\n');
'sin', 'sin',
'sinh', 'sinh',
'sqrt', 'sqrt',
'sum',
'tan', 'tan',
'tanh', 'tanh',
'times', 'times',