math-exercises 1.4.18 → 2.0.1

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

@@ -1,89 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPythagore = exports.pythagore = void 0;
+exports.pythagore = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const triangles_1 = require("../../../math/geometry/triangles");
 const randint_1 = require("../../../math/utils/random/randint");
-const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.pythagore = {
-    id: 'pythagore',
-    connector: '=',
-    instruction: '',
-    label: "Écrire l'égalité de Pythagore",
-    levels: ['4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPythagore, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getPythagore() {
+const getPythagore = () => {
     const vertices = [];
     const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
     for (let i = 0; i < 3; i++)
         vertices.push(String.fromCharCode(code + i));
     const triangle = triangles_1.TriangleConstructor.createRandomRightTriangle({ minRapport: 0.7, maxRapport: 1.3, names: vertices });
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: `${triangle.getSideAName()}^2 = ${triangle.getSideBName()}^2 + ${triangle.getSideCName()}^2`,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: `${triangle.getSideAName()} = ${triangle.getSideBName()} + ${triangle.getSideCName()}`,
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: `${triangle.getSideAName()}^2 = ${triangle.getSideBName()}^2 - ${triangle.getSideCName()}^2`,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: `${triangle.getSideBName()}^2 = ${triangle.getSideAName()}^2 + ${triangle.getSideCName()}^2`,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 4)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: `${triangle.getSideCName()}^2 = ${triangle.getSideAName()}^2 + ${triangle.getSideBName()}^2`,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 5)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: `${triangle.getSideAName()}^2 = ${triangle.getSideBName()} + ${triangle.getSideCName()}^2`,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 6)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: `${triangle.getSideAName()}^2 = ${triangle.getSideBName()}^2 + ${triangle.getSideCName()}`,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        return (0, shuffle_1.shuffle)(res);
-    };
+    const sideA = triangle.getSideAName();
+    const sideB = triangle.getSideBName();
+    const sideC = triangle.getSideCName();
+    const answer = `${sideA}^2=${sideB}^2+${sideC}^2`;
     const question = {
         instruction: "Écrire l'égalité de Pythagore pour la figure suivante : ",
-        answer: `${triangle.getSideAName()}^2=${triangle.getSideBName()}^2+${triangle.getSideCName()}^2`,
+        answer,
         keys: [...vertices, 'equal'],
         commands: triangle.generateCommands({}),
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, sideA, sideB, sideC },
     };
     return question;
