Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(formula): fix operation accuracy (#3244)

wpxp12345620b4dd569b2f
diff --git a/packages/engine-formula/src/engine/utils/math-kit.ts b/packages/engine-formula/src/engine/utils/math-kit.ts
index 6dd8c12fa8..1757e29e4a 100644
--- a/packages/engine-formula/src/engine/utils/math-kit.ts
+++ b/packages/engine-formula/src/engine/utils/math-kit.ts
@@ -20,20 +20,22 @@
Reference https://en.wikipedia.org/wiki/Numeric_precision_in_Microsoft_Excel
*/
+import Decimal from 'decimal.js';
+
export function plus(a: number, b: number): number {
- return a + b;
+ return new Decimal(a).add(b).toNumber();
}
export function minus(a: number, b: number): number {
- return a - b;
+ return new Decimal(a).sub(b).toNumber();
}
export function multiply(a: number, b: number): number {
- return a * b;
+ return new Decimal(a).mul(b).toNumber();
}
export function divide(a: number, b: number): number {
- return a / b;
+ return new Decimal(a).div(b).toNumber();
}
/**
diff --git a/packages/engine-formula/src/functions/math/cot/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/cot/__tests__/index.spec.ts
index d8a75d215b..d3b570975b 100644
--- a/packages/engine-formula/src/functions/math/cot/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/cot/__tests__/index.spec.ts
@@ -89,7 +89,7 @@ describe('Test cot function', () => {
const result = testFunction.calculate(valueArray);
expect(transformToValue(result.getArrayValue())).toStrictEqual([
[0.6420926159343306, ErrorType.VALUE, 0.3546331016766021, 0.6420926159343306, ErrorType.DIV_BY_ZERO, ErrorType.DIV_BY_ZERO],
- [ErrorType.DIV_BY_ZERO, -1.702956919426469, -0.9681244414101432, ErrorType.VALUE, 7.015252551434534, ErrorType.NAME],
+ [ErrorType.DIV_BY_ZERO, -1.702956919426469, -0.9681244414101433, ErrorType.VALUE, 7.015252551434534, ErrorType.NAME],
]);
});
});
diff --git a/packages/engine-formula/src/functions/math/coth/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/coth/__tests__/index.spec.ts
index 076a1e445c..6d2b5bff60 100644
--- a/packages/engine-formula/src/functions/math/coth/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/coth/__tests__/index.spec.ts
@@ -30,7 +30,7 @@ describe('Test coth function', () => {
it('Value is normal number', () => {
const value = NumberValueObject.create(1);
const result = testFunction.calculate(value);
- expect(result.getValue()).toBe(1.3130352854993315);
+ expect(result.getValue()).toBe(1.3130352854993312);
});
it('Value is number negative', () => {
@@ -82,7 +82,7 @@ describe('Test coth function', () => {
});
const result = testFunction.calculate(valueArray);
expect(transformToValue(result.getArrayValue())).toStrictEqual([
- [1.3130352854993315, ErrorType.VALUE, 1.1868318739223294, 1.3130352854993315, ErrorType.DIV_BY_ZERO, ErrorType.DIV_BY_ZERO],
+ [1.3130352854993312, ErrorType.VALUE, 1.1868318739223294, 1.3130352854993312, ErrorType.DIV_BY_ZERO, ErrorType.DIV_BY_ZERO],
[ErrorType.DIV_BY_ZERO, 1, 1.0187318407849029, ErrorType.VALUE, -1.0049698233136892, ErrorType.NAME],
]);
});
diff --git a/packages/engine-formula/src/functions/math/csch/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/csch/__tests__/index.spec.ts
index 44043a8a3a..085c464973 100644
--- a/packages/engine-formula/src/functions/math/csch/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/csch/__tests__/index.spec.ts
@@ -89,7 +89,7 @@ describe('Test csch function', () => {
const result = testFunction.calculate(valueArray);
expect(transformToValue(result.getArrayValue())).toStrictEqual([
[0.8509181282393216, ErrorType.VALUE, 0.6391947253834218, 0.8509181282393216, ErrorType.DIV_BY_ZERO, ErrorType.DIV_BY_ZERO],
- [ErrorType.DIV_BY_ZERO, 7.440151952041671e-44, 0.1944596704435054, ErrorType.VALUE, -0.09982156966882273, ErrorType.NAME],
+ [ErrorType.DIV_BY_ZERO, 7.440151952041671e-44, 0.1944596704435054, ErrorType.VALUE, -0.09982156966882272, ErrorType.NAME],
]);
});
});
diff --git a/packages/engine-formula/src/functions/math/sec/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/sec/__tests__/index.spec.ts
index 869d65fd46..0e8d220341 100644
--- a/packages/engine-formula/src/functions/math/sec/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/sec/__tests__/index.spec.ts
@@ -30,7 +30,7 @@ describe('Test sec function', () => {
it('Value is normal number', () => {
const value = NumberValueObject.create(1);
const result = testFunction.calculate(value);
- expect(result.getValue()).toBe(1.8508157176809255);
+ expect(result.getValue()).toBe(1.8508157176809252);
});
it('Value is number 2**27', () => {
@@ -48,7 +48,7 @@ describe('Test sec function', () => {
it('Value is number string', () => {
const value = StringValueObject.create('1.5');
const result = testFunction.calculate(value);
- expect(result.getValue()).toBe(14.136832902969903);
+ expect(result.getValue()).toBe(14.136832902969905);
});
it('Value is normal string', () => {
@@ -60,7 +60,7 @@ describe('Test sec function', () => {
it('Value is boolean', () => {
const value = BooleanValueObject.create(true);
const result = testFunction.calculate(value);
- expect(result.getValue()).toBe(1.8508157176809255);
+ expect(result.getValue()).toBe(1.8508157176809252);
});
it('Value is blank cell', () => {
const value = NullValueObject.create();
@@ -88,7 +88,7 @@ describe('Test sec function', () => {
});
const result = testFunction.calculate(valueArray);
expect(transformToValue(result.getArrayValue())).toStrictEqual([
- [1.8508157176809255, ErrorType.VALUE, 2.991882480183043, 1.8508157176809255, 1, 1],
+ [1.8508157176809252, ErrorType.VALUE, 2.991882480183043, 1.8508157176809252, 1, 1],
[1, 1.1596638229046938, -1.4376836183776793, ErrorType.VALUE, -1.0101086659079939, ErrorType.NAME],
]);
});
diff --git a/packages/engine-formula/src/functions/math/sech/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/sech/__tests__/index.spec.ts
index fb1f77790e..ebda2bf966 100644
--- a/packages/engine-formula/src/functions/math/sech/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/sech/__tests__/index.spec.ts
@@ -48,7 +48,7 @@ describe('Test sech function', () => {
it('Value is number string', () => {
const value = StringValueObject.create('1.5');
const result = testFunction.calculate(value);
- expect(result.getValue()).toBe(0.4250960349422805);
+ expect(result.getValue()).toBe(0.42509603494228054);
});
it('Value is normal string', () => {
@@ -89,7 +89,7 @@ describe('Test sech function', () => {
const result = testFunction.calculate(valueArray);
expect(transformToValue(result.getArrayValue())).toStrictEqual([
[0.6480542736638855, ErrorType.VALUE, 0.5385722606783082, 0.6480542736638855, 1, 1],
- [1, 7.440151952041671e-44, 0.19088406061175034, ErrorType.VALUE, 0.0993279274194332, ErrorType.NAME],
+ [1, 7.440151952041671e-44, 0.19088406061175034, ErrorType.VALUE, 0.09932792741943322, ErrorType.NAME],
]);
});
});
diff --git a/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts
index c337b0a514..b540f2b9cc 100644
--- a/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/subtotal/__tests__/index.spec.ts
@@ -299,7 +299,7 @@ describe('Test subtotal', () => {
});
it('Stdev.s, Var1 is array, var2 is array', () => {
const result = calculate('=SUBTOTAL(7,A1:B2,A3:F4)');
- expect(result).toBe(31.273350405026253);
+ expect(result).toBe(31.27335040502625);
});
it('Stdev.p, Var1 is array, var2 is array', () => {
const result = calculate('=SUBTOTAL(8,A1:B2,A3:F4)');
diff --git a/packages/engine-formula/src/functions/statistical/avedev/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/avedev/__tests__/index.spec.ts
index 61fae79952..1a09131021 100644
--- a/packages/engine-formula/src/functions/statistical/avedev/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/statistical/avedev/__tests__/index.spec.ts
@@ -136,7 +136,7 @@ describe('Test avedev function', () => {
column: 0,
});
const result = testFunction.calculate(var1, var2);
- expect(result.getValue()).toBe(16.469917355371898);
+ expect(result.getValue()).toBe(16.469917355371905);
});
it('Var1 is number, var2 is array not includes boolean, includes 0', () => {
diff --git a/packages/engine-formula/src/functions/statistical/averagea/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/averagea/__tests__/index.spec.ts
index 33f47620d1..d41d9027a9 100644
--- a/packages/engine-formula/src/functions/statistical/averagea/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/statistical/averagea/__tests__/index.spec.ts
@@ -136,7 +136,7 @@ describe('Test averagea function', () => {
column: 0,
});
const result = testFunction.calculate(var1, var2);
- expect(result.getValue()).toBe(9.506363636363638);
+ expect(result.getValue()).toBe(9.506363636363636);
});
it('Var1 is array includes string only', () => {