math-exercises 2.0.1 → 2.0.2

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"}

package/lib/math/sets/intervals/intervals.js

@@ -7,21 +7,24 @@ const nombre_1 = require("../../../math/numbers/nombre");
 const real_1 = require("../../../math/numbers/reals/real");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
+const infiniteNode_1 = require("../../../tree/nodes/numbers/infiniteNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const intervalNode_1 = require("../../../tree/nodes/sets/intervalNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const mathSet_1 = require("../mathSet");
 class IntervalConstructor {
     static random() {
-        let tex = '';
+        let tex = "";
         const randType = (0, randint_1.randint)(0, 6);
         let a, b;
         switch (randType) {
             case 0:
                 b = (0, randint_1.randint)(-10, 10);
-                tex = `]-\\infty;${b}${(0, coinFlip_1.coinFlip)() ? ']' : '['}`;
+                tex = `]-\\infty;${b}${(0, coinFlip_1.coinFlip)() ? "]" : "["}`;
                 break;
             case 1:
                 a = (0, randint_1.randint)(-10, 10);
-                tex = `${(0, coinFlip_1.coinFlip)() ? ']' : '['}${a};+\\infty[`;
+                tex = `${(0, coinFlip_1.coinFlip)() ? "]" : "["}${a};+\\infty[`;
                 break;
             case 2:
                 a = (0, randint_1.randint)(-10, 10);
@@ -59,64 +62,59 @@ class IntervalConstructor {
     }
 }
 exports.IntervalConstructor = IntervalConstructor;
-var BoundType;
-(function (BoundType) {
-    BoundType["OO"] = "]a;b[";
-    BoundType["OF"] = "]a;b]";
-    BoundType["FO"] = "[a;b[";
-    BoundType["FF"] = "[a;b]";
-})(BoundType || (BoundType = {}));
 class Interval {
     /**
      * [[a; b]] pour un interval d'integer;  [a;b] pour des réels
      */
-    constructor(tex = '[-10; 10]') {
-        if (!tex.includes(';'))
-            throw Error('wrong interval format');
+    constructor(tex = "[-10; 10]") {
+        if (!tex.includes(";"))
+            throw Error("wrong interval format");
         this.tex = tex;
-        const isInt = tex[1] === '[' || tex[1] === ']';
+        const isInt = tex[1] === "[" || tex[1] === "]";
         this.type = isInt ? nombre_1.NumberType.Integer : nombre_1.NumberType.Real;
         const left = tex[0];
         const right = tex[tex.length - 1];
-        const [a, b] = tex.slice(isInt ? 2 : 1, isInt ? tex.length - 2 : tex.length - 1).split(';');
+        const [a, b] = tex
+            .slice(isInt ? 2 : 1, isInt ? tex.length - 2 : tex.length - 1)
+            .split(";");
         this.minTex = a;
         this.maxTex = b;
         switch (`${left}a;b${right}`) {
-            case '[a;b]':
-                this.leftBracket = '[';
-                this.leftInequalitySymbol = '\\le';
-                this.rightInequalitySymbol = '\\le';
-                this.rightBracket = ']';
-                this.boundType = BoundType.FF;
+            case "[a;b]":
+                this.leftBracket = "[";
+                this.leftInequalitySymbol = "\\le";
+                this.rightInequalitySymbol = "\\le";
+                this.rightBracket = "]";
+                this.closure = intervalNode_1.ClosureType.FF;
                 break;
-            case ']a;b[':
-                this.leftBracket = ']';
-                this.rightBracket = '[';
-                this.leftInequalitySymbol = '<';
-                this.rightInequalitySymbol = '<';
-                this.boundType = BoundType.OO;
+            case "]a;b[":
+                this.leftBracket = "]";
+                this.rightBracket = "[";
+                this.leftInequalitySymbol = "<";
+                this.rightInequalitySymbol = "<";
+                this.closure = intervalNode_1.ClosureType.OO;
                 break;
-            case '[a;b[':
-                this.leftBracket = '[';
-                this.rightBracket = '[';
-                this.leftInequalitySymbol = '\\le';
-                this.rightInequalitySymbol = '<';
-                this.boundType = BoundType.FO;
+            case "[a;b[":
+                this.leftBracket = "[";
+                this.rightBracket = "[";
+                this.leftInequalitySymbol = "\\le";
+                this.rightInequalitySymbol = "<";
+                this.closure = intervalNode_1.ClosureType.FO;
                 break;
-            case ']a;b]':
-                this.leftBracket = ']';
-                this.rightBracket = ']';
-                this.leftInequalitySymbol = '<';
-                this.rightInequalitySymbol = '\\le';
-                this.boundType = BoundType.OF;
+            case "]a;b]":
+                this.leftBracket = "]";
+                this.rightBracket = "]";
+                this.leftInequalitySymbol = "<";
+                this.rightInequalitySymbol = "\\le";
+                this.closure = intervalNode_1.ClosureType.OF;
                 break;
             default:
-                throw console.error('wrong interval format');
+                throw console.error("wrong interval format");
         }
         function getBound(bound) {
-            return bound === '-\\infty'
+            return bound === "-\\infty"
                 ? Number.NEGATIVE_INFINITY
-                : bound === '+\\infty'
+                : bound === "+\\infty"
                     ? Number.POSITIVE_INFINITY
                     : Number(bound);
         }
@@ -127,16 +125,16 @@ class Interval {
         let unionRightBracket = this.max > interval.max
             ? this.rightBracket
             : this.max === interval.max
-                ? this.rightBracket === ']' || interval.rightBracket === ']'
-                    ? ']'
-                    : '['
+                ? this.rightBracket === "]" || interval.rightBracket === "]"
+                    ? "]"
+                    : "["
                 : interval.rightBracket;
         let unionLeftBracket = this.min < interval.min
             ? this.leftBracket
             : this.max === interval.max
-                ? this.leftBracket === '[' || interval.leftBracket === '['
-                    ? '['
-                    : ']'
+                ? this.leftBracket === "[" || interval.leftBracket === "["
+                    ? "["
+                    : "]"
                 : interval.leftBracket;
         let min = Math.min(this.min, interval.min);
         let minTex = this.min < interval.min ? this.minTex : interval.minTex;
@@ -144,11 +142,17 @@ class Interval {
         let maxTex = this.max > interval.max ? this.maxTex : interval.maxTex;
         if (this.max < interval.min ||
             this.min > interval.max ||
-            (this.max === interval.min && this.rightBracket === '[' && interval.leftBracket === ']') ||
-            (this.min === interval.max && this.leftBracket === ']' && interval.rightBracket === '[')) {
+            (this.max === interval.min &&
+                this.rightBracket === "[" &&
+                interval.leftBracket === "]") ||
+            (this.min === interval.max &&
+                this.leftBracket === "]" &&
+                interval.rightBracket === "[")) {
             const firstInterval = this.min < interval.min ? this : interval;
             const secondInterval = this.min < interval.min ? interval : this;
-            return new mathSet_1.MathSet(`${unionLeftBracket}${firstInterval.minTex};${firstInterval.maxTex}${firstInterval.rightBracket}\\cup${secondInterval.leftBracket}${secondInterval.minTex};${secondInterval.maxTex}${unionRightBracket}`, () => ((0, coinFlip_1.coinFlip)() ? firstInterval.getRandomElement() : secondInterval.getRandomElement()));
+            return new mathSet_1.MathSet(`${unionLeftBracket}${firstInterval.minTex};${firstInterval.maxTex}${firstInterval.rightBracket}\\cup${secondInterval.leftBracket}${secondInterval.minTex};${secondInterval.maxTex}${unionRightBracket}`, () => (0, coinFlip_1.coinFlip)()
+                ? firstInterval.getRandomElement()
+                : secondInterval.getRandomElement());
         }
         else {
             return new Interval(`${unionLeftBracket}${minTex};${maxTex}${unionRightBracket}`);
@@ -162,13 +166,14 @@ class Interval {
         //[a,b] n [c,d]
         const isDisjoint = b < c ||
             d < a ||
-            (b === c && (this.rightBracket === '[' || interval.leftBracket === ']')) ||
-            (a === d && (interval.rightBracket === '[' || this.leftBracket === ']'));
+            (b === c &&
+                (this.rightBracket === "[" || interval.leftBracket === "]")) ||
+            (a === d && (interval.rightBracket === "[" || this.leftBracket === "]"));
         if (isDisjoint) {
-            return new mathSet_1.MathSet('\\emptyset', () => null);
+            return new mathSet_1.MathSet("\\emptyset", () => null);
         }
-        const winningLeftBracket = (brack1, brack2) => (brack1 === ']' || brack2 === ']' ? ']' : '[');
-        const winningRightBracket = (brack1, brack2) => brack1 === '[' || brack2 === '[' ? '[' : ']';
+        const winningLeftBracket = (brack1, brack2) => brack1 === "]" || brack2 === "]" ? "]" : "[";
+        const winningRightBracket = (brack1, brack2) => brack1 === "[" || brack2 === "[" ? "[" : "]";
         let min = Math.max(a, c);
         let minTex = a >= c ? this.minTex : interval.minTex;
         let leftBracket = a === c
@@ -206,14 +211,14 @@ class Interval {
         return new mathSet_1.MathSet(this.toTex() + `\\ ${set.toTex()}`, rand);
     }
     insideToTex() {
-        return this.tex.replaceAll('[', '').replaceAll(']', '');
+        return this.tex.replaceAll("[", "").replaceAll("]", "");
     }
     toTex() {
         return `${this.leftBracket}${this.insideToTex()}${this.rightBracket}`;
     }
     toInequality() {
-        const isLeftClosed = this.boundType === BoundType.FO || this.boundType === BoundType.FF;
-        const isRightClosed = this.boundType === BoundType.FF || this.boundType === BoundType.OF;
+        const isLeftClosed = this.closure === intervalNode_1.ClosureType.FO || this.closure === intervalNode_1.ClosureType.FF;
+        const isRightClosed = this.closure === intervalNode_1.ClosureType.FF || this.closure === intervalNode_1.ClosureType.OF;
         if (this.max === Infinity) {
             if (isLeftClosed) {
                 return `x\\ge${this.min}`;
@@ -222,19 +227,23 @@ class Interval {
                 return `x>${this.min}`;
         }
         else if (this.min === -Infinity) {
-            if (this.boundType === BoundType.OF) {
+            if (this.closure === intervalNode_1.ClosureType.OF) {
                 return `x\\le${this.max}`;
             }
             else
                 return `x<${this.max}`;
         }
-        return `${this.min}${isLeftClosed ? '\\le x' : '<x'}${isRightClosed ? '\\le' : '<'}${this.max}`;
+        return `${this.min}${isLeftClosed ? "\\le x" : "<x"}${isRightClosed ? "\\le" : "<"}${this.max}`;
     }
     getRandomElement(precision = this.type === nombre_1.NumberType.Integer ? 0 : 2) {
         if (this.min === -Infinity || this.max === Infinity)
             throw Error("Can't chose amongst infinity");
-        let min = this.boundType === BoundType.OO || this.boundType === BoundType.OF ? this.min + epsilon_1.EPSILON : this.min;
-        let max = this.boundType === BoundType.OO || this.boundType === BoundType.FO ? this.max - epsilon_1.EPSILON : this.max;
+        let min = this.closure === intervalNode_1.ClosureType.OO || this.closure === intervalNode_1.ClosureType.OF
+            ? this.min + epsilon_1.EPSILON
+            : this.min;
+        let max = this.closure === intervalNode_1.ClosureType.OO || this.closure === intervalNode_1.ClosureType.FO
+            ? this.max - epsilon_1.EPSILON
+            : this.max;
         const value = (0, round_1.round)(min + Math.random() * (max - this.min), precision);
         switch (this.type) {
             case nombre_1.NumberType.Integer:
@@ -243,5 +252,10 @@ class Interval {
                 return new real_1.Real(value, value.toString());
         }
     }
+    toTree() {
+        const a = this.min === -Infinity ? infiniteNode_1.MinusInfinityNode : new numberNode_1.NumberNode(this.min);
+        const b = this.max === Infinity ? infiniteNode_1.PlusInfinityNode : new numberNode_1.NumberNode(this.max);
+        return new intervalNode_1.IntervalNode(a, b, this.closure);
+    }
 }
 exports.Interval = Interval;

package/lib/math/trigonometry/remarkableValue.d.ts

@@ -1,11 +1,16 @@
-import { Node } from '../../tree/nodes/node';
+import { Node } from "../../tree/nodes/node";
+import { Integer } from "../numbers/integer/integer";
+import { Rational } from "../numbers/rationals/rational";
 export interface RemarkableValue {
+    angleValue: Integer | Rational;
     angle: Node;
     cos: Node;
     sin: Node;
 }
 export declare abstract class RemarkableValueConstructor {
     static mainInterval: () => RemarkableValue;
-    static simplifiable: () => RemarkableValue;
+    static simplifiable: () => RemarkableValue & {
+        index: number;
+    };
 }
 //# sourceMappingURL=remarkableValue.d.ts.map

package/lib/math/trigonometry/remarkableValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remarkableValue.d.ts","sourceRoot":"","sources":["../../../src/math/trigonometry/remarkableValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAW7C,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;IACV,GAAG,EAAE,IAAI,CAAC;CACX;AAED,8BAAsB,0BAA0B;IAC9C,MAAM,CAAC,YAAY,QAAO,eAAe,CAIvC;IAEF,MAAM,CAAC,YAAY,QAAO,eAAe,CASvC;CACH"}
+{"version":3,"file":"remarkableValue.d.ts","sourceRoot":"","sources":["../../../src/math/trigonometry/remarkableValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAM7C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAKzD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;IACV,GAAG,EAAE,IAAI,CAAC;CACX;AAED,8BAAsB,0BAA0B;IAC9C,MAAM,CAAC,YAAY,QAAO,eAAe,CAIvC;IAEF,MAAM,CAAC,YAAY;eAAkC,MAAM;MAwBzD;CACH"}

package/lib/math/trigonometry/remarkableValue.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemarkableValueConstructor = void 0;
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const piNode_1 = require("../../tree/nodes/numbers/piNode");
-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 simplify_1 = require("../../tree/parsers/simplify");
 const random_1 = require("../../utils/random");
+const integer_1 = require("../numbers/integer/integer");
+const nombre_1 = require("../numbers/nombre");
+const rational_1 = require("../numbers/rationals/rational");
 const randint_1 = require("../utils/random/randint");
 const remarkableValues_1 = require("./remarkableValues");
 class RemarkableValueConstructor {
@@ -18,12 +20,21 @@ RemarkableValueConstructor.mainInterval = () => {
     // return new RemarkableValue(randValue.angle, randValue.cos, randValue.sin);
 };
 RemarkableValueConstructor.simplifiable = () => {
-    const randValue = (0, random_1.random)(remarkableValues_1.remarkableTrigoValues);
-    const toAdd = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-3, 4) * 2), piNode_1.PiNode);
-    const newAngle = (0, simplify_1.simplifyNode)(new addNode_1.AddNode(randValue.angle, toAdd));
+    const index = (0, randint_1.randint)(0, remarkableValues_1.remarkableTrigoValues.length);
+    const randValue = remarkableValues_1.remarkableTrigoValues[index];
+    const isInt = randValue.angleValue.type === nombre_1.NumberType.Integer;
+    const toAdd = (0, randint_1.randint)(-3, 4) * 2;
+    const newRadian = isInt
+        ? new integer_1.Integer(randValue.angleValue.value + toAdd)
+        : new rational_1.Rational(randValue.angleValue.num, randValue.angleValue.denum).add(new integer_1.Integer(toAdd));
+    const newAngle = isInt
+        ? new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(newRadian.value), piNode_1.PiNode)
+        : new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(newRadian.num), piNode_1.PiNode), new numberNode_1.NumberNode(newRadian.denum));
     return {
+        angleValue: newRadian,
         angle: newAngle,
         cos: randValue.cos,
         sin: randValue.sin,
+        index,
     };
 };

package/lib/math/trigonometry/remarkableValues.d.ts

@@ -1,3 +1,3 @@
-import { RemarkableValue } from './remarkableValue';
+import { RemarkableValue } from "./remarkableValue";
 export declare const remarkableTrigoValues: RemarkableValue[];
 //# sourceMappingURL=remarkableValues.d.ts.map

package/lib/math/trigonometry/remarkableValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../src/math/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,eAAO,MAAM,qBAAqB,EAAE,eAAe,EA8ClD,CAAC"}
+{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../src/math/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,eAAO,MAAM,qBAAqB,EAAE,eAAe,EA+ElD,CAAC"}