math-exercises 2.0.0 → 2.0.2

package/lib/math/polynomials/polynomial.js

@@ -9,10 +9,12 @@ const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
 const randint_1 = require("../../math/utils/random/randint");
 const coinFlip_1 = require("../../utils/coinFlip");
+const rational_1 = require("../numbers/rationals/rational");
+const infiniteNode_1 = require("../../tree/nodes/numbers/infiniteNode");
 class PolynomialConstructor {
-    static randomWithOrder(order, variable = 'x') {
+    static randomWithOrder(order, variable = "x") {
         if (order < 0) {
-            throw Error('Order must be a non-negative integer');
+            throw Error("Order must be a non-negative integer");
         }
         const coefficients = [];
         for (let i = 0; i <= order - 1; i++) {
@@ -21,9 +23,9 @@ class PolynomialConstructor {
         coefficients.push((0, randint_1.randint)(-9, 10, [0]));
         return new Polynomial(coefficients, variable);
     }
-    static random(maxOrder, variable = 'x') {
+    static random(maxOrder, variable = "x") {
         if (maxOrder < 0) {
-            throw Error('Order must be a non-negative integer');
+            throw Error("Order must be a non-negative integer");
         }
         const order = (0, randint_1.randint)(1, maxOrder + 1);
         const coefficients = [];
@@ -40,9 +42,9 @@ class PolynomialConstructor {
      * @param variable
      * @returns
      */
-    static randomWithLength(maxOrder, length, variable = 'x') {
+    static randomWithLength(maxOrder, length, variable = "x") {
         if (maxOrder < 0) {
-            throw Error('Order must be a non-negative integer');
+            throw Error("Order must be a non-negative integer");
         }
         const order = (0, randint_1.randint)(1, maxOrder + 1);
         const coefficients = [];
@@ -59,9 +61,9 @@ class PolynomialConstructor {
         coefficients.push((0, randint_1.randint)(-9, 10, [0]));
         return new Polynomial(coefficients, variable);
     }
-    static randomWithLengthAndSameSigns(maxOrder, length, variable = 'x') {
+    static randomWithLengthAndSameSigns(maxOrder, length, variable = "x") {
         if (maxOrder < 0) {
-            throw Error('Order must be a non-negative integer');
+            throw Error("Order must be a non-negative integer");
         }
         const order = (0, randint_1.randint)(1, maxOrder + 1);
         const coefficients = [];
@@ -79,13 +81,13 @@ class PolynomialConstructor {
         coefficients.push(sign * (0, randint_1.randint)(0, 10, [0]));
         return new Polynomial(coefficients, variable);
     }
-    static randomNoFI(maxOrder, to, length, variable = 'x') {
+    static randomNoFI(maxOrder, to, length, variable = "x") {
         if (maxOrder < 0) {
-            throw Error('Order must be a non-negative integer');
+            throw Error("Order must be a non-negative integer");
         }
         const order = (0, randint_1.randint)(1, maxOrder + 1);
         const fixedLength = length ?? order;
-        if (to === '+\\infty') {
+        if (to === "+\\infty") {
             return PolynomialConstructor.randomWithLengthAndSameSigns(maxOrder, fixedLength, variable);
         }
         //en -infini les degrés de parité différentes doivent avoir un signe différent
@@ -112,18 +114,20 @@ class Polynomial {
      * @param coefficients coefficients[i] est le coeff de x^i
      * @param variable
      */
-    constructor(coefficients, variable = 'x') {
+    constructor(coefficients, variable = "x") {
         if (coefficients.length === 0)
-            throw Error('coeffs must be not null');
-        if (coefficients.length > 1 && coefficients[coefficients.length - 1] === 0) {
-            throw Error('n-th coeff must be not null');
+            throw Error("coeffs must be not null");
+        if (coefficients.length > 1 &&
+            coefficients[coefficients.length - 1] === 0) {
+            throw Error("n-th coeff must be not null");
         }
         this.coefficients = coefficients;
         this.variable = variable;
         this.degree = coefficients.length - 1;
     }
     equals(P) {
-        return P.degree === this.degree && this.coefficients.every((coeff, i) => coeff === P.coefficients[i]);
+        return (P.degree === this.degree &&
+            this.coefficients.every((coeff, i) => coeff === P.coefficients[i]));
     }
     getRoots() {
         const roots = [];
@@ -154,11 +158,14 @@ class Polynomial {
         }
         else {
             //méthode de Newton-Raphson ou des bibliothèques de calcul symbolique pour obtenir les racines.
-            throw Error('general roots not implemented yet');
+            throw Error("general roots not implemented yet");
         }
         return roots.sort((a, b) => a - b);
     }
     add(P) {
+        if (typeof P === "number") {
+            return new Polynomial([this.coefficients[0] + P, ...this.coefficients.slice(1)], this.variable);
+        }
         if (P.variable !== this.variable)
             throw Error("Can't add two polynomials with different variables");
         const maxDegree = Math.max(P.degree, this.degree);
@@ -203,19 +210,50 @@ class Polynomial {
         }
         return new Polynomial(res.slice(0, firstNonZeroIndex), this.variable);
     }
+    scalarDivide(n) {
+        return new Polynomial(this.coefficients.map((coeff) => coeff / n), this.variable);
+    }
     opposite() {
         return new Polynomial(this.coefficients.map((coeff) => -coeff), this.variable);
     }
     derivate() {
+        if (this.coefficients.length === 1)
+            return new Polynomial([0], this.variable);
         const res = [];
         for (let i = 1; i < this.coefficients.length; i++)
             res.push(i * this.coefficients[i]);
         return new Polynomial(res, this.variable);
     }
-    integrate() {
-        const newCoefficients = this.coefficients.map((coeff, exp) => coeff / (exp + 1));
-        newCoefficients.unshift(0);
-        return new Polynomial(newCoefficients, this.variable);
+    // integrate(): Polynomial {
+    //   const newCoefficients = this.coefficients.map(
+    //     (coeff, exp) => coeff / (exp + 1),
+    //   );
+    //   newCoefficients.unshift(0);
+    //   return new Polynomial(newCoefficients, this.variable);
+    // }
+    integrateToNode(opts) {
+        let integralPolynomial = new variableNode_1.VariableNode("C");
+        for (let i = 0; i < this.degree + 1; i++) {
+            const coeff = this.coefficients[i];
+            if (coeff === 0)
+                continue;
+            const nodeCoeff = new rational_1.Rational(coeff, i + 1).simplify().toTree();
+            const powerNode = i + 1 === 1
+                ? new variableNode_1.VariableNode("x")
+                : new powerNode_1.PowerNode(new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(i + 1), opts);
+            let terme;
+            if (nodeCoeff.toTex() === "1")
+                terme = powerNode;
+            else if (nodeCoeff.toTex() === "-1")
+                terme = new oppositeNode_1.OppositeNode(powerNode, opts);
+            else {
+                terme = new multiplyNode_1.MultiplyNode(nodeCoeff, i + 1 === 1
+                    ? new variableNode_1.VariableNode("x")
+                    : new powerNode_1.PowerNode(new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(i + 1), opts), opts);
+            }
+            integralPolynomial = new addNode_1.AddNode(terme, integralPolynomial, opts);
+        }
+        return integralPolynomial;
     }
     calculate(x) {
         let res = 0;
@@ -226,26 +264,48 @@ class Polynomial {
     getLimit(to) {
         const leadingCoeff = this.coefficients[this.coefficients.length - 1];
         if (this.degree === 0)
-            return leadingCoeff + '';
-        if (to === '+\\infty') {
+            return leadingCoeff + "";
+        if (to === "+\\infty") {
+            if (leadingCoeff > 0)
+                return "+\\infty";
+            return "-\\infty";
+        }
+        else {
+            if (leadingCoeff > 0) {
+                if (this.degree % 2 === 0)
+                    return "+\\infty";
+                return "-\\infty";
+            }
+            else {
+                if (this.degree % 2 === 0)
+                    return "-\\infty";
+                return "+\\infty";
+            }
+        }
+    }
+    getLimitNode(to) {
+        const leadingCoeff = this.coefficients[this.coefficients.length - 1];
+        if (this.degree === 0)
+            return new numberNode_1.NumberNode(leadingCoeff);
+        if (to === "+\\infty") {
             if (leadingCoeff > 0)
-                return '+\\infty';
-            return '-\\infty';
+                return infiniteNode_1.PlusInfinityNode;
+            return infiniteNode_1.MinusInfinityNode;
         }
         else {
             if (leadingCoeff > 0) {
                 if (this.degree % 2 === 0)
-                    return '+\\infty';
-                return '-\\infty';
+                    return infiniteNode_1.PlusInfinityNode;
+                return infiniteNode_1.MinusInfinityNode;
             }
             else {
                 if (this.degree % 2 === 0)
-                    return '-\\infty';
-                return '+\\infty';
+                    return infiniteNode_1.MinusInfinityNode;
+                return infiniteNode_1.PlusInfinityNode;
             }
         }
     }
-    toTree() {
+    toTree(opts) {
         const recursive = (cursor) => {
             const coeff = this.coefficients[cursor];
             if (coeff === 0)
@@ -254,7 +314,7 @@ class Polynomial {
                 return new numberNode_1.NumberNode(coeff);
             }
             const monome = cursor > 1
-                ? new powerNode_1.PowerNode(new variableNode_1.VariableNode(this.variable), new numberNode_1.NumberNode(cursor))
+                ? new powerNode_1.PowerNode(new variableNode_1.VariableNode(this.variable), new numberNode_1.NumberNode(cursor), opts)
                 : new variableNode_1.VariableNode(this.variable);
             let res;
             if (coeff === 1)
@@ -262,7 +322,7 @@ class Polynomial {
             else if (coeff === -1)
                 res = new oppositeNode_1.OppositeNode(monome);
             else
-                res = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff), monome);
+                res = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff), monome, opts);
             let nextCoeff;
             for (let i = cursor - 1; i > -1; i--) {
                 if (this.coefficients[i]) {
@@ -280,7 +340,7 @@ class Polynomial {
         return recursive(this.degree);
     }
     toTex() {
-        let s = '';
+        let s = "";
         for (let i = this.degree; i > -1; i--) {
             const coeff = this.coefficients[i];
             if (coeff === 0)
@@ -288,10 +348,17 @@ class Polynomial {
             if (i === 0)
                 s += coeff > 0 ? `+${coeff}` : coeff;
             else if (i === this.degree) {
-                s += coeff === 1 ? '' : coeff === -1 ? '-' : coeff;
+                s += coeff === 1 ? "" : coeff === -1 ? "-" : coeff;
             }
             else {
-                s += coeff === 1 ? '+' : coeff === -1 ? '-' : coeff > 0 ? `+${coeff}` : coeff;
+                s +=
+                    coeff === 1
+                        ? "+"
+                        : coeff === -1
+                            ? "-"
+                            : coeff > 0
+                                ? `+${coeff}`
+                                : coeff;
             }
             //x^n
             if (i === 0)

package/lib/math/polynomials/rationalFrac.d.ts

@@ -0,0 +1,12 @@
+import { FractionNode } from "../../tree/nodes/operators/fractionNode";
+import { Polynomial } from "./polynomial";
+import { Rational } from "../numbers/rationals/rational";
+import { Integer } from "../numbers/integer/integer";
+export declare class RationalFrac {
+    num: Polynomial;
+    denum: Polynomial;
+    constructor(num: Polynomial, denum: Polynomial);
+    toTree(): FractionNode;
+    simplify(): Integer | Rational | RationalFrac;
+}
+//# sourceMappingURL=rationalFrac.d.ts.map

package/lib/math/polynomials/rationalFrac.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rationalFrac.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/rationalFrac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAErD,qBAAa,YAAY;IACvB,GAAG,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;gBACN,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU;IAI9C,MAAM;IAGN,QAAQ;CAuCT"}

package/lib/math/polynomials/rationalFrac.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RationalFrac = void 0;
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
+const mathjs_1 = require("mathjs");
+const rational_1 = require("../numbers/rationals/rational");
+const nombre_1 = require("../numbers/nombre");
+const integer_1 = require("../numbers/integer/integer");
+class RationalFrac {
+    constructor(num, denum) {
+        this.num = num;
+        this.denum = denum;
+    }
+    toTree() {
+        return new fractionNode_1.FractionNode(this.num.toTree(), this.denum.toTree());
+    }
+    simplify() {
+        if (this.num.coefficients.length === 1 && this.num.coefficients[0] === 0)
+            return new integer_1.Integer(0);
+        const numCoeffs = this.num.coefficients.filter((c) => c !== 0);
+        const numPGCD = numCoeffs.length > 1 ? (0, mathjs_1.gcd)(...numCoeffs) : numCoeffs[0];
+        const denumCoeffs = this.denum.coefficients.filter((c) => c !== 0);
+        const denumPGCD = denumCoeffs.length > 1 ? (0, mathjs_1.gcd)(...denumCoeffs) : denumCoeffs[0];
+        const rational = new rational_1.Rational(numPGCD, denumPGCD);
+        if (rational.isIrreductible()) {
+            return this;
+        }
+        const simplifiedRational = rational.simplify();
+        const simplifiedNum = this.num.scalarDivide(numPGCD);
+        const simplifiedDenum = this.denum.scalarDivide(denumPGCD);
+        if (simplifiedDenum.equals(simplifiedNum)) {
+            return simplifiedRational;
+        }
+        else {
+            const denumHasOnlyMinus = simplifiedDenum.coefficients.every((coeff) => coeff <= 0);
+            const trueDenum = denumHasOnlyMinus
+                ? simplifiedDenum.times(-1)
+                : simplifiedDenum;
+            if (simplifiedRational.type === nombre_1.NumberType.Integer) {
+                const int = simplifiedRational;
+                return new RationalFrac(simplifiedNum.times(int.value * (denumHasOnlyMinus ? -1 : 1)), trueDenum);
+            }
+            else {
+                const frac = simplifiedRational;
+                return new RationalFrac(simplifiedNum.times(frac.num * (denumHasOnlyMinus ? -1 : 1)), trueDenum.times(frac.denum));
+            }
+        }
+    }
+}
+exports.RationalFrac = RationalFrac;

package/lib/math/polynomials/trinom.d.ts

@@ -1,7 +1,8 @@
-import { Node } from '../../tree/nodes/node';
-import { NumberNode } from '../../tree/nodes/numbers/numberNode';
-import { MathSet } from '../sets/mathSet';
-import { Polynomial } from './polynomial';
+import { Node } from "../../tree/nodes/node";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { Point } from "../geometry/point";
+import { MathSet } from "../sets/mathSet";
+import { Polynomial } from "./polynomial";
 export declare abstract class TrinomConstructor {
     static random(domainA?: MathSet, domainB?: MathSet, domainC?: MathSet): Trinom;
     static randomCanonical(domainA?: MathSet, domainAlpha?: MathSet, domainBeta?: MathSet): Trinom;
@@ -24,6 +25,6 @@ export declare class Trinom extends Polynomial {
     getBetaNode(): Node;
     getFactorizedForm(): Node;
     getCanonicalForm(): Node;
-    getSommet(): string;
+    getSommet(): Point;
 }
 //# sourceMappingURL=trinom.d.ts.map

package/lib/math/polynomials/trinom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trinom.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/trinom.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAgBjE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,MAAM,CACX,OAAO,GAAE,OAAmF,EAC5F,OAAO,GAAE,OAAqC,EAC9C,OAAO,GAAE,OAAqC,GAC7C,MAAM;IAQT,MAAM,CAAC,eAAe,CACpB,OAAO,GAAE,OAAmF,EAC5F,WAAW,GAAE,OAAqC,EAClD,UAAU,GAAE,OAAqC,GAChD,MAAM;IAST,MAAM,CAAC,gBAAgB,CACrB,OAAO,GAAE,OAAmF,EAC5F,QAAQ,GAAE,OAAqC,EAC/C,QAAQ,GAAE,OAAqC,GAC9C,MAAM;CASV;AAED,qBAAa,MAAO,SAAQ,UAAU;IACpC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;gBACL,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAQnE,QAAQ;IAGR,YAAY,IAAI,UAAU;IAI1B,QAAQ;IAOR,YAAY,IAAI,IAAI,EAAE;IAiCtB,2BAA2B;IAO3B,QAAQ;IAGR,YAAY,IAAI,IAAI;IAIpB,OAAO;IAIP,WAAW,IAAI,IAAI;IAInB,iBAAiB,IAAI,IAAI;IAqBzB,gBAAgB,IAAI,IAAI;IAYxB,SAAS;CAGV"}
+{"version":3,"file":"trinom.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/trinom.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAQjE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAO1C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,MAAM,CACX,OAAO,GAAE,OAER,EACD,OAAO,GAAE,OAAqC,EAC9C,OAAO,GAAE,OAAqC,GAC7C,MAAM;IAST,MAAM,CAAC,eAAe,CACpB,OAAO,GAAE,OAER,EACD,WAAW,GAAE,OAAqC,EAClD,UAAU,GAAE,OAAqC,GAChD,MAAM;IAUT,MAAM,CAAC,gBAAgB,CACrB,OAAO,GAAE,OAER,EACD,QAAQ,GAAE,OAAqC,EAC/C,QAAQ,GAAE,OAAqC,GAC9C,MAAM;CAcV;AAED,qBAAa,MAAO,SAAQ,UAAU;IACpC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;gBACL,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAQnE,QAAQ;IAGR,YAAY,IAAI,UAAU;IAI1B,QAAQ;IAUR,YAAY,IAAI,IAAI,EAAE;IAoDtB,2BAA2B;IAO3B,QAAQ;IAGR,YAAY,IAAI,IAAI;IAIpB,OAAO;IAIP,WAAW,IAAI,IAAI;IAInB,iBAAiB,IAAI,IAAI;IA4CzB,gBAAgB,IAAI,IAAI;IAsBxB,SAAS;CAGV"}

package/lib/math/polynomials/trinom.js

@@ -7,9 +7,7 @@ const addNode_1 = require("../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
-const substractNode_1 = require("../../tree/nodes/operators/substractNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../tree/parsers/simplify");
 const mathjs_1 = require("mathjs");
 const point_1 = require("../geometry/point");
 const integer_1 = require("../numbers/integer/integer");
@@ -20,37 +18,37 @@ const intervals_1 = require("../sets/intervals/intervals");
 const polynomial_1 = require("./polynomial");
 const oppositeNode_1 = require("../../tree/nodes/functions/oppositeNode");
 class TrinomConstructor {
-    static random(domainA = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainB = new intervals_1.Interval('[[-10; 10]]'), domainC = new intervals_1.Interval('[[-10; 10]]')) {
+    static random(domainA = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainB = new intervals_1.Interval("[[-10; 10]]"), domainC = new intervals_1.Interval("[[-10; 10]]")) {
         const a = domainA.getRandomElement();
         const b = domainB.getRandomElement();
         const c = domainC.getRandomElement();
         if (a === null || b === null || c === null)
-            throw Error('received null in random trinom');
+            throw Error("received null in random trinom");
         return new Trinom(a.value, b.value, c.value);
     }
-    static randomCanonical(domainA = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainAlpha = new intervals_1.Interval('[[-10; 10]]'), domainBeta = new intervals_1.Interval('[[-10; 10]]')) {
+    static randomCanonical(domainA = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainAlpha = new intervals_1.Interval("[[-10; 10]]"), domainBeta = new intervals_1.Interval("[[-10; 10]]")) {
         const a = domainA.getRandomElement();
         const alpha = domainAlpha.getRandomElement();
         const beta = domainBeta.getRandomElement();
         if (a === null || alpha === null || beta === null)
-            throw Error('received null in random canonical');
+            throw Error("received null in random canonical");
         const b = -2 * a.value * alpha.value;
         const c = a.value * alpha.value ** 2 + beta.value;
         return new Trinom(a.value, b, c);
     }
-    static randomFactorized(domainA = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainX1 = new intervals_1.Interval('[[-10; 10]]'), domainX2 = new intervals_1.Interval('[[-10; 10]]')) {
+    static randomFactorized(domainA = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainX1 = new intervals_1.Interval("[[-10; 10]]"), domainX2 = new intervals_1.Interval("[[-10; 10]]")) {
         const a = domainA.getRandomElement();
         const x1 = domainX1.getRandomElement();
         const x2 = domainX2.getRandomElement();
         if (a === null || x1 === null || x2 === null)
-            throw Error('received null in random factorized');
+            throw Error("received null in random factorized");
         //a*x^2 + ax*-x2 + a*-x1*x + a*-x1*-x2
         return new Trinom(a.value, -a.value * (x1.value + x2.value), a.value * x1.value * x2.value);
     }
 }
 exports.TrinomConstructor = TrinomConstructor;
 class Trinom extends polynomial_1.Polynomial {
-    constructor(a, b, c, variable = 'x') {
+    constructor(a, b, c, variable = "x") {
         super([c, b, a], variable);
         this.a = a;
         this.b = b;
@@ -69,7 +67,10 @@ class Trinom extends polynomial_1.Polynomial {
             return [];
         if (delta === 0)
             return [-this.b / (2 * this.a)];
-        return [(-this.b - Math.sqrt(delta)) / (2 * this.a), (-this.b + Math.sqrt(delta)) / (2 * this.a)];
+        return [
+            (-this.b - Math.sqrt(delta)) / (2 * this.a),
+            (-this.b + Math.sqrt(delta)) / (2 * this.a),
+        ];
     }
     getRootsNode() {
         const delta = this.getDelta();
@@ -80,8 +81,12 @@ class Trinom extends polynomial_1.Polynomial {
         const sqrtDelta = Math.sqrt(delta);
         const isDeltaPerfectSquare = Math.sqrt(delta) === Math.floor(Math.sqrt(delta));
         if (isDeltaPerfectSquare) {
-            const addNode = new rational_1.Rational(-this.b + sqrtDelta, 2 * this.a).simplify().toTree();
-            const subNode = new rational_1.Rational(-this.b - sqrtDelta, 2 * this.a).simplify().toTree();
+            const addNode = new rational_1.Rational(-this.b + sqrtDelta, 2 * this.a)
+                .simplify()
+                .toTree();
+            const subNode = new rational_1.Rational(-this.b - sqrtDelta, 2 * this.a)
+                .simplify()
+                .toTree();
             return this.a > 0 ? [subNode, addNode] : [addNode, subNode];
         }
         let [sqrtA, sqrtB] = new real_1.SquareRoot(delta).getSimplifiedCoeffs();
@@ -92,15 +97,23 @@ class Trinom extends polynomial_1.Polynomial {
         const sqrtNode = sqrtA === 1
             ? new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(sqrtB))
             : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(sqrtA), new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(sqrtB)));
-        const subNode = trueB === 0 ? new oppositeNode_1.OppositeNode(sqrtNode) : new substractNode_1.SubstractNode(new numberNode_1.NumberNode(-trueB), sqrtNode);
+        const subNode = trueB === 0
+            ? new oppositeNode_1.OppositeNode(sqrtNode)
+            : new addNode_1.AddNode(new numberNode_1.NumberNode(-trueB), new oppositeNode_1.OppositeNode(sqrtNode));
         const addNode = trueB === 0 ? sqrtNode : new addNode_1.AddNode(new numberNode_1.NumberNode(-trueB), sqrtNode);
         if (denum === 1) {
             return this.a > 0 ? [subNode, addNode] : [addNode, subNode];
         }
         else {
             return this.a > 0
-                ? [new fractionNode_1.FractionNode(subNode, new numberNode_1.NumberNode(denum)), new fractionNode_1.FractionNode(addNode, new numberNode_1.NumberNode(denum))]
-                : [new fractionNode_1.FractionNode(addNode, new numberNode_1.NumberNode(denum)), new fractionNode_1.FractionNode(subNode, new numberNode_1.NumberNode(denum))];
+                ? [
+                    new fractionNode_1.FractionNode(subNode, new numberNode_1.NumberNode(denum)),
+                    new fractionNode_1.FractionNode(addNode, new numberNode_1.NumberNode(denum)),
+                ]
+                : [
+                    new fractionNode_1.FractionNode(addNode, new numberNode_1.NumberNode(denum)),
+                    new fractionNode_1.FractionNode(subNode, new numberNode_1.NumberNode(denum)),
+                ];
         }
     }
     getRootsEquationSolutionTex() {
@@ -115,27 +128,49 @@ class Trinom extends polynomial_1.Polynomial {
         return -this.b / (2 * this.a);
     }
     getAlphaNode() {
-        return (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-this.b), new numberNode_1.NumberNode(2 * this.a)));
+        return new rational_1.Rational(-this.b, 2 * this.a).simplify().toTree();
     }
     getBeta() {
         return -this.getDelta() / (4 * this.a);
     }
     getBetaNode() {
-        return (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-this.getDelta()), new numberNode_1.NumberNode(4 * this.a)));
+        return new rational_1.Rational(-this.getDelta(), 4 * this.a).simplify().toTree();
     }
     getFactorizedForm() {
         const roots = this.getRootsNode();
         if (!roots.length)
             return this.toTree();
-        if (roots.length === 1)
-            return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new powerNode_1.PowerNode(new substractNode_1.SubstractNode(new variableNode_1.VariableNode('x'), roots[0]), new numberNode_1.NumberNode(2))));
-        return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(new variableNode_1.VariableNode('x'), roots[0]), new substractNode_1.SubstractNode(new variableNode_1.VariableNode('x'), roots[1]))));
+        if (roots.length === 1) {
+            return roots[0].toTex() === "0"
+                ? new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new powerNode_1.SquareNode(new variableNode_1.VariableNode("x")))
+                : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new powerNode_1.SquareNode(new addNode_1.AddNode(new variableNode_1.VariableNode("x"), new oppositeNode_1.OppositeNode(roots[0]))));
+        }
+        if (roots[0].toTex() === "0") {
+            return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new multiplyNode_1.MultiplyNode(new variableNode_1.VariableNode("x"), new addNode_1.AddNode(new variableNode_1.VariableNode("x"), new oppositeNode_1.OppositeNode(roots[1]))));
+        }
+        else if (roots[1].toTex() === "0") {
+            return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new multiplyNode_1.MultiplyNode(new variableNode_1.VariableNode("x"), new addNode_1.AddNode(new variableNode_1.VariableNode("x"), new oppositeNode_1.OppositeNode(roots[0]))));
+        }
+        else {
+            return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(new variableNode_1.VariableNode("x"), new oppositeNode_1.OppositeNode(roots[0])), new addNode_1.AddNode(new variableNode_1.VariableNode("x"), new oppositeNode_1.OppositeNode(roots[1]))));
+        }
     }
     getCanonicalForm() {
-        return (0, simplify_1.simplifyNode)(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new powerNode_1.PowerNode(new substractNode_1.SubstractNode(new variableNode_1.VariableNode(this.variable), this.getAlphaNode()), new numberNode_1.NumberNode(2))), new numberNode_1.NumberNode(this.getBeta())));
+        const alpha = this.getAlpha();
+        let square;
+        if (alpha !== 0) {
+            square = new powerNode_1.SquareNode(new addNode_1.AddNode(new variableNode_1.VariableNode(this.variable), new oppositeNode_1.OppositeNode(this.getAlphaNode())));
+        }
+        else {
+            square = new powerNode_1.SquareNode(new variableNode_1.VariableNode(this.variable));
+        }
+        const beta = this.getBeta();
+        return beta !== 0
+            ? new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), square), new numberNode_1.NumberNode(this.getBeta()))
+            : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), square);
     }
     getSommet() {
-        return new point_1.Point('S', this.getAlphaNode(), this.getBetaNode()).toTexWithCoords();
+        return new point_1.Point("S", this.getAlphaNode(), this.getBetaNode());
     }
 }
 exports.Trinom = Trinom;

package/lib/math/sets/intervals/intervals.d.ts

@@ -1,27 +1,22 @@
-import { Nombre, NumberType } from '../../../math/numbers/nombre';
-import { DiscreteSet } from '../discreteSet';
-import { MathSet } from '../mathSet';
-import { MathSetInterface } from '../mathSetInterface';
+import { Nombre, NumberType } from "../../../math/numbers/nombre";
+import { ClosureType, IntervalNode } from "../../../tree/nodes/sets/intervalNode";
+import { DiscreteSet } from "../discreteSet";
+import { MathSet } from "../mathSet";
+import { MathSetInterface } from "../mathSetInterface";
 export declare abstract class IntervalConstructor {
     static random(): Interval;
     static differentRandoms(nb: number): Interval[];
 }
-declare enum BoundType {
-    OO = "]a;b[",
-    OF = "]a;b]",
-    FO = "[a;b[",
-    FF = "[a;b]"
-}
 export declare class Interval implements MathSetInterface {
     min: number;
     minTex: string;
     max: number;
     maxTex: string;
-    boundType: BoundType;
-    leftBracket: '[' | ']';
-    rightBracket: '[' | ']';
-    leftInequalitySymbol: '\\le' | '<' | '\\ge' | '>';
-    rightInequalitySymbol: '\\le' | '<' | '\\ge' | '>';
+    closure: ClosureType;
+    leftBracket: "[" | "]";
+    rightBracket: "[" | "]";
+    leftInequalitySymbol: "\\le" | "<" | "\\ge" | ">";
+    rightInequalitySymbol: "\\le" | "<" | "\\ge" | ">";
     type: NumberType;
     tex: string;
     /**
@@ -36,6 +31,6 @@ export declare class Interval implements MathSetInterface {
     toTex(): string;
     toInequality(): string;
     getRandomElement(precision?: number): Nombre;
+    toTree(): IntervalNode;
 }
-export {};
 //# sourceMappingURL=intervals.d.ts.map

package/lib/math/sets/intervals/intervals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intervals.d.ts","sourceRoot":"","sources":["../../../../src/math/sets/intervals/intervals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAM/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,8BAAsB,mBAAmB;IACvC,MAAM,CAAC,MAAM;IAoCb,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM;CAWnC;AACD,aAAK,SAAS;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;CACb;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,GAAG,GAAG,GAAG,CAAC;IACvB,YAAY,EAAE,GAAG,GAAG,GAAG,CAAC;IACxB,oBAAoB,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC;IAClD,qBAAqB,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC;IAEnD,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;gBACS,GAAG,SAAc;IAqD7B,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAuClC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAwCzC,OAAO,CAAC,EAAE,EAAE,MAAM;IAWlB,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAWrC,WAAW,IAAI,MAAM;IAGrB,KAAK,IAAI,MAAM;IAIf,YAAY,IAAI,MAAM;IAetB,gBAAgB,CAAC,SAAS,GAAE,MAAiD,GAAG,MAAM;CAYvF"}
+{"version":3,"file":"intervals.d.ts","sourceRoot":"","sources":["../../../../src/math/sets/intervals/intervals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAS/D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAG/E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,8BAAsB,mBAAmB;IACvC,MAAM,CAAC,MAAM;IAoCb,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM;CAWnC;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,EAAE,GAAG,GAAG,GAAG,CAAC;IACvB,YAAY,EAAE,GAAG,GAAG,GAAG,CAAC;IACxB,oBAAoB,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC;IAClD,qBAAqB,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC;IAEnD,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;gBACS,GAAG,SAAc;IAuD7B,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAgDlC,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IA0CzC,OAAO,CAAC,EAAE,EAAE,MAAM;IAWlB,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAWrC,WAAW,IAAI,MAAM;IAGrB,KAAK,IAAI,MAAM;IAIf,YAAY,IAAI,MAAM;IAmBtB,gBAAgB,CACd,SAAS,GAAE,MAAiD,GAC3D,MAAM;IAmBT,MAAM;CAOP"}