mathjs 11.3.3 → 11.4.0

package/lib/esm/expression/embeddedDocs/function/matrix/lyap.js

@@ -0,0 +1,8 @@
+export var lyapDocs = {
+  name: 'lyap',
+  category: 'Matrix',
+  syntax: ['lyap(A,Q)'],
+  description: 'Solves the Continuous-time Lyapunov equation AP+PA\'+Q=0 for P',
+  examples: ['lyap([[-2, 0], [1, -4]], [[3, 1], [1, 3]])', 'lyap(A,Q)'],
+  seealso: ['schur', 'sylvester']
+};

package/lib/esm/expression/embeddedDocs/function/matrix/schur.js

@@ -0,0 +1,8 @@
+export var schurDocs = {
+  name: 'schur',
+  category: 'Matrix',
+  syntax: ['schur(A)'],
+  description: 'Performs a real Schur decomposition of the real matrix A = UTU\'',
+  examples: ['schur([[1, 0], [-4, 3]])', 'schur(A)'],
+  seealso: ['lyap', 'sylvester']
+};

package/lib/esm/expression/embeddedDocs/function/matrix/sylvester.js

@@ -0,0 +1,8 @@
+export var sylvesterDocs = {
+  name: 'sylvester',
+  category: 'Matrix',
+  syntax: ['sylvester(A,B,C)'],
+  description: 'Solves the real-valued Sylvester equation AX+XB=C for X',
+  examples: ['sylvester([[-1, -2], [1, 1]], [[-2, 1], [-1, 2]], [[-3, 2], [3, 0]])', 'sylvester(A,B,C)'],
+  seealso: ['schur', 'lyap']
+};

package/lib/esm/factoriesAny.js

@@ -210,6 +210,7 @@ export { createLup } from './function/algebra/decomposition/lup.js';
 export { createQr } from './function/algebra/decomposition/qr.js';
 export { createSlu } from './function/algebra/decomposition/slu.js';
 export { createLusolve } from './function/algebra/solver/lusolve.js';
+export { createPolynomialRoot } from './function/algebra/polynomialRoot.js';
 export { createHelpClass } from './expression/Help.js';
 export { createChainClass } from './type/chain/Chain.js';
 export { createHelp } from './expression/function/help.js';
@@ -220,6 +221,9 @@ export { createPinv } from './function/matrix/pinv.js';
 export { createEigs } from './function/matrix/eigs.js';
 export { createExpm } from './function/matrix/expm.js';
 export { createSqrtm } from './function/matrix/sqrtm.js';
+export { createSylvester } from './function/algebra/sylvester.js';
+export { createSchur } from './function/algebra/decomposition/schur.js';
+export { createLyap } from './function/algebra/lyap.js';
 export { createDivide } from './function/arithmetic/divide.js';
 export { createDistance } from './function/geometry/distance.js';
 export { createIntersect } from './function/geometry/intersect.js';

package/lib/esm/function/algebra/decomposition/schur.js

@@ -0,0 +1,70 @@
+import { factory } from '../../../utils/factory.js';
+var name = 'schur';
+var dependencies = ['typed', 'matrix', 'identity', 'multiply', 'qr', 'norm', 'subtract'];
+export var createSchur = /* #__PURE__ */factory(name, dependencies, _ref => {
+  var {
+    typed,
+    matrix,
+    identity,
+    multiply,
+    qr,
+    norm,
+    subtract
+  } = _ref;
+  /**
+   *
+   * Performs a real Schur decomposition of the real matrix A = UTU' where U is orthogonal
+   * and T is upper quasi-triangular.
+   * https://en.wikipedia.org/wiki/Schur_decomposition
+   *
+   * Syntax:
+   *
+   *     math.schur(A)
+   *
+   * Examples:
+   *
+   *     const A = [[1, 0], [-4, 3]]
+   *     math.schur(A) // returns {T: [[3, 4], [0, 1]], R: [[0, 1], [-1, 0]]}
+   *
+   * See also:
+   *
+   *     sylvester, lyap, qr
+   *
+   * @param {Array | Matrix} A  Matrix A
+   * @return {{U: Array | Matrix, T: Array | Matrix}} Object containing both matrix U and T of the Schur Decomposition A=UTU'
+   */
+  return typed(name, {
+    Array: function Array(X) {
+      var r = _schur(matrix(X));
+      return {
+        U: r.U.valueOf(),
+        T: r.T.valueOf()
+      };
+    },
+    Matrix: function Matrix(X) {
+      return _schur(X);
+    }
+  });
+  function _schur(X) {
+    var n = X.size()[0];
+    var A = X;
+    var U = identity(n);
+    var k = 0;
+    var A0;
+    do {
+      A0 = A;
+      var QR = qr(A);
+      var Q = QR.Q;
+      var R = QR.R;
+      A = multiply(R, Q);
+      U = multiply(U, Q);
+      if (k++ > 100) {
+        break;
+      }
+    } while (norm(subtract(A, A0)) > 1e-4);
+    return {
+      U,
+      T: A
+    };
+  }
+});

