mathjs 10.1.1 → 10.2.0

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

@@ -1,13 +1,11 @@
 import { isConstantNode, isParenthesisNode } from '../../utils/is.js';
 import { factory } from '../../utils/factory.js';
 import { createUtil } from './simplify/util.js';
-import { createSimplifyCore } from './simplify/simplifyCore.js';
 import { createSimplifyConstant } from './simplify/simplifyConstant.js';
-import { createResolve } from './simplify/resolve.js';
 import { hasOwnProperty } from '../../utils/object.js';
 import { createEmptyMap, createMap } from '../../utils/map.js';
 var name = 'simplify';
-var dependencies = ['config', 'typed', 'parse', 'add', 'subtract', 'multiply', 'divide', 'pow', 'isZero', 'equal', '?fraction', '?bignumber', 'mathWithTransform', 'matrix', 'AccessorNode', 'ArrayNode', 'ConstantNode', 'FunctionNode', 'IndexNode', 'ObjectNode', 'OperatorNode', 'ParenthesisNode', 'SymbolNode'];
+var dependencies = ['config', 'typed', 'parse', 'add', 'subtract', 'multiply', 'divide', 'pow', 'isZero', 'equal', 'resolve', 'simplifyCore', '?fraction', '?bignumber', 'mathWithTransform', 'matrix', 'AccessorNode', 'ArrayNode', 'ConstantNode', 'FunctionNode', 'IndexNode', 'ObjectNode', 'OperatorNode', 'ParenthesisNode', 'SymbolNode'];
 export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
   var {
     config,
@@ -20,6 +18,8 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     pow,
     isZero,
     equal,
+    resolve,
+    simplifyCore,
     fraction,
     bignumber,
     mathWithTransform,
@@ -50,36 +50,18 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     OperatorNode,
     SymbolNode
   });
