math-exercises 1.4.5 → 1.4.6

package/lib/exercises/calcul/proportionality/proportionalityTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,oBAAoB,EAAE,YAYlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAyElD"}
+{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,oBAAoB,EAAE,YAYlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAyElD"}

package/lib/exercises/calcul/proportionality/proportionalityTable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProportionalityTable = exports.proportionalityTable = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const integer_1 = require("../../../math/numbers/integer/integer");
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
 const uuid_1 = require("uuid");
@@ -20,25 +21,25 @@ exports.proportionalityTable = {
 };
 function getProportionalityTable() {
     const fact = (0, randint_1.randint)(2, 10);
-    let [x1, x2] = [1, 2].map((el) => (0, randint_1.randint)(1, 100 / fact));
+    let [x1, x2] = integer_1.IntegerConstructor.randomDifferents(1, 100 / fact, 2);
     let [x3, x4] = [x1 * fact, x2 * fact];
-    let answer;
+    let answer = '';
     const randQuation = (0, randint_1.randint)(0, 4);
     switch (randQuation) {
         case 0:
-            answer = x1;
+            answer = x1 + '';
             x1 = '?';
             break;
         case 1:
-            answer = x2;
+            answer = +x2 + '';
             x2 = '?';
             break;
         case 2:
-            answer = x3;
+            answer = x3 + '';
             x3 = '?';
             break;
         case 3:
-            answer = x4;
+            answer = x4 + '';
             x4 = '?';
             break;
     }
@@ -75,7 +76,7 @@ function getProportionalityTable() {
 |${x2}|${x4}|
 
 Déterminer le nombre manquant.`,
-        answer: answer + '',
+        answer: answer,
         keys: [],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/derivation/derivative/expDerivativeOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAWhH,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,gBAAgB,IAAI,QAAQ,CAsC3C"}
+{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAWhH,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,gBAAgB,IAAI,QAAQ,CAwC3C"}

package/lib/exercises/derivation/derivative/expDerivativeOne.js

@@ -39,8 +39,10 @@ function getExpDerivative() {
         });
         (0, exercise_1.tryToAddWrongProp)(propositions, myfunction.toTex());
         (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(affine.toTree(), myfunction)).toTex());
-        (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(new numberNode_1.NumberNode(affine.coefficients[1])).toTex());
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(affine.coefficients[0]), myfunction)).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(new numberNode_1.NumberNode(a)).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(b), myfunction)).toTex());
+        while (propositions.length < numOptions)
+            (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10)), myfunction)).toTex());
         return (0, exercise_1.shuffleProps)(propositions, numOptions);
     };
     const question = {

package/lib/exercises/derivation/derivative/thirdDegreeDerivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/thirdDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAOlG,eAAO,MAAM,qBAAqB,EAAE,YAYnC,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CAiEnD"}
+{"version":3,"file":"thirdDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/thirdDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAOhH,eAAO,MAAM,qBAAqB,EAAE,YAYnC,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CAmEnD"}

package/lib/exercises/derivation/derivative/thirdDegreeDerivative.js

@@ -5,7 +5,6 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
-const shuffle_1 = require("../../../utils/shuffle");
 const uuid_1 = require("uuid");
 exports.thirdDegreeDerivative = {
     id: 'thirdDegreeDerivative',
@@ -35,8 +34,10 @@ function getThirdDegreeDerivative() {
             isRightAnswer: true,
             format: 'tex',
         });
-        (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([coefficients[0], coefficients[1], coefficients[2]]).toTree().toTex());
-        (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([coefficients[0] + coefficients[1], coefficients[1], coefficients[2]]).toTree().toTex());
+        if (coefficients[2] !== 0)
+            (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([coefficients[0], coefficients[1], coefficients[2]]).toTree().toTex());
+        if (coefficients[2] !== 0)
+            (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([coefficients[0] + coefficients[1], coefficients[1], coefficients[2]]).toTree().toTex());
         const missing = numOptions - propositions.length;
         for (let i = 0; i < missing; i++) {
             let isDuplicate;
@@ -57,7 +58,7 @@ function getThirdDegreeDerivative() {
             } while (isDuplicate);
             propositions.push(proposition);
         }
-        return (0, shuffle_1.shuffle)(propositions);
+        return (0, exercise_1.shuffleProps)(propositions, numOptions);
     };
     const question = {
         instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$.`,

package/lib/exercises/exercises.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU1C,eAAO,MAAM,SAAS,EAAE,YAAY,EA4QnC,CAAC"}
+{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAW1C,eAAO,MAAM,SAAS,EAAE,YAAY,EA6QnC,CAAC"}

package/lib/exercises/exercises.js

@@ -159,6 +159,7 @@ const firstDegreeInequationsType2_1 = require("./calculLitteral/inequations/firs
 const firstDegreeInequationsType3_1 = require("./calculLitteral/inequations/firstDegreeInequationsType3");
 const firstDegreeInequationsType0_1 = require("./calculLitteral/inequations/firstDegreeInequationsType0");
 const chasles_1 = require("./geometry/vectors/chasles");
+const deltaTrinom_1 = require("./functions/trinoms/deltaTrinom");
 const rootsFromFactorizedForm_1 = require("./functions/trinoms/rootsFromFactorizedForm");
 const rootsFromDevForm_1 = require("./functions/trinoms/rootsFromDevForm");
 const inequalityToInterval_1 = require("./sets/intervals/inequalityToInterval");
@@ -177,6 +178,7 @@ const calculatePower_1 = require("./powers/calculatePower");
 const calculateNegativePower_1 = require("./powers/calculateNegativePower");
 const decimalToScientific_1 = require("./powers/decimalToScientific");
 const powerDefinition_1 = require("./powers/powerDefinition");
+const niceRootsFromDevForm_1 = require("./functions/trinoms/niceRootsFromDevForm");
 exports.exercises = [
     /**
      * calcul litteral
@@ -394,9 +396,10 @@ exports.exercises = [
     extremumFromCanonicalForm_1.extremumFromCanonicalForm,
     extremumTypeFromAlgebricForm_1.extremumTypeFromAlgebricForm,
     variationsFromAlgebricForm_1.variationsFromAlgebricForm,
-    // deltaTrinom,
+    deltaTrinom_1.deltaTrinom,
     rootsFromFactorizedForm_1.rootsFromFactorizedForm,
     rootsFromDevForm_1.rootsFromDevForm,
+    niceRootsFromDevForm_1.niceRootsFromDevForm,
     /**Complexes */
     mutiplyComplex_1.mutiplyComplex,
     reAndIm_1.reAndIm,

package/lib/exercises/functions/trinoms/niceRootsFromDevForm.d.ts

@@ -0,0 +1,4 @@
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const niceRootsFromDevForm: MathExercise;
+export declare function getRootsFromDevFormQuestion(): Question;
+//# sourceMappingURL=niceRootsFromDevForm.d.ts.map

package/lib/exercises/functions/trinoms/niceRootsFromDevForm.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"niceRootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/niceRootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAOlG,eAAO,MAAM,oBAAoB,EAAE,YAWlC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAgDtD"}

package/lib/exercises/functions/trinoms/niceRootsFromDevForm.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRootsFromDevFormQuestion = exports.niceRootsFromDevForm = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const trinom_1 = require("../../../math/polynomials/trinom");
+const randint_1 = require("../../../math/utils/random/randint");
+const shuffle_1 = require("../../../utils/shuffle");
+const uuid_1 = require("uuid");
+exports.niceRootsFromDevForm = {
+    id: 'niceRootsFromDevForm',
+    connector: '\\iff',
+    instruction: '',
+    label: 'Résoudre une équation du second degré (solutions entières)',
+    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    isSingleStep: true,
+    sections: ['Second degré'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRootsFromDevFormQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+};
+function getRootsFromDevFormQuestion() {
+    const trinom = trinom_1.TrinomConstructor.randomFactorized();
+    const answer = trinom.getRootsEquationSolutionTex();
+    const getPropositions = (n) => {
+        const res = [];
+        res.push({
+            id: (0, uuid_1.v4)(),
+            statement: answer,
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        (0, exercise_1.tryToAddWrongProp)(res, 'S=\\emptyset');
+        const missing = n - res.length;
+        for (let i = 0; i < missing; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                let wrongX1 = (0, randint_1.randint)(-19, 0);
+                let wrongX2 = (0, randint_1.randint)(0, 20);
+                const wrongAnswer = `S=\\left\\{${wrongX1};${wrongX2}\\right\\}`;
+                proposition = {
+                    id: (0, uuid_1.v4)() + ``,
+                    statement: wrongAnswer,
+                    isRightAnswer: false,
+                    format: 'tex',
+                };
+                isDuplicate = res.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            res.push(proposition);
+        }
+        return (0, shuffle_1.shuffle)(res);
+    };
+    const question = {
+        answer: answer,
+        instruction: `Soit $f(x) = ${trinom.toTree().toTex()}$. Résoudre l'équation $f(x) = 0$.`,
+        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
+        getPropositions,
+        answerFormat: 'tex',
+    };
+    return question;
+}
+exports.getRootsFromDevFormQuestion = getRootsFromDevFormQuestion;

package/lib/exercises/functions/trinoms/rootsFromDevForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/rootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,gBAAgB,EAAE,YAW9B,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CA6CtD"}
+{"version":3,"file":"rootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/rootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAOlG,eAAO,MAAM,gBAAgB,EAAE,YAW9B,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CA+CtD"}

package/lib/exercises/functions/trinoms/rootsFromDevForm.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRootsFromDevFormQuestion = exports.rootsFromDevForm = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const trinom_1 = require("../../../math/polynomials/trinom");
+const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
 const uuid_1 = require("uuid");
 exports.rootsFromDevForm = {
@@ -12,7 +14,7 @@ exports.rootsFromDevForm = {
     label: 'Résoudre une équation du second degré',
     levels: ['1reSpé', 'TermSpé', 'MathComp'],
     isSingleStep: true,
-    sections: [],
+    sections: ['Second degré'],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRootsFromDevFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -28,12 +30,15 @@ function getRootsFromDevFormQuestion() {
             isRightAnswer: true,
             format: 'tex',
         });
+        (0, exercise_1.tryToAddWrongProp)(res, 'S=\\emptyset');
         const missing = n - res.length;
         for (let i = 0; i < missing; i++) {
             let isDuplicate;
             let proposition;
             do {
-                const wrongAnswer = '';
+                let wrongX1 = (0, randint_1.randint)(-19, 0);
+                let wrongX2 = (0, randint_1.randint)(0, 20);
+                const wrongAnswer = `S=\\left\\{${wrongX1};${wrongX2}\\right\\}`;
                 proposition = {
                     id: (0, uuid_1.v4)() + ``,
                     statement: wrongAnswer,
@@ -49,7 +54,7 @@ function getRootsFromDevFormQuestion() {
     const question = {
         answer: answer,
         instruction: `Soit $f(x) = ${trinom.toTree().toTex()}$. Résoudre l'équation $f(x) = 0$.`,
-        keys: [],
+        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
         getPropositions,
         answerFormat: 'tex',
     };

package/lib/exercises/geometry/cartesian/distanceBetweenTwoPoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,wBAAwB,EAAE,YAYtC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAkGtD"}
+{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAUhH,eAAO,MAAM,wBAAwB,EAAE,YAYtC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAkEtD"}

package/lib/exercises/geometry/cartesian/distanceBetweenTwoPoints.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDistanceBetweenTwoPoints = exports.distanceBetweenTwoPoints = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const point_1 = require("../../../math/geometry/point");
 const real_1 = require("../../../math/numbers/reals/real");
 const randTupleInt_1 = require("../../../math/utils/random/randTupleInt");
 const round_1 = require("../../../math/utils/round");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const shuffle_1 = require("../../../utils/shuffle");
 const uuid_1 = require("uuid");
 exports.distanceBetweenTwoPoints = {
     id: 'distanceBetweenTwoPoints',
@@ -30,54 +30,26 @@ function getDistanceBetweenTwoPoints() {
     const getPropositions = (n) => {
         const res = [];
         let isDuplicate;
-        let temp = n;
         res.push({
             id: (0, uuid_1.v4)() + '',
             statement: answer,
             isRightAnswer: true,
             format: 'tex',
         });
-        temp--;
         A = new point_1.Point('A', new numberNode_1.NumberNode(coords1[0]), new numberNode_1.NumberNode(coords1[1]));
         B = new point_1.Point('B', new numberNode_1.NumberNode(-coords2[0]), new numberNode_1.NumberNode(-coords2[1]));
         let wrongStatement = new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex();
-        isDuplicate = res.some((p) => p.statement === wrongStatement);
-        if (!isDuplicate) {
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: wrongStatement,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-            temp--;
-        }
+        (0, exercise_1.tryToAddWrongProp)(res, wrongStatement);
         A = new point_1.Point('A', new numberNode_1.NumberNode(coords1[1]), new numberNode_1.NumberNode(coords1[0]));
         B = new point_1.Point('B', new numberNode_1.NumberNode(coords2[0]), new numberNode_1.NumberNode(coords2[1]));
         wrongStatement = new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex();
-        isDuplicate = res.some((p) => p.statement === wrongStatement);
-        if (n > 0 && !isDuplicate) {
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: wrongStatement,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-            temp--;
-        }
+        (0, exercise_1.tryToAddWrongProp)(res, wrongStatement);
         A = new point_1.Point('A', new numberNode_1.NumberNode(coords1[0]), new numberNode_1.NumberNode(coords2[0]));
         B = new point_1.Point('B', new numberNode_1.NumberNode(coords1[1]), new numberNode_1.NumberNode(coords2[1]));
         wrongStatement = new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex();
-        isDuplicate = res.some((p) => p.statement === wrongStatement);
-        if (n > 0 && !isDuplicate) {
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: wrongStatement,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-            temp--;
-        }
-        for (let i = 0; i < temp; i++) {
+        (0, exercise_1.tryToAddWrongProp)(res, wrongStatement);
+        const missing = n - res.length;
+        for (let i = 0; i < missing; i++) {
             let proposition;
             do {
                 const [tempCoords1, tempsCoords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
@@ -92,9 +64,8 @@ function getDistanceBetweenTwoPoints() {
                 isDuplicate = res.some((p) => p.statement === proposition.statement);
             } while (isDuplicate);
             res.push(proposition);
-            temp--;
         }
-        return (0, shuffle_1.shuffle)(res);
+        return (0, exercise_1.shuffleProps)(res, n);
     };
     const question = {
         instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Calculer la distance $AB$.`,

package/lib/exercises/limits/rationalFracForbiddenValueLimit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rationalFracForbiddenValueLimit.d.ts","sourceRoot":"","sources":["../../../src/exercises/limits/rationalFracForbiddenValueLimit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAclG,eAAO,MAAM,+BAA+B,EAAE,YAW7C,CAAC;AAEF,wBAAgB,oCAAoC,IAAI,QAAQ,CAmE/D"}
+{"version":3,"file":"rationalFracForbiddenValueLimit.d.ts","sourceRoot":"","sources":["../../../src/exercises/limits/rationalFracForbiddenValueLimit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAchH,eAAO,MAAM,+BAA+B,EAAE,YAW7C,CAAC;AAEF,wBAAgB,oCAAoC,IAAI,QAAQ,CAoE/D"}

package/lib/exercises/limits/rationalFracForbiddenValueLimit.js

@@ -10,7 +10,6 @@ const discreteSet_1 = require("../../math/sets/discreteSet");
 const intervals_1 = require("../../math/sets/intervals/intervals");
 const randint_1 = require("../../math/utils/random/randint");
 const coinFlip_1 = require("../../utils/coinFlip");
-const shuffle_1 = require("../../utils/shuffle");
 const uuid_1 = require("uuid");
 exports.rationalFracForbiddenValueLimit = {
     id: 'rationalFracForbiddenValueLimit',
@@ -28,14 +27,15 @@ function getSequenceRationalFracLimitQuestion() {
     const polyDenum = new affine_1.Affine(1, (0, randint_1.randint)(-9, 10, [0]));
     const forbiddenValue = -polyDenum.b;
     const interval = new intervals_1.Interval('[[-10;10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(forbiddenValue)]));
-    const polyNum = trinom_1.TrinomConstructor.randomFactorized(new intervals_1.Interval('[[-10;10]]'), interval, interval);
+    const intervalStar = new intervals_1.Interval('[[-10;10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+    const polyNum = trinom_1.TrinomConstructor.randomFactorized(intervalStar, interval, interval);
     const numLimit = polyNum.calculate(-polyDenum.b);
     const getSign = (nb) => {
         return nb >= 0 ? '+' : '-';
     };
     const isRight = (0, coinFlip_1.coinFlip)();
     const to = isRight ? `${forbiddenValue}` : `${forbiddenValue}`;
-    const from = isRight ? `x > ${forbiddenValue}` : `x<${forbiddenValue}`;
+    const from = isRight ? `x>${forbiddenValue}` : `x<${forbiddenValue}`;
     const answer = isRight ? `${getSign(numLimit)}\\infty` : `${getSign(-numLimit)}\\infty`;
     const getPropositions = (n) => {
         const res = [];
@@ -65,13 +65,13 @@ function getSequenceRationalFracLimitQuestion() {
             } while (isDuplicate);
             res.push(proposition);
         }
-        return (0, shuffle_1.shuffle)(res);
+        return (0, exercise_1.shuffleProps)(res, n);
     };
     const question = {
         answer,
         instruction: `Soit $f$ la fonction définie par : $f(x) = \\dfrac{${polyNum.toTree().toTex()}}{${polyDenum
             .toTree()
-            .toTex()}}$. Déterminer $\\lim\\limits_{x \\to ${to}, ${from}}f(x).$
+            .toTex()}}$. Déterminer $\\lim\\limits_{x \\to ${to}, \\ ${from}}f(x).$
       `,
         keys: ['infty'],
         getPropositions,

package/lib/exercises/powers/calculateNegativePower.js

@@ -24,7 +24,7 @@ function getCalculatePowerQuestion() {
     const int = (0, randint_1.randint)(0, 11);
     const power = (0, randint_1.randint)(-5, 0);
     const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
-    const answer = new rational_1.Rational(1, int ** Math.abs(power)).simplify().toTree().toTex();
+    const answer = int === 0 ? '0' : new rational_1.Rational(1, int ** Math.abs(power)).simplify().toTree().toTex();
     const getPropositions = (n) => {
         const res = [];
         res.push({

package/lib/exercises/powers/decimalToScientific.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalToScientific.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/decimalToScientific.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,mBAAmB,EAAE,YA0BjC,CAAC;AAEF,wBAAgB,8BAA8B,IAAI,QAAQ,CAyDzD"}
+{"version":3,"file":"decimalToScientific.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/decimalToScientific.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,mBAAmB,EAAE,YA0BjC,CAAC;AAEF,wBAAgB,8BAA8B,IAAI,QAAQ,CAwDzD"}

package/lib/exercises/powers/decimalToScientific.js

@@ -15,7 +15,7 @@ exports.decimalToScientific = {
     id: 'decimalToScientific',
     connector: '=',
     instruction: '',
-    label: "Passer d'écriture décimal à écriture scientifique",
+    label: "Passer d'écriture décimale à écriture scientifique",
     levels: [
         '5ème',
         '4ème',
@@ -38,7 +38,6 @@ exports.decimalToScientific = {
     freeTimer: 60,
 };
 function getDecimalToScientificQuestion() {
-    //! manque le cas 0.000
     const isZero = (0, probaFlip_1.probaFlip)(0.2);
     let intPart, dec;
     if (isZero) {

package/lib/exercises/powers/powersOfTenToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersOfTenToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersOfTenToDecimal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,oBAAoB,EAAE,YA0BlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CAmD1D"}
+{"version":3,"file":"powersOfTenToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersOfTenToDecimal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,oBAAoB,EAAE,YA0BlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CAkD1D"}

package/lib/exercises/powers/powersOfTenToDecimal.js

@@ -57,7 +57,6 @@ function getPowersOfTenToDecimalQuestion() {
                 const wrongPower = randPower + (0, randint_1.randint)(-3, 4, [0]);
                 const wrongAnswerTree = new power_1.Power(10, wrongPower).toDecimalWriting().toTree();
                 const wrongAnswer = wrongAnswerTree.toTex();
-                console.log(wrongPower, wrongAnswer);
                 proposition = {
                     id: (0, uuid_1.v4)() + '',
                     statement: wrongAnswer,

package/lib/exercises/powers/powersPower.js

@@ -37,7 +37,7 @@ exports.powersPower = {
     freeTimer: 60,
 };
 function getPowersPowerQuestion(useOnlyPowersOfTen = false) {
-    const a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11);
+    const a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0, 1]);
     const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
     const statement = new powerNode_1.PowerNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c));
     let answerTree = new power_1.Power(a, b * c).simplify();

package/lib/exercises/powers/scientificToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scientificToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/scientificToDecimal.ts"],"names":[],"mappings":"AAAA;;MAEM;AASN,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,aAAa,CAAC;AAIrF,eAAO,MAAM,mBAAmB,EAAE,YA0BjC,CAAC;AAEF,wBAAgB,8BAA8B,IAAI,QAAQ,CAoDzD"}
+{"version":3,"file":"scientificToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/scientificToDecimal.ts"],"names":[],"mappings":"AAAA;;MAEM;AASN,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,mBAAmB,EAAE,YA0BjC,CAAC;AAEF,wBAAgB,8BAA8B,IAAI,QAAQ,CAqDzD"}

package/lib/exercises/powers/scientificToDecimal.js

@@ -9,7 +9,6 @@ const randint_1 = require("../../math/utils/random/randint");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
-const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const uuid_1 = require("uuid");
@@ -17,7 +16,7 @@ exports.scientificToDecimal = {
     id: 'scientificToDecimal',
     connector: '=',
     instruction: '',
-    label: "Passer d'écriture scientifique à écriture décimal",
+    label: "Passer d'écriture scientifique à écriture décimale",
     levels: [
         '5ème',
         '4ème',
@@ -53,7 +52,8 @@ function getScientificToDecimalQuestion() {
             format: 'tex',
         });
         (0, exercise_1.tryToAddWrongProp)(res, decScientific.multiplyByPowerOfTen(-tenPower).toTree().toTex());
-        for (let i = 0; i < n - 1; i++) {
+        const missing = n - res.length;
+        for (let i = 0; i < missing; i++) {
             let isDuplicate;
             let proposition;
             do {
@@ -69,7 +69,7 @@ function getScientificToDecimalQuestion() {
             } while (isDuplicate);
             res.push(proposition);
         }
-        return (0, shuffle_1.shuffle)(res);
+        return (0, exercise_1.shuffleProps)(res, n);
     };
     const question = {
         instruction: `Donner l'écriture décimale de : $${statement.toTex()}$`,

package/lib/exercises/probaStat/medianList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"medianList.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/medianList.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,aAAa,CAAC;AAIrF,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,aAAa,IAAI,QAAQ,CA8DxC"}
+{"version":3,"file":"medianList.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/medianList.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,aAAa,IAAI,QAAQ,CA8DxC"}

package/lib/exercises/probaStat/medianList.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMedianList = exports.medianWithList = void 0;
 const randint_1 = require("../../math/utils/random/randint");
-const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const uuid_1 = require("uuid");
@@ -57,7 +56,7 @@ function getMedianList() {
             } while (isDuplicate);
             res.push(proposition);
         }
-        return (0, shuffle_1.shuffle)(res);
+        return (0, exercise_1.shuffleProps)(res, n);
     };
     const question = {
         instruction: `On considère la liste suivante : $${randomValeurs.join(';\\ ')}.$

package/lib/exercises/probaStat/quartilesList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quartilesList.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/quartilesList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAqB,MAAM,aAAa,CAAC;AAIrF,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAEF,wBAAgB,YAAY,IAAI,QAAQ,CAsFvC"}
+{"version":3,"file":"quartilesList.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/quartilesList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAEF,wBAAgB,YAAY,IAAI,QAAQ,CAqFvC"}

package/lib/exercises/probaStat/quartilesList.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getQuartiles = exports.quartilesList = void 0;
 const randint_1 = require("../../math/utils/random/randint");
-const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const uuid_1 = require("uuid");
@@ -70,12 +69,11 @@ function getQuartiles() {
                     isRightAnswer: false,
                     format: 'tex',
                 };
-                console.log('iter', randomValeurs);
                 isDuplicate = res.some((p) => p.statement === proposition.statement);
             } while (isDuplicate);
             res.push(proposition);
         }
-        return (0, shuffle_1.shuffle)(res);
+        return (0, exercise_1.shuffleProps)(res, n);
     };
     const question = {
         instruction: `On considère la liste suivante : $${randomValeurs.join(';\\ ')}.$

package/lib/index.d.ts

@@ -1,4 +1,12 @@
 import { MathExercise, MathSection } from './exercises/exercise';
+/**
+ * TODO
+ * Décimal : permettre facilement -0.xxx
+ * Tree shaking export
+ *
+ *
+
+*/
 declare const allMathExercises: MathExercise[];
 declare const getAllMathExercisesBySection: () => {
     section: MathSection;

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIjE,QAAA,MAAM,gBAAgB,gBAAiB,CAAC;AAExC,QAAA,MAAM,4BAA4B;aACT,WAAW;UAAQ,YAAY,EAAE;GAkBzD,CAAC;AAIF,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIjE;;;;;;;EAOE;AACF,QAAA,MAAM,gBAAgB,gBAAiB,CAAC;AAExC,QAAA,MAAM,4BAA4B;aACT,WAAW;UAAQ,YAAY,EAAE;GAkBzD,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,CAAC"}

package/lib/index.js

@@ -2,7 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllMathExercisesBySection = exports.allMathExercises = void 0;
 const exercises_1 = require("./exercises/exercises");
-const decimalToScientific_1 = require("./exercises/powers/decimalToScientific");
+/**
+ * TODO
+ * Décimal : permettre facilement -0.xxx
+ * Tree shaking export
+ *
+ *
+
+*/
 const allMathExercises = [...exercises_1.exercises];
 exports.allMathExercises = allMathExercises;
 const getAllMathExercisesBySection = () => {
@@ -24,4 +31,3 @@ const getAllMathExercisesBySection = () => {
     return data;
 };
 exports.getAllMathExercisesBySection = getAllMathExercisesBySection;
-console.log(decimalToScientific_1.decimalToScientific.generator(10).forEach((q) => q.getPropositions(4)));

package/lib/math/numbers/integer/integer.d.ts

@@ -3,6 +3,7 @@ import { Nombre, NumberType } from '../nombre';
 export declare abstract class IntegerConstructor {
     static random(nbOfDigits: number, excludes?: number[]): number;
     static randomPrime(max?: number): number;
+    static randomDifferents(min: number, max: number, nb: number, excludes?: number[]): number[];
 }
 export declare class Integer implements Nombre {
     value: number;

package/lib/math/numbers/integer/integer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/integer/integer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAI/C,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrD,MAAM,CAAC,WAAW,CAAC,GAAG,GAAE,MAAW;CAGpC;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBAEL,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAMvC,MAAM,IAAI,IAAI;IAId,KAAK,CAAC,SAAS,EAAE,MAAM;IAiCvB,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;CAW3B"}
+{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/integer/integer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAI/C,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrD,MAAM,CAAC,WAAW,CAAC,GAAG,GAAE,MAAW;IAGnC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE;CAWlF;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBAEL,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAMvC,MAAM,IAAI,IAAI;IAId,KAAK,CAAC,SAAS,EAAE,MAAM;IAiCvB,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;CAW3B"}

package/lib/math/numbers/integer/integer.js

@@ -14,6 +14,17 @@ class IntegerConstructor {
     static randomPrime(max = 20) {
         return (0, random_1.random)(primes_1.primes.filter((p) => p < 20));
     }
+    static randomDifferents(min, max, nb, excludes) {
+        const res = [];
+        for (let i = 0; i < nb; i++) {
+            let newNb;
+            do {
+                newNb = (0, randint_1.randint)(min, max, excludes);
+            } while (res.includes(newNb));
+            res.push(newNb);
+        }
+        return res;
+    }
 }
 exports.IntegerConstructor = IntegerConstructor;
 class Integer {

package/lib/math/numbers/reals/extendedRingElement.d.ts

@@ -0,0 +1,13 @@
+import { Nombre } from '../nombre';
+/**
+ * element of Q(x)
+ * exp 2+3sqrt(5)
+ */
+export declare class ExtendedRingElement {
+    a: number;
+    b: number;
+    algebraicElement: Nombre;
+    constructor(a: number, b: number, algebraicElement: Nombre);
+    toTree(): import("../../../tree/nodes/node").Node;
+}
+//# sourceMappingURL=extendedRingElement.d.ts.map

package/lib/math/numbers/reals/extendedRingElement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extendedRingElement.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/extendedRingElement.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,qBAAa,mBAAmB;IAM9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,gBAAgB,EAAE,MAAM,CAAC;gBACb,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM;IAM1D,MAAM;CAeP"}

package/lib/math/numbers/reals/extendedRingElement.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExtendedRingElement = void 0;
+const oppositeNode_1 = require("../../../tree/nodes/functions/oppositeNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
+/**
+ * element of Q(x)
+ * exp 2+3sqrt(5)
+ */
+class ExtendedRingElement {
+    constructor(a, b, algebraicElement) {
+        this.a = a;
+        this.b = b;
+        this.algebraicElement = algebraicElement;
+    }
+    toTree() {
+        if (this.b === 0) {
+            return new numberNode_1.NumberNode(this.a);
+        }
+        else {
+            if (this.a === 0) {
+                if (this.b === 1)
+                    return this.algebraicElement.toTree();
+                if (this.b === -1)
+                    return new oppositeNode_1.OppositeNode(this.algebraicElement.toTree());
+                return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.b), this.algebraicElement.toTree());
+            }
+            else {
+                if (this.b === 1)
+                    return new addNode_1.AddNode(new numberNode_1.NumberNode(this.a), this.algebraicElement.toTree());
+                if (this.b === -1)
+                    return new substractNode_1.SubstractNode(new numberNode_1.NumberNode(this.a), this.algebraicElement.toTree());
+                return new addNode_1.AddNode(new numberNode_1.NumberNode(this.a), this.algebraicElement.toTree());
+            }
+        }
+    }
+}
+exports.ExtendedRingElement = ExtendedRingElement;

package/lib/math/numbers/reals/real.d.ts

@@ -23,6 +23,7 @@ export declare abstract class SquareRootConstructor {
 export declare class SquareRoot extends Real {
     operand: number;
     constructor(operand: number);
+    getSimplifiedCoeffs(): [number, number];
     simplify(): Real;
     toTex(): string;
     toTree(): Node;

package/lib/math/numbers/reals/real.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"real.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/real.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAQ7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,8BAAsB,eAAe;IACnC,MAAM,CAAC,MAAM;CAUd;AACD,qBAAa,IAAK,YAAW,MAAM;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBACL,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAKtC,MAAM,IAAI,IAAI;CAIf;AAED,8BAAsB,qBAAqB;IACzC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,EAAE,kBAA0B,EAAE,SAAc,EAAE;;;KAAA,GAAG,UAAU;IASrF,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW,GAAG,UAAU;CAIxD;AAED,qBAAa,UAAW,SAAQ,IAAI;IAClC,OAAO,EAAE,MAAM,CAAC;gBACJ,OAAO,EAAE,MAAM;IAK3B,QAAQ,IAAI,IAAI;IA+BhB,KAAK,IAAI,MAAM;IAIf,MAAM,IAAI,IAAI;CAGf"}
+{"version":3,"file":"real.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/real.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAQ7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,8BAAsB,eAAe;IACnC,MAAM,CAAC,MAAM;CAUd;AACD,qBAAa,IAAK,YAAW,MAAM;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBACL,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAKtC,MAAM,IAAI,IAAI;CAIf;AAED,8BAAsB,qBAAqB;IACzC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,EAAE,kBAA0B,EAAE,SAAc,EAAE;;;KAAA,GAAG,UAAU;IASrF,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW,GAAG,UAAU;CAIxD;AAED,qBAAa,UAAW,SAAQ,IAAI;IAClC,OAAO,EAAE,MAAM,CAAC;gBACJ,OAAO,EAAE,MAAM;IAK3B,mBAAmB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAevC,QAAQ,IAAI,IAAI;IAoBhB,KAAK,IAAI,MAAM;IAIf,MAAM,IAAI,IAAI;CAGf"}

package/lib/math/numbers/reals/real.js

@@ -62,7 +62,7 @@ class SquareRoot extends Real {
         super(Math.sqrt(operand), `\\sqrt{${operand}}`);
         this.operand = operand;
     }
-    simplify() {
+    getSimplifiedCoeffs() {
         const factors = (0, primeFactors_1.primeFactors)(this.operand);
         // finds primes with even exponents
         const multiples = [1];
@@ -75,6 +75,10 @@ class SquareRoot extends Real {
         }
         const outsideSqrt = multiples.reduce((x, y) => x * y);
         const insideSqrt = factors.length === 0 ? 1 : factors.reduce((x, y) => x * y);
+        return [outsideSqrt, insideSqrt];
+    }
+    simplify() {
+        const [outsideSqrt, insideSqrt] = this.getSimplifiedCoeffs();
         const simplified = insideSqrt !== 1
             ? new Real(outsideSqrt * Math.sqrt(insideSqrt), `${outsideSqrt === 1 ? '' : `${outsideSqrt}`}\\sqrt{${insideSqrt}}`)
             : new Real(outsideSqrt, outsideSqrt + '');

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

@@ -1 +1 @@
-{"version":3,"file":"polynomial.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/polynomial.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAW7C,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAa5D,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IActD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAmBhF,MAAM,CAAC,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAmB5F,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;CAyBzG;AAED,qBAAa,UAAU;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;OAIG;gBACS,YAAY,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAY;IAS1D,MAAM,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAG9B,QAAQ,IAAI,MAAM,EAAE;IA8BpB,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAc9B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU;IAM7B,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAkBnC,QAAQ,IAAI,UAAU;IAOtB,QAAQ,IAAI,UAAU;IAQtB,SAAS,IAAI,UAAU;IAMvB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAM5B,QAAQ,CAAC,EAAE,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM;IAiB7C,MAAM,IAAI,IAAI;IAmCd,KAAK,IAAI,MAAM;IAkBf,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"polynomial.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/polynomial.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAW7C,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAa5D,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IActD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAmBhF,MAAM,CAAC,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAmB5F,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;CAyBzG;AAED,qBAAa,UAAU;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;OAIG;gBACS,YAAY,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAY;IAS1D,MAAM,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAG9B,QAAQ,IAAI,MAAM,EAAE;IAkCpB,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAkB9B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU;IAO7B,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAsBnC,QAAQ,IAAI,UAAU;IAOtB,QAAQ,IAAI,UAAU;IAQtB,SAAS,IAAI,UAAU;IAMvB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAM5B,QAAQ,CAAC,EAAE,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM;IAiB7C,MAAM,IAAI,IAAI;IAmCd,KAAK,IAAI,MAAM;IAkBf,QAAQ,IAAI,MAAM;CAGnB"}

package/lib/math/polynomials/polynomial.js

@@ -108,7 +108,7 @@ class Polynomial {
     constructor(coefficients, variable = 'x') {
         if (coefficients.length === 0)
             throw Error('coeffs must be not null');
-        if (coefficients[coefficients.length - 1] === 0) {
+        if (coefficients.length > 1 && coefficients[coefficients.length - 1] === 0) {
             throw Error('n-th coeff must be not null');
         }
         this.coefficients = coefficients;
@@ -120,6 +120,9 @@ class Polynomial {
     }
     getRoots() {
         const roots = [];
+        if (this.degree === 0) {
+            return this.coefficients[0] === 0 ? [0] : [];
+        }
         if (this.degree === 1) {
             // Polynôme de degré 1 : ax + b = 0
             const a = this.coefficients[1];
@@ -144,22 +147,32 @@ 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');
         }
         return roots.sort((a, b) => a - b);
     }
     add(P) {
         if (P.variable !== this.variable)
             throw Error("Can't add two polynomials with different variables");
-        const newDegree = P.degree === this.degree && P.coefficients[P.degree] === -this.coefficients[this.degree]
-            ? P.degree - 1
-            : Math.max(P.degree, this.degree);
+        const maxDegree = Math.max(P.degree, this.degree);
         const res = [];
-        for (let i = 0; i < newDegree + 1; i++) {
+        for (let i = 0; i < maxDegree + 1; i++) {
             res[i] = (P.coefficients[i] ?? 0) + (this.coefficients[i] ?? 0);
         }
-        return new Polynomial(res, this.variable);
+        let firstNonZeroIndex = res.length;
+        for (let i = res.length - 1; i > -1; i--) {
+            if (res[i] !== 0)
+                break;
+            firstNonZeroIndex = i;
+        }
+        let coeffs = res.slice(0, firstNonZeroIndex);
+        if (!coeffs.length)
+            coeffs = [0];
+        return new Polynomial(coeffs, this.variable);
     }
     times(nb) {
+        if (nb === 0)
+            return new Polynomial([0], this.variable);
         return new Polynomial(this.coefficients.map((coeff) => coeff * nb), this.variable);
     }
     multiply(Q) {
@@ -175,7 +188,13 @@ class Polynomial {
             }
             res[k] = sum;
         }
-        return new Polynomial(res, this.variable);
+        let firstNonZeroIndex = res.length;
+        for (let i = res.length - 1; i > -1; i--) {
+            if (res[i] !== 0)
+                break;
+            firstNonZeroIndex = i;
+        }
+        return new Polynomial(res.slice(0, firstNonZeroIndex), this.variable);
     }
     opposite() {
         return new Polynomial(this.coefficients.map((coeff) => -coeff), this.variable);

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;AAejE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,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;IAQR,YAAY,IAAI,IAAI,EAAE;IAoBtB,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;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"}

package/lib/math/polynomials/trinom.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trinom = exports.TrinomConstructor = void 0;
+const sqrtNode_1 = require("../../tree/nodes/functions/sqrtNode");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
@@ -9,6 +10,7 @@ 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");
 const rational_1 = require("../numbers/rationals/rational");
@@ -16,6 +18,7 @@ const real_1 = require("../numbers/reals/real");
 const discreteSet_1 = require("../sets/discreteSet");
 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]]')) {
         const a = domainA.getRandomElement();
@@ -68,17 +71,37 @@ class Trinom extends polynomial_1.Polynomial {
             return [-this.b / (2 * this.a)];
         return [(-this.b - Math.sqrt(delta)) / (2 * this.a), (-this.b + Math.sqrt(delta)) / (2 * this.a)];
     }
-    //! la simplification de mathjs est foireuse, exemple (4+4sqrt(3))/16 est simplifiée mais pas (4-4sqrt(3))/16 ??
     getRootsNode() {
         const delta = this.getDelta();
         if (delta < 0)
             return [];
         if (delta === 0)
             return [new rational_1.Rational(-this.b, 2 * this.a).simplify().toTree()];
-        return [
-            (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new substractNode_1.SubstractNode(new numberNode_1.NumberNode(-this.b), new real_1.SquareRoot(delta).simplify().toTree()), new numberNode_1.NumberNode(2 * this.a))),
-            (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new addNode_1.AddNode(new numberNode_1.NumberNode(-this.b), new real_1.SquareRoot(delta).simplify().toTree()), new numberNode_1.NumberNode(2 * this.a))),
-        ];
+        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();
+            return this.a > 0 ? [subNode, addNode] : [addNode, subNode];
+        }
+        let [sqrtA, sqrtB] = new real_1.SquareRoot(delta).getSimplifiedCoeffs();
+        let denum = 2 * this.a;
+        let trueB = this.b;
+        const pgcd = (0, mathjs_1.gcd)(sqrtA, trueB, denum);
+        [sqrtA, trueB, denum] = [sqrtA, trueB, denum].map((n) => n / pgcd);
+        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 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))];
+        }
     }
     getRootsEquationSolutionTex() {
         const roots = this.getRootsNode();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [