pimath 0.0.33 → 0.0.34

package/esm/maths/geometry/point.js

@@ -1,16 +1,109 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Point = void 0;
+/**
+ * Vector module contains everything necessary to handle 2d or 3d vectors.
+ * @module Vector
+ */
 const coefficients_1 = require("../coefficients");
+const line_1 = require("./line");
+const vector_1 = require("./vector");
+/**
+ * Helper class - a way to identify an object {x: number, y: number}
+ */
 class PointXY {
-    x;
-    y;
 }
 class Point {
-    _x;
-    _y;
-    _exist;
     constructor(...values) {
+        // ------------------------------------------
+        // Creation / parsing functions
+        // ------------------------------------------
+        this.parse = (...values) => {
+            // Initialize the value.
+            this.zero();
+            // Nothing is given
+            if (values.length === 0) {
+                return this;
+            }
+            // One element is given - might be already a point !
+            if (values.length === 1) {
+                // it's already a point - clone it
+                if (values[0] instanceof Point) {
+                    this._x = values[0].x.clone();
+                    this._y = values[0].y.clone();
+                    return this;
+                }
+                // Value is given as string, comma separated.
+                if (typeof values[0] === 'string') {
+                    let xy = values[0].split(',');
+                    if (xy.length === 2) {
+                        this._x = new coefficients_1.Fraction(xy[0]).reduce();
+                        this._y = new coefficients_1.Fraction(xy[1]).reduce();
+                        return this;
+                    }
+                }
+                // Value given as an object with {x: value, y: value}
+                if (values[0] instanceof PointXY) {
+                    this._x = new coefficients_1.Fraction(values[0].x).reduce();
+                    this._y = new coefficients_1.Fraction(values[0].y).reduce();
+                    return this;
+                }
+                else {
+                    return this.zero();
+                }
+            }
+            if (values.length === 2) {
+                this._x = new coefficients_1.Fraction(values[0]).reduce();
+                this._y = new coefficients_1.Fraction(values[1]).reduce();
+                return this;
+            }
+            return this;
+        };
+        this.clone = () => {
+            this._x = this._x.clone();
+            this._y = this._y.clone();
+            return this;
+        };
+        this.zero = () => {
+            this._x = new coefficients_1.Fraction(null);
+            this._y = new coefficients_1.Fraction(null);
+            return this;
+        };
+        this.origin = () => {
+            this.zero();
+            return this;
+        };
+        this.middleOf = (P1, P2) => {
+            this._x = P1.x.clone().add(P2.x).divide(2);
+            this._y = P1.y.clone().add(P2.y).divide(2);
+            return this;
+        };
+        // ------------------------------------------
+        // Display functions
+        // ------------------------------------------
+        this.texValues = (numberOfDigits) => {
+            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)`;
+        };
+        this.distanceTo = (item) => {
+            let value = 0, fraction = new coefficients_1.Fraction(), tex = '';
+            if (item instanceof line_1.Line) {
+                return item.distanceTo(this);
+            }
+            else if (item instanceof Point) {
+                let V = new vector_1.Vector(this, item);
+                value = V.norm;
+                fraction = V.normSquare.sqrt();
+                tex = V.normSquare.isSquare() ? fraction.tex : `\\sqrt{\\dfrac{ ${V.normSquare.numerator} }{ ${V.normSquare.denominator} }}`;
+            }
+            return { value, fraction, tex };
+        };
+        this.isInListOfPoints = (list) => {
+            const keyList = list.map(x => x.key);
+            return keyList.includes(this.key);
+        };
         this._x = new coefficients_1.Fraction().zero();
         this._y = new coefficients_1.Fraction().zero();
         if (values !== undefined) {
@@ -19,6 +112,9 @@ class Point {
         return this;
     }
     ;
+    // ------------------------------------------
+    // Getter and setter
+    // ------------------------------------------
     get x() {
         return this._x;
     }
@@ -43,74 +139,26 @@ class Point {
         pts.push(this._y.tex);
         return `(${pts.join(';')})`;
     }
-    parse = (...values) => {
-        this.zero();
-        if (values.length === 0) {
-            return this;
-        }
-        if (values.length === 1) {
-            if (values[0] instanceof Point) {
-                this._x = values[0].x.clone();
-                this._y = values[0].y.clone();
-                return this;
-            }
-            if (typeof values[0] === 'string') {
-                let xy = values[0].split(',');
-                if (xy.length === 2) {
-                    this._x = new coefficients_1.Fraction(xy[0]).reduce();
-                    this._y = new coefficients_1.Fraction(xy[1]).reduce();
-                    return this;
-                }
-            }
-            if (values[0] instanceof PointXY) {
-                this._x = new coefficients_1.Fraction(values[0].x).reduce();
-                this._y = new coefficients_1.Fraction(values[0].y).reduce();
-                return this;
-            }
-            else {
-                return this.zero();
-            }
-        }
-        if (values.length === 2) {
-            this._x = new coefficients_1.Fraction(values[0]).reduce();
-            this._y = new coefficients_1.Fraction(values[1]).reduce();
-            return this;
-        }
-        return this;
-    };
-    clone = () => {
-        this._x = this._x.clone();
-        this._y = this._y.clone();
-        return this;
-    };
-    zero = () => {
-        this._x = new coefficients_1.Fraction(null);
-        this._y = new coefficients_1.Fraction(null);
-        return this;
-    };
-    origin = () => {
-        this.zero();
-        return this;
-    };
-    middleOf = (P1, P2) => {
-        this._x = P1.x.clone().add(P2.x).divide(2);
-        this._y = P1.y.clone().add(P2.y).divide(2);
-        return this;
-    };
-    texValues = (numberOfDigits) => {
-        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)`;
-    };
-    static pmatrix = (a, b, c) => {
-        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}`;
-        }
-    };
+    get key() {
+        return `${this.x.display};${this.y.display}`;
+    }
 }
 exports.Point = Point;
+// ------------------------------------------
+// Mathematical operations
+// ------------------------------------------
+// ------------------------------------------
+// Vector functions
+// ------------------------------------------
+// ------------------------------------------
+// Static functions
+// ------------------------------------------
+Point.pmatrix = (a, b, c) => {
+    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}`;
+    }
+};
 //# sourceMappingURL=point.js.map