package/lib/esm/function/algebra/lyap.js

@@ -0,0 +1,52 @@
+import { factory } from '../../utils/factory.js';
+var name = 'lyap';
+var dependencies = ['typed', 'matrix', 'sylvester', 'multiply', 'transpose'];
+export var createLyap = /* #__PURE__ */factory(name, dependencies, _ref => {
+  var {
+    typed,
+    matrix,
+    sylvester,
+    multiply,
+    transpose
+  } = _ref;
+  /**
+   *
+   * Solves the Continuous-time Lyapunov equation AP+PA'+Q=0 for P, where
+   * Q is an input matrix. When Q is symmetric, P is also symmetric. Notice
+   * that different equivalent definitions exist for the Continuous-time
+   * Lyapunov equation.
+   * https://en.wikipedia.org/wiki/Lyapunov_equation
+   *
+   * Syntax:
+   *
+   *     math.lyap(A, Q)
+   *
+   * Examples:
+   *
+   *     const A = [[-2, 0], [1, -4]]
+   *     const Q = [[3, 1], [1, 3]]
+   *     const P = math.lyap(A, Q)
+   *
+   * See also:
+   *
+   *     sylvester, schur
+   *
+   * @param {Matrix | Array} A  Matrix A
+   * @param {Matrix | Array} Q  Matrix Q
+   * @return {Matrix | Array} Matrix P solution to the Continuous-time Lyapunov equation AP+PA'=Q
+   */
+  return typed(name, {
+    'Matrix, Matrix': function MatrixMatrix(A, Q) {
+      return sylvester(A, transpose(A), multiply(-1, Q));
+    },
+    'Array, Matrix': function ArrayMatrix(A, Q) {
+      return sylvester(matrix(A), transpose(matrix(A)), multiply(-1, Q));
+    },
+    'Matrix, Array': function MatrixArray(A, Q) {
+      return sylvester(A, transpose(matrix(A)), matrix(multiply(-1, Q)));
+    },
+    'Array, Array': function ArrayArray(A, Q) {
+      return sylvester(matrix(A), transpose(matrix(A)), matrix(multiply(-1, Q))).toArray();
+    }
+  });
+});

package/lib/esm/function/algebra/polynomialRoot.js

