pimath 0.0.122 → 0.0.124

package/src/maths/algebra/polynom.ts

@@ -8,6 +8,7 @@ import {Numeric} from '../numeric';
 import {Fraction} from "../coefficients/fraction";
 import {Equation, ISolution} from "./equation";
 import {Random} from "../randomization/random";
+import {loadHighlighter} from "typedoc/dist/lib/utils/highlighter";
 
 export type PolynomParsingType = string | Polynom | number | Fraction | Monom
 
@@ -747,8 +748,11 @@ export class Polynom {
     isDeveloped = (polynomString: string): Boolean => {
         let P: Polynom;
 
+        // Start by removing the parenthis after a "power"
+        let pString = polynomString.replaceAll(/\^\(([-0-9/]+)\)/g, '$1')
+
         // There is at least one parenthese - it is not developed.
-        if (polynomString.split('(').length + polynomString.split(')').length > 0) {
+        if (pString.includes('(') || pString.includes(')')) {
             return false
         }
 
@@ -766,16 +770,17 @@ export class Polynom {
         }
 
         // Check that everything is completely developed. Actually, there are no parentheses... so it is fully developed
-
-        // maybe it wasn't reduced and not ordered...
-        // compare polynom string.
-
-        // normalize the string
-        let polynomStringNormalized = polynomString.replaceAll('[*\s]', '')
-
-        // Determine if it's the exact same string.
-        // TODO: Maybe it's enough to just make this test !
-        return polynomStringNormalized === P.reduce().reorder().display
+        return true
+
+        // // maybe it wasn't reduced and not ordered...
+        // // compare polynom string.
+        //
+        // // normalize the string
+        // let polynomStringNormalized = polynomString.replaceAll('[*\s]', '')
+        //
+        // // Determine if it's the exact same string.
+        // // TODO: Maybe it's enough to just make this test !a
+        // return polynomStringNormalized === P.reduce().reorder().display
     }
 
     // -------------------------------------

package/src/maths/algebra/rational.ts

@@ -54,6 +54,10 @@ export class Rational {
         return `\\frac{ ${this._numerator.tex} }{ ${this._denominator.tex} }`;
     }
 
+    get display(): string {
+        return `(${this._numerator.display})/(${this._denominator.display})`;
+    }
+
     get texFactors(): string {
         return `\\frac{ ${this._numerator.texFactors} }{ ${this._denominator.texFactors} }`
     }
@@ -126,7 +130,15 @@ export class Rational {
     reduce = (): Rational => {
         this._numerator.factorize();
         for (let f of this._numerator.factors) {
-            this.simplify(f);
+
+            if(f.degree().isZero()){
+                // Do the simplify only if the factor can divide the denominator
+                if(this._denominator.commonMonom().coefficient.clone().divide(f.monomByDegree().coefficient).isNatural()){
+                    this.simplify(f);
+                }
+            }else {
+                this.simplify(f);
+            }
         }
 
         return this;

package/src/maths/geometry/triangle.ts

@@ -28,6 +28,12 @@ export interface remarquableLines {
         'B': Line,
         'C': Line,
         'intersection': Point
+    },
+    externalBisectors: {
+        'A': Line,
+        'B': Line,
+        'C': Line,
+        'intersection': Point
     }
 }
 
@@ -281,6 +287,10 @@ export class Triangle {
     }
 
     private _calculateRemarquableLines = (): remarquableLines => {
+        const  bA= this._calculateBisectors('A'),
+            bB= this._calculateBisectors('B'),
+            bC= this._calculateBisectors('C')
+
         let remarquables: remarquableLines = {
             'medians': {
                 'A': new Line(this._A, this._middles.BC),
@@ -301,9 +311,15 @@ export class Triangle {
                 'intersection': null
             },
             'bisectors': {
-                'A': this._calculateBisectors('A'),
-                'B': this._calculateBisectors('B'),
-                'C': this._calculateBisectors('C'),
+                'A': bA.internal,
+                'B': bB.internal,
+                'C': bB.internal,
+                'intersection': null
+            },
+            externalBisectors: {
+                'A': bA.external,
+                'B': bB.external,
+                'C': bC.external,
                 'intersection': null
             }
         }
@@ -318,7 +334,7 @@ export class Triangle {
         return remarquables;
     }
 
-    private _calculateBisectors = (pt: string): Line => {
+    private _calculateBisectors = (pt: string): { internal: Line, external: Line } => {
         let tlines = this.lines, d1, d2;
 
         if(pt==='A'){
@@ -337,16 +353,16 @@ export class Triangle {
 
         // Must determine which bisectors is in the triangle
         if(pt==='A'){
-            return b1.hitSegment(this.B, this.C)?b1:b2;
+            return b1.hitSegment(this.B, this.C)?{internal:b1, external: b2}:{internal:b2, external: b1};
         }
         if(pt==='B'){
-            return b1.hitSegment(this.A, this.C)?b1:b2;
+            return b1.hitSegment(this.A, this.C)?{internal:b1, external: b2}:{internal:b2, external: b1};
         }
         if(pt==='C'){
-            return b1.hitSegment(this.B, this.A)?b1:b2;
+            return b1.hitSegment(this.B, this.A)?{internal:b1, external: b2}:{internal:b2, external: b1};
         }
 
         // Default returns the first bisector
-        return b1;
+        return {internal:b1, external: b2}
     }
 }

package/src/maths/numexp.ts

@@ -97,7 +97,7 @@ export class NumExp {
         stack.push(this._numberCorrection(value))
     }
 
-    evaluate(values: { [Key: string]: number }): number {
+    evaluate(values?: { [Key: string]: number }): number {
         const stack: number[] = []
 
         if(this._rpn===null){

package/src/maths/shutingyard.ts

@@ -254,22 +254,23 @@ export class Shutingyard {
             crtToken = expr[i]
             nextToken = expr[i + 1]
             normalizedExpr += crtToken
+
             if (crtToken.match(/[a-zA-Z]/g)) {
                 // Current element is a letter.
                 // if the next element is a letter, a number or an opening parentheses, add the multiplication sign.
-                if (nextToken.match(/[a-zA-Z\d(]/)) {
+                if (nextToken?.match(/[a-zA-Z\d(]/)) {
                     normalizedExpr += '*'
                 }
             } else if (crtToken.match(/\d/)) {
                 // Current element is a number.
                 // if the next element is a letter or a parentheses, add the multiplication sign.
-                if (nextToken.match(/[a-zA-Z(]/)) {
+                if (nextToken?.match(/[a-zA-Z(]/)) {
                     normalizedExpr += '*'
                 }
             } else if (crtToken === ')') {
                 // Current element is a closing parentheses.
                 // if the next element is a letter, a number or an opening parentheses, add the multiplication sign
-                if (nextToken.match(/[a-zA-Z\d(]/)) {
+                if (nextToken?.match(/[a-zA-Z\d(]/)) {
                     normalizedExpr += '*'
                 }
             }
@@ -279,7 +280,7 @@ export class Shutingyard {
         }
 
         // add the last token
-        return normalizedExpr + nextToken
+        return normalizedExpr + (nextToken===undefined?'':nextToken)
     }
 
     // /**
@@ -374,6 +375,7 @@ export class Shutingyard {
         // Normalize the input if required.
         if (uniformize || this._uniformize) expr = this.normalize(expr)
 
+
         let securityLoopLvl1 = 50,
             securityLoopLvl2_default = 50,
             securityLoopLvl2;

package/tests/algebra/polynom.test.ts

@@ -139,6 +139,14 @@ describe('Polynom tests', () => {
         expect(Q.isFactorized('4(2x+5)(x-6)')).to.be.true
         expect(Q.isFactorized('(8x+20)(x-6)')).to.be.false
         expect(Q.isFactorized('(8x+20)(x-6)', true)).to.be.true
+    });
+
+    it('should check if a polynom is developed', function () {
+        let P = new Polynom('x(x+1)')
+
+        expect(P.isDeveloped('x^(2)+x')).true
+        expect(P.isDeveloped('x^2+x')).true
+        expect(P.isDeveloped('x(x+1)')).false
 
     });
 

package/tests/algebra/rationnal.test.ts

@@ -56,4 +56,9 @@ describe('Rational tests', () => {
 
         expect(P.plotFunction).to.be.equal("(245*x-490)/(6*x^(2)-19*x+15)")
     });
+
+    it('should reduce withouth creating fraction', function () {
+        let P = new Rational('4(x+1)', '(x+1)(x-3)')
+        expect(P.reduce().display).to.be.equal('(4)/(x-3)')
+    });
 })

package/tests/numexp.test.ts

@@ -65,12 +65,17 @@ describe('Numerical expression', () => { // the tests container
     it('should work with constant', function () {
 
         let k = new NumExp('2pi*x')
-        expect(k.evaluate({x: 1})).to.be.equal(6.283186)
+        expect(+k.evaluate({x: 1}).toFixed(6)).to.be.equal(6.283185)
     });
 
     it('should work with constant but without variables', function () {
 
         let k = new NumExp('2pi')
-        expect(k.evaluate()).to.be.equal(6.283186)
+        expect(+k.evaluate().toFixed(6)).to.be.equal(6.283185)
+    });
+
+    it('should parse with ln or log', function () {
+        let k = new NumExp('ln(3)')
+        expect(+k.evaluate().toFixed(6)).to.be.equal(1.098612)
     });
 });

package/.idea/shelf/Uncommitted_changes_before_Update_at_24_07_2023_15_31_[Default_Changelist]1/shelved.patch

@@ -1,107 +0,0 @@
-Index: src/index.ts
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import {Numeric} from \"./maths/numeric\";\r\nimport {NumExp} from \"./maths/expressions/numexp\";\r\nimport {Shutingyard} from \"./maths/shutingyard\";\r\nimport {Random} from \"./maths/randomization/random\";\r\nimport {Fraction} from \"./maths/coefficients/fraction\";\r\nimport {NthRoot} from \"./maths/coefficients/nthRoot\";\r\nimport {Monom} from \"./maths/algebra/monom\";\r\nimport {Polynom} from \"./maths/algebra/polynom\";\r\nimport {Equation} from \"./maths/algebra/equation\";\r\nimport {LinearSystem} from \"./maths/algebra/linearSystem\";\r\nimport {Rational} from \"./maths/algebra/rational\";\r\nimport {Logicalset} from \"./maths/algebra/logicalset\";\r\nimport {PolynomExpFactor, PolynomExpProduct} from \"./maths/expressions/polynomexp\";\r\nimport {Vector} from \"./maths/geometry/vector\";\r\nimport {Line} from \"./maths/geometry/line\";\r\nimport {Triangle} from \"./maths/geometry/triangle\";\r\nimport {Circle} from \"./maths/geometry/circle\";\r\nimport {Point} from \"./maths/geometry/point\";\r\n\r\n// Expose as global\r\nexport const PiMath = {\r\n    ShutingYard: Shutingyard,\r\n    Numeric: Numeric,\r\n    NumExp: NumExp,\r\n    Fraction: Fraction,\r\n    Root: NthRoot,\r\n    Monom: Monom,\r\n    Polynom: Polynom,\r\n    Equation: Equation,\r\n    LinearSystem: LinearSystem,\r\n    Rational: Rational,\r\n    Logicalset: Logicalset,\r\n    Random: Random,\r\n    PolynomExpFactor: PolynomExpFactor,\r\n    PolynomExpProduct: PolynomExpProduct,\r\n    Geometry: {\r\n        Vector: Vector,\r\n        Point: Point,\r\n        Line: Line,\r\n        Triangle: Triangle,\r\n        Circle: Circle\r\n    }\r\n};\r\n\r\n(<any>window).Pi = PiMath\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/index.ts b/src/index.ts
---- a/src/index.ts	
-+++ b/src/index.ts	
-@@ -42,4 +42,5 @@
-     }
- };
- 
--(<any>window).Pi = PiMath
-+// rename window.Pi to window.PiMath
-+(<any>window).PiMath = PiMath
-Index: tests/numexp.test.ts
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import {expect} from 'chai';\r\nimport {NumExp} from \"../src/maths/expressions/numexp\";\r\nimport {Numeric} from \"../src/maths/numeric\";\r\n\r\ndescribe('Numerical expression', () => { // the tests container\r\n    it('RPN for numerical expression', () => {\r\n        const RPN = new NumExp('3*x+5').rpn\r\n        expect(RPN.map(x => x.token)).to.have.all.members(['3', 'x', '*', '5', '+'])\r\n\r\n        const RPN2 = new NumExp('-3*x^2-5').rpn\r\n        expect(RPN2.map(x => x.token)).to.have.all.members(['3', 'x', '2', '^', '*', '-', '5', '-'])\r\n    })\r\n\r\n    it('Evaluate for numerical expression', () => {\r\n        const expr = new NumExp('3*x+5')\r\n        expect(expr.evaluate({x: 5})).to.be.equal(20)\r\n\r\n        const expr2 = new NumExp('-3*x^2-5')\r\n        expect(expr2.evaluate({x: -2})).to.be.equal(-17)\r\n    })\r\n\r\n    it('Evaluation simple mathematical functions', () => {\r\n        const expr = new NumExp('sqrt(x)')\r\n        expect(expr.evaluate({x: 9})).to.be.equal(3)\r\n    })\r\n\r\n    it('should detect invalid rpn parsing', function () {\r\n        const exprValid = new NumExp('3*sin(x)'),\r\n            exprInvalid = new NumExp('3*sin')\r\n\r\n        expect(exprValid.isValid).to.be.true\r\n        expect(exprInvalid.isValid).to.be.false\r\n    });\r\n\r\n    it('souldd detect invalid expression withouth crahsing', function() {\r\n        const exprPourrie = new NumExp('3xsi'),\r\n            exprOk = new NumExp('3xsin(x)')\r\n\r\n        expect(exprPourrie.isValid).to.be.false\r\n        expect(exprOk.isValid).to.be.true\r\n    })\r\n\r\n    it('should parse without mult sign', function () {\r\n\r\n        let a = 1 / 5\r\n\r\n        const expr = new NumExp('3x-5', true)\r\n        expect(expr.isValid).to.be.true\r\n        expect(expr.evaluate({x: 2})).to.be.equal(1)\r\n\r\n        const expr2 = new NumExp('3*x-5', true)\r\n        expect(expr2.isValid).to.be.true\r\n        expect(expr2.evaluate({x: 2})).to.be.equal(1)\r\n    });\r\n\r\n    it('should calculate sqrt from exp', function(){\r\n        // let a = new NumExp('x^(1/3)')\r\n        // console.log(a.evaluate({x: 8}))\r\n\r\n        let k = new NumExp('nthrt(x,3)')\r\n        expect(k.evaluate({x: -8})).to.be.equal(-2)\r\n        expect(k.evaluate({x: 27})).to.be.equal(3)\r\n\r\n        let p = new NumExp('nthrt(x,4)')\r\n        expect(p.evaluate({x: 16})).to.be.equal(2)\r\n        expect(p.evaluate({x: -16})).to.be.NaN\r\n    })\r\n});\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/numexp.test.ts b/tests/numexp.test.ts
---- a/tests/numexp.test.ts	
-+++ b/tests/numexp.test.ts	
-@@ -65,4 +65,16 @@
-         expect(p.evaluate({x: 16})).to.be.equal(2)
-         expect(p.evaluate({x: -16})).to.be.NaN
-     })
-+
-+    it('should work with constant', function () {
-+
-+        let k = new NumExp('2pi*x')
-+        expect(k.evaluate({x: 1})).to.be.equal(6.283186)
-+    });
-+
-+    it('should work with constant but without variables', function () {
-+
-+        let k = new NumExp('2pi')
-+        expect(k.evaluate()).to.be.equal(6.283186)
-+    });
- });
-Index: tests/algebra/linear.test.ts
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>import {describe} from \"mocha\";\r\nimport {expect} from \"chai\";\r\nimport {LinearSystem} from \"../../src/maths/algebra/linearSystem\";\r\nimport {Polynom} from \"../../src/maths/algebra/polynom\";\r\nimport exp = require(\"constants\");\r\n\r\ndescribe('Linear systems tests', () => {\r\n    it('should solve a 2x2 equations', () => {\r\n        let LS = new LinearSystem(\r\n            '4x+5y=11',\r\n            '7y-24=3x'\r\n        )\r\n        LS.solve(true)\r\n\r\n        expect(LS.solution).to.be.equal('\\\\left(-1;3\\\\right)')\r\n    })\r\n    it('should solve a 3x3 equations', () => {\r\n        let LS = new LinearSystem(\r\n            '2x+7y-z=-3',\r\n            '-3x+2y+3z=12',\r\n            '-5x-3y+2z=5'\r\n        )\r\n\r\n        LS.solve()\r\n        console.log(LS.solution)\r\n    })\r\n\r\n    it('should solve a 3x3 equations II ', () => {\r\n        let LS = new LinearSystem(\r\n            '-x+y-z=-6',\r\n            '3x+2y+z=14',\r\n            '5x+y+3z=7'\r\n        )\r\n\r\n        LS.solve()\r\n        console.log(LS.solution)\r\n    })\r\n\r\n    it('should calculate the reduction', function () {\r\n        let E1 = new Polynom('6x+21y-3z'),\r\n            E2 = new Polynom('-6x+21y-3z')\r\n\r\n        // Start from hre\r\n        console.log('------------')\r\n        console.log(E1.tex, E2.tex)\r\n\r\n        console.log(E1.monoms.map(x => x.tex))\r\n        console.log(E2.monoms.map(x => x.tex))\r\n        E1.add(E2);\r\n\r\n        console.log(E1.tex)\r\n    });\r\n\r\n    it('should use a reduced linear reducation', function () {\r\n        let LS = new LinearSystem(\r\n            '3x-6y+3=0',\r\n            'x+12y-6=0'\r\n        )\r\n        LS.solve(true)\r\n\r\n        const tex = LS.stepTex('x')\r\n\r\n        expect(+LS.resolutionSteps['x'][0].operations[0][0]).to.be.equal(2)\r\n        expect(+LS.resolutionSteps['x'][0].operations[1][0]).to.be.equal(1)\r\n    });\r\n})\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/algebra/linear.test.ts b/tests/algebra/linear.test.ts
---- a/tests/algebra/linear.test.ts	
-+++ b/tests/algebra/linear.test.ts	
-@@ -63,4 +63,34 @@
-         expect(+LS.resolutionSteps['x'][0].operations[0][0]).to.be.equal(2)
-         expect(+LS.resolutionSteps['x'][0].operations[1][0]).to.be.equal(1)
-     });
-+
-+    it('should calculate what i need', function (){
-+        let LS = new LinearSystem(
-+            '15x-8y+16=0',
-+            '5x+12y-24=0'
-+        )
-+        LS.solve()
-+        console.log(LS.solution)
-+
-+        let LS2 = new LinearSystem(
-+            '15x-8y+16=0',
-+            '3x-4y-6=0'
-+        )
-+        LS2.solve()
-+        console.log(LS2.solution)
-+
-+        let LS3 = new LinearSystem(
-+            '5x+12y-24=0',
-+            '3x-4y-6=0'
-+        )
-+        LS3.solve()
-+        console.log(LS3.solution)
-+
-+        let LS4 = new LinearSystem(
-+            '70x+25y-50=0',
-+            '63x-54y-11=0'
-+        )
-+        LS4.solve()
-+        console.log(LS4.solution)
-+    })
- })
-Index: LICENSE.md
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>MIT License\r\n\r\nCopyright (c) 2020 Basil Gass\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a copy\r\nof this software and associated documentation files (the \"Software\"), to deal\r\nin the Software without restriction, including without limitation the rights\r\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software, and to permit persons to whom the Software is\r\nfurnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\nSOFTWARE.\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/LICENSE.md b/LICENSE.md
---- a/LICENSE.md	
-+++ b/LICENSE.md	
-@@ -1,6 +1,6 @@
- MIT License
- 
--Copyright (c) 2020 Basil Gass
-+Copyright (c) 2023 Basil Gass
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal

package/.idea/shelf/Uncommitted_changes_before_Update_at_24_07_2023_15_31__Default_Changelist_1.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_24_07_2023_15_31_[Default_Changelist]1" date="1690205596619" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_24_07_2023_15_31_[Default_Changelist]1/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 24.07.2023 15:31 [Default Changelist]" />
-</changelist>