mathjs 10.0.2 → 10.2.0

package/lib/cjs/factoriesAny.js

@@ -879,6 +879,12 @@ Object.defineProperty(exports, "createInverseConductanceQuantum", {
     return _physicalConstants.createInverseConductanceQuantum;
   }
 });
+Object.defineProperty(exports, "createInvmod", {
+  enumerable: true,
+  get: function get() {
+    return _invmod.createInvmod;
+  }
+});
 Object.defineProperty(exports, "createIsInteger", {
   enumerable: true,
   get: function get() {
@@ -981,6 +987,12 @@ Object.defineProperty(exports, "createLcm", {
     return _lcm.createLcm;
   }
 });
+Object.defineProperty(exports, "createLeafCount", {
+  enumerable: true,
+  get: function get() {
+    return _leafCount.createLeafCount;
+  }
+});
 Object.defineProperty(exports, "createLeftShift", {
   enumerable: true,
   get: function get() {
@@ -1503,6 +1515,12 @@ Object.defineProperty(exports, "createResize", {
     return _resize.createResize;
   }
 });
+Object.defineProperty(exports, "createResolve", {
+  enumerable: true,
+  get: function get() {
+    return _resolve.createResolve;
+  }
+});
 Object.defineProperty(exports, "createResultSet", {
   enumerable: true,
   get: function get() {
@@ -1671,6 +1689,12 @@ Object.defineProperty(exports, "createSimplify", {
     return _simplify.createSimplify;
   }
 });
+Object.defineProperty(exports, "createSimplifyCore", {
+  enumerable: true,
+  get: function get() {
+    return _simplifyCore.createSimplifyCore;
+  }
+});
 Object.defineProperty(exports, "createSin", {
   enumerable: true,
   get: function get() {
@@ -2112,6 +2136,8 @@ var _subtract = require("./function/arithmetic/subtract.js");
 
 var _xgcd = require("./function/arithmetic/xgcd.js");
 
+var _invmod = require("./function/arithmetic/invmod.js");
+
 var _dotMultiply = require("./function/arithmetic/dotMultiply.js");
 
 var _bitAnd = require("./function/bitwise/bitAnd.js");
@@ -2486,8 +2512,14 @@ var _catalan = require("./function/combinatorics/catalan.js");
 
 var _composition = require("./function/combinatorics/composition.js");
 
+var _leafCount = require("./function/algebra/leafCount.js");
+
 var _simplify = require("./function/algebra/simplify.js");
 
+var _simplifyCore = require("./function/algebra/simplifyCore.js");
+
+var _resolve = require("./function/algebra/resolve.js");
+
 var _derivative = require("./function/algebra/derivative.js");
 
 var _rationalize = require("./function/algebra/rationalize.js");

package/lib/cjs/factoriesNumber.js

@@ -579,6 +579,12 @@ Object.defineProperty(exports, "createReplacer", {
     return _replacer.createReplacer;
   }
 });
+Object.defineProperty(exports, "createResolve", {
+  enumerable: true,
+  get: function get() {
+    return _resolve.createResolve;
+  }
+});
 Object.defineProperty(exports, "createResultSet", {
   enumerable: true,
   get: function get() {
@@ -617,6 +623,12 @@ Object.defineProperty(exports, "createSimplify", {
     return _simplify.createSimplify;
   }
 });
+Object.defineProperty(exports, "createSimplifyCore", {
+  enumerable: true,
+  get: function get() {
+    return _simplifyCore.createSimplifyCore;
+  }
+});
 exports.createSinh = exports.createSin = void 0;
 Object.defineProperty(exports, "createSize", {
   enumerable: true,
@@ -764,8 +776,12 @@ var _help = require("./expression/function/help.js");
 
 var _chain = require("./type/chain/function/chain.js");
 
+var _resolve = require("./function/algebra/resolve.js");
+
 var _simplify = require("./function/algebra/simplify.js");
 
+var _simplifyCore = require("./function/algebra/simplifyCore.js");
+
 var _derivative = require("./function/algebra/derivative.js");
 
 var _rationalize = require("./function/algebra/rationalize.js");

package/lib/cjs/function/algebra/decomposition/qr.js

@@ -73,7 +73,7 @@ var createQr = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function
    * @return {{Q: Array | Matrix, R: Array | Matrix}} Q: the orthogonal
    * matrix and R: the upper triangular matrix
    */
-  return (0, _extends2["default"])(typed(name, {
+  return (0, _extends2.default)(typed(name, {
     DenseMatrix: function DenseMatrix(m) {
       return _denseQR(m);
     },

package/lib/cjs/function/algebra/leafCount.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createLeafCount = void 0;
+
+var _factory = require("../../utils/factory.js");
+
+var name = 'leafCount';
+var dependencies = ['parse', 'typed'];
+var createLeafCount = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+  var parse = _ref.parse,
+      typed = _ref.typed;
+
+  // This does the real work, but we don't have to recurse through
+  // a typed call if we separate it out
+  function countLeaves(node) {
+    var count = 0;
+    node.forEach(function (n) {
+      count += countLeaves(n);
+    });
+    return count || 1;
+  }
+  /**
+   * Gives the number of "leaf nodes" in the parse tree of the given expression
+   * A leaf node is one that has no subexpressions, essentially either a
+   * symbol or a constant. Note that `5!` has just one leaf, the '5'; the
+   * unary factorial operator does not add a leaf. On the other hand,
+   * function symbols do add leaves, so `sin(x)/cos(x)` has four leaves.
+   *
+   * The `simplify()` function should generally not increase the `leafCount()`
+   * of an expression, although currently there is no guarantee that it never
+   * does so. In many cases, `simplify()` reduces the leaf count.
+   *
+   * Syntax:
+   *
+   *     leafCount(expr)
+   *
+   * Examples:
+   *
+   *     math.leafCount('x') // 1
+   *     math.leafCount(math.parse('a*d-b*c')) // 4
+   *     math.leafCount('[a,b;c,d][0,1]') // 6
+   *
+   * See also:
+   *
+   *     simplify
+   *
+   * @param {Node|string} expr    The expression to count the leaves of
+   *
+   * @return {number}  The number of leaves of `expr`
+   *
+   */
+
+
+  return typed(name, {
+    string: function string(expr) {
+      return this(parse(expr));
+    },
+    Node: function Node(expr) {
+      return countLeaves(expr);
+    }
+  });
+});
+exports.createLeafCount = createLeafCount;

package/lib/cjs/function/algebra/rationalize.js

@@ -11,10 +11,8 @@ var _factory = require("../../utils/factory.js");
 
 var _simplifyConstant = require("./simplify/simplifyConstant.js");
 
-var _simplifyCore = require("./simplify/simplifyCore.js");
-
 var name = 'rationalize';
-var dependencies = ['config', 'typed', 'equal', 'isZero', 'add', 'subtract', 'multiply', 'divide', 'pow', 'parse', 'simplify', '?bignumber', '?fraction', 'mathWithTransform', 'ConstantNode', 'OperatorNode', 'FunctionNode', 'SymbolNode', 'ParenthesisNode'];
+var dependencies = ['config', 'typed', 'equal', 'isZero', 'add', 'subtract', 'multiply', 'divide', 'pow', 'parse', 'simplifyCore', 'simplify', '?bignumber', '?fraction', 'mathWithTransform', 'matrix', 'AccessorNode', 'ArrayNode', 'ConstantNode', 'FunctionNode', 'IndexNode', 'ObjectNode', 'OperatorNode', 'SymbolNode', 'ParenthesisNode'];
 var createRationalize = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
   var config = _ref.config,
       typed = _ref.typed,
@@ -26,38 +24,36 @@ var createRationalize = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
       divide = _ref.divide,
       pow = _ref.pow,
       parse = _ref.parse,
+      simplifyCore = _ref.simplifyCore,
       simplify = _ref.simplify,
       fraction = _ref.fraction,
       bignumber = _ref.bignumber,
       mathWithTransform = _ref.mathWithTransform,
+      matrix = _ref.matrix,
+      AccessorNode = _ref.AccessorNode,
+      ArrayNode = _ref.ArrayNode,
       ConstantNode = _ref.ConstantNode,
-      OperatorNode = _ref.OperatorNode,
       FunctionNode = _ref.FunctionNode,
+      IndexNode = _ref.IndexNode,
+      ObjectNode = _ref.ObjectNode,
+      OperatorNode = _ref.OperatorNode,
       SymbolNode = _ref.SymbolNode,
       ParenthesisNode = _ref.ParenthesisNode;
   var simplifyConstant = (0, _simplifyConstant.createSimplifyConstant)({
     typed: typed,
     config: config,
     mathWithTransform: mathWithTransform,
+    matrix: matrix,
     fraction: fraction,
     bignumber: bignumber,
+    AccessorNode: AccessorNode,
+    ArrayNode: ArrayNode,
     ConstantNode: ConstantNode,
-    OperatorNode: OperatorNode,
     FunctionNode: FunctionNode,
-    SymbolNode: SymbolNode
-  });
-  var simplifyCore = (0, _simplifyCore.createSimplifyCore)({
-    equal: equal,
-    isZero: isZero,
-    add: add,
-    subtract: subtract,
-    multiply: multiply,
-    divide: divide,
-    pow: pow,
-    ConstantNode: ConstantNode,
+    IndexNode: IndexNode,
+    ObjectNode: ObjectNode,
     OperatorNode: OperatorNode,
-    FunctionNode: FunctionNode,
-    ParenthesisNode: ParenthesisNode
+    SymbolNode: SymbolNode
   });
   /**
    * Transform a rationalizable expression in a rational fraction.
@@ -102,13 +98,13 @@ var createRationalize = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    * @param  {Object|boolean}      optional scope of expression or true for already evaluated rational expression at input
    * @param  {Boolean}  detailed   optional True if return an object, false if return expression node (default)
    *
-   * @return {Object | Node}    The rational polynomial of `expr` or na object
-   *            {Object}
-   *              {Expression Node} expression: node simplified expression
-   *              {Expression Node} numerator: simplified numerator of expression
-   *              {Expression Node | boolean} denominator: simplified denominator or false (if there is no denominator)
-   *              {Array}           variables:  variable names
-   *              {Array}           coefficients: coefficients of numerator sorted by increased exponent
+   * @return {Object | Node}    The rational polynomial of `expr` or an object
+   *            `{expression, numerator, denominator, variables, coefficients}`, where
+   *              `expression` is a `Node` with the node simplified expression,
+   *              `numerator` is a `Node` with the simplified numerator of expression,
+   *              `denominator` is a `Node` or `boolean` with the simplified denominator or `false` (if there is no denominator),
+   *              `variables` is an array with variable names,
+   *              and `coefficients` is an array with coefficients of numerator sorted by increased exponent
    *           {Expression Node}  node simplified expression
    *
    */
@@ -141,6 +137,12 @@ var createRationalize = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
       var polyRet = polynomial(expr, scope, true, setRules.firstRules); // Check if expression is a rationalizable polynomial
 
       var nVars = polyRet.variables.length;
+      var noExactFractions = {
+        exactFractions: false
+      };
+      var withExactFractions = {
+        exactFractions: true
+      };
       expr = polyRet.expression;
 
       if (nVars >= 1) {
@@ -151,18 +153,16 @@ var createRationalize = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
 
         var rules;
         var eDistrDiv = true;
-        var redoInic = false;
-        expr = simplify(expr, setRules.firstRules, {}, {
-          exactFractions: false
-        }); // Apply the initial rules, including succ div rules
+        var redoInic = false; // Apply the initial rules, including succ div rules:
 
+        expr = simplify(expr, setRules.firstRules, {}, noExactFractions);
         var s;
 
         while (true) {
-          // Apply alternately  successive division rules and distr.div.rules
+          // Alternate applying successive division rules and distr.div.rules
+          // until there are no more changes:
           rules = eDistrDiv ? setRules.distrDivRules : setRules.sucDivRules;
-          expr = simplify(expr, rules); // until no more changes
-
+          expr = simplify(expr, rules, {}, withExactFractions);
           eDistrDiv = !eDistrDiv; // Swap between Distr.Div and Succ. Div. Rules
 
           s = expr.toString();
@@ -177,14 +177,11 @@ var createRationalize = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
 
         if (redoInic) {
           // Apply first rules again without succ div rules (if there are changes)
-          expr = simplify(expr, setRules.firstRulesAgain, {}, {
-            exactFractions: false
-          });
-        }
+          expr = simplify(expr, setRules.firstRulesAgain, {}, noExactFractions);
+        } // Apply final rules:
+
 
-        expr = simplify(expr, setRules.finalRules, {}, {
-          exactFractions: false
-        }); // Apply final rules
+        expr = simplify(expr, setRules.finalRules, {}, noExactFractions);
       } // NVars >= 1
 
 

package/lib/cjs/function/algebra/resolve.js

@@ -0,0 +1,106 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createResolve = void 0;
+
+var _map = require("../../utils/map.js");
+
+var _is = require("../../utils/is.js");
+
+var _factory = require("../../utils/factory.js");
+
+var name = 'resolve';
+var dependencies = ['parse', 'ConstantNode', 'FunctionNode', 'OperatorNode', 'ParenthesisNode'];
+var createResolve = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
+  var parse = _ref.parse,
+      ConstantNode = _ref.ConstantNode,
+      FunctionNode = _ref.FunctionNode,
+      OperatorNode = _ref.OperatorNode,
+      ParenthesisNode = _ref.ParenthesisNode;
+
+  /**
+   * resolve(expr, scope) replaces variable nodes with their scoped values
+   *
+   * Syntax:
+   *
+   *     resolve(expr, scope)
+   *
+   * Examples:
+   *
+   *     math.resolve('x + y', {x:1, y:2})           // Node {1 + 2}
+   *     math.resolve(math.parse('x+y'), {x:1, y:2}) // Node {1 + 2}
+   *     math.simplify('x+y', {x:2, y:'x+x'}).toString()      // "6"
+   *
+   * See also:
+   *
+   *     simplify, evaluate
+   *
+   * @param {Node} node
+   *     The expression tree to be simplified
+   * @param {Object} scope
+   *     Scope specifying variables to be resolved
+   * @return {Node} Returns `node` with variables recursively substituted.
+   * @throws {ReferenceError}
+   *     If there is a cyclic dependency among the variables in `scope`,
+   *     resolution is impossible and a ReferenceError is thrown.
+   */
+  function resolve(node, scope) {
+    var within = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+
+    // note `within`:
+    // `within` is not documented, since it is for internal cycle
+    // detection only
+    if (!scope) {
+      return node;
+    }
+
+    if (!(0, _map.isMap)(scope)) {
+      scope = (0, _map.createMap)(scope);
+    }
+
+    if ((0, _is.isSymbolNode)(node)) {
+      if (within.has(node.name)) {
+        var variables = Array.from(within).join(', ');
+        throw new ReferenceError("recursive loop of variable definitions among {".concat(variables, "}"));
+      }
+
+      var value = scope.get(node.name);
+
+      if ((0, _is.isNode)(value)) {
+        var nextWithin = new Set(within);
+        nextWithin.add(node.name);
+        return resolve(value, scope, nextWithin);
+      } else if (typeof value === 'number') {
+        return parse(String(value));
+      } else if (value !== undefined) {
+        return new ConstantNode(value);
+      } else {
+        return node;
+      }
+    } else if ((0, _is.isOperatorNode)(node)) {
+      var args = node.args.map(function (arg) {
+        return resolve(arg, scope, within);
+      });
+      return new OperatorNode(node.op, node.fn, args, node.implicit);
+    } else if ((0, _is.isParenthesisNode)(node)) {
+      return new ParenthesisNode(resolve(node.content, scope, within));
+    } else if ((0, _is.isFunctionNode)(node)) {
+      var _args = node.args.map(function (arg) {
+        return resolve(arg, scope, within);
+      });
+
+      return new FunctionNode(node.name, _args);
+    } // Otherwise just recursively resolve any children (might also work
+    // for some of the above special cases)
+
+
+    return node.map(function (child) {
+      return resolve(child, scope, within);
+    });
+  }
+
+  return resolve;
+});
+exports.createResolve = createResolve;