mathjs 10.6.3 → 11.0.1

package/lib/cjs/type/matrix/utils/{algorithm08.js → matAlgo08xS0Sid.js}

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm08 = void 0;
+exports.createMatAlgo08xS0Sid = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
 var _DimensionError = require("../../../error/DimensionError.js");
 
-var name = 'algorithm08';
+var name = 'matAlgo08xS0Sid';
 var dependencies = ['typed', 'equalScalar'];
-var createAlgorithm08 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo08xS0Sid = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       equalScalar = _ref.equalScalar;
 
@@ -21,7 +21,7 @@ var createAlgorithm08 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    *
    *          ┌  f(Aij, Bij)  ; A(i,j) !== 0 && B(i,j) !== 0
-   * C(i,j) = ┤  A(i,j)       ; A(i,j) !== 0
+   * C(i,j) = ┤  A(i,j)       ; A(i,j) !== 0 && B(i,j) === 0
    *          └  0            ; otherwise
    *
    *
@@ -33,7 +33,7 @@ var createAlgorithm08 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * see https://github.com/josdejong/mathjs/pull/346#issuecomment-97620294
    */
-  return function algorithm08(a, b, callback) {
+  return function matAlgo08xS0Sid(a, b, callback) {
     // sparse matrix arrays
     var avalues = a._values;
     var aindex = a._index;
@@ -156,4 +156,4 @@ var createAlgorithm08 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     });
   };
 });
-exports.createAlgorithm08 = createAlgorithm08;
+exports.createMatAlgo08xS0Sid = createMatAlgo08xS0Sid;

package/lib/cjs/type/matrix/utils/{algorithm09.js → matAlgo09xS0Sf.js}

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm09 = void 0;
+exports.createMatAlgo09xS0Sf = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
 var _DimensionError = require("../../../error/DimensionError.js");
 
-var name = 'algorithm09';
+var name = 'matAlgo09xS0Sf';
 var dependencies = ['typed', 'equalScalar'];
-var createAlgorithm09 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo09xS0Sf = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       equalScalar = _ref.equalScalar;
 
@@ -33,7 +33,7 @@ var createAlgorithm09 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * see https://github.com/josdejong/mathjs/pull/346#issuecomment-97620294
    */
-  return function algorithm09(a, b, callback) {
+  return function matAlgo09xS0Sf(a, b, callback) {
     // sparse matrix arrays
     var avalues = a._values;
     var aindex = a._index;
@@ -143,4 +143,4 @@ var createAlgorithm09 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     });
   };
 });
-exports.createAlgorithm09 = createAlgorithm09;
+exports.createMatAlgo09xS0Sf = createMatAlgo09xS0Sf;

package/lib/cjs/type/matrix/utils/{algorithm10.js → matAlgo10xSids.js}

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm10 = void 0;
+exports.createMatAlgo10xSids = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
-var name = 'algorithm10';
+var name = 'matAlgo10xSids';
 var dependencies = ['typed', 'DenseMatrix'];
-var createAlgorithm10 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo10xSids = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       DenseMatrix = _ref.DenseMatrix;
 
@@ -32,7 +32,7 @@ var createAlgorithm10 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * https://github.com/josdejong/mathjs/pull/346#issuecomment-97626813
    */
-  return function algorithm10(s, b, callback, inverse) {
+  return function matAlgo10xSids(s, b, callback, inverse) {
     // sparse matrix arrays
     var avalues = s._values;
     var aindex = s._index;
@@ -107,4 +107,4 @@ var createAlgorithm10 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     });
   };
 });
-exports.createAlgorithm10 = createAlgorithm10;
+exports.createMatAlgo10xSids = createMatAlgo10xSids;

package/lib/cjs/type/matrix/utils/{algorithm11.js → matAlgo11xS0s.js}

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm11 = void 0;
+exports.createMatAlgo11xS0s = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
-var name = 'algorithm11';
+var name = 'matAlgo11xS0s';
 var dependencies = ['typed', 'equalScalar'];
-var createAlgorithm11 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo11xS0s = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       equalScalar = _ref.equalScalar;
 
@@ -32,7 +32,7 @@ var createAlgorithm11 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * https://github.com/josdejong/mathjs/pull/346#issuecomment-97626813
    */
