npm - pimath - Versions diffs - 0.0.126 → 0.0.128 - Mend

pimath 0.0.126 → 0.0.128

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (121) hide show

package/.idea/jsLibraryMappings.xml +6 -0
package/{public/index.html → dist/demo/exercises.html} +2 -2
package/dist/demo/matrices.html +39 -0
package/dist/demo/playground.html +20 -0
package/dist/demo.css +3 -0
package/dist/pimath.js +4239 -7819
package/dist/pimath.umd.cjs +15 -0
package/index.html +15 -0
package/package.json +16 -8
package/public/demo/exercises.html +283 -0
package/public/demo/matrices.html +39 -0
package/public/demo/playground.html +20 -0
package/src/demo/exercises.ts +0 -0
package/src/demo/matrices.ts +61 -0
package/src/demo/playground.ts +153 -0
package/src/{index.ts → main.ts} +1 -1
package/src/maths/algebra/polynom.ts +9 -16
package/src/maths/algebra/rational.ts +8 -4
package/src/maths/geometry/line.ts +22 -25
package/src/maths/geometry/point.ts +43 -29
package/src/maths/randomization/random.ts +7 -0
package/src/maths/randomization/rndGeometryCircle.ts +50 -0
package/src/maths/randomization/rndTypes.ts +10 -4
package/tests/algebra/polynom.test.ts +10 -0
package/tests/geometry/circle.test.ts +222 -1
package/tests/numeric.test.ts +19 -3
package/tsconfig.json +15 -4
package/vite.config.js +23 -0
package/webpack-production.config.js +22 -22
package/webpack.config.js +22 -22
package/dev/pimath.js +0 -7945
package/dev/pimath.js.map +0 -1
package/dist/pimath.js.map +0 -1
package/dist/pimath.min.js +0 -2
package/dist/pimath.min.js.map +0 -1
package/esm/index.d.ts +0 -38
package/esm/index.js +0 -44
package/esm/index.js.map +0 -1
package/esm/maths/algebra/equation.d.ts +0 -119
package/esm/maths/algebra/equation.js +0 -797
package/esm/maths/algebra/equation.js.map +0 -1
package/esm/maths/algebra/linearSystem.d.ts +0 -39
package/esm/maths/algebra/linearSystem.js +0 -279
package/esm/maths/algebra/linearSystem.js.map +0 -1
package/esm/maths/algebra/logicalset.d.ts +0 -28
package/esm/maths/algebra/logicalset.js +0 -158
package/esm/maths/algebra/logicalset.js.map +0 -1
package/esm/maths/algebra/monom.d.ts +0 -206
package/esm/maths/algebra/monom.js +0 -909
package/esm/maths/algebra/monom.js.map +0 -1
package/esm/maths/algebra/polynom.d.ts +0 -157
package/esm/maths/algebra/polynom.js +0 -1305
package/esm/maths/algebra/polynom.js.map +0 -1
package/esm/maths/algebra/rational.d.ts +0 -46
package/esm/maths/algebra/rational.js +0 -195
package/esm/maths/algebra/rational.js.map +0 -1
package/esm/maths/algebra/study/rationalStudy.d.ts +0 -28
package/esm/maths/algebra/study/rationalStudy.js +0 -244
package/esm/maths/algebra/study/rationalStudy.js.map +0 -1
package/esm/maths/algebra/study.d.ts +0 -143
package/esm/maths/algebra/study.js +0 -380
package/esm/maths/algebra/study.js.map +0 -1
package/esm/maths/coefficients/fraction.d.ts +0 -90
package/esm/maths/coefficients/fraction.js +0 -517
package/esm/maths/coefficients/fraction.js.map +0 -1
package/esm/maths/coefficients/nthRoot.d.ts +0 -23
package/esm/maths/coefficients/nthRoot.js +0 -137
package/esm/maths/coefficients/nthRoot.js.map +0 -1
package/esm/maths/geometry/circle.d.ts +0 -45
package/esm/maths/geometry/circle.js +0 -324
package/esm/maths/geometry/circle.js.map +0 -1
package/esm/maths/geometry/line.d.ts +0 -99
package/esm/maths/geometry/line.js +0 -485
package/esm/maths/geometry/line.js.map +0 -1
package/esm/maths/geometry/point.d.ts +0 -34
package/esm/maths/geometry/point.js +0 -167
package/esm/maths/geometry/point.js.map +0 -1
package/esm/maths/geometry/triangle.d.ts +0 -91
package/esm/maths/geometry/triangle.js +0 -276
package/esm/maths/geometry/triangle.js.map +0 -1
package/esm/maths/geometry/vector.d.ts +0 -41
package/esm/maths/geometry/vector.js +0 -198
package/esm/maths/geometry/vector.js.map +0 -1
package/esm/maths/numeric.d.ts +0 -28
package/esm/maths/numeric.js +0 -136
package/esm/maths/numeric.js.map +0 -1
package/esm/maths/numexp.d.ts +0 -19
package/esm/maths/numexp.js +0 -186
package/esm/maths/numexp.js.map +0 -1
package/esm/maths/randomization/random.d.ts +0 -23
package/esm/maths/randomization/random.js +0 -79
package/esm/maths/randomization/random.js.map +0 -1
package/esm/maths/randomization/randomCore.d.ts +0 -7
package/esm/maths/randomization/randomCore.js +0 -22
package/esm/maths/randomization/randomCore.js.map +0 -1
package/esm/maths/randomization/rndFraction.d.ts +0 -12
package/esm/maths/randomization/rndFraction.js +0 -44
package/esm/maths/randomization/rndFraction.js.map +0 -1
package/esm/maths/randomization/rndGeometryLine.d.ts +0 -12
package/esm/maths/randomization/rndGeometryLine.js +0 -46
package/esm/maths/randomization/rndGeometryLine.js.map +0 -1
package/esm/maths/randomization/rndGeometryPoint.d.ts +0 -12
package/esm/maths/randomization/rndGeometryPoint.js +0 -61
package/esm/maths/randomization/rndGeometryPoint.js.map +0 -1
package/esm/maths/randomization/rndHelpers.d.ts +0 -23
package/esm/maths/randomization/rndHelpers.js +0 -98
package/esm/maths/randomization/rndHelpers.js.map +0 -1
package/esm/maths/randomization/rndMonom.d.ts +0 -12
package/esm/maths/randomization/rndMonom.js +0 -53
package/esm/maths/randomization/rndMonom.js.map +0 -1
package/esm/maths/randomization/rndPolynom.d.ts +0 -13
package/esm/maths/randomization/rndPolynom.js +0 -75
package/esm/maths/randomization/rndPolynom.js.map +0 -1
package/esm/maths/randomization/rndTypes.d.ts +0 -34
package/esm/maths/randomization/rndTypes.js +0 -3
package/esm/maths/randomization/rndTypes.js.map +0 -1
package/esm/maths/shutingyard.d.ts +0 -59
package/esm/maths/shutingyard.js +0 -443
package/esm/maths/shutingyard.js.map +0 -1
package/public/matrices.html +0 -100
package/public/playground.html +0 -168

