pimath 0.0.72 → 0.0.75

package/dist/pi.js

@@ -3139,18 +3139,40 @@ class Polynom {
     }
     get texFactors() {
         this.factorize();
-        if (this.factors.length === 0) {
+        if (this.factors.length <= 1) {
             return this.tex;
         }
         let tex = '';
+        // Build an array of texFactors with the number of similar items.
+        let factorsCount = {};
         for (let f of this.factors) {
-            if (f.monoms.length > 1) {
-                tex += `(${f.tex})`;
+            if (factorsCount[f.tex] !== undefined) {
+                factorsCount[f.tex].degree++;
             }
             else {
-                tex = f.tex + tex;
+                factorsCount[f.tex] = {
+                    degree: 1,
+                    factor: f
+                };
+            }
+        }
+        for (let item of Object.values(factorsCount)) {
+            if (item.factor.length > 1) {
+                tex += `\\left( ${item.factor.tex} \\right)${item.degree > 1 ? '^{ ' + item.degree + ' }' : ''}`;
+            }
+            else {
+                tex += item.degree === 1 ? item.factor.tex : `\\left( ${item.factor} \\right^{ ${item.degree} }`;
             }
         }
+        //
+        // // Actual system
+        // for (let f of this.factors) {
+        //     if (f.monoms.length > 1) {
+        //         tex += `(${f.tex})`
+        //     } else {
+        //         tex = f.tex + tex;
+        //     }
+        // }
         return tex;
     }
     get length() {
@@ -3303,6 +3325,11 @@ class Rational {
             this._denominator = D.clone().pow(2);
             return this;
         };
+        this.factorize = (letter) => {
+            this._numerator.factorize(letter);
+            this._denominator.factorize(letter);
+            return this;
+        };
         this.simplify = (P) => {
             let NumeratorEuclidien = this._numerator.euclidian(P);
             if (!NumeratorEuclidien.reminder.isZero()) {
@@ -4744,6 +4771,16 @@ class NumExp {
                 else if (element.token === 'sqrt') {
                     this._addToStack(stack, Math.sqrt(a));
                 }
+                else if (element.token === 'nthrt') {
+                    // TODO: support nthrt in num. exp.
+                    // this._addToStack(stack, Math.pow(a, 1/b))
+                }
+                else if (element.token === 'ln') {
+                    this._addToStack(stack, Math.log(a));
+                }
+                else if (element.token === 'log') {
+                    this._addToStack(stack, Math.log10(a));
+                }
             }
         }
         if (stack.length === 1) {
@@ -5199,9 +5236,26 @@ class Circle {
     get developed() {
         return this._cartesian.tex;
     }
-    // TODO: reformat code for better display.
     get display() {
-        return this._cartesian.display;
+        if (this._exists) {
+            let cx, cy;
+            if (this._center.x.isZero()) {
+                cx = 'x^2';
+            }
+            else {
+                cx = `(x${this._center.x.isNegative() ? '+' : '-'}${this._center.x.clone().abs().tex})^2`;
+            }
+            if (this._center.y.isZero()) {
+                cy = 'y^2';
+            }
+            else {
+                cy = `(y${this._center.y.isNegative() ? '+' : '-'}${this._center.y.clone().abs().tex})^2`;
+            }
+            return `${cx}+${cy}=${this._squareRadius.display}`;
+        }
+        else {
+            return `\\text{le cercle n'existe pas.}`;
+        }
     }
     clone() {
         this._center = this._center.clone();
@@ -6920,6 +6974,9 @@ class Shutingyard {
                 'cos': { precedence: 4, associative: 'right', type: ShutingyardType.FUNCTION },
                 'tan': { precedence: 4, associative: 'right', type: ShutingyardType.FUNCTION },
                 'sqrt': { precedence: 4, associative: 'right', type: ShutingyardType.FUNCTION },
+                'nthrt': { precedence: 4, associative: 'right', type: ShutingyardType.FUNCTION },
+                'ln': { precedence: 4, associative: 'right', type: ShutingyardType.FUNCTION },
+                'log': { precedence: 4, associative: 'right', type: ShutingyardType.FUNCTION },
             };
             this._uniformize = false;
         }