-  return function algorithm11(s, b, callback, inverse) {
+  return function matAlgo11xS0s(s, b, callback, inverse) {
     // sparse matrix arrays
     var avalues = s._values;
     var aindex = s._index;
@@ -104,4 +104,4 @@ var createAlgorithm11 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     });
   };
 });
-exports.createAlgorithm11 = createAlgorithm11;
+exports.createMatAlgo11xS0s = createMatAlgo11xS0s;

package/lib/cjs/type/matrix/utils/{algorithm12.js → matAlgo12xSfs.js}

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm12 = void 0;
+exports.createMatAlgo12xSfs = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
-var name = 'algorithm12';
+var name = 'matAlgo12xSfs';
 var dependencies = ['typed', 'DenseMatrix'];
-var createAlgorithm12 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo12xSfs = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed,
       DenseMatrix = _ref.DenseMatrix;
 
@@ -32,7 +32,7 @@ var createAlgorithm12 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * https://github.com/josdejong/mathjs/pull/346#issuecomment-97626813
    */
-  return function algorithm12(s, b, callback, inverse) {
+  return function matAlgo12xSfs(s, b, callback, inverse) {
     // sparse matrix arrays
     var avalues = s._values;
     var aindex = s._index;
@@ -107,4 +107,4 @@ var createAlgorithm12 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     });
   };
 });
-exports.createAlgorithm12 = createAlgorithm12;
+exports.createMatAlgo12xSfs = createMatAlgo12xSfs;

package/lib/cjs/type/matrix/utils/{algorithm13.js → matAlgo13xDD.js}

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm13 = void 0;
+exports.createMatAlgo13xDD = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
 var _DimensionError = require("../../../error/DimensionError.js");
 
-var name = 'algorithm13';
+var name = 'matAlgo13xDD';
 var dependencies = ['typed'];
-var createAlgorithm13 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo13xDD = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed;
 
   /**
@@ -28,7 +28,7 @@ var createAlgorithm13 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * https://github.com/josdejong/mathjs/pull/346#issuecomment-97658658
    */
-  return function algorithm13(a, b, callback) {
+  return function matAlgo13xDD(a, b, callback) {
     // a arrays
     var adata = a._data;
     var asize = a._size;
@@ -98,4 +98,4 @@ var createAlgorithm13 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     return cv;
   }
 });
-exports.createAlgorithm13 = createAlgorithm13;
+exports.createMatAlgo13xDD = createMatAlgo13xDD;

package/lib/cjs/type/matrix/utils/{algorithm14.js → matAlgo14xDs.js}

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAlgorithm14 = void 0;
+exports.createMatAlgo14xDs = void 0;
 
 var _factory = require("../../../utils/factory.js");
 
 var _object = require("../../../utils/object.js");
 
-var name = 'algorithm14';
+var name = 'matAlgo14xDs';
 var dependencies = ['typed'];
-var createAlgorithm14 = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+var createMatAlgo14xDs = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var typed = _ref.typed;
 
   /**
@@ -29,7 +29,7 @@ var createAlgorithm14 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    *
    * https://github.com/josdejong/mathjs/pull/346#issuecomment-97659042
    */
-  return function algorithm14(a, b, callback, inverse) {
+  return function matAlgo14xDs(a, b, callback, inverse) {
     // a arrays
     var adata = a._data;
     var asize = a._size;
@@ -79,4 +79,4 @@ var createAlgorithm14 = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     return cv;
   }
 });
-exports.createAlgorithm14 = createAlgorithm14;
+exports.createMatAlgo14xDs = createMatAlgo14xDs;

package/lib/cjs/type/matrix/utils/matrixAlgorithmSuite.js

