math-exercises 1.4.18 → 2.0.0

package/lib/exercises/functions/absolute/absoluteValueEquations.js

@@ -1,75 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbsoluteValueEquationsQuestion = exports.absoluteValueEquations = void 0;
+exports.absoluteValueEquations = void 0;
 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 coinFlip_1 = require("../../../utils/coinFlip");
 const probaFlip_1 = require("../../../utils/probaFlip");
-const uuid_1 = require("uuid");
-exports.absoluteValueEquations = {
-    id: 'absoluteValueEquation',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une équation avec valeur absolue',
-    levels: ['2nde', '1reESM'],
-    isSingleStep: true,
-    sections: ['Valeur absolue', 'Équations'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAbsoluteValueEquationsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getAbsoluteValueEquationsQuestion() {
+const getAbsoluteValueEquationsQuestion = () => {
     const poly = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10, [0]), 1]);
     const a = (0, probaFlip_1.probaFlip)(0.9) ? (0, randint_1.randint)(1, 10) : (0, coinFlip_1.coinFlip)() ? 0 : (0, randint_1.randint)(-9, 0);
     //|x-b| = a
     const b = -poly.coefficients[0];
     const answer = a === 0 ? `S=\\left\\{${b}\\right\\}` : a < 0 ? `S=\\emptyset` : `S=\\left\\{${b - a};${b + a}\\right\\}`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        if (a < 0) {
-            (0, exercise_1.tryToAddWrongProp)(res, `S=\\left\\{${b - a};${b + a}\\right\\}`);
-            (0, exercise_1.tryToAddWrongProp)(res, `S=\\left\\{${b + a}\\right\\}`);
-        }
-        else if (a === 0) {
-            (0, exercise_1.tryToAddWrongProp)(res, `S=\\emptyset`);
-        }
-        else if (a > 0) {
-            (0, exercise_1.tryToAddWrongProp)(res, `S=\\left\\{${b + a}\\right\\}`);
-            (0, exercise_1.tryToAddWrongProp)(res, `S=\\left\\{${-b - a};${-b + a}\\right\\}`);
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `S=\\left\\{${(0, randint_1.randint)(-9, 0)};${(0, randint_1.randint)(0, 10)}\\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, exercise_1.shuffleProps)(res, n);
-    };
     const question = {
         answer: answer,
         instruction: `Résoudre l'équation $|${poly.toTree().toTex()}| = ${a}$.`,
         keys: ['S', 'equal', 'emptyset', 'lbrace', 'semicolon', 'rbrace'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a, b },
     };
     return question;
-}
-exports.getAbsoluteValueEquationsQuestion = getAbsoluteValueEquationsQuestion;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    if (a < 0) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${b - a};${b + a}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${b + a}\\right\\}`);
+    }
+    else if (a === 0) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\emptyset`);
+    }
+    else if (a > 0) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${b + a}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${-b - a};${-b + a}\\right\\}`);
+    }
+    while (propositions.length < n) {
+        const wrongAnswer = `S=\\left\\{${(0, randint_1.randint)(-9, 0)};${(0, randint_1.randint)(0, 10)}\\right\\}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.absoluteValueEquations = {
+    id: 'absoluteValueEquation',
+    connector: '\\iff',
+    label: 'Résoudre une équation avec valeur absolue',
+    levels: ['2nde', '1reESM'],
+    isSingleStep: true,
+    sections: ['Valeur absolue', 'Équations'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAbsoluteValueEquationsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/functions/absolute/absoluteValueInequations.d.ts

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

package/lib/exercises/functions/absolute/absoluteValueInequations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"absoluteValueInequations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/absoluteValueInequations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAOhH,eAAO,MAAM,wBAAwB,EAAE,YAWtC,CAAC;AAEF,wBAAgB,mCAAmC,IAAI,QAAQ,CAoD9D"}
+{"version":3,"file":"absoluteValueInequations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/absoluteValueInequations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAiCnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrE,CAAC"}

package/lib/exercises/functions/absolute/absoluteValueInequations.js

@@ -1,67 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbsoluteValueInequationsQuestion = exports.absoluteValueInequations = void 0;
+exports.absoluteValueInequations = void 0;
 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 coinFlip_1 = require("../../../utils/coinFlip");
-const uuid_1 = require("uuid");
-exports.absoluteValueInequations = {
-    id: 'absoluteValueInequations',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une inéquation avec valeur absolue',
-    levels: ['2nde', '1reESM'],
-    isSingleStep: true,
-    sections: ['Valeur absolue', 'Inéquations', 'Ensembles et intervalles'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAbsoluteValueInequationsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getAbsoluteValueInequationsQuestion() {
+const getAbsoluteValueInequationsQuestion = () => {
     const poly = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10, [0]), 1]);
     const a = (0, randint_1.randint)(1, 10);
     //|x-b| <= a
     const b = -poly.coefficients[0];
     const isStrict = (0, coinFlip_1.coinFlip)();
     const answer = isStrict ? `S=]${b - a};${b + a}[` : `S=[${b - a};${b + a}]`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(res, `S=]${b - a};${b + a}[`);
-        (0, exercise_1.tryToAddWrongProp)(res, `S=[${b - a};${b + a}]`);
-        (0, exercise_1.tryToAddWrongProp)(res, `S=\\left\\{${b - a};${b + a}\\right\\}`);
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `S=[${(0, randint_1.randint)(-9, 0)};${(0, randint_1.randint)(0, 10)}]`;
-                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, exercise_1.shuffleProps)(res, n);
-    };
     const question = {
         answer,
         instruction: `Résoudre l'inéquation $|${poly.toTree().toTex()}|${isStrict ? '<' : '\\le'}${a}$.`,
         keys: ['S', 'equal', 'lbracket', 'semicolon', 'rbracket', 'emptyset'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a, b },
     };
     return question;