-  var simplifyCore = createSimplifyCore({
-    equal,
-    isZero,
-    add,
-    subtract,
-    multiply,
-    divide,
-    pow,
-    AccessorNode,
-    ArrayNode,
-    ConstantNode,
-    FunctionNode,
-    IndexNode,
-    ObjectNode,
-    OperatorNode,
-    ParenthesisNode
-  });
-  var resolve = createResolve({
-    parse,
-    FunctionNode,
-    OperatorNode,
-    ParenthesisNode
-  });
   var {
+    hasProperty,
     isCommutative,
     isAssociative,
+    mergeContext,
     flatten,
     unflattenr,
     unflattenl,
-    createMakeNodeFunction
+    createMakeNodeFunction,
+    defaultContext,
+    realContext,
+    positiveContext
   } = createUtil({
     FunctionNode,
     OperatorNode,
@@ -115,6 +97,19 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    * 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.
    *
+   * To specify a rule as a string, separate the left and right pattern by '->'
+   * When specifying a rule as an object, the following keys are meaningful:
+   * - l - the left pattern
+   * - r - the right pattern
+   * - s - in lieu of l and r, the string form that is broken at -> to give them
+   * - repeat - whether to repeat this rule until the expression stabilizes
+   * - assuming - gives a context object, as in the 'context' option to
+   *     simplify. Every property in the context object must match the current
+   *     context in order, or else the rule will not be applied.
+   * - imposeContext - gives a context object, as in the 'context' option to
+   *     simplify. Any settings specified will override the incoming context
+   *     for all matches of this rule.
+   *
    * For more details on the theory, see:
    *
    * - [Strategies for simplifying math expressions (Stackoverflow)](https://stackoverflow.com/questions/7540227/strategies-for-simplifying-math-expressions)
@@ -123,12 +118,28 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    *  An optional `options` argument can be passed as last argument of `simplify`.
    *  Currently available options (defaults in parentheses):
    *  - `consoleDebug` (false): whether to write the expression being simplified
-        and any changes to it, along with the rule responsible, to console
+   *    and any changes to it, along with the rule responsible, to console
+   *  - `context` (simplify.defaultContext): an object giving properties of
+   *    each operator, which determine what simplifications are allowed. The
+   *    currently meaningful properties are commutative, associative,
+   *    total (whether the operation is defined for all arguments), and
+   *    trivial (whether the operation applied to a single argument leaves
+   *    that argument unchanged). The default context is very permissive and
+   *    allows almost all simplifications. Only properties differing from
+   *    the default need to be specified; the default context is used as a
+   *    fallback. Additional contexts `simplify.realContext` and
+   *    `simplify.positiveContext` are supplied to cause simplify to perform
+   *    just simplifications guaranteed to preserve all values of the expression
+   *    assuming all variables and subexpressions are real numbers or
+   *    positive real numbers, respectively. (Note that these are in some cases
+   *    more restrictive than the default context; for example, the default
+   *    context will allow `x/x` to simplify to 1, whereas
+   *    `simplify.realContext` will not, as `0/0` is not equal to 1.)
    *  - `exactFractions` (true): whether to try to convert all constants to
-        exact rational numbers.
+   *    exact rational numbers.
    *  - `fractionsLimit` (10000): when `exactFractions` is true, constants will
-        be expressed as fractions only when both numerator and denominator
-        are smaller than `fractionsLimit`.
+   *    be expressed as fractions only when both numerator and denominator
+   *    are smaller than `fractionsLimit`.
    *
    * Syntax:
    *
@@ -151,7 +162,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    *
    * See also:
    *
-   *     derivative, parse, evaluate, rationalize
+   *     simplifyCore, derivative, evaluate, parse, rationalize, resolve
    *
    * @param {Node | string} expr
    *            The expression to be simplified
@@ -199,7 +210,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     },
     'Node, Array, Map, Object': function NodeArrayMapObject(expr, rules, scope, options) {
       var debug = options.consoleDebug;
-      rules = _buildRules(rules);
+      rules = _buildRules(rules, options.context);
       var res = resolve(expr, scope);
       res = removeParens(res);
       var visited = {};
@@ -221,8 +232,8 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
             res = rules[i](res, options);
             if (debug) rulestr = rules[i].name;
           } else {
-            flatten(res);
-            res = applyRule(res, rules[i]);
+            flatten(res, options.context);
+            res = applyRule(res, rules[i], options.context);
 
             if (debug) {
               rulestr = "".concat(rules[i].l.toString(), " -> ").concat(rules[i].r.toString());
@@ -239,8 +250,12 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
               laststr = newstr;
             }
           }
+          /* Use left-heavy binary tree internally,
+           * since custom rule functions may expect it
+           */
 
-          unflattenl(res); // using left-heavy binary tree here since custom rule functions may expect it
+
+          unflattenl(res, options.context);
         }
 
         str = res.toString({
@@ -251,8 +266,9 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       return res;
     }
   });
