pimath 0.0.73 → 0.0.76

package/dist/pi.js

@@ -2680,81 +2680,86 @@ class Polynom {
          * @param maxValue Defines the greatest value to search to (default is 20).
          */
         this.factorize = (letter) => {
-            if (this.dirty_factors) {
-                let factors = [];
-                let P = this.clone().reorder();
-                // Extract the common monom
-                // 2x^3+6x^2 => 2x^2
-                let M = P.commonMonom();
-                if (!M.isOne()) {
-                    let tempPolynom = new Polynom(M);
-                    factors = [tempPolynom.clone()];
-                    P = P.euclidian(tempPolynom).quotient;
-                }
-                // Main loop
-                let securityLoop = P.degree().clone().multiply(2).value, maxDegree = 1;
-                while (securityLoop >= 0) {
-                    securityLoop--;
-                    if (P.monoms.length < 2) {
-                        // The polynom has only one monom => 7x^2
-                        // No need to continue.
-                        if (!P.isOne()) {
-                            factors.push(P.clone());
-                            P.one();
-                        }
-                        break;
-                    }
-                    else if (P.degree(letter).isOne()) {
-                        // The polynom is a first degree polynom => 3x-5
-                        // No need to continue
+            if (!this.dirty_factors) {
+                return this._factors;
+            }
+            let factors = [];
+            let P = this.clone().reorder();
+            // Extract the common monom
+            // 2x^3+6x^2 => 2x^2
+            let M = P.commonMonom();
+            // If the polynom starts with a negative monom, factorize it.
+            if (P.monomByDegree().coefficient.isStrictlyNegative() && M.coefficient.isStrictlyPositive()) {
+                M.opposed();
+            }
+            if (!M.isOne()) {
+                let tempPolynom = new Polynom(M);
+                factors = [tempPolynom.clone()];
+                P = P.euclidian(tempPolynom).quotient;
+            }
+            // Main loop
+            let securityLoop = P.degree().clone().multiply(2).value, maxDegree = 1;
+            while (securityLoop >= 0) {
+                securityLoop--;
+                if (P.monoms.length < 2) {
+                    // The polynom has only one monom => 7x^2
+                    // No need to continue.
+                    if (!P.isOne()) {
                         factors.push(P.clone());
                         P.one();
-                        break;
-                    }
-                    else {
-                        // Create the list of all "potential" polynom dividers.
-                        let allDividers = this._getAllPotentialFactors(P, maxDegree, letter);
-                        maxDegree = P.degree(letter).value;
-                        // Actually: 100ms
-                        while (allDividers.length > 0) {
-                            let div = allDividers[0];
-                            if (!P.isDividableBy(div)) {
-                                // Not dividable. Remove it from the list
-                                allDividers.shift();
-                            }
-                            else {
-                                // It's dividable - so make the division
-                                let result = P.euclidian(div);
-                                // Add the factor
-                                factors.push(div);
-                                // As it's dividable, get the quotient.
-                                P = result.quotient.clone();
-                                // filter all dividers that are no more suitable.
-                                allDividers = allDividers.filter(x => {
-                                    let pX = P.monoms[0], pC = P.monoms[P.monoms.length - 1], dX = x.monoms[0], dC = x.monoms[x.monoms.length - 1];
-                                    // Check last item (degree zero)
-                                    if (!pC.isDivisible(dC)) {
-                                        return false;
-                                    }
-                                    // Check the first item (degree max)
-                                    if (!pX.isDivisible(dX)) {
-                                        return false;
-                                    }
-                                    return true;
-                                });
-                            }
-                        }
                     }
+                    break;
                 }
-                // Maybe there is still something in the Polynom (not everything was possible to factorize)
-                if (!P.isOne()) {
+                else if (P.degree(letter).isOne()) {
+                    // The polynom is a first degree polynom => 3x-5
+                    // No need to continue
                     factors.push(P.clone());
+                    P.one();
+                    break;
+                }
+                else {
+                    // Create the list of all "potential" polynom dividers.
+                    let allDividers = this._getAllPotentialFactors(P, maxDegree, letter);
+                    maxDegree = P.degree(letter).value;
+                    // Actually: 100ms
+                    while (allDividers.length > 0) {
+                        let div = allDividers[0];
+                        if (!P.isDividableBy(div)) {
+                            // Not dividable. Remove it from the list
+                            allDividers.shift();
+                        }
+                        else {
+                            // It's dividable - so make the division
+                            let result = P.euclidian(div);
+                            // Add the factor
+                            factors.push(div);
+                            // As it's dividable, get the quotient.
+                            P = result.quotient.clone();
+                            // filter all dividers that are no more suitable.
+                            allDividers = allDividers.filter(x => {
+                                let pX = P.monoms[0], pC = P.monoms[P.monoms.length - 1], dX = x.monoms[0], dC = x.monoms[x.monoms.length - 1];
+                                // Check last item (degree zero)
+                                if (!pC.isDivisible(dC)) {
+                                    return false;
+                                }
+                                // Check the first item (degree max)
+                                if (!pX.isDivisible(dX)) {
+                                    return false;
+                                }
+                                return true;
+                            });
+                        }
+                    }
                 }
-                // Save the factors
-                this._factors = factors;
-                // The factors list is no more dirty
-                this.dirty_factors = false;
             }
+            // Maybe there is still something in the Polynom (not everything was possible to factorize)
+            if (!P.isOne()) {
+                factors.push(P.clone());
+            }
+            // Save the factors
+            this._factors = factors;
+            // The factors list is no more dirty
+            this.dirty_factors = false;
             return this._factors;
         };
         this.isDividableBy = (div) => {
@@ -3139,16 +3144,32 @@ 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
+                };
+            }
+        }
+        // First round to put the 'monom' first
+        let simpleFactor = new Polynom().one();
+        for (let item of Object.values(factorsCount).filter(item => item.factor.monoms.length === 1)) {
+            simpleFactor.multiply(item.factor);
+        }
+        let tex = simpleFactor.isOne() ? '' : simpleFactor.tex;
+        // Loop through all factors that contains at least 2 monoms.
+        for (let item of Object.values(factorsCount).filter(item => item.factor.monoms.length > 1)) {
+            if (item.factor.length > 1) {
+                tex += `\\left( ${item.factor.tex} \\right)${item.degree > 1 ? '^{ ' + item.degree + ' }' : ''}`;
             }
         }
         return tex;
@@ -3303,6 +3324,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 +4770,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) {
@@ -6937,6 +6973,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;
         }