fix(formula): fix bug

dream-num · Oct 29, 2024 · 94783f9 · 94783f9
1 parent cdcfad8
commit 94783f9
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 4 deletions.
diff --git a/packages/engine-formula/src/functions/statistical/percentrank-exc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/percentrank-exc/__tests__/index.spec.ts
@@ -75,6 +75,24 @@ describe('Test percentrankExc function', () => {
             });
             const result2 = testFunction.calculate(array2, x);
             expect(getObjectValue(result2)).toStrictEqual(ErrorType.NUM);
+
+            const array3 = ArrayValueObject.create({
+                calculateValueList: transformToValueObject([
+                    [-1],
+                ]),
+                rowCount: 1,
+                columnCount: 1,
+                unitId: '',
+                sheetId: '',
+                row: 0,
+                column: 0,
+            });
+            const result3 = testFunction.calculate(array3, x);
+            expect(getObjectValue(result3)).toStrictEqual(ErrorType.NA);
+
+            const x2 = NumberValueObject.create(-1);
+            const result4 = testFunction.calculate(array3, x2);
+            expect(getObjectValue(result4)).toStrictEqual(1);
         });
 
         it('X value test', () => {

diff --git a/packages/engine-formula/src/functions/statistical/percentrank-exc/index.ts b/packages/engine-formula/src/functions/statistical/percentrank-exc/index.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { isRealNum } from '@univerjs/core';
 import { ErrorType } from '../../../basics/error-type';
 import { expandArrayValueObject } from '../../../engine/utils/array-object';
@@ -22,8 +24,6 @@ import { floor } from '../../../engine/utils/math-kit';
 import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
 import { NumberValueObject } from '../../../engine/value-object/primitive-object';
 import { BaseFunction } from '../../base-function';
-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
 
 export class PercentrankExc extends BaseFunction {
     override minParams = 2;
@@ -95,6 +95,14 @@ export class PercentrankExc extends BaseFunction {
             return ErrorValueObject.create(ErrorType.NA);
         }
 
+        if (n === 1) {
+            if (xValue === array[0]) {
+                return NumberValueObject.create(1);
+            } else {
+                return ErrorValueObject.create(ErrorType.NA);
+            }
+        }
+
         let result = 0;
         let match = false;
         let i = 0;

diff --git a/packages/engine-formula/src/functions/statistical/percentrank-inc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/percentrank-inc/__tests__/index.spec.ts
@@ -75,6 +75,24 @@ describe('Test percentrankInc function', () => {
             });
             const result2 = testFunction.calculate(array2, x);
             expect(getObjectValue(result2)).toStrictEqual(ErrorType.NUM);
+
+            const array3 = ArrayValueObject.create({
+                calculateValueList: transformToValueObject([
+                    [-1],
+                ]),
+                rowCount: 1,
+                columnCount: 1,
+                unitId: '',
+                sheetId: '',
+                row: 0,
+                column: 0,
+            });
+            const result3 = testFunction.calculate(array3, x);
+            expect(getObjectValue(result3)).toStrictEqual(ErrorType.NA);
+
+            const x2 = NumberValueObject.create(-1);
+            const result4 = testFunction.calculate(array3, x2);
+            expect(getObjectValue(result4)).toStrictEqual(1);
         });
 
         it('X value test', () => {

diff --git a/packages/engine-formula/src/functions/statistical/percentrank-inc/index.ts b/packages/engine-formula/src/functions/statistical/percentrank-inc/index.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { isRealNum } from '@univerjs/core';
 import { ErrorType } from '../../../basics/error-type';
 import { expandArrayValueObject } from '../../../engine/utils/array-object';
@@ -22,8 +24,6 @@ import { floor } from '../../../engine/utils/math-kit';
 import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
 import { NumberValueObject } from '../../../engine/value-object/primitive-object';
 import { BaseFunction } from '../../base-function';
-import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
 
 export class PercentrankInc extends BaseFunction {
     override minParams = 2;
@@ -95,6 +95,14 @@ export class PercentrankInc extends BaseFunction {
             return ErrorValueObject.create(ErrorType.NA);
         }
 
+        if (n === 1) {
+            if (xValue === array[0]) {
+                return NumberValueObject.create(1);
+            } else {
+                return ErrorValueObject.create(ErrorType.NA);
+            }
+        }
+
         let result = 0;
         let match = false;
         let i = 0;