fix: xyIntegralOptions extends xyIntegrationOptions (#234)

mljs · Mar 13, 2024 · 3b85a72 · 3b85a72
1 parent d15216e
commit 3b85a72
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/src/xy/xyIntegral.ts b/src/xy/xyIntegral.ts
@@ -3,31 +3,14 @@ import { DataXY } from 'cheminfo-types';
 import { xGetFromToIndex } from '../x';
 
 import { xyCheck } from './xyCheck';
+import { XYIntegrationOptions } from './xyIntegration';
 
-export interface XYIntegralOptions {
+export interface XYIntegralOptions extends XYIntegrationOptions {
   /**
    * Integrate from the larger value to the smallest value
    * @default false
    * */
   reverse?: boolean;
-  /**
-   * First value for xyIntegration in the X scale
-   */
-  from?: number;
-  /**
-   * First point for xyIntegration
-   * @default 0
-   * */
-  fromIndex?: number;
-  /**
-   *  Last point for xyIntegration
-   * @default x.length-1
-   * */
-  toIndex?: number;
-  /**
-   * Last value for xyIntegration in the X scale
-   */
-  to?: number;
 }
 
 /**

diff --git a/src/xy/xyIntegration.ts b/src/xy/xyIntegration.ts
@@ -3,7 +3,27 @@ import { DataXY } from 'cheminfo-types';
 import { xGetFromToIndex } from '../x';
 
 import { xyCheck } from './xyCheck';
-import { XYIntegralOptions } from './xyIntegral';
+
+export interface XYIntegrationOptions {
+  /**
+   * First value for xyIntegration in the X scale
+   */
+  from?: number;
+  /**
+   * First point for xyIntegration
+   * @default 0
+   * */
+  fromIndex?: number;
+  /**
+   *  Last point for xyIntegration
+   * @default x.length-1
+   * */
+  toIndex?: number;
+  /**
+   * Last value for xyIntegration in the X scale
+   */
+  to?: number;
+}
 
 /**
  * Calculate integration
@@ -14,7 +34,7 @@ import { XYIntegralOptions } from './xyIntegral';
  */
 export function xyIntegration(
   data: DataXY,
-  options: XYIntegralOptions = {},
+  options: XYIntegrationOptions = {},
 ): number {
   xyCheck(data, { minLength: 1 });
   const { x, y } = data;