package/public/demo/matrices.html ADDED Viewed

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
+    <title>Getting Started</title>
+	<script type="module" src="../../src/main.ts"></script>
+    <!-- KaTeX -->
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.css"
+          integrity="sha384-R4558gYOUz8mP9YWpZJjofhk+zx0AS11p36HnD2ZKj/6JR5z27gSSULCNHIRReVs" rel="stylesheet">
+    <!-- The loading of KaTeX is deferred to speed up page rendering -->
+    <script crossorigin="anonymous"
+            integrity="sha384-z1fJDqw8ZApjGO3/unPWUPsIymfsJmyrDVWC8Tv/a1HeOtGmkwNd/7xUS0Xcnvsx"
+            src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.js"></script>
+    <!-- To automatically render math in text elements, include the auto-render extension: -->
+    <script crossorigin="anonymous"
+            integrity="sha384-+XBljXPPiv+OzfbB3cVmLHf4hdUFHlWNZN5spNQ7rmHTXpd7WvJum6fIACpNNfIR"
+            onload="renderMathInElement(document.body);"
+            src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/contrib/auto-render.min.js"></script>
+    <link href="../demo.css" rel="stylesheet">
+</head>
+<body>
+<div id="app">
+</div>
+<script type="module" src="../../src/demo/matrices.ts">
+</script>
+</body>
+</html>