@@ -0,0 +1,122 @@
+import { factory } from '../../utils/factory.js';
+var name = 'polynomialRoot';
+var dependencies = ['typed', 'isZero', 'equalScalar', 'add', 'subtract', 'multiply', 'divide', 'sqrt', 'unaryMinus', 'cbrt', 'typeOf', 'im', 're'];
+export var createPolynomialRoot = /* #__PURE__ */factory(name, dependencies, _ref => {
+  var {
+    typed,
+    isZero,
+    equalScalar,
+    add,
+    subtract,
+    multiply,
+    divide,
+    sqrt,
+    unaryMinus,
+    cbrt,
+    typeOf,
+    im,
+    re
+  } = _ref;
+  /**
+   * Finds the numerical values of the distinct roots of a polynomial with real or complex coefficients.
+   * Currently operates only on linear, quadratic, and cubic polynomials using the standard
+   * formulas for the roots.
+   *
+   * Syntax:
+   *
+   *     polynomialRoot(constant, linearCoeff, quadraticCoeff, cubicCoeff)
+   *
+   * Examples:
+   *     // linear
+   *     math.polynomialRoot(6, 3)                                        // [-2]
+   *     math.polynomialRoot(math.complex(6,3), 3)                        // [-2 - i]
+   *     math.polynomialRoot(math.complex(6,3), math.complex(2,1))        // [-3 + 0i]
+   *     // quadratic
+   *     math.polynomialRoot(2, -3, 1)                                    // [2, 1]
+   *     math.polynomialRoot(8, 8, 2)                                     // [-2]
+   *     math.polynomialRoot(-2, 0, 1)                                    // [1.4142135623730951, -1.4142135623730951]
+   *     math.polynomialRoot(2, -2, 1)                                    // [1 + i, 1 - i]
+   *     math.polynomialRoot(math.complex(1,3), math.complex(-3, -2), 1)  // [2 + i, 1 + i]
+   *     // cubic
+   *     math.polynomialRoot(-6, 11, -6, 1)                               // [1, 3, 2]
+   *     math.polynomialRoot(-8, 0, 0, 1)                                 // [-1 - 1.7320508075688774i, 2, -1 + 1.7320508075688774i]
+   *     math.polynomialRoot(0, 8, 8, 2)                                  // [0, -2]
+   *     math.polynomialRoot(1, 1, 1, 1)                                  // [-1 + 0i, 0 - i, 0 + i]
+   *
+   * See also:
+   *     cbrt, sqrt
+   *
+   * @param {... number | Complex} coeffs
+   *     The coefficients of the polynomial, starting with with the constant coefficent, followed
+   *     by the linear coefficient and subsequent coefficients of increasing powers.
+   * @return {Array} The distinct roots of the polynomial
+   */
+
+  return typed(name, {
+    'number|Complex, ...number|Complex': (constant, restCoeffs) => {
+      var coeffs = [constant, ...restCoeffs];
+      while (coeffs.length > 0 && isZero(coeffs[coeffs.length - 1])) {
+        coeffs.pop();
+      }
+      if (coeffs.length < 2) {
+        throw new RangeError("Polynomial [".concat(constant, ", ").concat(restCoeffs, "] must have a non-zero non-constant coefficient"));
+      }
+      switch (coeffs.length) {
+        case 2:
+          // linear
+          return [unaryMinus(divide(coeffs[0], coeffs[1]))];
+        case 3:
+          {
+            // quadratic
+            var [c, b, a] = coeffs;
+            var denom = multiply(2, a);
+            var d1 = multiply(b, b);
+            var d2 = multiply(4, a, c);
+            if (equalScalar(d1, d2)) return [divide(unaryMinus(b), denom)];
+            var discriminant = sqrt(subtract(d1, d2));
+            return [divide(subtract(discriminant, b), denom), divide(subtract(unaryMinus(discriminant), b), denom)];
+          }
+        case 4:
+          {
+            // cubic, cf. https://en.wikipedia.org/wiki/Cubic_equation
+            var [d, _c, _b, _a] = coeffs;
+            var _denom = unaryMinus(multiply(3, _a));
+            var D0_1 = multiply(_b, _b);
+            var D0_2 = multiply(3, _a, _c);
+            var D1_1 = add(multiply(2, _b, _b, _b), multiply(27, _a, _a, d));
+            var D1_2 = multiply(9, _a, _b, _c);
+            if (equalScalar(D0_1, D0_2) && equalScalar(D1_1, D1_2)) {
+              return [divide(_b, _denom)];
+            }
+            var Delta0 = subtract(D0_1, D0_2);
+            var Delta1 = subtract(D1_1, D1_2);
+            var discriminant1 = add(multiply(18, _a, _b, _c, d), multiply(_b, _b, _c, _c));
+            var discriminant2 = add(multiply(4, _b, _b, _b, d), multiply(4, _a, _c, _c, _c), multiply(27, _a, _a, d, d));
+            if (equalScalar(discriminant1, discriminant2)) {
+              return [divide(subtract(multiply(4, _a, _b, _c), add(multiply(9, _a, _a, d), multiply(_b, _b, _b))), multiply(_a, Delta0)),
+              // simple root
+              divide(subtract(multiply(9, _a, d), multiply(_b, _c)), multiply(2, Delta0)) // double root
+              ];
+            }
+            // OK, we have three distinct roots
+            var Ccubed;
+            if (equalScalar(D0_1, D0_2)) {
+              Ccubed = Delta1;
+            } else {
+              Ccubed = divide(add(Delta1, sqrt(subtract(multiply(Delta1, Delta1), multiply(4, Delta0, Delta0, Delta0)))), 2);
+            }
+            var allRoots = true;
+            var rawRoots = cbrt(Ccubed, allRoots).toArray().map(C => divide(add(_b, C, divide(Delta0, C)), _denom));
+            return rawRoots.map(r => {
+              if (typeOf(r) === 'Complex' && equalScalar(re(r), re(r) + im(r))) {
+                return re(r);
+              }
+              return r;
+            });
+          }
+        default:
+          throw new RangeError("only implemented for cubic or lower-order polynomials, not ".concat(coeffs));
+      }
+    }
+  });
+});

