ml-matrix 6.8.0 → 6.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ml-matrix",
-  "version": "6.8.0",
+  "version": "6.9.0",
   "description": "Matrix manipulation and computation library",
   "main": "matrix.js",
   "module": "src/index.js",
@@ -16,12 +16,13 @@
   ],
   "scripts": {
     "compile": "rollup -c",
-    "eslint": "eslint benchmark src testUtils.js",
+    "eslint": "eslint src testUtils.js",
     "eslint-fix": "npm run eslint -- --fix",
-    "prepublishOnly": "npm run compile",
-    "test": "npm run test-coverage && npm run eslint",
-    "test-only": "jest",
-    "test-coverage": "jest --coverage"
+    "prepack": "npm run compile",
+    "prettier": "prettier --check src",
+    "prettier-write": "prettier --write src",
+    "test": "npm run test-only && npm run eslint && npm run prettier",
+    "test-only": "jest --coverage"
   },
   "jest": {
     "testEnvironment": "node"
@@ -54,24 +55,25 @@
   },
   "homepage": "https://github.com/mljs/matrix",
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+    "@rollup/plugin-commonjs": "^21.0.2",
+    "@rollup/plugin-node-resolve": "^13.1.3",
     "benchmark": "^2.1.4",
-    "csv-parse": "^4.15.4",
-    "eslint": "^7.24.0",
-    "eslint-config-cheminfo": "^5.2.3",
-    "jest": "^26.6.3",
-    "jest-matcher-deep-close-to": "^2.0.1",
-    "mathjs": "^9.3.2",
-    "ml-dataset-iris": "^1.1.1",
+    "csv-parse": "^5.0.4",
+    "eslint": "^8.10.0",
+    "eslint-config-cheminfo": "^7.2.2",
+    "jest": "^27.5.1",
+    "jest-matcher-deep-close-to": "^3.0.2",
+    "mathjs": "^10.1.1",
+    "ml-dataset-iris": "^1.2.1",
     "numeric": "^1.2.6",
-    "prettier": "^2.2.1",
+    "prettier": "^2.5.1",
     "pretty-hrtime": "^1.0.3",
-    "rollup": "^2.45.2",
+    "rollup": "^2.68.0",
     "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
-    "ml-array-rescale": "^1.3.5"
+    "is-any-array": "^2.0.0",
+    "ml-array-rescale": "^1.3.7"
   }
 }

package/src/correlation.js

