math-exercises 1.4.18 → 2.0.0

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

@@ -1,14 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVariationsFromAlgebricFormQuestion = exports.variationsFromAlgebricForm = void 0;
+exports.variationsFromAlgebricForm = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const trinom_1 = require("../../../math/polynomials/trinom");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getVariationsFromAlgebricFormQuestion = () => {
+    const isDevForm = (0, coinFlip_1.coinFlip)();
+    const trinom = isDevForm ? trinom_1.TrinomConstructor.random() : trinom_1.TrinomConstructor.randomCanonical();
+    const answer = trinom.a > 0 ? 'Décroissante puis croissante' : 'Croissante puis décroissante';
+    const question = {
+        answer: answer,
+        instruction: `Quelles sont les variations de la fonction $f$ définie par $f(x) = ${isDevForm ? trinom.toTree().toTex() : trinom.getCanonicalForm().toTex()}$ ?`,
+        answerFormat: 'raw',
+        qcmGeneratorProps: { answer, a: trinom.a },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.addWrongProp)(propositions, a < 0 ? 'Décroissante puis croissante' : 'Croissante puis décroissante', 'raw');
+    (0, exercise_1.addWrongProp)(propositions, 'Constante', 'raw');
+    (0, exercise_1.addWrongProp)(propositions, 'On ne peut pas savoir', 'raw');
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.variationsFromAlgebricForm = {
     id: 'variationsFromAlgebricForm',
-    instruction: '',
     label: "Déterminer les variations d'une fonction du second degré via sa forme algébrique",
     levels: ['1reSpé'],
     isSingleStep: true,
@@ -17,45 +36,5 @@ exports.variationsFromAlgebricForm = {
     answerType: 'QCM',
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getVariationsFromAlgebricFormQuestion() {
-    const isDevForm = (0, coinFlip_1.coinFlip)();
-    const trinom = isDevForm ? trinom_1.TrinomConstructor.random() : trinom_1.TrinomConstructor.randomCanonical();
-    const answer = trinom.a > 0 ? 'Décroissante puis croissante' : 'Croissante puis décroissante';
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'raw',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: trinom.a < 0 ? 'Décroissante puis croissante' : 'Croissante puis décroissante',
-            isRightAnswer: false,
-            format: 'raw',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: 'Constante',
-            isRightAnswer: false,
-            format: 'raw',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: 'On ne peut pas savoir',
-            isRightAnswer: false,
-            format: 'raw',
-        });
-        return (0, shuffle_1.shuffle)(res);
-    };
-    const question = {
-        answer: answer,
-        instruction: `Quelles sont les variations de la fonction $f$ définie par $f(x) = ${isDevForm ? trinom.toTree().toTex() : trinom.getCanonicalForm().toTex()}$ ?`,
-        getPropositions,
-        answerFormat: 'raw',
-    };
-    return question;
-}
-exports.getVariationsFromAlgebricFormQuestion = getVariationsFromAlgebricFormQuestion;

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

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

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,EAAmC,MAAM,0BAA0B,CAAC;AAUhH,eAAO,MAAM,wBAAwB,EAAE,YAYtC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAkEtD"}
+{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqDnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrE,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDistanceBetweenTwoPoints = exports.distanceBetweenTwoPoints = void 0;
+exports.distanceBetweenTwoPoints = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const point_1 = require("../../../math/geometry/point");
@@ -8,73 +8,58 @@ 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 uuid_1 = require("uuid");
-exports.distanceBetweenTwoPoints = {
-    id: 'distanceBetweenTwoPoints',
-    connector: '=',
-    instruction: '',
-    label: 'Distance entre deux points',
-    levels: ['2nde', '1reESM'],
-    sections: ['Géométrie cartésienne'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDistanceBetweenTwoPoints, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getDistanceBetweenTwoPoints() {
+const getDistanceBetweenTwoPoints = () => {
     const [coords1, coords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
     let A = new point_1.Point('A', new numberNode_1.NumberNode(coords1[0]), new numberNode_1.NumberNode(coords1[1]));
     let B = new point_1.Point('B', new numberNode_1.NumberNode(coords2[0]), new numberNode_1.NumberNode(coords2[1]));
     const answer = new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex();
-    const getPropositions = (n) => {
-        const res = [];
-        let isDuplicate;
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        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();
-        (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();
-        (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();
-        (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 });
-                const A = new point_1.Point('A', new numberNode_1.NumberNode(tempCoords1[0]), new numberNode_1.NumberNode(tempCoords1[1]));
-                const B = new point_1.Point('B', new numberNode_1.NumberNode(tempsCoords2[0]), new numberNode_1.NumberNode(tempsCoords2[1]));
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex(),
-                    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 = {
         instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Calculer la distance $AB$.`,
         startStatement: 'AB',
         answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, coords1, coords2 },
     };
     return question;
-}
-exports.getDistanceBetweenTwoPoints = getDistanceBetweenTwoPoints;
+};
+const getPropositions = (n, { answer, coords1, coords2 }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const xA = new numberNode_1.NumberNode(coords1[0]);
+    const xB = new numberNode_1.NumberNode(coords1[1]);
+    const yA = new numberNode_1.NumberNode(coords2[0]);
+    const yB = new numberNode_1.NumberNode(coords2[1]);
+    let A, B;
+    A = new point_1.Point('A', xA, xB);
+    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();
+    (0, exercise_1.tryToAddWrongProp)(propositions, wrongStatement);
+    A = new point_1.Point('A', xB, xA);
+    B = new point_1.Point('B', yA, yB);
+    wrongStatement = new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex();
+    (0, exercise_1.tryToAddWrongProp)(propositions, wrongStatement);
+    A = new point_1.Point('A', xA, yA);
+    B = new point_1.Point('B', xB, yB);
+    wrongStatement = new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex();
+    (0, exercise_1.tryToAddWrongProp)(propositions, wrongStatement);
+    while (propositions.length < n) {
+        const [tempCoords1, tempsCoords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
+        const A = new point_1.Point('A', new numberNode_1.NumberNode(tempCoords1[0]), new numberNode_1.NumberNode(tempCoords1[1]));
+        const B = new point_1.Point('B', new numberNode_1.NumberNode(tempsCoords2[0]), new numberNode_1.NumberNode(tempsCoords2[1]));
+        (0, exercise_1.tryToAddWrongProp)(propositions, new real_1.SquareRoot((0, round_1.round)(A.distanceTo(B) ** 2, 0)).simplify().toTree().toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.distanceBetweenTwoPoints = {
+    id: 'distanceBetweenTwoPoints',
+    connector: '=',
+    label: 'Distance entre deux points',
+    levels: ['2nde', '1reESM'],
+    sections: ['Géométrie cartésienne'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDistanceBetweenTwoPoints, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/geometry/cartesian/midpoint.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,QAAQ,EAAE,YAYtB,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAiD9C"}
+{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/cartesian/midpoint.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,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrD,CAAC"}

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

@@ -1,65 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMidpointQuestion = exports.midpoint = void 0;
+exports.midpoint = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const point_1 = require("../../../math/geometry/point");
 const randTupleInt_1 = require("../../../math/utils/random/randTupleInt");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getMidpointQuestion = () => {
+    const [coords1, coords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
+    const A = new point_1.Point('A', new numberNode_1.NumberNode(coords1[0]), new numberNode_1.NumberNode(coords1[1]));
+    const B = new point_1.Point('B', new numberNode_1.NumberNode(coords2[0]), new numberNode_1.NumberNode(coords2[1]));
+    const answer = A.midpoint(B).toTexWithCoords();
+    const question = {
+        instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Quelles sont les coordonnées du milieu $I$ de $[AB]$ ?`,
+        startStatement: 'I',
+        answer,
+        keys: ['I', 'semicolon'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const [tempCoords1, tempsCoords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
+        const temps1 = new point_1.Point('A', new numberNode_1.NumberNode(tempCoords1[0]), new numberNode_1.NumberNode(tempCoords1[1]));
+        const temps2 = new point_1.Point('B', new numberNode_1.NumberNode(tempsCoords2[0]), new numberNode_1.NumberNode(tempsCoords2[1]));
+        const wrongAnswer = temps1.midpoint(temps2);
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTexWithCoords());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.midpoint = {
     id: 'midpoint',
     connector: '=',
-    instruction: '',
     label: 'Coordonnées du milieu',
     levels: ['3ème', '2nde'],
     isSingleStep: false,
     sections: ['Géométrie cartésienne'],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMidpointQuestion, nb),
-    keys: ['semicolon'],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getMidpointQuestion() {
-    const [coords1, coords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
-    const A = new point_1.Point('A', new numberNode_1.NumberNode(coords1[0]), new numberNode_1.NumberNode(coords1[1]));
-    const B = new point_1.Point('B', new numberNode_1.NumberNode(coords2[0]), new numberNode_1.NumberNode(coords2[1]));
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: A.midpoint(B).toTexWithCoords(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const [tempCoords1, tempsCoords2] = (0, randTupleInt_1.distinctRandTupleInt)(2, 2, { from: -9, to: 10 });
-                const temps1 = new point_1.Point('A', new numberNode_1.NumberNode(tempCoords1[0]), new numberNode_1.NumberNode(tempCoords1[1]));
-                const temps2 = new point_1.Point('B', new numberNode_1.NumberNode(tempsCoords2[0]), new numberNode_1.NumberNode(tempsCoords2[1]));
-                const wrongAnswer = temps1.midpoint(temps2);
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.toTexWithCoords(),
-                    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 $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Quelles sont les coordonnées du milieu $I$ de $[AB]$ ?`,
-        startStatement: 'I',
-        answer: A.midpoint(B).toTexWithCoords(),
-        keys: ['I', 'semicolon'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getMidpointQuestion = getMidpointQuestion;

package/lib/exercises/geometry/euclidean/circleArea.d.ts

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

package/lib/exercises/geometry/euclidean/circleArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/circleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAe,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,UAAU,EAAE,YAWxB,CAAC;AAEF,wBAAgB,aAAa,IAAI,QAAQ,CAgDxC"}
+{"version":3,"file":"circleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/circleArea.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;AA8BnB,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWvD,CAAC"}

package/lib/exercises/geometry/euclidean/circleArea.js

@@ -1,16 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCircleArea = exports.circleArea = void 0;
+exports.circleArea = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getCircleArea = () => {
+    const radius = (0, randint_1.randint)(1, 13);
+    const diametre = (0, randint_1.randint)(1, 21);
+    const coin = (0, coinFlip_1.coinFlip)();
+    const answerNb = coin ? (0, round_1.round)(Math.PI * radius ** 2, 2) : (0, round_1.round)(Math.PI * (diametre / 2) ** 2, 2);
+    const answer = (answerNb + '').replace('.', ',');
+    const question = {
+        instruction: `Calculer l'aire d'un cercle de ${coin ? 'rayon ' + radius : 'diamètre ' + diametre} cm.`,
+        answer,
+        answerFormat: 'tex',
+        keys: [],
+        qcmGeneratorProps: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(Math.random() * 100, 2) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.circleArea = {
     id: 'circleArea',
     connector: '=',
-    instruction: '',
     label: "Calculer l'aire d'un cercle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -18,44 +40,5 @@ exports.circleArea = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCircleArea, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getCircleArea() {
-    const radius = (0, randint_1.randint)(1, 13);
-    const diametre = (0, randint_1.randint)(1, 21);
-    const coin = (0, coinFlip_1.coinFlip)();
-    const correctAnswer = coin ? (0, round_1.round)(Math.PI * radius ** 2, 2) + '' : (0, round_1.round)(Math.PI * (diametre / 2) ** 2, 2) + '';
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: correctAnswer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, round_1.round)(Math.random() * 100, 2) + '';
-                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: `Calculer l'aire d'un cercle de ${coin ? 'rayon ' + radius : 'diamètre ' + diametre} cm.`,
-        answer: correctAnswer.replace('.', ','),
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getCircleArea = getCircleArea;

package/lib/exercises/geometry/euclidean/circleCircumference.d.ts

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

package/lib/exercises/geometry/euclidean/circleCircumference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circleCircumference.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/circleCircumference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAe,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,mBAAmB,EAAE,YAWjC,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CAgDjD"}
+{"version":3,"file":"circleCircumference.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/circleCircumference.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8BnB,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}

package/lib/exercises/geometry/euclidean/circleCircumference.js

@@ -1,16 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCircleCircumference = exports.circleCircumference = void 0;
+exports.circleCircumference = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getCircleCircumference = () => {
+    const radius = (0, randint_1.randint)(1, 13);
+    const diametre = (0, randint_1.randint)(1, 21);
+    const coin = (0, coinFlip_1.coinFlip)();
+    const answerNb = coin ? (0, round_1.round)(2 * Math.PI * radius, 2) : (0, round_1.round)(Math.PI * diametre, 2);
+    const answer = (answerNb + '').replace('.', ',');
+    const question = {
+        instruction: `Calculer la circonférence d'un cercle de ${coin ? 'rayon ' + radius : 'diamètre ' + diametre} cm.`,
+        answer: answer,
+        answerFormat: 'tex',
+        keys: [],
+        qcmGeneratorProps: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(Math.random() * 100, 2) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.circleCircumference = {
     id: 'circleCircumference',
     connector: '=',
-    instruction: '',
     label: "Calculer la circonférence d'un cercle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -18,44 +40,5 @@ exports.circleCircumference = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCircleCircumference, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getCircleCircumference() {
-    const radius = (0, randint_1.randint)(1, 13);
-    const diametre = (0, randint_1.randint)(1, 21);
-    const coin = (0, coinFlip_1.coinFlip)();
-    const correctAnswer = coin ? (0, round_1.round)(2 * Math.PI * radius, 2) + '' : (0, round_1.round)(Math.PI * diametre, 2) + '';
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: correctAnswer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, round_1.round)(Math.random() * 100, 2) + '';
-                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: `Calculer la circonférence d'un cercle de ${coin ? 'rayon ' + radius : 'diamètre ' + diametre} cm.`,
-        answer: correctAnswer.replace('.', ','),
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getCircleCircumference = getCircleCircumference;

package/lib/exercises/geometry/euclidean/pythagore.d.ts

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

package/lib/exercises/geometry/euclidean/pythagore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pythagore.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/pythagore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,SAAS,EAAE,YAWvB,CAAC;AAEF,wBAAgB,YAAY,IAAI,QAAQ,CA8EvC"}
+{"version":3,"file":"pythagore.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/pythagore.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IAEd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWtD,CAAC"}