package/lib/esm/function/algebra/simplify/wildcards.js

@@ -0,0 +1,20 @@
+import { isConstantNode, isFunctionNode, isOperatorNode, isParenthesisNode } from '../../../utils/is.js';
+export { isConstantNode, isSymbolNode as isVariableNode } from '../../../utils/is.js';
+export function isNumericNode(x) {
+  return isConstantNode(x) || isOperatorNode(x) && x.isUnary() && isConstantNode(x.args[0]);
+}
+export function isConstantExpression(x) {
+  if (isConstantNode(x)) {
+    // Basic Constant types
+    return true;
+  }
+  if ((isFunctionNode(x) || isOperatorNode(x)) && x.args.every(isConstantExpression)) {
+    // Can be constant depending on arguments
+    return true;
+  }
+  if (isParenthesisNode(x) && isConstantExpression(x.content)) {
+    // Parenthesis are transparent
+    return true;
+  }
+  return false; // Probably missing some edge cases
+}

package/lib/esm/function/algebra/simplify.js

@@ -1,4 +1,5 @@
-import { isConstantNode, isParenthesisNode } from '../../utils/is.js';
+import { isParenthesisNode } from '../../utils/is.js';
+import { isConstantNode, isVariableNode, isNumericNode, isConstantExpression } from './simplify/wildcards.js';
 import { factory } from '../../utils/factory.js';
 import { createUtil } from './simplify/util.js';
 import { hasOwnProperty } from '../../utils/object.js';
@@ -75,9 +76,15 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    * expression is that variables starting with the following characters are
    * interpreted as wildcards:
    *
-   * - 'n' - matches any Node
-   * - 'c' - matches any ConstantNode
-   * - 'v' - matches any Node that is not a ConstantNode
+   * - 'n' - Matches any node [Node]
+   * - 'c' - Matches a constant literal (5 or 3.2) [ConstantNode]
+   * - 'cl' - Matches a constant literal; same as c [ConstantNode]
+   * - 'cd' - Matches a decimal literal (5 or -3.2) [ConstantNode or unaryMinus wrapping a ConstantNode]
+   * - 'ce' - Matches a constant expression (-5 or √3) [Expressions consisting of only ConstantNodes, functions, and operators]
+   * - 'v' - Matches a variable; anything not matched by c (-5 or x) [Node that is not a ConstantNode]
+   * - 'vl' - Matches a variable literal (x or y) [SymbolNode]
+   * - 'vd' - Matches a non-decimal expression; anything not matched by cd (x or √3) [Node that is not a ConstantNode or unaryMinus that is wrapping a ConstantNode]
+   * - 've' - Matches a variable expression; anything not matched by ce (x or 2x) [Expressions that contain a SymbolNode or other non-constant term]
    *
    * The default list of rules is exposed on the function as `simplify.rules`
    * and can be used as a basis to built a set of custom rules. Note that since
