mathjs 10.6.4 → 11.1.0

package/lib/cjs/function/relational/compare.js

@@ -11,15 +11,15 @@ var _number = require("../../utils/number.js");
 
 var _factory = require("../../utils/factory.js");
 
-var _algorithm = require("../../type/matrix/utils/algorithm03.js");
+var _matAlgo03xDSf = require("../../type/matrix/utils/matAlgo03xDSf.js");
 
-var _algorithm2 = require("../../type/matrix/utils/algorithm12.js");
+var _matAlgo12xSfs = require("../../type/matrix/utils/matAlgo12xSfs.js");
 
-var _algorithm3 = require("../../type/matrix/utils/algorithm14.js");
+var _matAlgo05xSfSf = require("../../type/matrix/utils/matAlgo05xSfSf.js");
 
-var _algorithm4 = require("../../type/matrix/utils/algorithm13.js");
+var _matrixAlgorithmSuite = require("../../type/matrix/utils/matrixAlgorithmSuite.js");
 
-var _algorithm5 = require("../../type/matrix/utils/algorithm05.js");
+var _compareUnits = require("./compareUnits.js");
 
 var name = 'compare';
 var dependencies = ['typed', 'config', 'matrix', 'equalScalar', 'BigNumber', 'Fraction', 'DenseMatrix'];