@@ -0,0 +1,238 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMatrixAlgorithmSuite = void 0;
+
+var _factory = require("../../../utils/factory.js");
+
+var _object = require("../../../utils/object.js");
+
+var _matAlgo13xDD = require("./matAlgo13xDD.js");
+
+var _matAlgo14xDs = require("./matAlgo14xDs.js");
+
+var name = 'matrixAlgorithmSuite';
+var dependencies = ['typed', 'matrix'];
+var createMatrixAlgorithmSuite = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+  var typed = _ref.typed,
+      matrix = _ref.matrix;
+  var matAlgo13xDD = (0, _matAlgo13xDD.createMatAlgo13xDD)({
+    typed: typed
+  });
+  var matAlgo14xDs = (0, _matAlgo14xDs.createMatAlgo14xDs)({
+    typed: typed
+  });
+  /**
+   * Return a signatures object with the usual boilerplate of
+   * matrix algorithms, based on a plain options object with the
+   * following properties:
+   *   elop: function -- the elementwise operation to use, defaults to self
+   *   SS: function -- the algorithm to apply for two sparse matrices
+   *   DS: function -- the algorithm to apply for a dense and a sparse matrix
+   *   SD: function -- algo for a sparse and a dense; defaults to SD flipped
+   *   Ss: function -- the algorithm to apply for a sparse matrix and scalar
+   *   sS: function -- algo for scalar and sparse; defaults to Ss flipped
+   *   scalar: string -- typed-function type for scalars, defaults to 'any'
+   *
+   * If Ss is not specified, no matrix-scalar signatures are generated.
+   *
+   * @param {object} options
+   * @return {Object<string, function>} signatures
+   */
+
+  return function matrixAlgorithmSuite(options) {
+    var elop = options.elop;
+    var SD = options.SD || options.DS;
+    var matrixSignatures;
+
+    if (elop) {
+      // First the dense ones
+      matrixSignatures = {
+        'DenseMatrix, DenseMatrix': function DenseMatrixDenseMatrix(x, y) {
+          return matAlgo13xDD(x, y, elop);
+        },
+        'Array, Array': function ArrayArray(x, y) {
+          return matAlgo13xDD(matrix(x), matrix(y), elop).valueOf();
+        },
+        'Array, DenseMatrix': function ArrayDenseMatrix(x, y) {
+          return matAlgo13xDD(matrix(x), y, elop);
+        },
+        'DenseMatrix, Array': function DenseMatrixArray(x, y) {
+          return matAlgo13xDD(x, matrix(y), elop);
+        }
+      }; // Now incorporate sparse matrices
+
+      if (options.SS) {
+        matrixSignatures['SparseMatrix, SparseMatrix'] = function (x, y) {
+          return options.SS(x, y, elop, false);
+        };
+      }
+
+      if (options.DS) {
+        matrixSignatures['DenseMatrix, SparseMatrix'] = function (x, y) {
+          return options.DS(x, y, elop, false);
+        };
+
+        matrixSignatures['Array, SparseMatrix'] = function (x, y) {
+          return options.DS(matrix(x), y, elop, false);
+        };
+      }
+
+      if (SD) {
+        matrixSignatures['SparseMatrix, DenseMatrix'] = function (x, y) {
+          return SD(y, x, elop, true);
+        };
+
+        matrixSignatures['SparseMatrix, Array'] = function (x, y) {
+          return SD(matrix(y), x, elop, true);
+        };
+      }
+    } else {
+      // No elop, use this
+      // First the dense ones
+      matrixSignatures = {
+        'DenseMatrix, DenseMatrix': typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo13xDD(x, y, self);
+          };
+        }),
+        'Array, Array': typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo13xDD(matrix(x), matrix(y), self).valueOf();
+          };
+        }),
+        'Array, DenseMatrix': typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo13xDD(matrix(x), y, self);
+          };
+        }),
+        'DenseMatrix, Array': typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo13xDD(x, matrix(y), self);
+          };
+        })
+      }; // Now incorporate sparse matrices
+
+      if (options.SS) {
+        matrixSignatures['SparseMatrix, SparseMatrix'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return options.SS(x, y, self, false);
+          };
+        });
+      }
+
+      if (options.DS) {
+        matrixSignatures['DenseMatrix, SparseMatrix'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return options.DS(x, y, self, false);
+          };
+        });
+        matrixSignatures['Array, SparseMatrix'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return options.DS(matrix(x), y, self, false);
+          };
+        });
+      }
+
+      if (SD) {
+        matrixSignatures['SparseMatrix, DenseMatrix'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return SD(y, x, self, true);
+          };
+        });
+        matrixSignatures['SparseMatrix, Array'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return SD(matrix(y), x, self, true);
+          };
+        });
+      }
+    } // Now add the scalars
+
+
+    var scalar = options.scalar || 'any';
+    var Ds = options.Ds || options.Ss;
+
+    if (Ds) {
+      if (elop) {
+        matrixSignatures['DenseMatrix,' + scalar] = function (x, y) {
+          return matAlgo14xDs(x, y, elop, false);
+        };
+
+        matrixSignatures[scalar + ', DenseMatrix'] = function (x, y) {
+          return matAlgo14xDs(y, x, elop, true);
+        };
+
+        matrixSignatures['Array,' + scalar] = function (x, y) {
+          return matAlgo14xDs(matrix(x), y, elop, false).valueOf();
+        };
+
+        matrixSignatures[scalar + ', Array'] = function (x, y) {
+          return matAlgo14xDs(matrix(y), x, elop, true).valueOf();
+        };
+      } else {
+        matrixSignatures['DenseMatrix,' + scalar] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo14xDs(x, y, self, false);
+          };
+        });
+        matrixSignatures[scalar + ', DenseMatrix'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo14xDs(y, x, self, true);
+          };
+        });
+        matrixSignatures['Array,' + scalar] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo14xDs(matrix(x), y, self, false).valueOf();
+          };
+        });
+        matrixSignatures[scalar + ', Array'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return matAlgo14xDs(matrix(y), x, self, true).valueOf();
+          };
+        });
+      }
+    }
+
+    var sS = options.sS !== undefined ? options.sS : options.Ss;
+
+    if (elop) {
+      if (options.Ss) {
+        matrixSignatures['SparseMatrix,' + scalar] = function (x, y) {
+          return options.Ss(x, y, elop, false);
+        };
+      }
+
+      if (sS) {
+        matrixSignatures[scalar + ', SparseMatrix'] = function (x, y) {
+          return sS(y, x, elop, true);
+        };
+      }
+    } else {
+      if (options.Ss) {
+        matrixSignatures['SparseMatrix,' + scalar] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return options.Ss(x, y, self, false);
+          };
+        });
+      }
+
+      if (sS) {
+        matrixSignatures[scalar + ', SparseMatrix'] = typed.referToSelf(function (self) {
+          return function (x, y) {
+            return sS(y, x, self, true);
+          };
+        });
+      }
+    } // Also pull in the scalar signatures if the operator is a typed function
+
+
+    if (elop && elop.signatures) {
+      (0, _object.extend)(matrixSignatures, elop.signatures);
+    }
+
+    return matrixSignatures;
+  };
+});
+exports.createMatrixAlgorithmSuite = createMatrixAlgorithmSuite;