-  simplify.simplifyCore = simplifyCore;
-  simplify.resolve = resolve;
+  simplify.defaultContext = defaultContext;
+  simplify.realContext = realContext;
+  simplify.positiveContext = positiveContext;
 
   function removeParens(node) {
     return node.transform(function (node, path, parent) {
@@ -304,41 +320,147 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
   // Note initially we tend constants to the right because like-term
   // collection prefers the left, and we would rather collect nonconstants
   {
-    l: 'n-n1',
-    r: 'n+-n1'
-  }, // temporarily replace 'subtract' so we can further flatten the 'add' operator
-  {
-    l: '-(c*v)',
-    r: 'v * (-c)'
-  }, // make non-constant terms positive
-  {
+    s: 'n-n1 -> n+-n1',
+    // temporarily replace 'subtract' so we can further flatten the 'add' operator
+    assuming: {
+      subtract: {
+        total: true
+      }
+    }
+  }, {
+    s: '-(c*v) -> v * (-c)',
+    // make non-constant terms positive
+    assuming: {
+      multiply: {
+        commutative: true
+      },
+      subtract: {
+        total: true
+      }
+    }
+  }, {
+    s: '-(c*v) -> (-c) * v',
+    // non-commutative version, part 1
+    assuming: {
+      multiply: {
+        commutative: false
+      },
+      subtract: {
+        total: true
+      }
+    }
+  }, {
+    s: '-(v*c) -> v * (-c)',
+    // non-commutative version, part 2
+    assuming: {
+      multiply: {
+        commutative: false
+      },
+      subtract: {
+        total: true
+      }
+    }
+  }, {
+    l: '-(n1/n2)',
+    r: '-n1/n2'
+  }, {
     l: '-v',
     r: 'v * (-1)'
-  }, {
+  }, // finish making non-constant terms positive
+  {
+    l: '(n1 + n2)*(-1)',
+    r: 'n1*(-1) + n2*(-1)',
+    repeat: true
+  }, // expand negations to achieve as much sign cancellation as possible
+  {
     l: 'n/n1^n2',
     r: 'n*n1^-n2'
   }, // temporarily replace 'divide' so we can further flatten the 'multiply' operator
   {
     l: 'n/n1',
     r: 'n*n1^-1'
-  }, simplifyConstant, // expand nested exponentiation
+  }, {
+    s: '(n1*n2)^n3 -> n1^n3 * n2^n3',
+    assuming: {
+      multiply: {
+        commutative: true
+      }
+    }
+  }, {
+    s: '(n1*n2)^(-1) -> n2^(-1) * n1^(-1)',
+    assuming: {
+      multiply: {
+        commutative: false
+      }
+    }
+  }, // expand nested exponentiation
   {
-    l: '(n ^ n1) ^ n2',
-    r: 'n ^ (n1 * n2)'
-  }, // collect like factors
+    s: '(n ^ n1) ^ n2 -> n ^ (n1 * n2)',
+    assuming: {
+      divide: {
+        total: true
+      }
+    } // 1/(1/n) = n needs 1/n to exist
+
+  }, // collect like factors; into a sum, only do this for nonconstants
   {
+    l: ' v   * ( v   * n1 + n2)',
+    r: 'v^2       * n1 +  v   * n2'
+  }, {
+    s: ' v   * (v^n4 * n1 + n2)   ->  v^(1+n4)  * n1 +  v   * 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',
+    assuming: {
+      divide: {
+        total: true
+      }
+    }
+  }, {
+    s: 'v^n3 * (v^n4 * n1 + n2)   ->  v^(n3+n4) * n1 + v^n3 * n2',
+    assuming: {
+      divide: {
+        total: true
+      }
+    }
+  }, {
     l: 'n*n',
     r: 'n^2'
   }, {
-    l: 'n * n^n1',
-    r: 'n^(n1+1)'
+    s: 'n * n^n1 -> n^(n1+1)',
+    assuming: {
+      divide: {
+        total: true
+      }
+    } // n*1/n = n^(-1+1) needs 1/n
+
   }, {
-    l: 'n^n1 * n^n2',
-    r: 'n^(n1+n2)'
-  }, // collect like terms
+    s: 'n^n1 * n^n2 -> n^(n1+n2)',
+    assuming: {
+      divide: {
+        total: true
+      }
+    } // ditto for n^2*1/n^2
+
+  }, // Unfortunately, to deal with more complicated cancellations, it
+  // becomes necessary to simplify constants twice per pass. It's not
+  // terribly expensive compared to matching rules, so this should not
+  // pose a performance problem.
+  simplifyConstant, // First: before collecting like terms
+  // collect like terms
   {
-    l: 'n+n',
-    r: '2*n'
+    s: 'n+n -> 2*n',
+    assuming: {
+      add: {
+        total: true
+      }
+    } // 2 = 1 + 1 needs to exist
+
   }, {
     l: 'n+-n',
     r: '0'
@@ -351,33 +473,91 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     r: 'n3*(n1+n2)'
   }, // All sub-monomials tried there.
   {
+    l: 'n3^(-n4)*n1 +   n3  * n2',
+    r: 'n3^(-n4)*(n1 + n3^(n4+1) *n2)'
+  }, {
+    l: 'n3^(-n4)*n1 + n3^n5 * n2',
+    r: 'n3^(-n4)*(n1 + n3^(n4+n5)*n2)'
+  }, {
+    s: 'n*v + v -> (n+1)*v',
+    // noncommutative additional cases
+    assuming: {
+      multiply: {
+        commutative: false
+      }
+    }
+  }, {
+    s: 'n1*n3 + n2*n3 -> (n1+n2)*n3',
+    assuming: {
+      multiply: {
+        commutative: false
+      }
+    }
+  }, {
+    s: 'n1*n3^(-n4) + n2 * n3    -> (n1 + n2*n3^(n4 +  1))*n3^(-n4)',
+    assuming: {
+      multiply: {
+        commutative: false
+      }
+    }
+  }, {
+    s: 'n1*n3^(-n4) + n2 * n3^n5 -> (n1 + n2*n3^(n4 + n5))*n3^(-n4)',
+    assuming: {
+      multiply: {
+        commutative: false
+      }
+    }
+  }, {
     l: 'n*c + c',
     r: '(n+1)*c'
-  }, // remove parenthesis in the case of negating a quantity
-  // (It might seem this rule should precede collecting like terms,
-  // but putting it after gives another chance of noticing like terms,
-  // and any new like terms produced by this will be collected
-  // on the next pass through all the rules.)
-  {
-    l: 'n1 + (n2 + n3)*(-1)',
-    r: 'n1 + n2*(-1) + n3*(-1)'
-  }, // make factors positive (and undo 'make non-constant terms positive')
+  }, {
+    s: 'c*n + c -> c*(n+1)',
+    assuming: {
+      multiply: {
+        commutative: false
+      }
+    }
+  }, simplifyConstant, // Second: before returning expressions to "standard form"
+  // make factors positive (and undo 'make non-constant terms positive')
   {
-    l: '(-n)*n1',
-    r: '-(n*n1)'
+    s: '(-n)*n1 -> -(n*n1)',
+    assuming: {
+      subtract: {
+        total: true
+      }
+    }
+  }, {
+    s: 'n1*(-n) -> -(n1*n)',
+    // in case * non-commutative
+    assuming: {
+      subtract: {
+        total: true
+      },
+      multiply: {
+        commutative: false
+      }
+    }
   }, // final ordering of constants
   {
-    l: 'c+v',
-    r: 'v+c',
-    context: {
+    s: 'c+v -> v+c',
+    assuming: {
+      add: {
+        commutative: true
+      }
+    },
+    imposeContext: {
       add: {
         commutative: false
       }
     }
   }, {
-    l: 'v*c',
-    r: 'c*v',
-    context: {
+    s: 'v*c -> c*v',
+    assuming: {
+      multiply: {
+        commutative: true
+      }
+    },
+    imposeContext: {
       multiply: {
         commutative: false
       }
@@ -389,36 +569,125 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     r: 'n-n1'
   }, // undo replace 'subtract'
   {
-    l: 'n*(n1^-1)',
-    r: 'n/n1'
-  }, // undo replace 'divide'
-  {
-    l: 'n*n1^-n2',
-    r: 'n/n1^n2'
+    s: 'n*(n1^-1) -> n/n1',
+    // undo replace 'divide'; for * commutative
+    assuming: {
+      multiply: {
+        commutative: true
+      }
+    } // o.w. / not conventional
+
   }, {
-    l: 'n1^-1',
-    r: '1/n1'
+    s: 'n*n1^-n2 -> n/n1^n2',
+    assuming: {
+      multiply: {
+        commutative: true
+      }
+    } // o.w. / not conventional
+
+  }, {
+    s: 'n^-1 -> 1/n',
+    assuming: {
+      multiply: {
+        commutative: true
+      }
+    } // o.w. / not conventional
+
   }, {
-    l: 'n*(n1/n2)',
-    r: '(n*n1)/n2'
-  }, // '*' before '/'
+    l: 'n^1',
+    r: 'n'
+  }, // can be produced by power cancellation
   {
-    l: 'n-(n1+n2)',
-    r: 'n-n1-n2'
-  }, // '-' before '+'
-  // { l: '(n1/n2)/n3', r: 'n1/(n2*n3)' },
+    s: 'n*(n1/n2) -> (n*n1)/n2',
+    // '*' before '/'
+    assuming: {
+      multiply: {
+        associative: true
+      }
+    }
+  }, {
+    s: 'n-(n1+n2) -> n-n1-n2',
+    // '-' before '+'
+    assuming: {
+      addition: {
+        associative: true,
+        commutative: true
+      }
+    }
+  }, // { l: '(n1/n2)/n3', r: 'n1/(n2*n3)' },
   // { l: '(n*n1)/(n*n2)', r: 'n1/n2' },
+  // simplifyConstant can leave an extra factor of 1, which can always
+  // be eliminated, since the identity always commutes
   {
     l: '1*n',
-    r: 'n'
-  }, // this pattern can be produced by simplifyConstant
-  {
-    l: 'n1/(n2/n3)',
-    r: '(n1*n3)/n2'
+    r: 'n',
+    imposeContext: {
+      multiply: {
+        commutative: true
+      }
+    }
+  }, {
+    s: 'n1/(n2/n3) -> (n1*n3)/n2',
+    assuming: {
+      multiply: {
+        associative: true
+      }
+    }
   }, {
     l: 'n1/(-n2)',
     r: '-n1/n2'
   }];