-}
-exports.getAbsoluteValueInequationsQuestion = getAbsoluteValueInequationsQuestion;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S=]${b - a};${b + a}[`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S=[${b - a};${b + a}]`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${b - a};${b + a}\\right\\}`);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=[${(0, randint_1.randint)(-9, 0)};${(0, randint_1.randint)(0, 10)}]`);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.absoluteValueInequations = {
+    id: 'absoluteValueInequations',
+    connector: '\\iff',
+    label: 'Résoudre une inéquation avec valeur absolue',
+    levels: ['2nde', '1reESM'],
+    isSingleStep: true,
+    sections: ['Valeur absolue', 'Inéquations', 'Ensembles et intervalles'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAbsoluteValueInequationsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/functions/affines/leadingCoefficient.d.ts

@@ -1,4 +1,12 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const leadingCoefficient: MathExercise;
-export declare function getLeadingCoefficientQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    xA: number;
+    yA: number;
+    xB: number;
+    yB: number;
+};
+type VEAProps = {};
+export declare const leadingCoefficient: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=leadingCoefficient.d.ts.map

package/lib/exercises/functions/affines/leadingCoefficient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,kBAAkB,EAAE,YAWhC,CAAC;AAEF,wBAAgB,6BAA6B,IAAI,QAAQ,CAkFxD"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsEnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}

package/lib/exercises/functions/affines/leadingCoefficient.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLeadingCoefficientQuestion = exports.leadingCoefficient = void 0;
+exports.leadingCoefficient = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const droite_1 = require("../../../math/geometry/droite");
 const point_1 = require("../../../math/geometry/point");
@@ -10,20 +11,7 @@ const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
 const mathjs_1 = require("mathjs");
-const uuid_1 = require("uuid");
-exports.leadingCoefficient = {
-    id: 'leadingCoefficient',
-    connector: '=',
-    instruction: '',
-    label: 'Lire le coefficient directeur',
-    levels: ['3ème', '2nde', '1reESM', '2ndPro', '1rePro', '1reTech'],
-    isSingleStep: false,
-    sections: ['Droites'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLeadingCoefficientQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getLeadingCoefficientQuestion() {
+const getLeadingCoefficientQuestion = () => {
     let xA, yA, xB, yB;
     let pointA, pointB;
     do {
@@ -55,42 +43,42 @@ function getLeadingCoefficientQuestion() {
         xmin = -bValue / aValue - 1;
         xmax = 1;
     }
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: droite.getLeadingCoefficient(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = droite.getLeadingCoefficient() !== '0'
-                    ? (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(droite.a, new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0, 1]))))
-                    : new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0]));
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.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 answer = droite.getLeadingCoefficient();
     const question = {
         instruction: 'Déterminer le coefficient directeur de la droite représentée ci-dessous : ',
-        answer: droite.getLeadingCoefficient(),
+        answer,
         keys: [],
         commands: [`f(x) = (${a}) * x + (${b})`],
         coords: [xmin, xmax, ymin, ymax],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, xA, xB, yA, yB },
     };
     return question;