package/lib/cjs/type/number.js

@@ -147,15 +147,17 @@ var createNumber = /* #__PURE__ */(0, _factory.factory)(name, dependencies, func
     Unit: function Unit(x) {
       throw new Error('Second argument with valueless unit expected');
     },
-    null: function _null(x) {
+    "null": function _null(x) {
       return 0;
     },
     'Unit, string | Unit': function UnitStringUnit(unit, valuelessUnit) {
       return unit.toNumber(valuelessUnit);
     },
-    'Array | Matrix': function ArrayMatrix(x) {
-      return (0, _collection.deepMap)(x, this);
-    }
+    'Array | Matrix': typed.referToSelf(function (self) {
+      return function (x) {
+        return (0, _collection.deepMap)(x, self);
+      };
+    })
   }); // reviver function to parse a JSON object like:
   //
   //     {"mathjs":"number","value":"2.3"}

package/lib/cjs/type/string.js

@@ -46,18 +46,20 @@ var createString = /* #__PURE__ */(0, _factory.factory)(name, dependencies, func
       return '';
     },
     number: _number.format,
-    null: function _null(x) {
+    "null": function _null(x) {
       return 'null';
     },
-    boolean: function boolean(x) {
+    "boolean": function boolean(x) {
       return x + '';
     },
     string: function string(x) {
       return x;
     },
-    'Array | Matrix': function ArrayMatrix(x) {
-      return (0, _collection.deepMap)(x, this);
-    },
+    'Array | Matrix': typed.referToSelf(function (self) {
+      return function (x) {
+        return (0, _collection.deepMap)(x, self);
+      };
+    }),
     any: function any(x) {
       return String(x);
     }