package/public/demo/playground.html ADDED Viewed

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Getting Started</title>
+    <script type="module" src="../../dist/pimath.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.css" integrity="sha384-AfEj0r4/OFrOo5t7NnNe46zW/tFgW6x/bCJG8FqQCEo3+Aro6EYUG4+cU+KJWu/X" crossorigin="anonymous">
+    <!-- The loading of KaTeX is deferred to speed up page rendering -->
+    <script src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js" integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js" integrity="sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa" crossorigin="anonymous"></script>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="../../src/demo/playground.ts">
+</script>
+</body>
+</html>

package/src/demo/exercises.ts ADDED Viewed

File without changes

package/src/demo/matrices.ts ADDED Viewed

@@ -0,0 +1,61 @@
+function detMatrice(M: number[][]): { matrix: number[][], determinant: number } {
+    return {
+        matrix: M,
+        determinant: detnxn(M)
+    }
+}
+function det2x2(M: number[][]): number {
+    return M[0][0] * M[1][1] - M[1][0] * M[0][1]
+}
+function subMatrix(M: number[][], row: number, col: number) {
+    let subM = []
+    for (let r = 0; r < M.length; r++) {
+        if (r === row) {
+            continue
+        }
+        let subMrow = []
+        for (let c = 0; c < M[r].length; c++) {
+            if (c === col) {
+                continue
+            }
+            subMrow.push(M[r][c])
+        }
+        subM.push(subMrow)
+    }
+    return subM
+}
+function detnxn(M: number[][]) {
+    let result = 0
+    if (M.length === 2) {
+        result = det2x2(M)
+    } else {
+        for (let i = 0; i < M.length; i++) {
+            if (M[i][0] !== 0) {
+                result += M[i][0] * Math.pow(-1, i) * detnxn(subMatrix(M, i, 0))
+            }
+        }
+    }
+    return result
+}
+const M = detMatrice([
+    [0, 2, -1, 4, 0],
+    [3, 5, 0, 0, -2],
+    [0, -3, 1, 0, 0],
+    [0, 0, -4, 3, -3],
+    [-1, 0, 0, 1, 2]
+])
+document.getElementById('app').innerHTML = `<p>\\[${M.matrix} = ${M.determinant}\\]</p>`;
+// @ts-ignore
+renderMathInElement(document.getElementById('app'))

package/src/demo/playground.ts ADDED Viewed