@@ -31,21 +31,22 @@ var createCompare = /* #__PURE__ */(0, _factory.factory)(name, dependencies, fun
       BigNumber = _ref.BigNumber,
       Fraction = _ref.Fraction,
       DenseMatrix = _ref.DenseMatrix;
-  var algorithm03 = (0, _algorithm.createAlgorithm03)({
+  var matAlgo03xDSf = (0, _matAlgo03xDSf.createMatAlgo03xDSf)({
     typed: typed
   });
-  var algorithm05 = (0, _algorithm5.createAlgorithm05)({
+  var matAlgo05xSfSf = (0, _matAlgo05xSfSf.createMatAlgo05xSfSf)({
     typed: typed,
     equalScalar: equalScalar
   });
-  var algorithm12 = (0, _algorithm2.createAlgorithm12)({
+  var matAlgo12xSfs = (0, _matAlgo12xSfs.createMatAlgo12xSfs)({
     typed: typed,
     DenseMatrix: DenseMatrix
   });
-  var algorithm13 = (0, _algorithm4.createAlgorithm13)({
-    typed: typed
+  var matrixAlgorithmSuite = (0, _matrixAlgorithmSuite.createMatrixAlgorithmSuite)({
+    typed: typed,
+    matrix: matrix
   });
-  var algorithm14 = (0, _algorithm3.createAlgorithm14)({
+  var compareUnits = (0, _compareUnits.createCompareUnits)({
     typed: typed
   });
   /**
@@ -86,13 +87,13 @@ var createCompare = /* #__PURE__ */(0, _factory.factory)(name, dependencies, fun
    *                                                          1 when x > y, -1 when x < y, and 0 when x == y.
    */
 
-  return typed(name, {
+  return typed(name, createCompareNumber({
+    typed: typed,
+    config: config
+  }), {
     'boolean, boolean': function booleanBoolean(x, y) {
       return x === y ? 0 : x > y ? 1 : -1;
     },
-    'number, number': function numberNumber(x, y) {
-      return (0, _number.nearlyEqual)(x, y, config.epsilon) ? 0 : x > y ? 1 : -1;
-    },
     'BigNumber, BigNumber': function BigNumberBigNumber(x, y) {
       return (0, _nearlyEqual.nearlyEqual)(x, y, config.epsilon) ? new BigNumber(0) : new BigNumber(x.cmp(y));
     },
@@ -101,59 +102,12 @@ var createCompare = /* #__PURE__ */(0, _factory.factory)(name, dependencies, fun
     },
     'Complex, Complex': function ComplexComplex() {
       throw new TypeError('No ordering relation is defined for complex numbers');
-    },
-    'Unit, Unit': function UnitUnit(x, y) {
-      if (!x.equalBase(y)) {
-        throw new Error('Cannot compare units with different base');
-      }
-
-      return this(x.value, y.value);
-    },
-    'SparseMatrix, SparseMatrix': function SparseMatrixSparseMatrix(x, y) {
-      return algorithm05(x, y, this);
-    },
-    'SparseMatrix, DenseMatrix': function SparseMatrixDenseMatrix(x, y) {
-      return algorithm03(y, x, this, true);
-    },
-    'DenseMatrix, SparseMatrix': function DenseMatrixSparseMatrix(x, y) {
-      return algorithm03(x, y, this, false);
-    },
-    'DenseMatrix, DenseMatrix': function DenseMatrixDenseMatrix(x, y) {
-      return algorithm13(x, y, this);
-    },
-    'Array, Array': function ArrayArray(x, y) {
-      // use matrix implementation
-      return this(matrix(x), matrix(y)).valueOf();
-    },
-    'Array, Matrix': function ArrayMatrix(x, y) {
-      // use matrix implementation
-      return this(matrix(x), y);
-    },
-    'Matrix, Array': function MatrixArray(x, y) {
-      // use matrix implementation
-      return this(x, matrix(y));
-    },
-    'SparseMatrix, any': function SparseMatrixAny(x, y) {
-      return algorithm12(x, y, this, false);
-    },
-    'DenseMatrix, any': function DenseMatrixAny(x, y) {
-      return algorithm14(x, y, this, false);
-    },
-    'any, SparseMatrix': function anySparseMatrix(x, y) {
-      return algorithm12(y, x, this, true);
-    },
-    'any, DenseMatrix': function anyDenseMatrix(x, y) {
-      return algorithm14(y, x, this, true);
-    },
-    'Array, any': function ArrayAny(x, y) {
-      // use matrix implementation
-      return algorithm14(matrix(x), y, this, false).valueOf();
-    },
-    'any, Array': function anyArray(x, y) {
-      // use matrix implementation
-      return algorithm14(matrix(y), x, this, true).valueOf();
     }
-  });
+  }, compareUnits, matrixAlgorithmSuite({
+    SS: matAlgo05xSfSf,
+    DS: matAlgo03xDSf,
+    Ss: matAlgo12xSfs
+  }));
 });
 exports.createCompare = createCompare;
 var createCompareNumber = /* #__PURE__ */(0, _factory.factory)(name, ['typed', 'config'], function (_ref2) {

package/lib/cjs/function/relational/compareNatural.js

@@ -89,75 +89,79 @@ var createCompareNatural = /* #__PURE__ */(0, _factory.factory)(name, dependenci
    */
 
   return typed(name, {
-    'any, any': function anyAny(x, y) {
-      var typeX = (0, _is.typeOf)(x);
-      var typeY = (0, _is.typeOf)(y);
-      var c; // numeric types
-
-      if ((typeX === 'number' || typeX === 'BigNumber' || typeX === 'Fraction') && (typeY === 'number' || typeY === 'BigNumber' || typeY === 'Fraction')) {
-        c = compare(x, y);
+    'any, any': _compareNatural
+  }); // just to check # args
+
+  function _compareNatural(x, y) {
+    var typeX = (0, _is.typeOf)(x);
+    var typeY = (0, _is.typeOf)(y);
+    var c; // numeric types
+
+    if ((typeX === 'number' || typeX === 'BigNumber' || typeX === 'Fraction') && (typeY === 'number' || typeY === 'BigNumber' || typeY === 'Fraction')) {
+      c = compare(x, y);
+
+      if (c.toString() !== '0') {
+        // c can be number, BigNumber, or Fraction
+        return c > 0 ? 1 : -1; // return a number
+      } else {
+        return (0, _javascriptNaturalSort["default"])(typeX, typeY);
+      }
+    } // matrix types
 
-        if (c.toString() !== '0') {
-          // c can be number, BigNumber, or Fraction
-          return c > 0 ? 1 : -1; // return a number
-        } else {
-          return (0, _javascriptNaturalSort.default)(typeX, typeY);
-        }
-      } // matrix types
 
+    var matTypes = ['Array', 'DenseMatrix', 'SparseMatrix'];
 
-      if (typeX === 'Array' || typeX === 'Matrix' || typeY === 'Array' || typeY === 'Matrix') {
-        c = compareMatricesAndArrays(this, x, y);
+    if (matTypes.includes(typeX) || matTypes.includes(typeY)) {
+      c = compareMatricesAndArrays(_compareNatural, x, y);
 
-        if (c !== 0) {
-          return c;
-        } else {
-          return (0, _javascriptNaturalSort.default)(typeX, typeY);
-        }
-      } // in case of different types, order by name of type, i.e. 'BigNumber' < 'Complex'
+      if (c !== 0) {
+        return c;
+      } else {
+        return (0, _javascriptNaturalSort["default"])(typeX, typeY);
+      }
+    } // in case of different types, order by name of type, i.e. 'BigNumber' < 'Complex'
 
 
-      if (typeX !== typeY) {
-        return (0, _javascriptNaturalSort.default)(typeX, typeY);
-      }
+    if (typeX !== typeY) {
+      return (0, _javascriptNaturalSort["default"])(typeX, typeY);
+    }
 
-      if (typeX === 'Complex') {
-        return compareComplexNumbers(x, y);
-      }
+    if (typeX === 'Complex') {
+      return compareComplexNumbers(x, y);
+    }
 
-      if (typeX === 'Unit') {
-        if (x.equalBase(y)) {
-          return this(x.value, y.value);
-        } // compare by units
+    if (typeX === 'Unit') {
+      if (x.equalBase(y)) {
+        return _compareNatural(x.value, y.value);
+      } // compare by units
 
 
-        return compareArrays(this, x.formatUnits(), y.formatUnits());
-      }
+      return compareArrays(_compareNatural, x.formatUnits(), y.formatUnits());
+    }
 
-      if (typeX === 'boolean') {
-        return compareBooleans(x, y);
-      }
+    if (typeX === 'boolean') {
+      return compareBooleans(x, y);
+    }
 
-      if (typeX === 'string') {
-        return (0, _javascriptNaturalSort.default)(x, y);
-      }
+    if (typeX === 'string') {
+      return (0, _javascriptNaturalSort["default"])(x, y);
+    }
 
-      if (typeX === 'Object') {
-        return compareObjects(this, x, y);
-      }
+    if (typeX === 'Object') {
+      return compareObjects(_compareNatural, x, y);
+    }
 
-      if (typeX === 'null') {
-        return 0;
-      }
+    if (typeX === 'null') {
+      return 0;
+    }
 
-      if (typeX === 'undefined') {
-        return 0;
-      } // this should not occur...
+    if (typeX === 'undefined') {
+      return 0;
+    } // this should not occur...
 
 
-      throw new TypeError('Unsupported type of value "' + typeX + '"');
-    }
-  });
+    throw new TypeError('Unsupported type of value "' + typeX + '"');
+  }
   /**
    * Compare mixed matrix/array types, by converting to same-shaped array.
    * This comparator is non-deterministic regarding input types.
@@ -166,6 +170,7 @@ var createCompareNatural = /* #__PURE__ */(0, _factory.factory)(name, dependenci
    * @returns {number} Returns the comparison result: -1, 0, or 1
    */
 
+
   function compareMatricesAndArrays(compareNatural, x, y) {
     if ((0, _is.isSparseMatrix)(x) && (0, _is.isSparseMatrix)(y)) {
       return compareArrays(compareNatural, x.toJSON().values, y.toJSON().values);
@@ -252,8 +257,8 @@ var createCompareNatural = /* #__PURE__ */(0, _factory.factory)(name, dependenci
     var keysX = Object.keys(x);
     var keysY = Object.keys(y); // compare keys
 
-    keysX.sort(_javascriptNaturalSort.default);
-    keysY.sort(_javascriptNaturalSort.default);
+    keysX.sort(_javascriptNaturalSort["default"]);
+    keysY.sort(_javascriptNaturalSort["default"]);
     var c = compareArrays(compareNatural, keysX, keysY);
 
     if (c !== 0) {

package/lib/cjs/function/relational/compareText.js

@@ -9,20 +9,17 @@ var _string = require("../../utils/string.js");
 
 var _factory = require("../../utils/factory.js");
 
-var _algorithm = require("../../type/matrix/utils/algorithm14.js");
-
-var _algorithm2 = require("../../type/matrix/utils/algorithm13.js");
+var _matrixAlgorithmSuite = require("../../type/matrix/utils/matrixAlgorithmSuite.js");
 
 var name = 'compareText';
 var dependencies = ['typed', 'matrix'];
+_string.compareText.signature = 'any, any';
 var createCompareText = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       matrix = _ref.matrix;
-  var algorithm13 = (0, _algorithm2.createAlgorithm13)({
-    typed: typed
-  });
-  var algorithm14 = (0, _algorithm.createAlgorithm14)({
-    typed: typed
+  var matrixAlgorithmSuite = (0, _matrixAlgorithmSuite.createMatrixAlgorithmSuite)({
+    typed: typed,
+    matrix: matrix
   });
   /**
    * Compare two strings lexically. Comparison is case sensitive.
@@ -53,44 +50,14 @@ var createCompareText = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *                                        1 when x > y, -1 when x < y, and 0 when x == y.
    */
 
-  return typed(name, {
-    'any, any': _string.compareText,
-    'DenseMatrix, DenseMatrix': function DenseMatrixDenseMatrix(x, y) {
-      return algorithm13(x, y, _string.compareText);
-    },
-    'Array, Array': function ArrayArray(x, y) {
-      // use matrix implementation
-      return this(matrix(x), matrix(y)).valueOf();
-    },
-    'Array, Matrix': function ArrayMatrix(x, y) {
-      // use matrix implementation
-      return this(matrix(x), y);
-    },
-    'Matrix, Array': function MatrixArray(x, y) {
-      // use matrix implementation
-      return this(x, matrix(y));
-    },
-    'DenseMatrix, any': function DenseMatrixAny(x, y) {
-      return algorithm14(x, y, _string.compareText, false);
-    },
-    'any, DenseMatrix': function anyDenseMatrix(x, y) {
-      return algorithm14(y, x, _string.compareText, true);
-    },
-    'Array, any': function ArrayAny(x, y) {
-      // use matrix implementation
-      return algorithm14(matrix(x), y, _string.compareText, false).valueOf();
-    },
-    'any, Array': function anyArray(x, y) {
-      // use matrix implementation
-      return algorithm14(matrix(y), x, _string.compareText, true).valueOf();
-    }
-  });
+  return typed(name, _string.compareText, matrixAlgorithmSuite({
+    elop: _string.compareText,
+    Ds: true
+  }));
 });
 exports.createCompareText = createCompareText;
 var createCompareTextNumber = /* #__PURE__ */(0, _factory.factory)(name, ['typed'], function (_ref2) {
   var typed = _ref2.typed;
-  return typed(name, {
-    'any, any': _string.compareText
-  });
+  return typed(name, _string.compareText);
 });
 exports.createCompareTextNumber = createCompareTextNumber;

package/lib/cjs/function/relational/compareUnits.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createCompareUnits = void 0;
+
+var _factory = require("../../utils/factory.js");
+
+var createCompareUnits = /* #__PURE__ */(0, _factory.factory)('compareUnits', ['typed'], function (_ref) {
+  var typed = _ref.typed;
+  return {
+    'Unit, Unit': typed.referToSelf(function (self) {
+      return function (x, y) {
+        if (!x.equalBase(y)) {
+          throw new Error('Cannot compare units with different base');
+        }
+
+        return typed.find(self, [x.valueType(), y.valueType()])(x.value, y.value);
+      };
+    })
+  };
+});
+exports.createCompareUnits = createCompareUnits;

package/lib/cjs/function/relational/equal.js

@@ -7,15 +7,13 @@ exports.createEqualNumber = exports.createEqual = void 0;
 
 var _factory = require("../../utils/factory.js");
 
-var _algorithm = require("../../type/matrix/utils/algorithm03.js");
+var _matAlgo03xDSf = require("../../type/matrix/utils/matAlgo03xDSf.js");
 
-var _algorithm2 = require("../../type/matrix/utils/algorithm07.js");
+var _matAlgo07xSSf = require("../../type/matrix/utils/matAlgo07xSSf.js");
 
-var _algorithm3 = require("../../type/matrix/utils/algorithm12.js");
+var _matAlgo12xSfs = require("../../type/matrix/utils/matAlgo12xSfs.js");
 
-var _algorithm4 = require("../../type/matrix/utils/algorithm13.js");
-
-var _algorithm5 = require("../../type/matrix/utils/algorithm14.js");
+var _matrixAlgorithmSuite = require("../../type/matrix/utils/matrixAlgorithmSuite.js");
 
 var name = 'equal';
 var dependencies = ['typed', 'matrix', 'equalScalar', 'DenseMatrix'];
@@ -24,22 +22,20 @@ var createEqual = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
       matrix = _ref.matrix,
       equalScalar = _ref.equalScalar,
       DenseMatrix = _ref.DenseMatrix;
-  var algorithm03 = (0, _algorithm.createAlgorithm03)({
+  var matAlgo03xDSf = (0, _matAlgo03xDSf.createMatAlgo03xDSf)({
     typed: typed
   });
-  var algorithm07 = (0, _algorithm2.createAlgorithm07)({
+  var matAlgo07xSSf = (0, _matAlgo07xSSf.createMatAlgo07xSSf)({
     typed: typed,
     DenseMatrix: DenseMatrix
   });
-  var algorithm12 = (0, _algorithm3.createAlgorithm12)({
+  var matAlgo12xSfs = (0, _matAlgo12xSfs.createMatAlgo12xSfs)({
     typed: typed,
     DenseMatrix: DenseMatrix
   });
-  var algorithm13 = (0, _algorithm4.createAlgorithm13)({
-    typed: typed
-  });
-  var algorithm14 = (0, _algorithm5.createAlgorithm14)({
-    typed: typed
+  var matrixAlgorithmSuite = (0, _matrixAlgorithmSuite.createMatrixAlgorithmSuite)({
+    typed: typed,
+    matrix: matrix
   });
   /**
    * Test whether two values are equal.
@@ -86,72 +82,15 @@ var createEqual = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
    * @return {boolean | Array | Matrix} Returns true when the compared values are equal, else returns false
    */
 
-  return typed(name, {
-    'any, any': function anyAny(x, y) {
-      // strict equality for null and undefined?
-      if (x === null) {
-        return y === null;
-      }
-
-      if (y === null) {
-        return x === null;
-      }
-
-      if (x === undefined) {
-        return y === undefined;
-      }
-
-      if (y === undefined) {
-        return x === undefined;
-      }
-
-      return equalScalar(x, y);
-    },
-    'SparseMatrix, SparseMatrix': function SparseMatrixSparseMatrix(x, y) {
-      return algorithm07(x, y, equalScalar);
-    },
-    'SparseMatrix, DenseMatrix': function SparseMatrixDenseMatrix(x, y) {
-      return algorithm03(y, x, equalScalar, true);
-    },
-    'DenseMatrix, SparseMatrix': function DenseMatrixSparseMatrix(x, y) {
-      return algorithm03(x, y, equalScalar, false);
-    },
-    'DenseMatrix, DenseMatrix': function DenseMatrixDenseMatrix(x, y) {
-      return algorithm13(x, y, equalScalar);
-    },
-    'Array, Array': function ArrayArray(x, y) {
-      // use matrix implementation
-      return this(matrix(x), matrix(y)).valueOf();
-    },
-    'Array, Matrix': function ArrayMatrix(x, y) {
-      // use matrix implementation
-      return this(matrix(x), y);
-    },
-    'Matrix, Array': function MatrixArray(x, y) {
-      // use matrix implementation
-      return this(x, matrix(y));
-    },
-    'SparseMatrix, any': function SparseMatrixAny(x, y) {
-      return algorithm12(x, y, equalScalar, false);
-    },
-    'DenseMatrix, any': function DenseMatrixAny(x, y) {
-      return algorithm14(x, y, equalScalar, false);
-    },
-    'any, SparseMatrix': function anySparseMatrix(x, y) {
-      return algorithm12(y, x, equalScalar, true);
-    },
-    'any, DenseMatrix': function anyDenseMatrix(x, y) {
-      return algorithm14(y, x, equalScalar, true);
-    },
-    'Array, any': function ArrayAny(x, y) {
-      // use matrix implementation
-      return algorithm14(matrix(x), y, equalScalar, false).valueOf();
-    },
-    'any, Array': function anyArray(x, y) {
-      // use matrix implementation
-      return algorithm14(matrix(y), x, equalScalar, true).valueOf();
-    }
-  });
+  return typed(name, createEqualNumber({
+    typed: typed,
+    equalScalar: equalScalar
+  }), matrixAlgorithmSuite({
+    elop: equalScalar,
+    SS: matAlgo07xSSf,
+    DS: matAlgo03xDSf,
+    Ss: matAlgo12xSfs
+  }));
 });
 exports.createEqual = createEqual;
 var createEqualNumber = (0, _factory.factory)(name, ['typed', 'equalScalar'], function (_ref2) {

package/lib/cjs/function/relational/equalScalar.js

@@ -13,12 +13,16 @@ var _factory = require("../../utils/factory.js");
 
 var _complex = require("../../utils/complex.js");
 
+var _compareUnits = require("./compareUnits.js");
+
 var name = 'equalScalar';
 var dependencies = ['typed', 'config'];
 var createEqualScalar = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       config = _ref.config;
-
+  var compareUnits = (0, _compareUnits.createCompareUnits)({
+    typed: typed
+  });
   /**
    * Test whether two scalar values are nearly equal.
    *
@@ -27,6 +31,7 @@ var createEqualScalar = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    * @return {boolean}                                                  Returns true when the compared values are equal, else returns false
    * @private
    */
+
   return typed(name, {
     'boolean, boolean': function booleanBoolean(x, y) {
       return x === y;
@@ -42,15 +47,8 @@ var createEqualScalar = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     },
     'Complex, Complex': function ComplexComplex(x, y) {
       return (0, _complex.complexEquals)(x, y, config.epsilon);
-    },
-    'Unit, Unit': function UnitUnit(x, y) {
-      if (!x.equalBase(y)) {
-        throw new Error('Cannot compare units with different base');
-      }
-
-      return this(x.value, y.value);
     }
-  });
+  }, compareUnits);
 });
 exports.createEqualScalar = createEqualScalar;
 var createEqualScalarNumber = (0, _factory.factory)(name, ['typed', 'config'], function (_ref2) {