pimath 0.0.49 → 0.0.53

package/public/index.html

@@ -49,32 +49,31 @@
         let triplets = []
         let n = 9, v
 
-        for(let u = 2; u<=n; u++){
-            v = ( u%2===0 )?1:2
-            while(v < u){
-                if(Pi.Numeric.gcd(u, v)===1){
+        for (let u = 2; u <= n; u++) {
+            v = (u % 2 === 0) ? 1 : 2
+            while (v < u) {
+                if (Pi.Numeric.gcd(u, v) === 1) {
                     triplets.push([
                         u, v,
-                        u**2-v**2,
-                        2*u*v,
-                        u**2+v**2
+                        u ** 2 - v ** 2,
+                        2 * u * v,
+                        u ** 2 + v ** 2
                     ])
                 }
-                    v = v + 2
+                v = v + 2
             }
         }
 
         let target = 13
         // Filtrer les triplets pour n'avoir que les valeurs 15.
-        triplets = triplets.filter(x=>x[x.length-1]===target)
-
+        triplets = triplets.filter(x => x[x.length - 1] === target)
 
 
         // méthode inverse, à partir du triplet.
         triplets = []
-        for(let u = 0; u <= target; u++){
-            for(let v = 0; v <=target; v++){
-                if(u**2+v**2===target**2){
+        for (let u = 0; u <= target; u++) {
+            for (let v = 0; v <= target; v++) {
+                if (u ** 2 + v ** 2 === target ** 2) {
                     triplets.push([u, v, target])
                 }
             }
@@ -86,228 +85,228 @@
     }
 
 
-	// Should be
-	function examplePolynomExpSimple () {
-		const F1 = new Pi.PolynomExpFactor('x^2-4x+7', -1),
-			F2 = new Pi.PolynomExpFactor('8x-16', 1),
-			PP = new Pi.PolynomExpProduct(F2, F1)
-
-		const D = F1.derivative()
-		D.reduce()
-
-			console.log(PP.integrate())
-		return {
-			d: katex.renderToString('\\left(' + F1.tex + '\\right)\'=' + D.tex),
-			i: katex.renderToString('\\displaystyle\\int\\ ' + PP.tex + '\\ \\text{d}x = ' + PP.integrate().tex)
-		}
-	}
-
-	function example () {
-		let P = new Pi.Polynom('3x^(2/3)-5x+5/3')
-
-		console.log(P.tex)
-
-		return {
-			tex: katex.renderToString(P.tex)
-		}
-	}
-
-	// let ne = new Pi.NumExp('5/x*sin(x*x)')
-	// const expr2 = new Pi.NumExp('-3*x^2-5')
-	//
-	// console.log(expr2.evaluate({x: -2}))
-	//
-	//
-	// let ne = new Pi.NumExp('5/x*sqrt(x^2)')
-	//
-	// console.log(ne.rpn)
-	// console.log(ne.evaluate({x: 0}))
-
-	function dev () {
-		let output = []
-
-		ex1()
-		// ex1()
-		// console.log(ex1())
-		output = [
-			'\\text{exercice 1}',
-			...ex1(),
-			'--------------',
-			'\\text{exercice 2}',
-			...ex2(),
-			'--------------',
-			'\\text{exercice 3}',
-			...ex3(),
-			'--------------',
-			'\\text{exercice 4}',
-			...ex4()]
-
-		// console.log(ex1())
-		return {
-			output
-		}
-	}
-
-	function ex1 () {
-		// EXERCICE 1
-		let cart = [
-			'A',
-			'x^2-10x+y^2-8y+37=0',
-			'x^2-4x+y^2+6y+20=0',
-			'3x^2+3y^2+18y+3=0',
-			'4x^2-16x+8y^2-16y-10=0',
-			'B',
-			'x^2+10x+y^2-8y+32=0',
-			'5x^2+5y^2+80y+45=0',
-			'3x^2-9x+5y^2-10y+45=0',
-			'x^2-8x+y^2+4x+36=0'
-		], C, texData = []
-
-		for (let equ of cart) {
-			if (equ.length === 1) {
-				texData.push(`\\text{série ${equ}}`)
-				continue
-			}
-			C = new Pi.Geometry.Circle(equ)
-			if (C.exists) {
-				texData.push(equ + '\\implies ' + C.tex + '\\implies C' + C.center.tex + ',\\ r=' + C.radius.tex)
-			} else {
-				texData.push(equ + '\\implies' + '\\text{pas un cercle}')
-			}
-		}
-
-		return texData
-	}
-
-	function ex2 () {
-		let Center1 = new Pi.Geometry.Point(4, -2),
-			C1 = new Pi.Geometry.Circle(Center1, 10, true),
-			droites1 = [
-				'x+3y-8=0',
-				'x-6y+6=0',
-				'2x+y-1=0',
-				'3x-4y-36=0'
-			],
-			Center2 = new Pi.Geometry.Point(8, 6),
-			C2 = new Pi.Geometry.Circle(
-				Center2,
-				40,
-				true),
-			droites2 = [
-				'x-3y+30=0',
-				'4x+11y-22=0',
-				'3x-y+8=0',
-				'2x+y-32=0'
-			],
-			d, pr, out = []
-
-		out.push('\\text{série A}')
-		out.push('(\\Gamma_1):' + C1.tex)
-		for (let equ of droites1) {
-			d = new Pi.Geometry.Line(equ)
-			pr = C1.relativePosition(d)
-
-			if (pr === 0) {
-				out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C1.center).tex + '\\implies \\text{externe}\\ ')
-			} else if (pr === 1) {
-				out.push(d.tex.canonical + '\\implies \\text{tangent: }' + C1.lineIntersection(d)[0].tex)
-			} else {
-				out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C1.center).tex + '\\implies \\text{sécant:}\\ ' + C1.lineIntersection(d).map(x => x.tex).join('\\quad'))
-			}
-		}
-
-		out.push('\\text{série B}')
-		out.push('(\\Gamma_2):' + C2.tex)
-		for (let equ of droites2) {
-			d = new Pi.Geometry.Line(equ)
-			pr = C2.relativePosition(d)
-			if (pr === 0) {
-				out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C2.center).tex + '\\implies \\text{externe}')
-			} else if (pr === 1) {
-				out.push(d.tex.canonical + '\\implies \\text{tangent: }' + C2.lineIntersection(d)[0].tex)
-			} else {
-				out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C2.center).tex + '\\implies \\text{sécant:} ' + C2.lineIntersection(d).map(x => x.tex).join('\\quad'))
-			}
-		}
-
-		return out
-	}
-
-	function ex3 () {
-		let C = new Pi.Geometry.Circle(
-			new Pi.Geometry.Point(-14, 18),
-			new Pi.Geometry.Point(-2, 14),
-			new Pi.Geometry.Point(-10, 22)
-		), T1 = new Pi.Geometry.Triangle(new Pi.Geometry.Point(-14, 18),
-			new Pi.Geometry.Point(-2, 14),
-			new Pi.Geometry.Point(-10, 22))
-
-		let E = new Pi.Geometry.Circle(
-			new Pi.Geometry.Point(4, 10),
-			new Pi.Geometry.Point(5, 5),
-			new Pi.Geometry.Point(9, 11)
-		), T2 = new Pi.Geometry.Triangle(
-			new Pi.Geometry.Point(4, 10),
-			new Pi.Geometry.Point(5, 5),
-			new Pi.Geometry.Point(9, 11)
-		)
-
-		return [
-			'\\text{2 milieux, 2 normales, 2 médiatrices, 2 intersection, 1 rayon, 1 équation}',
-			'\\text{série A}',
-			(new Pi.Geometry.Point().middleOf(T2.A, T2.B)).tex + '\\quad (m_{AB}):\\ ' + T2.remarquables.mediators.AB.tex.canonical,
-			(new Pi.Geometry.Point().middleOf(T2.A, T2.C)).tex + '\\quad (m_{AC}):\\ ' + T2.remarquables.mediators.AC.tex.canonical,
-			(new Pi.Geometry.Point().middleOf(T2.C, T2.B)).tex + '\\quad (m_{BC}):\\ ' + T2.remarquables.mediators.BC.tex.canonical,
-			E.tex,
-			'\\text{série B}',
-			(new Pi.Geometry.Point().middleOf(T1.A, T1.B)).tex + '\\quad (m_{AB}):\\ ' + T1.remarquables.mediators.AB.tex.canonical,
-			(new Pi.Geometry.Point().middleOf(T1.A, T1.C)).tex + '\\quad (m_{AC}):\\ ' + T1.remarquables.mediators.AC.tex.canonical,
-			(new Pi.Geometry.Point().middleOf(T1.C, T1.B)).tex + '\\quad (m_{BC}):\\ ' + T1.remarquables.mediators.BC.tex.canonical,
-			C.tex,
-
-		]
-	}
-
-	function ex4 () {
-		// A
-		let A = new Pi.Geometry.Point(-6, -9),
-			C = new Pi.Geometry.Circle('(x+3)^2+(y+5)^2=25'),
-			Oy = C.cartesian.clone().replaceBy('x', new Pi.Polynom().zero()),
-			Ox = C.cartesian.clone().replaceBy('y', new Pi.Polynom().zero()),
-			t = new Pi.Geometry.Line(
-				A,
-				new Pi.Geometry.Vector(A, C.center),
-				Pi.Geometry.Line.PERPENDICULAR
-			)
-
-		Oy.solve()
-		Ox.solve()
-
-		// B
-		let A1 = new Pi.Geometry.Point(-4, -14),
-			C1 = new Pi.Geometry.Circle('(x-10)^2+(y+6)^2=100'),
-			Oy1 = C1.cartesian.clone().replaceBy('x', new Pi.Polynom().zero()),
-			Ox1 = C1.cartesian.clone().replaceBy('y', new Pi.Polynom().zero()),
-			t1 = new Pi.Geometry.Line(
-				A1,
-				new Pi.Geometry.Vector(A1, C1.center),
-				Pi.Geometry.Line.PERPENDICULAR
-			)
-
-		Oy1.solve()
-		Ox1.solve()
-
-		return [
-			'\\text{série A}',
-			'(Ox):\\ ' + Ox.solutions.map(y => `(${y.value};0)`),
-			'(Oy):\\ ' + Oy.solutions.map(x => `(0;${x.value})`),
-			'(t):\\ ' + t.tex.canonical,
-			'\\text{série B}',
-			'(Ox):\\ ' + Ox1.solutions.map(y => `(${y.value};0)`),
-			'(Oy):\\ ' + Oy1.solutions.map(x => `(0;${x.value})`),
-			'(t):\\ ' + t1.tex.canonical
-		]
-	}
+    // Should be
+    function examplePolynomExpSimple() {
+        const F1 = new Pi.PolynomExpFactor('x^2-4x+7', -1),
+            F2 = new Pi.PolynomExpFactor('8x-16', 1),
+            PP = new Pi.PolynomExpProduct(F2, F1)
+
+        const D = F1.derivative()
+        D.reduce()
+
+        console.log(PP.integrate())
+        return {
+            d: katex.renderToString('\\left(' + F1.tex + '\\right)\'=' + D.tex),
+            i: katex.renderToString('\\displaystyle\\int\\ ' + PP.tex + '\\ \\text{d}x = ' + PP.integrate().tex)
+        }
+    }
+
+    function example() {
+        let P = new Pi.Polynom('3x^(2/3)-5x+5/3')
+
+        console.log(P.tex)
+
+        return {
+            tex: katex.renderToString(P.tex)
+        }
+    }
+
+    // let ne = new Pi.NumExp('5/x*sin(x*x)')
+    // const expr2 = new Pi.NumExp('-3*x^2-5')
+    //
+    // console.log(expr2.evaluate({x: -2}))
+    //
+    //
+    // let ne = new Pi.NumExp('5/x*sqrt(x^2)')
+    //
+    // console.log(ne.rpn)
+    // console.log(ne.evaluate({x: 0}))
+
+    function dev() {
+        let output = []
+
+        ex1()
+        // ex1()
+        // console.log(ex1())
+        output = [
+            '\\text{exercice 1}',
+            ...ex1(),
+            '--------------',
+            '\\text{exercice 2}',
+            ...ex2(),
+            '--------------',
+            '\\text{exercice 3}',
+            ...ex3(),
+            '--------------',
+            '\\text{exercice 4}',
+            ...ex4()]
+
+        // console.log(ex1())
+        return {
+            output
+        }
+    }
+
+    function ex1() {
+        // EXERCICE 1
+        let cart = [
+            'A',
+            'x^2-10x+y^2-8y+37=0',
+            'x^2-4x+y^2+6y+20=0',
+            '3x^2+3y^2+18y+3=0',
+            '4x^2-16x+8y^2-16y-10=0',
+            'B',
+            'x^2+10x+y^2-8y+32=0',
+            '5x^2+5y^2+80y+45=0',
+            '3x^2-9x+5y^2-10y+45=0',
+            'x^2-8x+y^2+4x+36=0'
+        ], C, texData = []
+
+        for (let equ of cart) {
+            if (equ.length === 1) {
+                texData.push(`\\text{série ${equ}}`)
+                continue
+            }
+            C = new Pi.Geometry.Circle(equ)
+            if (C.exists) {
+                texData.push(equ + '\\implies ' + C.tex + '\\implies C' + C.center.tex + ',\\ r=' + C.radius.tex)
+            } else {
+                texData.push(equ + '\\implies' + '\\text{pas un cercle}')
+            }
+        }
+
+        return texData
+    }
+
+    function ex2() {
+        let Center1 = new Pi.Geometry.Point(4, -2),
+            C1 = new Pi.Geometry.Circle(Center1, 10, true),
+            droites1 = [
+                'x+3y-8=0',
+                'x-6y+6=0',
+                '2x+y-1=0',
+                '3x-4y-36=0'
+            ],
+            Center2 = new Pi.Geometry.Point(8, 6),
+            C2 = new Pi.Geometry.Circle(
+                Center2,
+                40,
+                true),
+            droites2 = [
+                'x-3y+30=0',
+                '4x+11y-22=0',
+                '3x-y+8=0',
+                '2x+y-32=0'
+            ],
+            d, pr, out = []
+
+        out.push('\\text{série A}')
+        out.push('(\\Gamma_1):' + C1.tex)
+        for (let equ of droites1) {
+            d = new Pi.Geometry.Line(equ)
+            pr = C1.relativePosition(d)
+
+            if (pr === 0) {
+                out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C1.center).tex + '\\implies \\text{externe}\\ ')
+            } else if (pr === 1) {
+                out.push(d.tex.canonical + '\\implies \\text{tangent: }' + C1.lineIntersection(d)[0].tex)
+            } else {
+                out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C1.center).tex + '\\implies \\text{sécant:}\\ ' + C1.lineIntersection(d).map(x => x.tex).join('\\quad'))
+            }
+        }
+
+        out.push('\\text{série B}')
+        out.push('(\\Gamma_2):' + C2.tex)
+        for (let equ of droites2) {
+            d = new Pi.Geometry.Line(equ)
+            pr = C2.relativePosition(d)
+            if (pr === 0) {
+                out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C2.center).tex + '\\implies \\text{externe}')
+            } else if (pr === 1) {
+                out.push(d.tex.canonical + '\\implies \\text{tangent: }' + C2.lineIntersection(d)[0].tex)
+            } else {
+                out.push(d.tex.canonical + '\\implies \\delta = ' + d.distanceTo(C2.center).tex + '\\implies \\text{sécant:} ' + C2.lineIntersection(d).map(x => x.tex).join('\\quad'))
+            }
+        }
+
+        return out
+    }
+
+    function ex3() {
+        let C = new Pi.Geometry.Circle(
+            new Pi.Geometry.Point(-14, 18),
+            new Pi.Geometry.Point(-2, 14),
+            new Pi.Geometry.Point(-10, 22)
+        ), T1 = new Pi.Geometry.Triangle(new Pi.Geometry.Point(-14, 18),
+            new Pi.Geometry.Point(-2, 14),
+            new Pi.Geometry.Point(-10, 22))
+
+        let E = new Pi.Geometry.Circle(
+            new Pi.Geometry.Point(4, 10),
+            new Pi.Geometry.Point(5, 5),
+            new Pi.Geometry.Point(9, 11)
+        ), T2 = new Pi.Geometry.Triangle(
+            new Pi.Geometry.Point(4, 10),
+            new Pi.Geometry.Point(5, 5),
+            new Pi.Geometry.Point(9, 11)
+        )
+
+        return [
+            '\\text{2 milieux, 2 normales, 2 médiatrices, 2 intersection, 1 rayon, 1 équation}',
+            '\\text{série A}',
+            (new Pi.Geometry.Point().middleOf(T2.A, T2.B)).tex + '\\quad (m_{AB}):\\ ' + T2.remarquables.mediators.AB.tex.canonical,
+            (new Pi.Geometry.Point().middleOf(T2.A, T2.C)).tex + '\\quad (m_{AC}):\\ ' + T2.remarquables.mediators.AC.tex.canonical,
+            (new Pi.Geometry.Point().middleOf(T2.C, T2.B)).tex + '\\quad (m_{BC}):\\ ' + T2.remarquables.mediators.BC.tex.canonical,
+            E.tex,
+            '\\text{série B}',
+            (new Pi.Geometry.Point().middleOf(T1.A, T1.B)).tex + '\\quad (m_{AB}):\\ ' + T1.remarquables.mediators.AB.tex.canonical,
+            (new Pi.Geometry.Point().middleOf(T1.A, T1.C)).tex + '\\quad (m_{AC}):\\ ' + T1.remarquables.mediators.AC.tex.canonical,
+            (new Pi.Geometry.Point().middleOf(T1.C, T1.B)).tex + '\\quad (m_{BC}):\\ ' + T1.remarquables.mediators.BC.tex.canonical,
+            C.tex,
+
+        ]
+    }
+
+    function ex4() {
+        // A
+        let A = new Pi.Geometry.Point(-6, -9),
+            C = new Pi.Geometry.Circle('(x+3)^2+(y+5)^2=25'),
+            Oy = C.cartesian.clone().replaceBy('x', new Pi.Polynom().zero()),
+            Ox = C.cartesian.clone().replaceBy('y', new Pi.Polynom().zero()),
+            t = new Pi.Geometry.Line(
+                A,
+                new Pi.Geometry.Vector(A, C.center),
+                Pi.Geometry.Line.PERPENDICULAR
+            )
+
+        Oy.solve()
+        Ox.solve()
+
+        // B
+        let A1 = new Pi.Geometry.Point(-4, -14),
+            C1 = new Pi.Geometry.Circle('(x-10)^2+(y+6)^2=100'),
+            Oy1 = C1.cartesian.clone().replaceBy('x', new Pi.Polynom().zero()),
+            Ox1 = C1.cartesian.clone().replaceBy('y', new Pi.Polynom().zero()),
+            t1 = new Pi.Geometry.Line(
+                A1,
+                new Pi.Geometry.Vector(A1, C1.center),
+                Pi.Geometry.Line.PERPENDICULAR
+            )
+
+        Oy1.solve()
+        Ox1.solve()
+
+        return [
+            '\\text{série A}',
+            '(Ox):\\ ' + Ox.solutions.map(y => `(${y.value};0)`),
+            '(Oy):\\ ' + Oy.solutions.map(x => `(0;${x.value})`),
+            '(t):\\ ' + t.tex.canonical,
+            '\\text{série B}',
+            '(Ox):\\ ' + Ox1.solutions.map(y => `(${y.value};0)`),
+            '(Oy):\\ ' + Oy1.solutions.map(x => `(0;${x.value})`),
+            '(t):\\ ' + t1.tex.canonical
+        ]
+    }
 
 </script>
 </body>

package/src/index.ts

@@ -3,7 +3,7 @@ import {NumExp} from "./maths/expressions/numexp";
 import {Shutingyard} from "./maths/shutingyard";
 import {Random} from "./maths/randomization/random";
 import {Fraction} from "./maths/coefficients/fraction";
-import {Nthroot} from "./maths/coefficients/nthroot";
+import {NthRoot} from "./maths/coefficients/nthRoot";
 import {Monom} from "./maths/algebra/monom";
 import {Polynom} from "./maths/algebra/polynom";
 import {Equation} from "./maths/algebra/equation";
@@ -23,7 +23,7 @@ export const PiMath = {
     Numeric: Numeric,
     NumExp: NumExp,
     Fraction: Fraction,
-    Root: Nthroot,
+    Root: NthRoot,
     Monom: Monom,
     Polynom: Polynom,
     Equation: Equation,