@@ -0,0 +1,153 @@
+import {Point} from "../maths/geometry/point.ts";
+import {Line} from "../maths/geometry/line.ts";
+let A = new Point(0, 2),
+    B = new Point(2, 3),
+    C = new Point(1 / 2, 4),
+    D = new Point(2, -1 / 2);
+let L1 = new Line(A, B).simplifyDirection(),
+    L2 = new Line(C, D).simplifyDirection();
+document.getElementById('app').innerHTML = `<p>\\( ${L1.tex.parametric} \\)</p>`;
+document.getElementById('app').innerHTML += `<p>\\( ${L2.tex.parametric} \\)</p>`;
+let I = L1.intersection(L2);
+if (I.hasIntersection) {
+    document.getElementById('app').innerHTML += `<p>\\[ ${L1.intersection(L2).point.tex} \\]</p>`
+} else if (I.isParallel) {
+    document.getElementById('app').innerHTML += `<p>Elles sont parallèles</p>`
+} else if (I.isSame) {
+    document.getElementById('app').innerHTML += `<p>Elles sont confondues</p>`
+}
+// @ts-ignore
+renderMathInElement(document.getElementById('app'), {fleqn: true});
+/*let p;
+p = new Pi.Polynom('3x(6x+9)+6(6x+9)');
+document.getElementById('app').innerHTML = `<p>${p.raw}</p>`;
+document.getElementById('app').innerHTML += `<p>${p.display}</p>`;
+let v1 = new Pi.Vector('3 4'),
+	v2 = new Pi.Vector('-2 5');
+console.log(v1);
+console.log(v2);
+console.log(Pi.Vector.scalarProduct(v1, v2));
+let P = new Pi.Polynom('(x+5)(x-17)(37x+35)');
+let Q = new Pi.Polynom('1');
+P.factorize(100)
+P.factors.forEach(n=> {
+	console.log(n.tex)
+	Q.multiply(n);
+})
+// Check that we have the same polynom.
+console.log(P.tex);
+console.log(Q.tex);
+/*let n = new Pi.Polynom(),
+		d = new Pi.Polynom();
+n.parse('(x+3)(x+4)');
+d.parse('(x+3)(x-2)')
+let r = new Pi.Rational(n, d);
+document.getElementById('app').innerHTML = `<p>${r.tex}</p>`*/
+/*
+let M = new Pi.Monom().random('x', 2, false, false);
+console.log(M.displayWithSign);
+let S = new Pi.LinearSystem().parse(
+	'x-3y=-2',
+	'4x+7x=1'
+);
+S.solve();
+document.getElementById('app').innerHTML = `<p>${S.tex}</p>`;
+document.getElementById('app').innerHTML += `<p>${S.texSolution}</p>`;
+let S = new Pi.LinearSystem().generate(3,-5,2);
+document.getElementById('app').innerHTML = `<p>${S.tex}</p>`;
+S.solve();
+S.log;
+S.tex;
+S = new Pi.LinearSystem().generate(-1,8,-2);
+document.getElementById('app').innerHTML += `<p>${S.tex}</p>`;
+S.solve();
+S.log;
+let P = new Pi.Polynom('3x^2+5yx-2');
+console.log(P.tex);
+console.log(P.numberOfVars);
+P.replaceBy('y', new Pi.Polynom('2x+1'));
+console.log(P.tex);
+let A = new Pi.Equation('2x+3y=5');
+console.log(A.tex);
+A.isolate('x');
+console.log(A.tex);
+A.isolate('y');
+console.log(A.tex);
+let P = new Pi.Polynom().rndSimple(2).makeItComplicate();
+console.log(P.tex);
+console.log(P.texString);
+let A = new Pi.Fraction().parse('2/5');
+console.log(A.frac);
+let F = new Pi.Fraction().parse('18/5');
+let N = new Pi.Root().parse(F).reduce();
+console.log(N.tex);
+let E = new Pi.Equation().create(new Pi.Polynom().parse('x^2+6x-8'), new Pi.Polynom().zero());
+E.solve();
+console.log(E.solutions);
+let D = 42;
+console.log(Pi.Numeric.dividers(D));
+let X = new Pi.Polynom().rndFactorable(2, false);
+console.log(X.tex);
+X.factors.forEach(function(P, i){
+	console.log(P.tex);
+});
+let EQ = new Pi.Equation('2x+3>=5x-2');
+EQ.solve();
+console.log(EQ.solution);
+EQ.parseString('2x+3<5x-2');
+EQ.solve();
+console.log(EQ.solution);
+EQ.parseString('7x+3>5x-2');
+EQ.solve();
+console.log(EQ.solution);
+EQ.parseString('7x+3=<5x-2');
+EQ.solve();
+console.log(EQ.solution);
+EQ.parseString('7x+3=<7x-2');
+EQ.solve();
+console.log(EQ.solution);
+EQ.parseString('7x+3>7x-2');
+EQ.solve();
+console.log(EQ.solution);
+EQ.parseString('x^2+6x+9>=0');
+EQ.solve();
+console.log(EQ.solution);*/

package/src/{index.ts → main.ts} RENAMED Viewed

@@ -39,4 +39,4 @@ export const PiMath = {
     }
 };
-// (<any>window).Pi = PiMath
+// (<any>window).PiMath = PiMath

package/src/maths/algebra/polynom.ts CHANGED Viewed