+  /**
+   * Takes any rule object as allowed by the specification in simplify
+   * and puts it in a standard form used by applyRule
+   */
+
+  function _canonicalizeRule(ruleObject, context) {
+    var newRule = {};
+
+    if (ruleObject.s) {
+      var lr = ruleObject.s.split('->');
+
+      if (lr.length === 2) {
+        newRule.l = lr[0];
+        newRule.r = lr[1];
+      } else {
+        throw SyntaxError('Could not parse rule: ' + ruleObject.s);
+      }
+    } else {
+      newRule.l = ruleObject.l;
+      newRule.r = ruleObject.r;
+    }
+
+    newRule.l = removeParens(parse(newRule.l));
+    newRule.r = removeParens(parse(newRule.r));
+
+    for (var prop of ['imposeContext', 'repeat', 'assuming']) {
+      if (prop in ruleObject) {
+        newRule[prop] = ruleObject[prop];
+      }
+    }
+
+    if (ruleObject.evaluate) {
+      newRule.evaluate = parse(ruleObject.evaluate);
+    }
+
+    if (isAssociative(newRule.l, context)) {
+      var makeNode = createMakeNodeFunction(newRule.l);
+
+      var expandsym = _getExpandPlaceholderSymbol();
+
+      newRule.expanded = {};
+      newRule.expanded.l = makeNode([newRule.l.clone(), expandsym]); // Push the expandsym into the deepest possible branch.
+      // This helps to match the newRule against nodes returned from getSplits() later on.
+
+      flatten(newRule.expanded.l, context);
+      unflattenr(newRule.expanded.l, context);
+      newRule.expanded.r = makeNode([newRule.r, expandsym]);
+    }
+
+    return newRule;
+  }
   /**
    * Parse the string array of rules into nodes
    *
@@ -436,7 +705,8 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    * 'n1 * c1 -> c1 * n1'
    */
 
