@cortex-js/compute-engine 0.23.0 → 0.23.1

package/dist/compute-engine.esm.js

@@ -1,4 +1,4 @@
-/** CortexJS Compute Engine 0.23.0 */
+/** CortexJS Compute Engine 0.23.1 */
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -2220,7 +2220,7 @@ function cosine(Ctor, x) {
   Ctor.precision -= k;
   return x;
 }
-var divide = function() {
+var divide = /* @__PURE__ */ function() {
   function multiplyInteger(x, k, base) {
     var temp, carry = 0, i = x.length;
     for (x = x.slice(); i--; ) {
@@ -15966,8 +15966,17 @@ function order(a, b) {
 }
 function canonicalOrder(expr, { recursive = false }) {
   if (expr.ops) {
-    let ops2 = recursive ? expr.ops.map((x) => canonicalOrder(x, { recursive })) : expr.ops;
-    ops2 = expr.head === "Add" ? sortAdd(ops2) : ops2.sort(order);
+    let ops2 = expr.ops;
+    if (recursive)
+      ops2 = ops2.map((x) => canonicalOrder(x, { recursive }));
+    const ce = expr.engine;
+    if (expr.head === "Add")
+      ops2 = sortAdd(ops2);
+    else {
+      let isCommutative = expr.head === "Multiply" || (ce.lookupFunction(expr.head)?.commutative ?? false);
+      if (isCommutative)
+        ops2 = ops2.sort(order);
+    }
     return expr.engine._fn(expr.head, ops2);
   }
   return expr;
@@ -22819,13 +22828,13 @@ function flattenForm(expr) {
   if (expr.head === "Delimiter")
     ops2 = [flattenDelimiter(expr.engine, expr.op1)];
   const ce = expr.engine;
-  let isCommutative = expr.head === "Add" || expr.head === "Multiply";
-  if (!isCommutative) {
+  let isAssociative = expr.head === "Add" || expr.head === "Multiply";
+  if (!isAssociative) {
     const def = ce.lookupFunction(expr.head);
-    if (def?.commutative)
-      isCommutative = true;
+    if (def?.associative)
+      isAssociative = true;
   }
-  if (isCommutative && typeof expr.head === "string")
+  if (isAssociative && typeof expr.head === "string")
     expr = ce._fn(expr.head, flattenOps(ops2, expr.head));
   return expr;
 }
@@ -22853,8 +22862,9 @@ function multiplyForm(expr) {
   const ops2 = expr.ops.map(multiplyForm);
   if (expr.head === "Multiply")
     return canonicalMultiply(expr.engine, ops2);
-  if (expr.head === "Negate")
-    return canonicalMultiply(expr.engine, [expr.op1, expr.engine.NegativeOne]);
+  if (expr.head === "Negate") {
+    return canonicalMultiply(expr.engine, [ops2[0], expr.engine.NegativeOne]);
+  }
   return expr;
 }
 function addForm(expr) {
@@ -31631,10 +31641,10 @@ function isFunctionValue(value) {
 }
 
 // src/compute-engine.ts
-var version = "0.23.0";
+var version = "0.23.1";
 globalThis[Symbol.for("io.cortexjs.compute-engine")] = {
   ComputeEngine: ComputeEngine.prototype.constructor,
-  version: "0.23.0"
+  version: "0.23.1"
 };
 export {
   ADDITION_PRECEDENCE,

package/dist/compute-engine.js

@@ -1,4 +1,4 @@
-/** CortexJS Compute Engine 0.23.0 */
+/** CortexJS Compute Engine 0.23.1 */
     (function(global,factory){typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'],factory):(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ComputeEngine = {}));})(this, (function (exports) { 'use strict';
 var ComputeEngine = (() => {
   var __create = Object.create;
@@ -2250,7 +2250,7 @@ var ComputeEngine = (() => {
     Ctor.precision -= k;
     return x;
   }
-  var divide = function() {
+  var divide = /* @__PURE__ */ function() {
     function multiplyInteger(x, k, base) {
       var temp, carry = 0, i = x.length;
       for (x = x.slice(); i--; ) {
@@ -15996,8 +15996,17 @@ var ComputeEngine = (() => {
   }
   function canonicalOrder(expr, { recursive = false }) {
     if (expr.ops) {
-      let ops2 = recursive ? expr.ops.map((x) => canonicalOrder(x, { recursive })) : expr.ops;
-      ops2 = expr.head === "Add" ? sortAdd(ops2) : ops2.sort(order);
+      let ops2 = expr.ops;
+      if (recursive)
+        ops2 = ops2.map((x) => canonicalOrder(x, { recursive }));
+      const ce = expr.engine;
+      if (expr.head === "Add")
+        ops2 = sortAdd(ops2);
+      else {
+        let isCommutative = expr.head === "Multiply" || (ce.lookupFunction(expr.head)?.commutative ?? false);
+        if (isCommutative)
+          ops2 = ops2.sort(order);
+      }
       return expr.engine._fn(expr.head, ops2);
     }
     return expr;
@@ -22849,13 +22858,13 @@ var ComputeEngine = (() => {
     if (expr.head === "Delimiter")
       ops2 = [flattenDelimiter(expr.engine, expr.op1)];
     const ce = expr.engine;
-    let isCommutative = expr.head === "Add" || expr.head === "Multiply";
-    if (!isCommutative) {
+    let isAssociative = expr.head === "Add" || expr.head === "Multiply";
+    if (!isAssociative) {
       const def = ce.lookupFunction(expr.head);
-      if (def?.commutative)
-        isCommutative = true;
+      if (def?.associative)
+        isAssociative = true;
     }
-    if (isCommutative && typeof expr.head === "string")
+    if (isAssociative && typeof expr.head === "string")
       expr = ce._fn(expr.head, flattenOps(ops2, expr.head));
     return expr;
   }
@@ -22883,8 +22892,9 @@ var ComputeEngine = (() => {
     const ops2 = expr.ops.map(multiplyForm);
     if (expr.head === "Multiply")
       return canonicalMultiply(expr.engine, ops2);
-    if (expr.head === "Negate")
-      return canonicalMultiply(expr.engine, [expr.op1, expr.engine.NegativeOne]);
+    if (expr.head === "Negate") {
+      return canonicalMultiply(expr.engine, [ops2[0], expr.engine.NegativeOne]);
+    }
     return expr;
   }
   function addForm(expr) {
@@ -31661,10 +31671,10 @@ ${JSON.stringify(entry)}`
   }
 
   // src/compute-engine.ts
-  var version = "0.23.0";
+  var version = "0.23.1";
   globalThis[Symbol.for("io.cortexjs.compute-engine")] = {
     ComputeEngine: ComputeEngine.prototype.constructor,
-    version: "0.23.0"
+    version: "0.23.1"
   };
   return __toCommonJS(compute_engine_exports);
 })();