-}
-exports.getLeadingCoefficientQuestion = getLeadingCoefficientQuestion;
+};
+const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const pointA = new point_1.Point('A', new numberNode_1.NumberNode(xA), new numberNode_1.NumberNode(yA));
+    const pointB = new point_1.Point('B', new numberNode_1.NumberNode(xB), new numberNode_1.NumberNode(yB));
+    const droite = droite_1.DroiteConstructor.fromTwoPoints(pointA, pointB, 'D');
+    const leadingCoefficient = droite.getLeadingCoefficient();
+    while (propositions.length < n) {
+        const wrongAnswer = leadingCoefficient !== '0'
+            ? (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(droite.a, new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0, 1]))))
+            : new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0]));
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.leadingCoefficient = {
+    id: 'leadingCoefficient',
+    connector: '=',
+    label: 'Lire le coefficient directeur',
+    levels: ['3ème', '2nde', '1reESM', '2ndPro', '1rePro', '1reTech'],
+    isSingleStep: false,
+    sections: ['Droites'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLeadingCoefficientQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/functions/affines/leadingCoefficientCalculV1.d.ts

@@ -1,4 +1,12 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const leadingCoefficientCalculV1: MathExercise;
-export declare function getLeadingCoefficientCalculV1Question(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    xA: number;
+    xB: number;
+    yA: number;
+    yB: number;
+};
+type VEAProps = {};
+export declare const leadingCoefficientCalculV1: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=leadingCoefficientCalculV1.d.ts.map

package/lib/exercises/functions/affines/leadingCoefficientCalculV1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,qCAAqC,IAAI,QAAQ,CAoDhE"}
+{"version":3,"file":"leadingCoefficientCalculV1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IAEX,EAAE,EAAE,MAAM,CAAC;IAEX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWvE,CAAC"}

package/lib/exercises/functions/affines/leadingCoefficientCalculV1.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLeadingCoefficientCalculV1Question = exports.leadingCoefficientCalculV1 = void 0;
+exports.leadingCoefficientCalculV1 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -8,11 +9,33 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getLeadingCoefficientCalculV1Question = () => {
+    const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
+    const xB = (0, randint_1.randint)(-9, 10, [xA]);
+    const yB = (0, randint_1.randint)(-9, 10);
+    const answer = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree().toTex();
+    const question = {
+        instruction: `Soit $f$ une fonction affine telle que $f(${xA})$ = $${yA}$ et $f(${xB})$ = $${yB}$.$\\\\$Quel est le coefficient directeur de $f$ ?`,
+        startStatement: 'a',
+        answer,
+        answerFormat: 'tex',
+        keys: [],
+        qcmGeneratorProps: { answer, xA, xB, yA, yB },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA + (0, randint_1.randint)(-3, 4, [0])), new numberNode_1.NumberNode(xB - xA + (0, randint_1.randint)(-3, 4, [0])))).toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.leadingCoefficientCalculV1 = {
     id: 'leadingCoefficientCalculV1',
     connector: '=',
-    instruction: '',
     label: "Calculer le coefficient directeur d'une fonction affine",
     levels: ['3ème', '2nde', '2ndPro', '1rePro', '1reTech'],
     isSingleStep: true,
@@ -20,44 +43,5 @@ exports.leadingCoefficientCalculV1 = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLeadingCoefficientCalculV1Question, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getLeadingCoefficientCalculV1Question() {
-    const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
-    const xB = (0, randint_1.randint)(-9, 10, [xA]);
-    const yB = (0, randint_1.randint)(-9, 10);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA), new numberNode_1.NumberNode(xB - xA))).toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA + (0, randint_1.randint)(-3, 4, [0])), new numberNode_1.NumberNode(xB - xA + (0, randint_1.randint)(-3, 4, [0])))).toTex();
-                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 = {
-        instruction: `Soit $f$ une fonction affine telle que $f(${xA})$ = $${yA}$ et $f(${xB})$ = $${yB}$.$\\\\$Quel est le coefficient directeur de $f$ ?`,
-        startStatement: 'a',
-        answer: new rational_1.Rational(yB - yA, xB - xA).simplify().toTree().toTex(),
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getLeadingCoefficientCalculV1Question = getLeadingCoefficientCalculV1Question;

package/lib/exercises/functions/affines/leadingCoefficientCalculV2.d.ts

@@ -1,4 +1,12 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const leadingCoefficientCalculV2: MathExercise;
-export declare function getLeadingCoefficientCalculV1Question(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    xA: number;
+    xB: number;
+    yA: number;
+    yB: number;
+};
+type VEAProps = {};
+export declare const leadingCoefficientCalculV2: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=leadingCoefficientCalculV2.d.ts.map

package/lib/exercises/functions/affines/leadingCoefficientCalculV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,qCAAqC,IAAI,QAAQ,CAmDhE"}
+{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8BnB,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWvE,CAAC"}

package/lib/exercises/functions/affines/leadingCoefficientCalculV2.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLeadingCoefficientCalculV1Question = exports.leadingCoefficientCalculV2 = void 0;
+exports.leadingCoefficientCalculV2 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -8,56 +9,38 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.leadingCoefficientCalculV2 = {
-    id: 'leadingCoefficientCalculV2',
-    connector: '=',
-    instruction: '',
-    label: "Coefficient directeur à l'aide de deux points",
-    levels: ['3ème', '2nde', '2ndPro', '1rePro', '1reTech'],
-    isSingleStep: false,
-    sections: ['Droites'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLeadingCoefficientCalculV1Question, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getLeadingCoefficientCalculV1Question() {
+const getLeadingCoefficientCalculV1Question = () => {
     const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
     const xB = (0, randint_1.randint)(-9, 10, [xA]);
     const yB = (0, randint_1.randint)(-9, 10);
     const answer = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree().toTex();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA + (0, randint_1.randint)(-3, 4, [0])), new numberNode_1.NumberNode(xB - xA + (0, randint_1.randint)(-3, 4, [0])))).toTex();
-                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 = {
         instruction: `Soit $d$ une droite passant par les points $A(${xA};${yA})$ et $B(${xB};${yB})$.$\\\\$Déterminer le coefficient directeur de $d$.`,
         answer: answer,
-        getPropositions,
         answerFormat: 'tex',
         keys: [],
+        qcmGeneratorProps: { answer, xA, xB, yA, yB },
     };
     return question;
-}
-exports.getLeadingCoefficientCalculV1Question = getLeadingCoefficientCalculV1Question;
+};
+const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA + (0, randint_1.randint)(-3, 4, [0])), new numberNode_1.NumberNode(xB - xA + (0, randint_1.randint)(-3, 4, [0])))).toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.leadingCoefficientCalculV2 = {
+    id: 'leadingCoefficientCalculV2',
+    connector: '=',
+    label: "Coefficient directeur à l'aide de deux points",
+    levels: ['3ème', '2nde', '2ndPro', '1rePro', '1reTech'],
+    isSingleStep: false,
+    sections: ['Droites'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLeadingCoefficientCalculV1Question, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/functions/affines/signFunction.d.ts

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

package/lib/exercises/functions/affines/signFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signFunction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/signFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,YAAY,EAAE,YAY1B,CAAC;AAEF,wBAAgB,eAAe,IAAI,QAAQ,CAuE1C"}
+{"version":3,"file":"signFunction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/signFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqDnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}