-  function _buildRules(rules) {
+
+  function _buildRules(rules, context) {
     // Array of rules to be used to simplify expressions
     var ruleSet = [];
 
@@ -447,49 +717,14 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
 
       switch (ruleType) {
         case 'string':
-          {
-            var lr = rule.split('->');
-
-            if (lr.length === 2) {
-              rule = {
-                l: lr[0],
-                r: lr[1]
-              };
-            } else {
-              throw SyntaxError('Could not parse rule: ' + rule);
-            }
-          }
+          rule = {
+            s: rule
+          };
 
         /* falls through */
 
         case 'object':
-          newRule = {
-            l: removeParens(parse(rule.l)),
-            r: removeParens(parse(rule.r))
-          };
-
-          if (rule.context) {
-            newRule.context = rule.context;
-          }
-
-          if (rule.evaluate) {
-            newRule.evaluate = parse(rule.evaluate);
-          }
-
-          if (isAssociative(newRule.l)) {
-            var makeNode = createMakeNodeFunction(newRule.l);
-
-            var expandsym = _getExpandPlaceholderSymbol();
-
-            newRule.expanded = {};
-            newRule.expanded.l = makeNode([newRule.l.clone(), expandsym]); // Push the expandsym into the deepest possible branch.
-            // This helps to match the newRule against nodes returned from getSplits() later on.
-
-            flatten(newRule.expanded.l);
-            unflattenr(newRule.expanded.l);
-            newRule.expanded.r = makeNode([newRule.r, expandsym]);
-          }
-
+          newRule = _canonicalizeRule(rule, context);
           break;
 
         case 'function':
@@ -514,90 +749,155 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
     return new SymbolNode('_p' + _lastsym++);
   }
 
-  function mapRule(nodes, rule) {
+  function mapRule(nodes, rule, context) {
+    var resNodes = nodes;
+
     if (nodes) {
       for (var i = 0; i < nodes.length; ++i) {
-        nodes[i] = applyRule(nodes[i], rule);
+        var newNode = applyRule(nodes[i], rule, context);
+
+        if (newNode !== nodes[i]) {
+          if (resNodes === nodes) {
+            resNodes = nodes.slice();
+          }
+
+          resNodes[i] = newNode;
+        }
       }
     }
+
+    return resNodes;
   }
   /**
    * Returns a simplfied form of node, or the original node if no simplification was possible.
    *
    * @param  {ConstantNode | SymbolNode | ParenthesisNode | FunctionNode | OperatorNode} node
+   * @param  {Object | Function} rule
+   * @param  {Object} context -- information about assumed properties of operators
    * @return {ConstantNode | SymbolNode | ParenthesisNode | FunctionNode | OperatorNode} The simplified form of `expr`, or the original node if no simplification was possible.
    */
 
 
-  var applyRule = typed('applyRule', {
-    'Node, Object': function NodeObject(node, rule) {
-      // console.log('Entering applyRule(' + node.toString() + ')')
-      // Do not clone node unless we find a match
-      var res = node; // First replace our child nodes with their simplified versions
-      // If a child could not be simplified, applying the rule to it
-      // will have no effect since the node is returned unchanged
-
-      if (res instanceof OperatorNode || res instanceof FunctionNode) {
-        mapRule(res.args, rule);
-      } else if (res instanceof ParenthesisNode) {
-        if (res.content) {
-          res.content = applyRule(res.content, rule);
-        }
-      } else if (res instanceof ArrayNode) {
-        mapRule(res.items, rule);
-      } else if (res instanceof AccessorNode) {
-        if (res.object) {
-          res.object = applyRule(res.object, rule);
+  function applyRule(node, rule, context) {
+    //    console.log('Entering applyRule("', rule.l.toString({parenthesis:'all'}), '->', rule.r.toString({parenthesis:'all'}), '",', node.toString({parenthesis:'all'}),')')
+    // check that the assumptions for this rule are satisfied by the current
+    // context:
+    if (rule.assuming) {
+      for (var symbol in rule.assuming) {
+        for (var property in rule.assuming[symbol]) {
+          if (hasProperty(symbol, property, context) !== rule.assuming[symbol][property]) {
+            return node;
+          }
         }
+      }
+    }
 
-        if (res.index) {
-          res.index = applyRule(res.index, rule);
-        }
-      } else if (res instanceof IndexNode) {
-        mapRule(res.dimensions, rule);
-      } else if (res instanceof ObjectNode) {
-        for (var prop in res.properties) {
-          res.properties[prop] = applyRule(res.properties[prop], rule);
+    var mergedContext = mergeContext(rule.imposeContext, context); // Do not clone node unless we find a match
+
+    var res = node; // First replace our child nodes with their simplified versions
+    // If a child could not be simplified, applying the rule to it
+    // will have no effect since the node is returned unchanged
+
+    if (res instanceof OperatorNode || res instanceof FunctionNode) {
+      var newArgs = mapRule(res.args, rule, context);
+
+      if (newArgs !== res.args) {
+        res = res.clone();
+        res.args = newArgs;
+      }
+    } else if (res instanceof ParenthesisNode) {
+      if (res.content) {
+        var newContent = applyRule(res.content, rule, context);
+
+        if (newContent !== res.content) {
+          res = new ParenthesisNode(newContent);
         }
-      } // Try to match a rule against this node
+      }
+    } else if (res instanceof ArrayNode) {
+      var newItems = mapRule(res.items, rule, context);
 
+      if (newItems !== res.items) {
+        res = new ArrayNode(newItems);
+      }
+    } else if (res instanceof AccessorNode) {
+      var newObj = res.object;
 
-      var repl = rule.r;
+      if (res.object) {
+        newObj = applyRule(res.object, rule, context);
+      }
 
-      var matches = _ruleMatch(rule.l, res)[0]; // If the rule is associative operator, we can try matching it while allowing additional terms.
-      // This allows us to match rules like 'n+n' to the expression '(1+x)+x' or even 'x+1+x' if the operator is commutative.
+      var newIndex = res.index;
 
+      if (res.index) {
+        newIndex = applyRule(res.index, rule, context);
+      }
 
-      if (!matches && rule.expanded) {
-        repl = rule.expanded.r;
-        matches = _ruleMatch(rule.expanded.l, res)[0];
+      if (newObj !== res.object || newIndex !== res.index) {
+        res = new AccessorNode(newObj, newIndex);
       }
+    } else if (res instanceof IndexNode) {
+      var newDims = mapRule(res.dimensions, rule, context);
 
-      if (matches) {
-        // const before = res.toString({parenthesis: 'all'})
-        // Create a new node by cloning the rhs of the matched rule
-        // we keep any implicit multiplication state if relevant
-        var implicit = res.implicit;
-        res = repl.clone();
+      if (newDims !== res.dimensions) {
+        res = new IndexNode(newDims);
+      }
+    } else if (res instanceof ObjectNode) {
+      var changed = false;
+      var newProps = {};
 
-        if (implicit && 'implicit' in repl) {
-          res.implicit = true;
-        } // Replace placeholders with their respective nodes without traversing deeper into the replaced nodes
+      for (var prop in res.properties) {
+        newProps[prop] = applyRule(res.properties[prop], rule, context);
 
+        if (newProps[prop] !== res.properties[prop]) {
+          changed = true;
+        }
+      }
 
-        res = res.transform(function (node) {
-          if (node.isSymbolNode && hasOwnProperty(matches.placeholders, node.name)) {
-            return matches.placeholders[node.name].clone();
-          } else {
-            return node;
-          }
-        }); // const after = res.toString({parenthesis: 'all'})
-        // console.log('Simplified ' + before + ' to ' + after)
+      if (changed) {
+        res = new ObjectNode(newProps);
       }
+    } // Try to match a rule against this node
 
-      return res;
+
+    var repl = rule.r;
+
+    var matches = _ruleMatch(rule.l, res, mergedContext)[0]; // If the rule is associative operator, we can try matching it while allowing additional terms.
+    // This allows us to match rules like 'n+n' to the expression '(1+x)+x' or even 'x+1+x' if the operator is commutative.
+
+
+    if (!matches && rule.expanded) {
+      repl = rule.expanded.r;
+      matches = _ruleMatch(rule.expanded.l, res, mergedContext)[0];
     }
-  });
+
+    if (matches) {
+      // const before = res.toString({parenthesis: 'all'})
+      // Create a new node by cloning the rhs of the matched rule
+      // we keep any implicit multiplication state if relevant
+      var implicit = res.implicit;
+      res = repl.clone();
+
+      if (implicit && 'implicit' in repl) {
+        res.implicit = true;
+      } // Replace placeholders with their respective nodes without traversing deeper into the replaced nodes
+
+
+      res = res.transform(function (node) {
+        if (node.isSymbolNode && hasOwnProperty(matches.placeholders, node.name)) {
+          return matches.placeholders[node.name].clone();
+        } else {
+          return node;
+        }
+      }); // const after = res.toString({parenthesis: 'all'})
+      // console.log('Simplified ' + before + ' to ' + after)
+    }
+
+    if (rule.repeat && res !== node) {
+      res = applyRule(res, rule, context);
+    }
+
+    return res;
+  }
   /**
    * Get (binary) combinations of a flattened binary node
    * e.g. +(node1, node2, node3) -> [
@@ -607,6 +907,7 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    *
    */
 
+
   function getSplits(node, context) {
     var res = [];
     var right, rightArgs;
@@ -620,9 +921,18 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
         res.push(makeNode([node.args[i], right]));
       }
     } else {
-      rightArgs = node.args.slice(1);
-      right = rightArgs.length === 1 ? rightArgs[0] : makeNode(rightArgs);
-      res.push(makeNode([node.args[0], right]));
+      // Keep order, but try all parenthesizations
+      for (var _i = 1; _i < node.args.length; _i++) {
+        var left = node.args[0];
+
+        if (_i > 1) {
+          left = makeNode(node.args.slice(0, _i));
+        }
+
+        rightArgs = node.args.slice(_i);
+        right = rightArgs.length === 1 ? rightArgs[0] : makeNode(rightArgs);
+        res.push(makeNode([left, right]));
+      }
     }
 
     return res;
@@ -725,15 +1035,19 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
    *
    * @param {ConstantNode | SymbolNode | ParenthesisNode | FunctionNode | OperatorNode} rule
    * @param {ConstantNode | SymbolNode | ParenthesisNode | FunctionNode | OperatorNode} node
+   * @param {Object} context -- provides assumed properties of operators
+   * @param {Boolean} isSplit -- whether we are in process of splitting an
+   *                    n-ary operator node into possible binary combinations.
+   *                    Defaults to false.
    * @return {Object} Information about the match, if it exists.
    */
 
 
-  function _ruleMatch(rule, node, isSplit) {
+  function _ruleMatch(rule, node, context, isSplit) {
     //    console.log('Entering _ruleMatch(' + JSON.stringify(rule) + ', ' + JSON.stringify(node) + ')')
     //    console.log('rule = ' + rule)
     //    console.log('node = ' + node)
-    //    console.log('Entering _ruleMatch(' + rule.toString() + ', ' + node.toString() + ')')
+    //    console.log('Entering _ruleMatch(', rule.toString({parenthesis:'all'}), ', ', node.toString({parenthesis:'all'}), ', ', context, ')')
     var res = [{
       placeholders: {}
     }];
@@ -751,32 +1065,65 @@ export var createSimplify = /* #__PURE__ */factory(name, dependencies, _ref => {
       } // rule and node match. Search the children of rule and node.
 
 
-      if (node.args.length === 1 && rule.args.length === 1 || !isAssociative(node) && node.args.length === rule.args.length || isSplit) {
-        // Expect non-associative operators to match exactly
+      if (node.args.length === 1 && rule.args.length === 1 || !isAssociative(node, context) && node.args.length === rule.args.length || isSplit) {
+        // Expect non-associative operators to match exactly,
+        // except in any order if operator is commutative
         var childMatches = [];
 
         for (var i = 0; i < rule.args.length; i++) {
-          var childMatch = _ruleMatch(rule.args[i], node.args[i]);
+          var childMatch = _ruleMatch(rule.args[i], node.args[i], context);
 
           if (childMatch.length === 0) {
             // Child did not match, so stop searching immediately
-            return [];
+            break;
           } // The child matched, so add the information returned from the child to our result
 
 
           childMatches.push(childMatch);
         }
 
+        if (childMatches.length !== rule.args.length) {
+          if (!isCommutative(node, context) || // exact match in order needed
+          rule.args.length === 1) {
+            // nothing to commute
+            return [];
+          }
+
+          if (rule.args.length > 2) {
+            /* Need to generate all permutations and try them.
+             * It's a bit complicated, and unlikely to come up since there
+             * are very few ternary or higher operators. So punt for now.
+             */
+            throw new Error('permuting >2 commutative non-associative rule arguments not yet implemented');
+          }
+          /* Exactly two arguments, try them reversed */
+
+
+          var leftMatch = _ruleMatch(rule.args[0], node.args[1], context);
+
+          if (leftMatch.length === 0) {
+            return [];
+          }
+
+          var rightMatch = _ruleMatch(rule.args[1], node.args[0], context);
+
+          if (rightMatch.length === 0) {
+            return [];
+          }
+
+          childMatches = [leftMatch, rightMatch];
+        }
+
         res = mergeChildMatches(childMatches);
       } else if (node.args.length >= 2 && rule.args.length === 2) {
         // node is flattened, rule is not
         // Associative operators/functions can be split in different ways so we check if the rule matches each
         // them and return their union.
-        var splits = getSplits(node, rule.context);
+        var splits = getSplits(node, context);
         var splitMatches = [];
 
-        for (var _i = 0; _i < splits.length; _i++) {
-          var matchSet = _ruleMatch(rule, splits[_i], true); // recursing at the same tree depth here
+        for (var _i2 = 0; _i2 < splits.length; _i2++) {
+          var matchSet = _ruleMatch(rule, splits[_i2], context, true); // recursing at the same tree depth here
 
 
           splitMatches = splitMatches.concat(matchSet);