@cortex-js/compute-engine 0.26.2 → 0.26.3

package/README.md

@@ -27,13 +27,15 @@ import { ComputeEngine } from "@cortex-js/compute-engine";
 
 const ce = new ComputeEngine();
 
-engine.parse("2^{11}-1 \\in \\Z").evaluate().print()
+ce.parse("2^{11}-1 \\in \\Z").evaluate().print()
 // ➔ "True"
 ```
 
-## More
+## FAQ
 
-- [Build](BUILD.md) instructions
+**Q** How do I build the project?
+
+[Build](BUILD.md) instructions
 
 ## Related Projects
 

package/dist/compute-engine.esm.js

@@ -1,4 +1,4 @@
-/** Compute Engine 0.26.2 */
+/** Compute Engine 0.26.3 */
 
 // src/compute-engine/boxed-expression/public.ts
 function isRuleStep(x) {
@@ -9596,7 +9596,10 @@ function canonicalMultiply(ce, ops) {
       if (next.operator === "Sqrt" && next.op1.isNumberLiteral && isSubtype(next.op1.type, "finite_integer")) {
         let radical = next.op1.numericValue;
         if (typeof radical !== "number") radical = radical.re;
-        if (radical >= SMALL_INTEGER) continue;
+        if (radical >= SMALL_INTEGER) {
+          ys.push(x);
+          continue;
+        }
         if (isSubtype(x.type, "finite_rational")) {
           const rational = x.numericValue;
           const [num, den] = typeof rational === "number" ? [rational, 1] : [rational.numerator.re, rational.denominator.re];
@@ -9689,6 +9692,7 @@ function mulN(...xs) {
 function canonicalDivide(op1, op2) {
   const ce = op1.engine;
   if (!op1.isValid || !op2.isValid) return ce._fn("Divide", [op1, op2]);
+  if (op1.isNaN || op2.isNaN) return ce.NaN;
   if (op2.is(0)) return op1.is(0) ? ce.NaN : ce.ComplexInfinity;
   if (op1.is(0)) return ce.Zero;
   if (op2.is(0) === false) {
@@ -9888,9 +9892,11 @@ var Product = class _Product {
           return;
         }
         if (term.isInfinity) {
-          this.coefficient = this.engine._numericValue(
-            term.isNegative ? -Infinity : Infinity
-          );
+          if (isOne(exp2)) {
+            this.coefficient = this.engine._numericValue(
+              term.isNegative ? -Infinity : Infinity
+            );
+          } else this.terms.push({ term, exponent: exp2 });
           return;
         }
         if (isOne(exp2)) {
@@ -10045,8 +10051,15 @@ var Product = class _Product {
     const ce = this.engine;
     const coef = this.coefficient;
     if (coef.isZero) return [ce.Zero, ce.One];
-    if (coef.isPositiveInfinity || coef.isNegativeInfinity)
+    if (coef.isPositiveInfinity || coef.isNegativeInfinity) {
+      if (this.terms.length === 0) {
+        return [
+          coef.isPositiveInfinity ? ce.PositiveInfinity : ce.NegativeInfinity,
+          ce.One
+        ];
+      }
       return [ce.NaN, ce.NaN];
+    }
     const isNegativeOne2 = coef.isNegativeOne;
     if (isNegativeOne2) this.coefficient = ce._numericValue(1);
     const xs = this.groupedByDegrees({ mode: "rational" });
@@ -10613,13 +10626,23 @@ function evalTrig(name, op) {
         (x) => x.sinh(),
         (x) => x.sinh()
       );
-    case "Tan":
-      return applyAngle(
+    case "Tan": {
+      const result = applyAngle(
         op,
-        Math.tan,
-        (x) => x.toSignificantDigits(ce.precision + 4).tan().toSignificantDigits(ce.precision),
+        (x) => {
+          const y = Math.tan(x);
+          if (y > 1e6 || y < -1e6) return ce.ComplexInfinity;
+          return y;
+        },
+        (x) => {
+          const y = x.tan();
+          if (y.greaterThan(1e6) || y.lessThan(-1e6)) return ce.ComplexInfinity;
+          return y;
+        },
         (x) => x.tan()
       );
+      return result;
+    }
     case "Tanh":
       return applyAngle(
         op,
@@ -10853,9 +10876,11 @@ function canonicalRoot(a, b) {
   if (exp2 === 1) return a;
   if (exp2 === 2) {
     if (a.isNumberLiteral && isSubtype(a.type, "rational")) {
-      const v = a.sqrt();
-      if (typeof v.numericValue === "number") return v;
-      if (v.numericValue.isExact) return v;
+      if (a.re < SMALL_INTEGER) {
+        const v = a.sqrt();
+        if (typeof v.numericValue === "number") return v;
+        if (v.numericValue.isExact) return v;
+      }
     }
     return ce._fn("Sqrt", [a]);
   }
@@ -11623,10 +11648,9 @@ function makeLambda(expr) {
     ce.resetContext();
     let i = 0;
     for (const param of params) ce.assign(param, args[i++]);
-    const result = fn.N() ?? fn.evaluate();
+    const result = fn.evaluate();
     ce.swapScope(context);
-    if (!result.isValid) return void 0;
-    return result;
+    return result.isValid ? result : void 0;
   };
 }
 function apply3(fn, args) {
@@ -13423,7 +13447,7 @@ var ARITHMETIC_LIBRARY = [
         const [base, exp2] = args;
         return canonicalRoot(base, exp2);
       },
-      evaluate: ([x, n], { numericApproximation }) => x.root(n)
+      evaluate: ([x, n], { numericApproximation }) => root(x, n, { numericApproximation })
     },
     Round: {
       complexity: 1250,
@@ -21743,8 +21767,15 @@ var DERIVATIVES_TABLE = {
   Log: ["Power", ["Multiply", "_", ["Ln", "10"]], -1],
   Sqrt: ["Multiply", ["Power", "_", ["Negate", "Half"]], "Half"],
   Abs: [
-    "Piecewise",
-    ["Tuple", ["Multiply", "_", ["Power", "_", -1]], ["Greater", "_", 0]]
+    "Which",
+    ["Equal", "_", 0],
+    NaN,
+    ["Less", "_", 0],
+    -1,
+    ["Greater", "_", 0],
+    1,
+    "True",
+    ["D", ["Abs", "_"], "_"]
   ],
   // https://proofwiki.org/wiki/Derivative_of_Error_Function
   Erf: [
@@ -24601,9 +24632,9 @@ var TRIGONOMETRY_LIBRARY = [
         }
         return ce.number(fArg).div(180).mul(ce.Pi);
       },
-      evaluate: (ops, { engine: ce }) => {
-        if (ce.angularUnit === "deg") return ops[0];
-        return ops[0].mul(ce.Pi.div(180)).evaluate();
+      evaluate: (ops, options) => {
+        if (options.engine.angularUnit === "deg") return ops[0];
+        return ops[0].mul(options.engine.Pi.div(180)).evaluate(options);
       }
     },
     // Hypot: sqrt(x*x + y*y)
@@ -25417,7 +25448,7 @@ var BoxedNumber = class extends _BoxedExpression {
     if (typeof this._value === "number") {
       if (this._value === 0 || this._value === 1) return this;
       if (this._value === -1) return this.engine.I;
-      if (this._value > 0 && Number.isInteger(this._value))
+      if (this._value > 0 && Number.isInteger(this._value) && this._value < SMALL_INTEGER)
         return this.engine.number(
           this.engine._numericValue({ radical: this._value })
         );
@@ -32963,7 +32994,7 @@ var ComputeEngine = class _ComputeEngine {
     }
     if ("radical" in value || "rational" in value) {
       if (value.radical !== void 0 && (!Number.isInteger(value.radical) || value.radical >= SMALL_INTEGER)) {
-        return makeNumericValue(value);
+        throw Error("Unexpected value for radical part:" + value.radical);
       }
       if (value.rational) {
         if (isMachineRational(value.rational)) {
@@ -34363,10 +34394,10 @@ function mark(line, mark2) {
 }
 
 // src/compute-engine.ts
-var version = "0.26.2";
+var version = "0.26.3";
 globalThis[Symbol.for("io.cortexjs.compute-engine")] = {
   ComputeEngine: ComputeEngine.prototype.constructor,
-  version: "0.26.2"
+  version: "0.26.3"
 };
 export {
   ComputeEngine,

package/dist/compute-engine.js

@@ -1,4 +1,4 @@
-/** Compute Engine 0.26.2 */
+/** Compute Engine 0.26.3 */
     (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 __defProp = Object.defineProperty;
@@ -9627,7 +9627,10 @@ Invalid type
         if (next.operator === "Sqrt" && next.op1.isNumberLiteral && isSubtype(next.op1.type, "finite_integer")) {
           let radical = next.op1.numericValue;
           if (typeof radical !== "number") radical = radical.re;
-          if (radical >= SMALL_INTEGER) continue;
+          if (radical >= SMALL_INTEGER) {
+            ys.push(x);
+            continue;
+          }
           if (isSubtype(x.type, "finite_rational")) {
             const rational = x.numericValue;
             const [num, den] = typeof rational === "number" ? [rational, 1] : [rational.numerator.re, rational.denominator.re];
@@ -9720,6 +9723,7 @@ Invalid type
   function canonicalDivide(op1, op2) {
     const ce = op1.engine;
     if (!op1.isValid || !op2.isValid) return ce._fn("Divide", [op1, op2]);
+    if (op1.isNaN || op2.isNaN) return ce.NaN;
     if (op2.is(0)) return op1.is(0) ? ce.NaN : ce.ComplexInfinity;
     if (op1.is(0)) return ce.Zero;
     if (op2.is(0) === false) {
@@ -9919,9 +9923,11 @@ Invalid type
             return;
           }
           if (term.isInfinity) {
-            this.coefficient = this.engine._numericValue(
-              term.isNegative ? -Infinity : Infinity
-            );
+            if (isOne(exp2)) {
+              this.coefficient = this.engine._numericValue(
+                term.isNegative ? -Infinity : Infinity
+              );
+            } else this.terms.push({ term, exponent: exp2 });
             return;
           }
           if (isOne(exp2)) {
@@ -10076,8 +10082,15 @@ Invalid type
       const ce = this.engine;
       const coef = this.coefficient;
       if (coef.isZero) return [ce.Zero, ce.One];
-      if (coef.isPositiveInfinity || coef.isNegativeInfinity)
+      if (coef.isPositiveInfinity || coef.isNegativeInfinity) {
+        if (this.terms.length === 0) {
+          return [
+            coef.isPositiveInfinity ? ce.PositiveInfinity : ce.NegativeInfinity,
+            ce.One
+          ];
+        }
         return [ce.NaN, ce.NaN];
+      }
       const isNegativeOne2 = coef.isNegativeOne;
       if (isNegativeOne2) this.coefficient = ce._numericValue(1);
       const xs = this.groupedByDegrees({ mode: "rational" });
@@ -10644,13 +10657,23 @@ Invalid type
           (x) => x.sinh(),
           (x) => x.sinh()
         );
-      case "Tan":
-        return applyAngle(
+      case "Tan": {
+        const result = applyAngle(
           op,
-          Math.tan,
-          (x) => x.toSignificantDigits(ce.precision + 4).tan().toSignificantDigits(ce.precision),
+          (x) => {
+            const y = Math.tan(x);
+            if (y > 1e6 || y < -1e6) return ce.ComplexInfinity;
+            return y;
+          },
+          (x) => {
+            const y = x.tan();
+            if (y.greaterThan(1e6) || y.lessThan(-1e6)) return ce.ComplexInfinity;
+            return y;
+          },
           (x) => x.tan()
         );
+        return result;
+      }
       case "Tanh":
         return applyAngle(
           op,
@@ -10884,9 +10907,11 @@ Invalid type
     if (exp2 === 1) return a;
     if (exp2 === 2) {
       if (a.isNumberLiteral && isSubtype(a.type, "rational")) {
-        const v = a.sqrt();
-        if (typeof v.numericValue === "number") return v;
-        if (v.numericValue.isExact) return v;
+        if (a.re < SMALL_INTEGER) {
+          const v = a.sqrt();
+          if (typeof v.numericValue === "number") return v;
+          if (v.numericValue.isExact) return v;
+        }
       }
       return ce._fn("Sqrt", [a]);
     }
@@ -11654,10 +11679,9 @@ Invalid type
       ce.resetContext();
       let i = 0;
       for (const param of params) ce.assign(param, args[i++]);
-      const result = fn.N() ?? fn.evaluate();
+      const result = fn.evaluate();
       ce.swapScope(context);
-      if (!result.isValid) return void 0;
-      return result;
+      return result.isValid ? result : void 0;
     };
   }
   function apply3(fn, args) {
@@ -13454,7 +13478,7 @@ Invalid type
           const [base, exp2] = args;
           return canonicalRoot(base, exp2);
         },
-        evaluate: ([x, n], { numericApproximation }) => x.root(n)
+        evaluate: ([x, n], { numericApproximation }) => root(x, n, { numericApproximation })
       },
       Round: {
         complexity: 1250,
@@ -21774,8 +21798,15 @@ ${e.message}`);
     Log: ["Power", ["Multiply", "_", ["Ln", "10"]], -1],
     Sqrt: ["Multiply", ["Power", "_", ["Negate", "Half"]], "Half"],
     Abs: [
-      "Piecewise",
-      ["Tuple", ["Multiply", "_", ["Power", "_", -1]], ["Greater", "_", 0]]
+      "Which",
+      ["Equal", "_", 0],
+      NaN,
+      ["Less", "_", 0],
+      -1,
+      ["Greater", "_", 0],
+      1,
+      "True",
+      ["D", ["Abs", "_"], "_"]
     ],
     // https://proofwiki.org/wiki/Derivative_of_Error_Function
     Erf: [
@@ -24632,9 +24663,9 @@ ${e.message}`);
           }
           return ce.number(fArg).div(180).mul(ce.Pi);
         },
-        evaluate: (ops, { engine: ce }) => {
-          if (ce.angularUnit === "deg") return ops[0];
-          return ops[0].mul(ce.Pi.div(180)).evaluate();
+        evaluate: (ops, options) => {
+          if (options.engine.angularUnit === "deg") return ops[0];
+          return ops[0].mul(options.engine.Pi.div(180)).evaluate(options);
         }
       },
       // Hypot: sqrt(x*x + y*y)
@@ -25448,7 +25479,7 @@ Error in definition of "${name}"`,
       if (typeof this._value === "number") {
         if (this._value === 0 || this._value === 1) return this;
         if (this._value === -1) return this.engine.I;
-        if (this._value > 0 && Number.isInteger(this._value))
+        if (this._value > 0 && Number.isInteger(this._value) && this._value < SMALL_INTEGER)
           return this.engine.number(
             this.engine._numericValue({ radical: this._value })
           );
@@ -32994,7 +33025,7 @@ Error in definition of "${name}"`,
       }
       if ("radical" in value || "rational" in value) {
         if (value.radical !== void 0 && (!Number.isInteger(value.radical) || value.radical >= SMALL_INTEGER)) {
-          return makeNumericValue(value);
+          throw Error("Unexpected value for radical part:" + value.radical);
         }
         if (value.rational) {
           if (isMachineRational(value.rational)) {
@@ -34394,10 +34425,10 @@ ${lineNo.toString().padStart(maxDigits, " ")}`;
   }
 
   // src/compute-engine.ts
-  var version = "0.26.2";
+  var version = "0.26.3";
   globalThis[Symbol.for("io.cortexjs.compute-engine")] = {
     ComputeEngine: ComputeEngine.prototype.constructor,
-    version: "0.26.2"
+    version: "0.26.3"
   };
   return __toCommonJS(compute_engine_exports);
 })();