-}
-exports.getPythagore = getPythagore;
+};
+const getPropositions = (n, { answer, sideA, sideB, sideC }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA} = ${sideB} + ${sideC}`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2 = ${sideB}^2 - ${sideC}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideB}^2 = ${sideA}^2 + ${sideC}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideC}^2 = ${sideA}^2 + ${sideB}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2 = ${sideB} + ${sideC}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2 = ${sideB}^2 + ${sideC}`);
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.pythagore = {
+    id: 'pythagore',
+    connector: '=',
+    label: "Écrire l'égalité de Pythagore",
+    levels: ['4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPythagore, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"pythagoreCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/pythagoreCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,eAAe,EAAE,YAW7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CA0F7C"}
+{"version":3,"file":"pythagoreCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/pythagoreCalcul.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;AAyEnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}

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

@@ -1,26 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPythagoreCalcul = exports.pythagoreCalcul = void 0;
+exports.pythagoreCalcul = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const triangles_1 = require("../../../math/geometry/triangles");
 const real_1 = require("../../../math/numbers/reals/real");
 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.pythagoreCalcul = {
-    id: 'pythagoreCalcul',
-    connector: '=',
-    instruction: '',
-    label: 'Utiliser le théoreme de Pythagore pour faire des calculs',
-    levels: ['4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPythagoreCalcul, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getPythagoreCalcul() {
+const getPythagoreCalcul = () => {
     const vertices = [];
     const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
     for (let i = 0; i < 3; i++)
@@ -52,42 +40,38 @@ function getPythagoreCalcul() {
             highlightedSide: sides[randoms[2]],
         }),
     ];
-    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 temp = (0, randint_1.randint)(2, 300);
-                const squareRoot = new real_1.SquareRoot(temp);
-                const wrongAnswer = Math.sqrt(temp) === Math.floor(Math.sqrt(temp)) ? Math.sqrt(temp).toString() : squareRoot.toTree().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);
-    };
+    answer = answer + '';
     const question = {
         instruction: `Dans le triangle ${triangle.getTriangleName()} ci-dessous rectangle en ${triangle.getRightAngle()}, on sait que ${sides[randoms[0]]} = $${sideLengths[randoms[0]]}$ et que ${sides[randoms[1]]} = $${sideLengths[randoms[1]]}$.$\\\\$Calculer la longueur exacte ${sides[randoms[2]]}`,
-        answer: answer + '',
+        answer,
         keys: [...vertices, 'equal'],
         commands,
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getPythagoreCalcul = getPythagoreCalcul;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const temp = (0, randint_1.randint)(2, 300);
+        const squareRoot = new real_1.SquareRoot(temp);
+        const wrongAnswer = Math.sqrt(temp) === Math.floor(Math.sqrt(temp)) ? Math.sqrt(temp).toString() : squareRoot.toTree().toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.pythagoreCalcul = {
+    id: 'pythagoreCalcul',
+    connector: '=',
+    label: 'Utiliser le théoreme de Pythagore pour faire des calculs',
+    levels: ['4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPythagoreCalcul, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"rectangleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/rectangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,aAAa,EAAE,YAW3B,CAAC;AAEF,wBAAgB,gBAAgB,IAAI,QAAQ,CA4C3C"}
+{"version":3,"file":"rectangleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/rectangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAIlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2BnB,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}

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

@@ -1,14 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRectangleArea = exports.rectangleArea = void 0;
+exports.rectangleArea = 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 getRectangleArea = () => {
+    const length = (0, randint_1.randint)(3, 13);
+    const width = (0, randint_1.randint)(1, length);
+    const answer = length * width + '';
+    const question = {
+        instruction: `Calculer l'aire d'un rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`,
+        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, randint_1.randint)(3, 13) * (0, randint_1.randint)(3, 13) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.rectangleArea = {
     id: 'rectangleArea',
     connector: '=',
-    instruction: '',
     label: "Calculer l'aire d'un rectangle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -16,41 +36,5 @@ exports.rectangleArea = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRectangleArea, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getRectangleArea() {
-    const length = (0, randint_1.randint)(3, 13);
-    const width = (0, randint_1.randint)(1, length);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: length * width + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: (0, randint_1.randint)(3, 13) * (0, randint_1.randint)(3, 13) + '',
-                    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 rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`,
-        answer: length * width + '',
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getRectangleArea = getRectangleArea;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"rectanglePerimeter.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/rectanglePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,kBAAkB,EAAE,YAWhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CA4ChD"}
+{"version":3,"file":"rectanglePerimeter.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/rectanglePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2BnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}

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

@@ -1,14 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRectanglePerimeter = exports.rectanglePerimeter = void 0;
+exports.rectanglePerimeter = 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 getRectanglePerimeter = () => {
+    const length = (0, randint_1.randint)(3, 13);
+    const width = (0, randint_1.randint)(1, length);
+    const answer = (length + width) * 2 + '';
+    const question = {
+        instruction: `Calculer le périmètre d'un rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`,
+        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, randint_1.randint)(3, 13) + (0, randint_1.randint)(1, 13)) * 2 + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.rectanglePerimeter = {
     id: 'rectanglePerimeter',
     connector: '=',
-    instruction: '',
     label: "Calculer le périmètre d'un rectangle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -16,41 +36,5 @@ exports.rectanglePerimeter = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRectanglePerimeter, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getRectanglePerimeter() {
-    const length = (0, randint_1.randint)(3, 13);
-    const width = (0, randint_1.randint)(1, length);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: (length + width) * 2 + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: ((0, randint_1.randint)(3, 13) + (0, randint_1.randint)(1, 13)) * 2 + '',
-                    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 le périmètre d'un rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`,
-        answer: (length + width) * 2 + '',
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getRectanglePerimeter = getRectanglePerimeter;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"rightTriangleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/rightTriangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,iBAAiB,EAAE,YAW/B,CAAC;AAEF,wBAAgB,oBAAoB,IAAI,QAAQ,CA4D/C"}
+{"version":3,"file":"rightTriangleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/rightTriangleArea.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;AA6CnB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}

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

@@ -1,24 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRightTriangleArea = exports.rightTriangleArea = void 0;
+exports.rightTriangleArea = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const triangles_1 = require("../../../math/geometry/triangles");
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.rightTriangleArea = {
-    id: 'rightTriangleArea',
-    connector: '=',
-    instruction: '',
-    label: "Calculer l'aire d'un triangle rectangle",
-    levels: ['4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRightTriangleArea, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getRightTriangleArea() {
+const getRightTriangleArea = () => {
     const vertices = [];
     const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
     for (let i = 0; i < 3; i++)
@@ -31,39 +19,35 @@ function getRightTriangleArea() {
             setCaptions: [sidesLength[0] + '', sidesLength[1] + ''],
         }),
     ];
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: (sidesLength[0] * sidesLength[1]) / 2 + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: ((0, randint_1.randint)(2, 12) * (0, randint_1.randint)(2, 12)) / 2 + '',
-                    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 = ((sidesLength[0] * sidesLength[1]) / 2 + '').replace('.', ',');
     const question = {
         instruction: `Calculer l'aire du triangle ${triangle.getTriangleName()} rectangle en ${triangle.getRightAngle()} sachant que ${triangle.getSideBName()} = $${sidesLength[0]}$ cm et ${triangle.getSideCName()} = $${sidesLength[1]}$ cm.`,
-        answer: ((sidesLength[0] * sidesLength[1]) / 2 + '').replace('.', ','),
+        answer,
         keys: [...vertices, 'equal', 'cm2'],
         commands,
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getRightTriangleArea = getRightTriangleArea;
+};
+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)(2, 12) * (0, randint_1.randint)(2, 12)) / 2 + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.rightTriangleArea = {
+    id: 'rightTriangleArea',
+    connector: '=',
+    label: "Calculer l'aire d'un triangle rectangle",
+    levels: ['4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRightTriangleArea, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

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

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

@@ -1,14 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSquareArea = exports.squareArea = void 0;
+exports.squareArea = 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 getSquareArea = () => {
+    const side = (0, randint_1.randint)(1, 21);
+    const answer = side ** 2 + '';
+    const question = {
+        instruction: `Calculer l'aire d'un carré de $${side}$ cm de côté.`,
+        answer: side ** 2 + '',
+        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, randint_1.randint)(1, 13) ** 2 + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.squareArea = {
     id: 'squareArea',
     connector: '=',
-    instruction: '',
     label: "Calculer l'aire d'un carré",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -17,40 +36,5 @@ exports.squareArea = {
     qcmTimer: 60,
     freeTimer: 60,
     maxAllowedQuestions: 20,
+    getPropositions,
 };
-function getSquareArea() {
-    const side = (0, randint_1.randint)(1, 21);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: side ** 2 + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: (0, randint_1.randint)(1, 13) ** 2 + '',
-                    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 carré de $${side}$ cm de côté.`,
-        answer: side ** 2 + '',
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getSquareArea = getSquareArea;

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

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