math-exercises 1.4.18 → 2.0.1

package/lib/exercises/functions/cube/cubicEquation.js

@@ -1,14 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCubicEquationQuestion = exports.cubicEquation = void 0;
+exports.cubicEquation = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getCubicEquationQuestion = () => {
+    const x = (0, randint_1.randint)(-10, 11);
+    const k = x ** 3;
+    const answer = `S=\\left\\{${x}\\right\\}`;
+    const question = {
+        answer: answer,
+        instruction: `Résoudre l'équation suivante : $x^3 = ${k}$`,
+        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, k },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, k }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{${k ** 3}\\}`);
+    while (propositions.length < n) {
+        const wrongAnswer = (0, randint_1.randint)(-10, 11) + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{${wrongAnswer}\\}`);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.cubicEquation = {
     id: 'cubicEquation',
     connector: '\\iff',
-    instruction: '',
     label: 'Résoudre une équation du type $x^3 = k$',
     levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
     isSingleStep: true,
@@ -17,52 +39,5 @@ exports.cubicEquation = {
     qcmTimer: 60,
     freeTimer: 60,
     maxAllowedQuestions: 20,
+    getPropositions,
 };
-function getCubicEquationQuestion() {
-    const x = (0, randint_1.randint)(-10, 11);
-    const k = x ** 3;
-    const answer = `S=\\left\\{${x}\\right\\}`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        if (x ** 3 !== k ** 3) {
-            res.push({
-                id: (0, uuid_1.v4)(),
-                statement: `S=\\{${k ** 3}\\}`,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, randint_1.randint)(-10, 11) + '';
-                proposition = {
-                    id: (0, uuid_1.v4)() + ``,
-                    statement: `S=\\{${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: `Résoudre l'équation suivante : $x^3 = ${k}$`,
-        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getCubicEquationQuestion = getCubicEquationQuestion;

package/lib/exercises/functions/rationalFraction/rationalFractionForbiddenValue.d.ts

@@ -0,0 +1,12 @@
+import { MathExercise } from "../../../exercises/exercise";
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+};
+type VEAProps = {};
+export declare const rationalFractionForbiddenValue: MathExercise<QCMProps, VEAProps>;
+export {};
+//# sourceMappingURL=rationalFractionForbiddenValue.d.ts.map

package/lib/exercises/functions/rationalFraction/rationalFractionForbiddenValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rationalFractionForbiddenValue.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/rationalFraction/rationalFractionForbiddenValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3E,CAAC"}

package/lib/exercises/functions/rationalFraction/rationalFractionForbiddenValue.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rationalFractionForbiddenValue = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const affine_1 = require("../../../math/polynomials/affine");
+const randint_1 = require("../../../math/utils/random/randint");
+const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getRationalFractionForbiddenValueQuestion = () => {
+    const a = (0, randint_1.randint)(-10, 11, [0]);
+    const b = (0, randint_1.randint)(-10, 11);
+    //pour éviter affine2 = k*affine1
+    let c, d;
+    do {
+        c = (0, randint_1.randint)(-10, 11, [0]);
+        d = (0, randint_1.randint)(-10, 11);
+    } while (a * d - b * c === 0);
+    const affine1 = new affine_1.Affine(a, b);
+    const affine2 = new affine_1.Affine(c, d);
+    const fct = new fractionNode_1.FractionNode(affine1.toTree(), affine2.toTree());
+    const fctTex = fct.toTex();
+    const answerTree = new rational_1.Rational(-d, c).simplify().toTree();
+    const answer = answerTree.toTex();
+    const question = {
+        answer,
+        instruction: `Soit $f(x)=${fctTex}$. Quelle est la valeur interdite de la fonction $f$ ?`,
+        keys: [],
+        answerFormat: "tex",
+        qcmGeneratorProps: { answer, a, b, c, d },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b, c, d }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(-b, a).simplify().toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, d + "");
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-10, 11) + "");
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.rationalFractionForbiddenValue = {
+    id: "rationalFractionForbiddenValue",
+    connector: "=",
+    label: "Déterminer la valeur interdite d'un quotient de polynôme",
+    levels: ["2nde", "1reESM", "1reSpé"],
+    isSingleStep: true,
+    sections: ["Fonctions", "Fractions", "Fonctions affines"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRationalFractionForbiddenValueQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

@@ -1,4 +1,8 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const alphaBetaFromDevForm: MathExercise;
-export declare function getAlphaBetaFromDevFormQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+};
+type VEAProps = {};
+export declare const alphaBetaFromDevForm: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=alphaBetaFromDevForm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"alphaBetaFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/alphaBetaFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,oBAAoB,EAAE,YAWlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CAmD1D"}
+{"version":3,"file":"alphaBetaFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/alphaBetaFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}

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

@@ -1,65 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAlphaBetaFromDevFormQuestion = exports.alphaBetaFromDevForm = void 0;
+exports.alphaBetaFromDevForm = 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 coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.alphaBetaFromDevForm = {
-    id: 'alphaBetaFromDevForm',
-    connector: '=',
-    instruction: '',
-    label: 'Déterminer $\\alpha$ ou $\\beta$ à partir de la forme développée',
-    levels: ['1reSpé'],
-    isSingleStep: false,
-    sections: ['Second degré'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAlphaBetaFromDevFormQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getAlphaBetaFromDevFormQuestion() {
+const getAlphaBetaFromDevFormQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.randomCanonical();
     const param = (0, coinFlip_1.coinFlip)() ? '\\alpha' : '\\beta';
-    const alpha = trinom.getAlpha();
-    const beta = trinom.getBeta();
     const alphaTex = trinom.getAlphaNode().toTex();
     const betaTex = trinom.getBetaNode().toTex();
     const answer = param === '\\alpha' ? alphaTex : betaTex;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: (0, randint_1.randint)(-10, 11).toString(),
-                    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,
         keys: ['x', 'alpha', 'beta'],
         instruction: `Soit $f$ la fonction définie par $f(x) = ${trinom.toTree().toTex()}$. Que vaut $${param}$ ?`,
-        getPropositions,
         answerFormat: 'tex',
         startStatement: param,
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getAlphaBetaFromDevFormQuestion = getAlphaBetaFromDevFormQuestion;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-10, 11).toString());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.alphaBetaFromDevForm = {
+    id: 'alphaBetaFromDevForm',
+    connector: '=',
+    label: 'Déterminer $\\alpha$ ou $\\beta$ à partir de la forme développée',
+    levels: ['1reSpé'],
+    isSingleStep: false,
+    sections: ['Second degré'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAlphaBetaFromDevFormQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

@@ -1,4 +1,12 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const alphaBetaInCanonicalForm: MathExercise;
-export declare function getAlphaBetaInCanonicalFormQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    param: string;
+    a: number;
+    alpha: number;
+    beta: number;
+};
+type VEAProps = {};
+export declare const alphaBetaInCanonicalForm: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=alphaBetaInCanonicalForm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"alphaBetaInCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/alphaBetaInCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,wBAAwB,EAAE,YAWtC,CAAC;AAEF,wBAAgB,mCAAmC,IAAI,QAAQ,CA4E9D"}
+{"version":3,"file":"alphaBetaInCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/alphaBetaInCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2CnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrE,CAAC"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAlphaBetaInCanonicalFormQuestion = exports.alphaBetaInCanonicalForm = void 0;
+exports.alphaBetaInCanonicalForm = 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");
@@ -9,20 +10,7 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.alphaBetaInCanonicalForm = {
-    id: 'alphaInCanonicalForm',
-    connector: '=',
-    instruction: '',
-    label: 'Identifier $\\alpha$ et $\\beta$ dans la forme canonique',
-    levels: ['1reSpé'],
-    isSingleStep: true,
-    sections: ['Second degré'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAlphaBetaInCanonicalFormQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getAlphaBetaInCanonicalFormQuestion() {
+const getAlphaBetaInCanonicalFormQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.randomCanonical();
     const param = (0, coinFlip_1.coinFlip)() ? '\\alpha' : '\\beta';
     const alpha = trinom.getAlpha();
@@ -30,64 +18,41 @@ function getAlphaBetaInCanonicalFormQuestion() {
     const alphaTex = trinom.getAlphaNode().toTex();
     const betaTex = trinom.getBetaNode().toTex();
     const answer = param === '\\alpha' ? alphaTex : betaTex;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        if (beta !== alpha)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: param === '\\alpha' ? betaTex : alphaTex,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (alpha !== 0 && (param === '\\alpha' || beta !== -alpha))
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: (0, simplify_1.simplifyNode)(new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(alpha))).toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (!res.some((prop) => prop.statement === trinom.a.toString())) {
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: trinom.a.toString(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, randint_1.randint)(-10, 11);
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.toString(),
-                    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 = {
         instruction: `Soit $f$ la fonction définie par $f(x) = ${trinom
             .getCanonicalForm()
             .toTex()}$. Que vaut $${param}$ ?`,
         answer: answer,
         keys: ['x', 'alpha', 'beta'],
-        getPropositions,
         answerFormat: 'tex',
         startStatement: param,
+        qcmGeneratorProps: { answer, param, a: trinom.a, alpha, beta },
     };
     return question;
-}
-exports.getAlphaBetaInCanonicalFormQuestion = getAlphaBetaInCanonicalFormQuestion;
+};
+const getPropositions = (n, { answer, param, alpha, beta, a }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const alphaNode = new numberNode_1.NumberNode(alpha);
+    const alphaTex = alphaNode.toTex();
+    const betaTex = new numberNode_1.NumberNode(beta).toTex();
+    (0, exercise_1.tryToAddWrongProp)(propositions, param === '\\alpha' ? betaTex : alphaTex);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(alpha))).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, a.toString());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-10, 11) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.alphaBetaInCanonicalForm = {
+    id: 'alphaInCanonicalForm',
+    connector: '=',
+    label: 'Identifier $\\alpha$ et $\\beta$ dans la forme canonique',
+    levels: ['1reSpé'],
+    isSingleStep: true,
+    sections: ['Second degré'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAlphaBetaInCanonicalFormQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

@@ -1,4 +1,9 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const canonicalFromDevForm: MathExercise;
-export declare function getCanonicalFromDevFormQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    a: number;
+};
+type VEAProps = {};
+export declare const canonicalFromDevForm: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=canonicalFromDevForm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"canonicalFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/canonicalFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,oBAAoB,EAAE,YAWlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CA8C1D"}
+{"version":3,"file":"canonicalFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/canonicalFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}

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

@@ -1,16 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCanonicalFromDevFormQuestion = exports.canonicalFromDevForm = void 0;
+exports.canonicalFromDevForm = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const trinom_1 = require("../../../math/polynomials/trinom");
 const discreteSet_1 = require("../../../math/sets/discreteSet");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getCanonicalFromDevFormQuestion = () => {
+    const trinom = trinom_1.TrinomConstructor.randomCanonical();
+    const answer = trinom.getCanonicalForm().toTex();
+    const question = {
+        answer,
+        keys: ['x', 'equal', 'alpha', 'beta'],
+        instruction: `Déterminer la forme canonique de la fonction $f$ définie par $f(x) = ${trinom.toTree().toTex()}$`,
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: trinom.a },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, trinom_1.TrinomConstructor.randomCanonical(new discreteSet_1.DiscreteSet([new integer_1.Integer(a), new integer_1.Integer(-a)]))
+            .getCanonicalForm()
+            .toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.canonicalFromDevForm = {
     id: 'canonicalFromDevForm',
     connector: '\\iff',
-    instruction: '',
     label: 'Déterminer la forme canonique à partir de la forme développée',
     levels: ['1reSpé'],
     isSingleStep: false,
@@ -18,43 +39,5 @@ exports.canonicalFromDevForm = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCanonicalFromDevFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getCanonicalFromDevFormQuestion() {
-    const trinom = trinom_1.TrinomConstructor.randomCanonical();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: trinom.getCanonicalForm().toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: trinom_1.TrinomConstructor.randomCanonical(new discreteSet_1.DiscreteSet([new integer_1.Integer(trinom.a), new integer_1.Integer(-trinom.a)]))
-                        .getCanonicalForm()
-                        .toTex(),
-                    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: trinom.getCanonicalForm().toTex(),
-        keys: ['x', 'equal', 'alpha', 'beta'],
-        instruction: `Déterminer la forme canonique de la fonction $f$ définie par $f(x) = ${trinom.toTree().toTex()}$`,
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getCanonicalFromDevFormQuestion = getCanonicalFromDevFormQuestion;

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const deltaTrinom: MathExercise;
-export declare function getDeltaTrinomQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+    c: number;
+};
+type VEAProps = {};
+export declare const deltaTrinom: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=deltaTrinom.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deltaTrinom.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/deltaTrinom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,WAAW,EAAE,YAWzB,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CA4DjD"}
+{"version":3,"file":"deltaTrinom.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/deltaTrinom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYxD,CAAC"}

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

@@ -1,15 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeltaTrinomQuestion = exports.deltaTrinom = void 0;
+exports.deltaTrinom = 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");
+const getDeltaTrinomQuestion = () => {
+    const trinom = trinom_1.TrinomConstructor.random();
+    const answer = trinom.getDelta() + '';
+    const question = {
+        answer: answer,
+        instruction: `Soit $f(x) = ${trinom.toTree().toTex()}$. Calculer le discriminant $\\Delta$.`,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: trinom.a, b: trinom.b, c: trinom.c },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b, c }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const bMinus4ac = b - 4 * a * c;
+    (0, exercise_1.tryToAddWrongProp)(propositions, bMinus4ac + '');
+    const bSquarePlus4ac = b ** 2 + a * c;
+    (0, exercise_1.tryToAddWrongProp)(propositions, bSquarePlus4ac + '');
+    while (propositions.length < n) {
+        const wrongAnswer = (0, randint_1.randint)(-100, 100) + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.deltaTrinom = {
     id: 'deltaTrinom',
     connector: '=',
-    instruction: '',
+    getPropositions,
     label: "Calculer le discriminant d'un trinôme",
     levels: ['1reSpé', 'TermSpé', 'MathComp'],
     isSingleStep: true,
@@ -18,58 +43,3 @@ exports.deltaTrinom = {
     qcmTimer: 60,
     freeTimer: 60,
 };
-function getDeltaTrinomQuestion() {
-    const trinom = trinom_1.TrinomConstructor.random();
-    const answer = trinom.getDelta();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const bMinus4ac = trinom.b - 4 * trinom.a * trinom.c;
-        if (bMinus4ac !== answer)
-            res.push({
-                id: (0, uuid_1.v4)(),
-                statement: bMinus4ac + '',
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        const bSquarePlus4ac = trinom.b ** 2 + trinom.a * trinom.c;
-        if (bSquarePlus4ac !== answer && bSquarePlus4ac !== bMinus4ac)
-            res.push({
-                id: (0, uuid_1.v4)(),
-                statement: bSquarePlus4ac + '',
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, randint_1.randint)(-100, 100) + '';
-                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()}$. Calculer le discriminant $\\Delta$.`,
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getDeltaTrinomQuestion = getDeltaTrinomQuestion;