package/esm/maths/geometry/point.js.map

@@ -1 +1 @@
-{"version":3,"file":"point.js","sourceRoot":"","sources":["../../../src/maths/geometry/point.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"point.js","sourceRoot":"","sources":["../../../src/maths/geometry/point.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,kDAAwC;AACxC,iCAA4B;AAC5B,qCAAgC;AAEhC;;GAEG;AACH,MAAM,OAAO;CAGZ;AAED,MAAa,KAAK;IAKd,YAAY,GAAG,MAAiB;QAgDhC,6CAA6C;QAC7C,+BAA+B;QAC/B,6CAA6C;QAC7C,UAAK,GAAG,CAAC,GAAG,MAAiB,EAAS,EAAE;YACpC,wBAAwB;YACxB,IAAI,CAAC,IAAI,EAAE,CAAC;YAEZ,mBAAmB;YACnB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,OAAO,IAAI,CAAC;aACf;YAED,oDAAoD;YACpD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,kCAAkC;gBAClC,IAAI,MAAM,CAAC,CAAC,CAAC,YAAY,KAAK,EAAE;oBAC5B,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;oBAC7B,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;oBAC7B,OAAO,IAAI,CAAA;iBACd;gBAED,6CAA6C;gBAC7C,IAAI,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;oBAC/B,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBAC7B,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;wBACjB,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;wBACtC,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;wBACtC,OAAO,IAAI,CAAA;qBACd;iBACJ;gBAED,qDAAqD;gBACrD,IAAG,MAAM,CAAC,CAAC,CAAC,YAAY,OAAO,EAAC;oBACxB,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;oBAC5C,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;oBAChD,OAAO,IAAI,CAAA;iBACd;qBAAM;oBACH,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA;iBACrB;aACJ;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;gBAC1C,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAA;gBAC1C,OAAO,IAAI,CAAA;aACd;YAED,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QAEF,UAAK,GAAG,GAAU,EAAE;YAChB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;YACzB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;YAEzB,OAAO,IAAI,CAAA;QACf,CAAC,CAAA;QAED,SAAI,GAAG,GAAU,EAAE;YACf,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA;QAED,WAAM,GAAG,GAAU,EAAE;YACjB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA;QAED,aAAQ,GAAG,CAAC,EAAS,EAAE,EAAS,EAAS,EAAE;YACvC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE3C,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA;QACD,6CAA6C;QAC7C,oBAAoB;QACpB,6CAA6C;QAC7C,cAAS,GAAG,CAAC,cAAsB,EAAU,EAAE;YAC3C,IAAI,GAAG,GAAG,EAAE,CAAC;YAEb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACnF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YAEnF,OAAO,UAAU,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAA;QAC5C,CAAC,CAAA;QAoBD,eAAU,GAAG,CAAC,IAAe,EAAsD,EAAE;YACjF,IAAI,KAAK,GAAG,CAAC,EAAE,QAAQ,GAAG,IAAI,uBAAQ,EAAE,EAAE,GAAG,GAAG,EAAE,CAAA;YAElD,IAAG,IAAI,YAAY,WAAI,EAAC;gBACpB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;aAC/B;iBAAK,IAAG,IAAI,YAAY,KAAK,EAAC;gBAC3B,IAAI,CAAC,GAAG,IAAI,eAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBAE9B,KAAK,GAAG,CAAC,CAAC,IAAI,CAAA;gBACd,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;gBAC9B,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAA,CAAC,CAAA,QAAQ,CAAC,GAAG,CAAA,CAAC,CAAA,mBAAmB,CAAC,CAAC,UAAU,CAAC,SAAS,OAAO,CAAC,CAAC,UAAU,CAAC,WAAW,KAAK,CAAA;aAC3H;YACD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAA;QACnC,CAAC,CAAA;QAKD,qBAAgB,GAAG,CAAC,IAAa,EAAW,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,GAAG,CAAC,CAAA;YAElC,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACrC,CAAC,CAAA;QA7KG,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,IAAI,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;SACzB;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAAA,CAAC;IAEF,6CAA6C;IAC7C,oBAAoB;IACpB,6CAA6C;IAC7C,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,CAAC,KAAe;QACjB,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,CAAC,KAAe;QACjB,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,GAAG;QACH,IAAI,GAAG,GAAG,EAAE,CAAC;QAEb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAEtB,OAAO,UAAU,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAA;IAC5C,CAAC;IAED,IAAI,OAAO;QACP,IAAI,GAAG,GAAG,EAAE,CAAC;QAEb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAEtB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IAC/B,CAAC;IAyHD,IAAI,GAAG;QACL,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;IAClD,CAAC;;AA9KD,sBAoLC;AA1CG,6CAA6C;AAC7C,0BAA0B;AAC1B,6CAA6C;AAE7C,6CAA6C;AAC7C,mBAAmB;AACnB,6CAA6C;AAE7C,6CAA6C;AAC7C,mBAAmB;AACnB,6CAA6C;AACtC,aAAO,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,CAAO,EAAU,EAAE;IACjD,IAAI,CAAC,KAAK,SAAS,EAAE;QACjB,OAAO,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;KAC3F;SAAM;QACH,OAAO,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;KACrH;AACL,CAAC,CAAC"}

package/esm/maths/geometry/triangle.d.ts

@@ -53,10 +53,32 @@ export declare class Triangle {
         'AC': Line;
     };
     get remarquables(): remarquableLines;
+    /**
+     * Parse values to a triangle. Supported formats:
+     * Point, Point, Point
+     * x1, y1, x2, y2, x3, y3
+     * TODO: Something else ?
+     * @param values
+     */
     parse: (...values: any) => Triangle;
+    /**
+     * Clone the Triangle class
+     */
     clone: () => Triangle;
+    /**
+     * Generate the Line object for the three segments of the triangle
+     */
     private _updateTriangle;
+    /**
+     * Get the Point class for the given name
+     * @param ptName
+     */
     private getPointByName;
+    /**
+     * Get the vector for the segment given by name.
+     * @param ptName1
+     * @param ptName2
+     */
     private getSegment;
     private _calculateRemarquableLines;
     private _calculateBisectors;

package/esm/maths/geometry/triangle.js

@@ -7,18 +7,209 @@ const vector_1 = require("./vector");
 const line_1 = require("./line");
 const equation_1 = require("../algebra/equation");
 class Triangle {
-    _A;
-    _B;
-    _C;
-    _lines;
-    _middles;
-    _remarquables;
     constructor(...values) {
+        // ------------------------------------------
+        // Creation / parsing functions
+        // ------------------------------------------
+        /**
+         * Parse values to a triangle. Supported formats:
+         * Point, Point, Point
+         * x1, y1, x2, y2, x3, y3
+         * TODO: Something else ?
+         * @param values
+         */
+        this.parse = (...values) => {
+            if (values.length === 6) {
+                // Check if all values are number or fractions.
+                let v = values.map((x) => new fraction_1.Fraction(x));
+                return this.parse(new point_1.Point(v[0], v[1]), new point_1.Point(v[2], v[3]), new point_1.Point(v[4], v[5]));
+            }
+            else if (values.length === 3) {
+                // Possibilities:
+                // - Three points (or part of points, only dict for example, or array (TODO: Add the array syntax for point)
+                // - Three lines
+                // - Three lines as text.
+                if (values.filter((x) => typeof x === 'string').length === 3) {
+                    return this.parse(...values.map((x) => new line_1.Line(x)));
+                }
+                else if (values.filter((x) => x instanceof line_1.Line).length === 3) {
+                    // We have three lines
+                    this._lines = {
+                        'AB': values[0],
+                        'BC': values[1],
+                        'AC': values[2]
+                    };
+                    // Get the intersection points -> build the triangle using these intersection points.
+                    let intersect = values[0].intersection(values[1]);
+                    if (intersect.hasIntersection) {
+                        this._B = intersect.point.clone();
+                    }
+                    else {
+                        return this;
+                    }
+                    intersect = values[1].intersection(values[2]);
+                    if (intersect.hasIntersection) {
+                        this._C = intersect.point.clone();
+                    }
+                    else {
+                        return this;
+                    }
+                    intersect = values[2].intersection(values[0]);
+                    if (intersect.hasIntersection) {
+                        this._A = intersect.point.clone();
+                    }
+                    else {
+                        return this;
+                    }
+                }
+                else {
+                    // At least, one of the value is not a point.
+                    if (values.filter((x) => (x instanceof point_1.Point)).length < 3) {
+                        return this.parse(new point_1.Point(values[0]), new point_1.Point(values[1]), new point_1.Point(values[2]));
+                    }
+                    // We have three points.
+                    this._A = values[0].clone();
+                    this._B = values[1].clone();
+                    this._C = values[2].clone();
+                    this._lines = {
+                        'AB': new line_1.Line(this._A, this._B),
+                        'BC': new line_1.Line(this._B, this._C),
+                        'AC': new line_1.Line(this._A, this._C)
+                    };
+                }
+            }
+            else if (values.length === 1) {
+                if (values[0] instanceof Triangle) {
+                    return values[0].clone();
+                }
+            }
+            this._updateTriangle();
+            return this;
+        };
+        /**
+         * Clone the Triangle class
+         */
+        this.clone = () => {
+            this._A = this._A.clone();
+            this._B = this._B.clone();
+            this._C = this._C.clone();
+            this._lines = {
+                'AB': this._lines.AB.clone(),
+                'BC': this._lines.BC.clone(),
+                'AC': this._lines.AC.clone()
+            };
+            this._updateTriangle();
+            return this;
+        };
+        // ------------------------------------------
+        // Triangle operations and properties
+        // ------------------------------------------
+        /**
+         * Generate the Line object for the three segments of the triangle
+         */
+        this._updateTriangle = () => {
+            this._middles = {
+                'AB': new point_1.Point().middleOf(this._A, this._B),
+                'AC': new point_1.Point().middleOf(this._A, this._C),
+                'BC': new point_1.Point().middleOf(this._B, this._C)
+            };
+            this._remarquables = this._calculateRemarquableLines();
+        };
+        /**
+         * Get the Point class for the given name
+         * @param ptName
+         */
+        this.getPointByName = (ptName) => {
+            switch (ptName.toUpperCase()) {
+                case 'A':
+                    return this._A;
+                case 'B':
+                    return this._B;
+                case 'C':
+                    return this._C;
+            }
+            // Something went wrong ! Return the first point
+            return this._A;
+        };
+        /**
+         * Get the vector for the segment given by name.
+         * @param ptName1
+         * @param ptName2
+         */
+        this.getSegment = (ptName1, ptName2) => {
+            return new vector_1.Vector(this.getPointByName(ptName1), this.getPointByName(ptName2));
+        };
+        this._calculateRemarquableLines = () => {
+            let remarquables = {
+                'medians': {
+                    'A': new line_1.Line(this._A, this._middles.BC),
+                    'B': new line_1.Line(this._B, this._middles.AC),
+                    'C': new line_1.Line(this._C, this._middles.AB),
+                    'intersection': null
+                },
+                'mediators': {
+                    'AB': new line_1.Line(this._middles.AB, new vector_1.Vector(this._A, this._B).normal()),
+                    'AC': new line_1.Line(this._middles.AC, new vector_1.Vector(this._A, this._C).normal()),
+                    'BC': new line_1.Line(this._middles.BC, new vector_1.Vector(this._B, this._C).normal()),
+                    'intersection': null
+                },
+                'heights': {
+                    'A': new line_1.Line(this._A, new vector_1.Vector(this._B, this._C).normal()),
+                    'B': new line_1.Line(this._B, new vector_1.Vector(this._A, this._C).normal()),
+                    'C': new line_1.Line(this._C, new vector_1.Vector(this._A, this._B).normal()),
+                    'intersection': null
+                },
+                'bisectors': {
+                    'A': this._calculateBisectors('A'),
+                    'B': this._calculateBisectors('B'),
+                    'C': this._calculateBisectors('C'),
+                    'intersection': null
+                }
+            };
+            // As it's a triangle, we assume the lines are intersecting and aren't parallel or superposed.
+            remarquables.medians.intersection = remarquables.medians.A.intersection(remarquables.medians.B).point;
+            remarquables.mediators.intersection = remarquables.mediators.AB.intersection(remarquables.mediators.BC).point;
+            remarquables.heights.intersection = remarquables.heights.A.intersection(remarquables.heights.B).point;
+            remarquables.bisectors.intersection = remarquables.bisectors.A.intersection(remarquables.bisectors.B).point;
+            // Everything was calculated for the remarquable lines.
+            return remarquables;
+        };
+        this._calculateBisectors = (pt) => {
+            let tlines = this.lines, d1, d2;
+            if (pt === 'A') {
+                d1 = tlines.AB;
+                d2 = tlines.AC;
+            }
+            else if (pt === 'B') {
+                d1 = tlines.AB;
+                d2 = tlines.BC;
+            }
+            else if (pt === 'C') {
+                d1 = tlines.BC;
+                d2 = tlines.AC;
+            }
+            let b1 = new line_1.Line(new equation_1.Equation(d1.equation.left.clone().multiply(d2.n.simplify().norm), d2.equation.left.clone().multiply(d1.n.simplify().norm)).reorder(true).simplify()), b2 = new line_1.Line(new equation_1.Equation(d1.equation.left.clone().multiply(d2.n.simplify().norm), d2.equation.left.clone().multiply(d1.n.simplify().norm).opposed()).reorder(true).simplify());
+            // Must determine which bisectors is in the triangle
+            if (pt === 'A') {
+                return b1.hitSegment(this.B, this.C) ? b1 : b2;
+            }
+            if (pt === 'B') {
+                return b1.hitSegment(this.A, this.C) ? b1 : b2;
+            }
+            if (pt === 'C') {
+                return b1.hitSegment(this.B, this.A) ? b1 : b2;
+            }
+            // Default returns the first bisector
+            return b1;
+        };
         if (values.length > 0) {
             this.parse(...values);
         }
         return this;
     }
+    // ------------------------------------------
+    // Getter and setters
+    // ------------------------------------------
     get A() {
         return this._A;
     }
@@ -73,158 +264,6 @@ class Triangle {
     get remarquables() {
         return this._remarquables;
     }
-    parse = (...values) => {
-        if (values.length === 6) {
-            let v = values.map((x) => new fraction_1.Fraction(x));
-            return this.parse(new point_1.Point(v[0], v[1]), new point_1.Point(v[2], v[3]), new point_1.Point(v[4], v[5]));
-        }
-        else if (values.length === 3) {
-            if (values.filter((x) => typeof x === 'string').length === 3) {
-                return this.parse(...values.map((x) => new line_1.Line(x)));
-            }
-            else if (values.filter((x) => x instanceof line_1.Line).length === 3) {
-                this._lines = {
-                    'AB': values[0],
-                    'BC': values[1],
-                    'AC': values[2]
-                };
-                let intersect = values[0].intersection(values[1]);
-                if (intersect.hasIntersection) {
-                    this._B = intersect.point.clone();
-                }
-                else {
-                    return this;
-                }
-                intersect = values[1].intersection(values[2]);
-                if (intersect.hasIntersection) {
-                    this._C = intersect.point.clone();
-                }
-                else {
-                    return this;
-                }
-                intersect = values[2].intersection(values[0]);
-                if (intersect.hasIntersection) {
-                    this._A = intersect.point.clone();
-                }
-                else {
-                    return this;
-                }
-            }
-            else {
-                if (values.filter((x) => (x instanceof point_1.Point)).length < 3) {
-                    return this.parse(new point_1.Point(values[0]), new point_1.Point(values[1]), new point_1.Point(values[2]));
-                }
-                this._A = values[0].clone();
-                this._B = values[1].clone();
-                this._C = values[2].clone();
-                this._lines = {
-                    'AB': new line_1.Line(this._A, this._B),
-                    'BC': new line_1.Line(this._B, this._C),
-                    'AC': new line_1.Line(this._A, this._C)
-                };
-            }
-        }
-        else if (values.length === 1) {
-            if (values[0] instanceof Triangle) {
-                return values[0].clone();
-            }
-        }
-        this._updateTriangle();
-        return this;
-    };
-    clone = () => {
-        this._A = this._A.clone();
-        this._B = this._B.clone();
-        this._C = this._C.clone();
-        this._lines = {
-            'AB': this._lines.AB.clone(),
-            'BC': this._lines.BC.clone(),
-            'AC': this._lines.AC.clone()
-        };
-        this._updateTriangle();
-        return this;
-    };
-    _updateTriangle = () => {
-        this._middles = {
-            'AB': new point_1.Point().middleOf(this._A, this._B),
-            'AC': new point_1.Point().middleOf(this._A, this._C),
-            'BC': new point_1.Point().middleOf(this._B, this._C)
-        };
-        this._remarquables = this._calculateRemarquableLines();
-    };
-    getPointByName = (ptName) => {
-        switch (ptName.toUpperCase()) {
-            case 'A':
-                return this._A;
-            case 'B':
-                return this._B;
-            case 'C':
-                return this._C;
-        }
-        return this._A;
-    };
-    getSegment = (ptName1, ptName2) => {
-        return new vector_1.Vector(this.getPointByName(ptName1), this.getPointByName(ptName2));
-    };
-    _calculateRemarquableLines = () => {
-        let remarquables = {
-            'medians': {
-                'A': new line_1.Line(this._A, this._middles.BC),
-                'B': new line_1.Line(this._B, this._middles.AC),
-                'C': new line_1.Line(this._C, this._middles.AB),
-                'intersection': null
-            },
-            'mediators': {
-                'AB': new line_1.Line(this._middles.AB, new vector_1.Vector(this._A, this._B).normal()),
-                'AC': new line_1.Line(this._middles.AC, new vector_1.Vector(this._A, this._C).normal()),
-                'BC': new line_1.Line(this._middles.BC, new vector_1.Vector(this._B, this._C).normal()),
-                'intersection': null
-            },
-            'heights': {
-                'A': new line_1.Line(this._A, new vector_1.Vector(this._B, this._C).normal()),
-                'B': new line_1.Line(this._B, new vector_1.Vector(this._A, this._C).normal()),
-                'C': new line_1.Line(this._C, new vector_1.Vector(this._A, this._B).normal()),
-                'intersection': null
-            },
-            'bisectors': {
-                'A': this._calculateBisectors('A'),
-                'B': this._calculateBisectors('B'),
-                'C': this._calculateBisectors('C'),
-                'intersection': null
-            }
-        };
-        remarquables.medians.intersection = remarquables.medians.A.intersection(remarquables.medians.B).point;
-        remarquables.mediators.intersection = remarquables.mediators.AB.intersection(remarquables.mediators.BC).point;
-        remarquables.heights.intersection = remarquables.heights.A.intersection(remarquables.heights.B).point;
-        remarquables.bisectors.intersection = remarquables.bisectors.A.intersection(remarquables.bisectors.B).point;
-        return remarquables;
-    };
-    _calculateBisectors = (pt) => {
-        let tlines = this.lines, d1, d2;
-        if (pt === 'A') {
-            d1 = tlines.AB;
-            d2 = tlines.AC;
-        }
-        else if (pt === 'B') {
-            d1 = tlines.AB;
-            d2 = tlines.BC;
-        }
-        else if (pt === 'C') {
-            d1 = tlines.BC;
-            d2 = tlines.AC;
-        }
-        let b1 = new line_1.Line(new equation_1.Equation(d1.equation.left.clone().multiply(d2.n.simplify().norm), d2.equation.left.clone().multiply(d1.n.simplify().norm)).reorder(true).simplify()), b2 = new line_1.Line(new equation_1.Equation(d1.equation.left.clone().multiply(d2.n.simplify().norm), d2.equation.left.clone().multiply(d1.n.simplify().norm).opposed()).reorder(true).simplify());
-        if (pt === 'A') {
-            return b1.hitSegment(this.B, this.C) ? b1 : b2;
-        }
-        if (pt === 'B') {
-            return b1.hitSegment(this.A, this.C) ? b1 : b2;
-        }
-        if (pt === 'C') {
-            return b1.hitSegment(this.B, this.A) ? b1 : b2;
-        }
-        return b1;
-    };
 }
 exports.Triangle = Triangle;
 //# sourceMappingURL=triangle.js.map