@@ -250,7 +257,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       }
     }
   }, {
-    s: '-(c*v) -> v * (-c)',
+    s: '-(cl*v) -> v * (-cl)',
     // make non-constant terms positive
     assuming: {
       multiply: {
@@ -261,7 +268,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       }
     }
   }, {
-    s: '-(c*v) -> (-c) * v',
+    s: '-(cl*v) -> (-cl) * v',
     // non-commutative version, part 1
     assuming: {
       multiply: {
@@ -272,7 +279,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       }
     }
   }, {
-    s: '-(v*c) -> v * (-c)',
+    s: '-(v*cl) -> v * (-cl)',
     // non-commutative version, part 2
     assuming: {
       multiply: {
@@ -330,24 +337,24 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
   },
   // collect like factors; into a sum, only do this for nonconstants
   {
-    l: ' v   * ( v   * n1 + n2)',
-    r: 'v^2       * n1 +  v   * n2'
+    l: ' vd   * ( vd   * n1 + n2)',
+    r: 'vd^2       * n1 +  vd   * n2'
   }, {
-    s: ' v   * (v^n4 * n1 + n2)   ->  v^(1+n4)  * n1 +  v   * n2',
+    s: ' vd   * (vd^n4 * n1 + n2)   ->  vd^(1+n4)  * n1 +  vd   * n2',
     assuming: {
       divide: {
         total: true
       }
     } // v*1/v = v^(1+-1) needs 1/v
   }, {
-    s: 'v^n3 * ( v   * n1 + n2)   ->  v^(n3+1)  * n1 + v^n3 * n2',
+    s: 'vd^n3 * ( vd   * n1 + n2)   ->  vd^(n3+1)  * n1 + vd^n3 * n2',
     assuming: {
       divide: {
         total: true
       }
     }
   }, {
-    s: 'v^n3 * (v^n4 * n1 + n2)   ->  v^(n3+n4) * n1 + v^n3 * n2',
+    s: 'vd^n3 * (vd^n4 * n1 + n2)   ->  vd^(n3+n4) * n1 + vd^n3 * n2',
     assuming: {
       divide: {
         total: true
@@ -390,8 +397,8 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     l: 'n+-n',
     r: '0'
   }, {
-    l: 'v*n + v',
-    r: 'v*(n+1)'
+    l: 'vd*n + vd',
+    r: 'vd*(n+1)'
   },
   // NOTE: leftmost position is special:
   {
@@ -406,7 +413,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     l: 'n3^(-n4)*n1 + n3^n5 * n2',
     r: 'n3^(-n4)*(n1 + n3^(n4+n5)*n2)'
   }, {
-    s: 'n*v + v -> (n+1)*v',
+    s: 'n*vd + vd -> (n+1)*vd',
     // noncommutative additional cases
     assuming: {
       multiply: {
@@ -435,10 +442,10 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       }
     }
   }, {
-    l: 'n*c + c',
-    r: '(n+1)*c'
+    l: 'n*cd + cd',
+    r: '(n+1)*cd'
   }, {
-    s: 'c*n + c -> c*(n+1)',
+    s: 'cd*n + cd -> cd*(n+1)',
     assuming: {
       multiply: {
         commutative: false
@@ -469,7 +476,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
   },
   // final ordering of constants
   {
-    s: 'c+v -> v+c',
+    s: 'ce+ve -> ve+ce',
     assuming: {
       add: {
         commutative: true
@@ -481,7 +488,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       }
     }
   }, {
-    s: 'v*c -> c*v',
+    s: 'vd*cd -> cd*vd',
     assuming: {
       multiply: {
         commutative: true
@@ -1047,9 +1054,8 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       }
     } else if (rule instanceof SymbolNode) {
       // If the rule is a SymbolNode, then it carries a special meaning
-      // according to the first character of the symbol node name.
-      // c.* matches a ConstantNode
-      // n.* matches any node
+      // according to the first one or two characters of the symbol node name.
+      // These meanings are expalined in the documentation for simplify()
       if (rule.name.length === 0) {
         throw new Error('Symbol in rule has 0 length...!?');
       }
@@ -1058,29 +1064,83 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
         if (rule.name !== node.name) {
           return [];
         }
-      } else if (rule.name[0] === 'n' || rule.name.substring(0, 2) === '_p') {
-        // rule matches _anything_, so assign this node to the rule.name placeholder
-        // Assign node to the rule.name placeholder.
-        // Our parent will check for matches among placeholders.
-        res[0].placeholders[rule.name] = node;
-      } else if (rule.name[0] === 'v') {
-        // rule matches any variable thing (not a ConstantNode)
-        if (!isConstantNode(node)) {
-          res[0].placeholders[rule.name] = node;
-        } else {
-          // Mis-match: rule was expecting something other than a ConstantNode
-          return [];
-        }
-      } else if (rule.name[0] === 'c') {
-        // rule matches any ConstantNode
-        if (node instanceof ConstantNode) {
-          res[0].placeholders[rule.name] = node;
-        } else {
-          // Mis-match: rule was expecting a ConstantNode
-          return [];
-        }
       } else {
-        throw new Error('Invalid symbol in rule: ' + rule.name);
+        // wildcards are composed of up to two alphabetic or underscore characters
+        switch (rule.name[1] >= 'a' && rule.name[1] <= 'z' ? rule.name.substring(0, 2) : rule.name[0]) {
+          case 'n':
+          case '_p':
+            // rule matches _anything_, so assign this node to the rule.name placeholder
+            // Assign node to the rule.name placeholder.
+            // Our parent will check for matches among placeholders.
+            res[0].placeholders[rule.name] = node;
+            break;
+          case 'c':
+          case 'cl':
+            // rule matches a ConstantNode
+            if (isConstantNode(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          case 'v':
+            // rule matches anything other than a ConstantNode
+            if (!isConstantNode(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          case 'vl':
+            // rule matches VariableNode
+            if (isVariableNode(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          case 'cd':
+            // rule matches a ConstantNode or unaryMinus-wrapped ConstantNode
+            if (isNumericNode(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          case 'vd':
+            // rule matches anything other than a ConstantNode or unaryMinus-wrapped ConstantNode
+            if (!isNumericNode(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          case 'ce':
+            // rule matches expressions that have a constant value
+            if (isConstantExpression(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          case 've':
+            // rule matches expressions that do not have a constant value
+            if (!isConstantExpression(node)) {
+              res[0].placeholders[rule.name] = node;
+            } else {
+              // mis-match: rule does not encompass current node
+              return [];
+            }
+            break;
+          default:
+            throw new Error('Invalid symbol in rule: ' + rule.name);
+        }
       }
     } else if (rule instanceof ConstantNode) {
       // Literal constant must match exactly

package/lib/esm/function/algebra/simplifyConstant.js

@@ -286,20 +286,37 @@ export var createSimplifyConstant = /* #__PURE__ */factory(name, dependencies, _
    * @return - Either a Node representing a binary expression or Fraction
    */
   function foldOp(fn, args, makeNode, options) {
-    return args.reduce(function (a, b) {
-      if (!isNode(a) && !isNode(b)) {
+    var first = args.shift();
+
+    // In the following reduction, sofar always has one of the three following
+    // forms: [NODE], [CONSTANT], or [NODE, CONSTANT]
+    var reduction = args.reduce((sofar, next) => {
+      if (!isNode(next)) {
+        var last = sofar.pop();
+        if (isNode(last)) {
+          return [last, next];
+        }
+        // Two constants in a row, try to fold them into one
         try {
-          return _eval(fn, [a, b], options);
-        } catch (ignoreandcontinue) {}
-        a = _toNode(a);
-        b = _toNode(b);
-      } else if (!isNode(a)) {
-        a = _toNode(a);
-      } else if (!isNode(b)) {
-        b = _toNode(b);
+          sofar.push(_eval(fn, [last, next], options));
+          return sofar;
+        } catch (ignoreandcontinue) {
+          sofar.push(last);
+          // fall through to Node case
+        }
       }
-      return makeNode([a, b]);
-    });
+
+      // Encountered a Node, or failed folding --
+      // collapse everything so far into a single tree:
+      sofar.push(_ensureNode(sofar.pop()));
+      var newtree = sofar.length === 1 ? sofar[0] : makeNode(sofar);
+      return [makeNode([newtree, _ensureNode(next)])];
+    }, [first]);
+    if (reduction.length === 1) {
+      return reduction[0];
+    }
+    // Might end up with a tree and a constant at the end:
+    return makeNode([reduction[0], _toNode(reduction[1])]);
   }
 
   // destroys the original node and returns a folded one