@@ -23,6 +23,13 @@ export interface IEuclidian {
  */
 export class Polynom {
     private _rawString: string;
+    private _dirty_factors: boolean
+    private _dirty_zeroes: boolean
+    private _euclidianCache: { [Key: string]: IEuclidian }
+    private _factors: Polynom[];
+    private _monoms: Monom[];
+    private _texString: string;
+    private _zeroes: ISolution[]
     /**
      *
@@ -40,8 +47,6 @@ export class Polynom {
         return this;
     }
-    private _dirty_factors: boolean
     // ------------------------------------------
     get dirty_factors(): boolean {
         return this._dirty_factors;
@@ -51,8 +56,6 @@ export class Polynom {
         this._dirty_factors = value;
     }
-    private _dirty_zeroes: boolean
     get dirty_zeroes(): boolean {
         return this._dirty_zeroes;
     }
@@ -61,8 +64,6 @@ export class Polynom {
         this._dirty_zeroes = value;
     }
-    private _euclidianCache: { [Key: string]: IEuclidian }
     get euclidianCache(): { [p: string]: IEuclidian } {
         return this._euclidianCache;
     }
@@ -71,8 +72,6 @@ export class Polynom {
         this._euclidianCache = value;
     }
-    private _factors: Polynom[];
     get factors(): Polynom[] {
         return this.factorize()
     }
@@ -82,8 +81,6 @@ export class Polynom {
         this._factors = value;
     }
-    private _monoms: Monom[];
     // ------------------------------------------
     get monoms() {
         return this._monoms;
@@ -93,14 +90,10 @@ export class Polynom {
         this._monoms = M;
     }
-    private _texString: string;
     get texString(): string {
         return this._texString;
     }
-    private _zeroes: ISolution[]
     get zeroes(): ISolution[] {
         return this.getZeroes()
     }
@@ -495,11 +488,11 @@ export class Polynom {
             // Get the greatest monom divided by the max monom of the divider
             newM = reminder.monomByDegree(undefined, letter).clone().divide(maxMP);
-            if (newM.isZero()) break;
+            if (newM.isZero()) continue;
             // Get the new quotient and reminder.
             quotient.add(newM);
-            reminder.subtract(P.clone().multiply(newM));
+            reminder.subtract(P.clone().multiply(newM)).reduce();
             // Check if the reminder is zero.
             if (newM.degree(letter).isZero()) break

package/src/maths/algebra/rational.ts CHANGED Viewed

@@ -62,6 +62,10 @@ export class Rational {
         return `\\frac{ ${this._numerator.texFactors} }{ ${this._denominator.texFactors} }`
     }
+    get displayFactors(): string {
+        return `(${this._numerator.displayFactors})/(${this._denominator.displayFactors})`;
+    }
     get plotFunction(): string {
         return `(${this._numerator.plotFunction})/(${this._denominator.plotFunction})`
     }
@@ -131,12 +135,12 @@ export class Rational {
         this._numerator.factorize();
         for (let f of this._numerator.factors) {
-            if(f.degree().isZero()){
+            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()){
+                if (this._denominator.commonMonom().coefficient.clone().divide(f.monomByDegree().coefficient).isNatural()) {
                     this.simplify(f);
                 }
-            }else {
+            } else {
                 this.simplify(f);
             }
         }
@@ -234,7 +238,7 @@ export class Rational {
         return this._numerator.evaluateAsNumeric(values) / this._denominator.evaluateAsNumeric(values)
     }
-    study = (config?:StudyConfig|string): RationalStudy => {
+    study = (config?: StudyConfig | string): RationalStudy => {
         return new RationalStudy(this, config)
     }
 }

package/src/maths/geometry/line.ts CHANGED Viewed

@@ -9,7 +9,6 @@ import {Fraction} from "../coefficients/fraction";
 import {Equation} from "../algebra/equation";
 import {Polynom} from "../algebra/polynom";
 import {Random} from "../randomization/random";
-import {LinearSystem} from "../algebra/linearSystem";
 import {Monom} from "../algebra/monom";
 export enum LinePropriety {
@@ -26,7 +25,20 @@ export class Line {
     private _referencePropriety: LinePropriety
     private _referenceLine: Line
     private _reduceBeforeDisplay: boolean
+    // ax + by + c = 0
+    private _a: Fraction;
+    private _b: Fraction;
+    private _c: Fraction;
+    private _OA: Point;
+    private _d: Vector;
+    private _n: Vector;
+    private _exists: boolean
+    /**
+     * Value can be a mix of:
+     *
+     * @param values
+     */
     constructor(...values: unknown[]) {
         this._exists = false;
@@ -39,19 +51,17 @@ export class Line {
         return this;
     }
-    // ax + by + c = 0
-    private _a: Fraction;
     get a(): Fraction {
         return this._a;
     }
+    // ------------------------------------------
+    // Getter and setter
     set a(value: Fraction) {
         this._a = value;
     }
-    private _b: Fraction;
     get b(): Fraction {
         return this._b;
     }
@@ -60,21 +70,14 @@ export class Line {
         this._b = value;
     }
-    private _c: Fraction;
     get c(): Fraction {
         return this._c;
     }
-    // ------------------------------------------
-    // Getter and setter
     set c(value: Fraction) {
         this._c = value;
     }
-    private _OA: Point;
     get OA(): Point {
         return this._OA;
     }
@@ -83,8 +86,6 @@ export class Line {
         this._OA = value;
     }
-    private _d: Vector;
     get d(): Vector {
         return this._d;
     }
@@ -93,14 +94,10 @@ export class Line {
         this._d = value;
     }
-    private _n: Vector;
     get n(): Vector {
         return this._n;
     }
-    private _exists: boolean
     get exists(): boolean {
         return this._exists;
     }
@@ -108,19 +105,19 @@ export class Line {
     // ------------------------------------------
     get equation(): Equation {
         let equ = new Equation(new Polynom().parse('xy', this._a, this._b, this._c), new Polynom('0'))
-        if(this._reduceBeforeDisplay) {
+        if (this._reduceBeforeDisplay) {
             return equ.simplify();
-        }else{
+        } else {
             return equ
         }
     }
     get system(): { x: Equation, y: Equation } {
         let e1 = new Equation(
-            new Polynom('x'),
-            new Polynom(this._OA.x)
-                .add(new Monom('k').multiplyByNumber(this._d.x))
-        ),
+                new Polynom('x'),
+                new Polynom(this._OA.x)
+                    .add(new Monom('k').multiplyByNumber(this._d.x))
+            ),
             e2 = new Equation(
                 new Polynom('y'),
                 new Polynom(this._OA.y)

package/src/maths/geometry/point.ts CHANGED Viewed

@@ -73,6 +73,20 @@ export class Point {
     // ------------------------------------------
     // Creation / parsing functions
+    get key(): string {
+        return `${this.x.display};${this.y.display}`
+    }
+    // ------------------------------------------
+    static pmatrix = (a: any, b: any, c?: any): string => {
+        if (c === undefined) {
+            return `\\begin{pmatrix} ${a.tex ? a.tex : a} \\\\ ${b.tex ? b.tex : b} \\end{pmatrix}`;
+        } else {
+            return `\\begin{pmatrix} ${a.tex ? a.tex : a} \\\\ ${b.tex ? b.tex : b} \\\\ ${c.tex ? c.tex : c} \\end{pmatrix}`;
+        }
+    };
     // ------------------------------------------
     parse = (...values: unknown[]): Point => {
         // Initialize the value.
@@ -103,9 +117,9 @@ export class Point {
             }
             // Value given as an object with {x: value, y: value}
-            if(values[0] instanceof PointXY){
-                    this._x = new Fraction(values[0].x).reduce()
-                    this._y = new Fraction(values[0].y).reduce()
+            if (values[0] instanceof PointXY) {
+                this._x = new Fraction(values[0].x).reduce()
+                this._y = new Fraction(values[0].y).reduce()
                 return this
             } else {
                 return this.zero()
@@ -138,6 +152,8 @@ export class Point {
         this.zero();
         return this;
     }
+    // ------------------------------------------
+    // Display functions
     middleOf = (P1: Point, P2: Point): Point => {
         this._x = P1.x.clone().add(P2.x).divide(2);
@@ -146,17 +162,6 @@ export class Point {
         return this;
     }
     // ------------------------------------------
-    // Display functions
-    // ------------------------------------------
-    texValues = (numberOfDigits: number): string => {
-        let pts = [];
-        pts.push(this._x.value.toFixed(numberOfDigits === undefined ? 2 : numberOfDigits));
-        pts.push(this._y.value.toFixed(numberOfDigits === undefined ? 2 : numberOfDigits));
-        return `\\left(${pts.join(';')}\\right)`
-    }
-    // ------------------------------------------
     // Mathematical operations
     // ------------------------------------------
@@ -166,36 +171,45 @@ export class Point {
     // ------------------------------------------
     // Static functions
+    translate = (value: { x: number | Fraction, y: number | Fraction }): Point => {
+        this._x = this._x.add(value.x)
+        this._y = this._y.add(value.y)
+        return this
+    }
     // ------------------------------------------
-    static pmatrix = (a: any, b: any, c?: any): string => {
-        if (c === undefined) {
-            return `\\begin{pmatrix} ${a.tex ? a.tex : a} \\\\ ${b.tex ? b.tex : b} \\end{pmatrix}`;
-        } else {
-            return `\\begin{pmatrix} ${a.tex ? a.tex : a} \\\\ ${b.tex ? b.tex : b} \\\\ ${c.tex ? c.tex : c} \\end{pmatrix}`;
-        }
-    };
+    texValues = (numberOfDigits: number): string => {
+        let pts = [];
+        pts.push(this._x.value.toFixed(numberOfDigits === undefined ? 2 : numberOfDigits));
+        pts.push(this._y.value.toFixed(numberOfDigits === undefined ? 2 : numberOfDigits));
+        return `\\left(${pts.join(';')}\\right)`
+    }
-    distanceTo = (item:Point|Line): { value: number, fraction: Fraction, tex: string } => {
+    distanceTo = (item: Point | Line): { value: number, fraction: Fraction, tex: string } => {
         let value = 0, fraction = new Fraction(), tex = ''
-        if(item instanceof Line){
+        if (item instanceof Line) {
             return item.distanceTo(this)
-        }else if(item instanceof Point){
+        } else if (item instanceof Point) {
             let V = new Vector(this, item)
             value = V.norm
             fraction = V.normSquare.sqrt()
             tex = V.normSquare.isSquare() ? fraction.tex : `\\sqrt{\\frac{ ${V.normSquare.numerator} }{ ${V.normSquare.denominator} }}`
         }
-        return { value, fraction, tex }
+        return {value, fraction, tex}
     }
-    get key(): string {
-      return `${this.x.display};${this.y.display}`
-}
     isInListOfPoints = (list: Point[]): boolean => {
-        const keyList = list.map(x=>x.key)
+        const keyList = list.map(x => x.key)
         return keyList.includes(this.key)
     }
+    isEqual = (pt: Point): boolean => {
+        return this.x.isEqual(pt.x) && this.y.isEqual(pt.y)
+    }
 }

package/src/maths/randomization/random.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import {rndMonom} from "./rndMonom";
 import {rndHelpers} from "./rndHelpers";
 import {
     randomCoefficientConfig,
+    randomGeometryCircleConfig,
     randomGeometryLineConfig,
     randomGeometryPointConfig,
     randomMonomConfig,
@@ -16,6 +17,8 @@ import {Line} from "../geometry/line";
 import {rndGeometryLine} from "./rndGeometryLine";
 import {Point} from "../geometry/point";
 import {rndGeometryPoint} from "./rndGeometryPoint";
+import {Circle} from "../geometry/circle";
+import {rndGeometryCircle} from "./rndGeometryCircle";
 export * from "./rndTypes"
@@ -69,5 +72,9 @@ export namespace Random {
             return (new rndGeometryPoint(config).generate())
         }
+        export function circle(config?: randomGeometryCircleConfig): Circle {
+            return (new rndGeometryCircle(config).generate())
+        }
     }
 }