@@ -1,3 +1,5 @@
+import { isAnyArray } from 'is-any-array';
+
 import Matrix from './matrix';
 
 export function correlation(xMatrix, yMatrix = xMatrix, options = {}) {
@@ -6,7 +8,7 @@ export function correlation(xMatrix, yMatrix = xMatrix, options = {}) {
   if (
     typeof yMatrix === 'object' &&
     !Matrix.isMatrix(yMatrix) &&
-    !Array.isArray(yMatrix)
+    !isAnyArray(yMatrix)
   ) {
     options = yMatrix;
     yMatrix = xMatrix;

package/src/covariance.js

@@ -1,3 +1,5 @@
+import { isAnyArray } from 'is-any-array';
+
 import Matrix from './matrix';
 
 export function covariance(xMatrix, yMatrix = xMatrix, options = {}) {
@@ -6,7 +8,7 @@ export function covariance(xMatrix, yMatrix = xMatrix, options = {}) {
   if (
     typeof yMatrix === 'object' &&
     !Matrix.isMatrix(yMatrix) &&
-    !Array.isArray(yMatrix)
+    !isAnyArray(yMatrix)
   ) {
     options = yMatrix;
     yMatrix = xMatrix;

package/src/dc/nipals.js

@@ -1,3 +1,5 @@
+import { isAnyArray } from 'is-any-array';
+
 import Matrix from '../matrix';
 import WrapperMatrix2D from '../wrap/WrapperMatrix2D';
 
@@ -13,7 +15,7 @@ export default class nipals {
 
     let u;
     if (Y) {
-      if (Array.isArray(Y) && typeof Y[0] === 'number') {
+      if (isAnyArray(Y) && typeof Y[0] === 'number') {
         Y = Matrix.columnVector(Y);
       } else {
         Y = WrapperMatrix2D.checkMatrix(Y);

package/src/matrix.js

@@ -1,3 +1,4 @@
+import { isAnyArray } from 'is-any-array';
 import rescale from 'ml-array-rescale';
 
 import { inspectMatrix, inspectMatrixWithOptions } from './inspect';
@@ -28,8 +29,9 @@ import {
   checkColumnIndex,
   checkColumnVector,
   checkRange,
-  checkIndices,
   checkNonEmpty,
+  checkRowIndices,
+  checkColumnIndices,
 } from './util';
 
 export class AbstractMatrix {
@@ -1027,6 +1029,7 @@ export class AbstractMatrix {
       resultat = resultat.setSubMatrix(c22, c11.rows, c11.columns);
       return resultat.subMatrix(0, rows - 1, 0, cols - 1);
     }
+
     return blockMult(x, y, r, c);
   }
 
@@ -1236,12 +1239,13 @@ export class AbstractMatrix {
   }
 
   selection(rowIndices, columnIndices) {
-    let indices = checkIndices(this, rowIndices, columnIndices);
+    checkRowIndices(this, rowIndices);
+    checkColumnIndices(this, columnIndices);
     let newMatrix = new Matrix(rowIndices.length, columnIndices.length);
-    for (let i = 0; i < indices.row.length; i++) {
-      let rowIndex = indices.row[i];
-      for (let j = 0; j < indices.column.length; j++) {
-        let columnIndex = indices.column[j];
+    for (let i = 0; i < rowIndices.length; i++) {
+      let rowIndex = rowIndices[i];
+      for (let j = 0; j < columnIndices.length; j++) {
+        let columnIndex = columnIndices[j];
         newMatrix.set(i, j, this.get(rowIndex, columnIndex));
       }
     }
@@ -1329,13 +1333,13 @@ export class AbstractMatrix {
     }
     switch (by) {
       case 'row': {
-        if (!Array.isArray(mean)) {
+        if (!isAnyArray(mean)) {
           throw new TypeError('mean must be an array');
         }
         return varianceByRow(this, unbiased, mean);
       }
       case 'column': {
-        if (!Array.isArray(mean)) {
+        if (!isAnyArray(mean)) {
           throw new TypeError('mean must be an array');
         }
         return varianceByColumn(this, unbiased, mean);
@@ -1378,14 +1382,14 @@ export class AbstractMatrix {
     const { center = this.mean(by) } = options;
     switch (by) {
       case 'row': {
-        if (!Array.isArray(center)) {
+        if (!isAnyArray(center)) {
           throw new TypeError('center must be an array');
         }
         centerByRow(this, center);
         return this;
       }
       case 'column': {
-        if (!Array.isArray(center)) {
+        if (!isAnyArray(center)) {
           throw new TypeError('center must be an array');
         }
         centerByColumn(this, center);
@@ -1416,7 +1420,7 @@ export class AbstractMatrix {
       case 'row': {
         if (scale === undefined) {
           scale = getScaleByRow(this);
-        } else if (!Array.isArray(scale)) {
+        } else if (!isAnyArray(scale)) {
           throw new TypeError('scale must be an array');
         }
         scaleByRow(this, scale);
@@ -1425,7 +1429,7 @@ export class AbstractMatrix {
       case 'column': {
         if (scale === undefined) {
           scale = getScaleByColumn(this);
-        } else if (!Array.isArray(scale)) {
+        } else if (!isAnyArray(scale)) {
           throw new TypeError('scale must be an array');
         }
         scaleByColumn(this, scale);
@@ -1452,9 +1456,8 @@ export class AbstractMatrix {
 
 AbstractMatrix.prototype.klass = 'Matrix';
 if (typeof Symbol !== 'undefined') {
-  AbstractMatrix.prototype[
-    Symbol.for('nodejs.util.inspect.custom')
-  ] = inspectMatrix;
+  AbstractMatrix.prototype[Symbol.for('nodejs.util.inspect.custom')] =
+    inspectMatrix;
 }
 
 function compareNumbers(a, b) {
@@ -1487,7 +1490,7 @@ export default class Matrix extends AbstractMatrix {
       } else {
         throw new TypeError('nColumns must be a positive integer');
       }
-    } else if (Array.isArray(nRows)) {
+    } else if (isAnyArray(nRows)) {
       // Copy the values from the 2D array
       const arrayData = nRows;
       nRows = arrayData.length;

package/src/util.js

@@ -1,3 +1,5 @@
+import { isAnyArray } from 'is-any-array';
+
 /**
  * @private
  * Check that a row index is not out of bounds
@@ -64,46 +66,28 @@ export function checkColumnVector(matrix, vector) {
   return vector;
 }
 
-export function checkIndices(matrix, rowIndices, columnIndices) {
-  return {
-    row: checkRowIndices(matrix, rowIndices),
-    column: checkColumnIndices(matrix, columnIndices),
-  };
-}
-
 export function checkRowIndices(matrix, rowIndices) {
-  if (typeof rowIndices !== 'object') {
-    throw new TypeError('unexpected type for row indices');
+  if (!isAnyArray(rowIndices)) {
+    throw new TypeError('row indices must be an array');
   }
 
-  let rowOut = rowIndices.some((r) => {
-    return r < 0 || r >= matrix.rows;
-  });
-
-  if (rowOut) {
-    throw new RangeError('row indices are out of range');
+  for (let i = 0; i < rowIndices.length; i++) {
+    if (rowIndices[i] < 0 || rowIndices[i] >= matrix.rows) {
+      throw new RangeError('row indices are out of range');
+    }
   }
-
-  if (!Array.isArray(rowIndices)) rowIndices = Array.from(rowIndices);
-
-  return rowIndices;
 }
 
 export function checkColumnIndices(matrix, columnIndices) {
-  if (typeof columnIndices !== 'object') {
-    throw new TypeError('unexpected type for column indices');
+  if (!isAnyArray(columnIndices)) {
+    throw new TypeError('column indices must be an array');
   }
 
-  let columnOut = columnIndices.some((c) => {
-    return c < 0 || c >= matrix.columns;
-  });
-
-  if (columnOut) {
-    throw new RangeError('column indices are out of range');
+  for (let i = 0; i < columnIndices.length; i++) {
+    if (columnIndices[i] < 0 || columnIndices[i] >= matrix.columns) {
+      throw new RangeError('column indices are out of range');
+    }
   }
-  if (!Array.isArray(columnIndices)) columnIndices = Array.from(columnIndices);
-
-  return columnIndices;
 }
 
 export function checkRange(matrix, startRow, endRow, startColumn, endColumn) {

package/src/views/columnSelection.js

@@ -4,7 +4,7 @@ import BaseView from './base';
 
 export default class MatrixColumnSelectionView extends BaseView {
   constructor(matrix, columnIndices) {
-    columnIndices = checkColumnIndices(matrix, columnIndices);
+    checkColumnIndices(matrix, columnIndices);
     super(matrix, matrix.rows, columnIndices.length);
     this.columnIndices = columnIndices;
   }

package/src/views/rowSelection.js

@@ -4,7 +4,7 @@ import BaseView from './base';
 
 export default class MatrixRowSelectionView extends BaseView {
   constructor(matrix, rowIndices) {
-    rowIndices = checkRowIndices(matrix, rowIndices);
+    checkRowIndices(matrix, rowIndices);
     super(matrix, rowIndices.length, matrix.columns);
     this.rowIndices = rowIndices;
   }

package/src/views/selection.js

@@ -1,13 +1,14 @@
-import { checkIndices } from '../util';
+import { checkRowIndices, checkColumnIndices } from '../util';
 
 import BaseView from './base';
 
 export default class MatrixSelectionView extends BaseView {
   constructor(matrix, rowIndices, columnIndices) {
-    let indices = checkIndices(matrix, rowIndices, columnIndices);
-    super(matrix, indices.row.length, indices.column.length);
-    this.rowIndices = indices.row;
-    this.columnIndices = indices.column;
+    checkRowIndices(matrix, rowIndices);
+    checkColumnIndices(matrix, columnIndices);
+    super(matrix, rowIndices.length, columnIndices.length);
+    this.rowIndices = rowIndices;
+    this.columnIndices = columnIndices;
   }
 
   set(rowIndex, columnIndex, value) {

package/src/wrap/wrap.js

@@ -1,9 +1,11 @@
+import { isAnyArray } from 'is-any-array';
+
 import WrapperMatrix1D from './WrapperMatrix1D';
 import WrapperMatrix2D from './WrapperMatrix2D';
 
 export function wrap(array, options) {
-  if (Array.isArray(array)) {
-    if (array[0] && Array.isArray(array[0])) {
+  if (isAnyArray(array)) {
+    if (array[0] && isAnyArray(array[0])) {
       return new WrapperMatrix2D(array);
     } else {
       return new WrapperMatrix1D(array, options);