math-exercises 2.0.11 → 2.0.13

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

@@ -1,38 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.circleCircumference = void 0;
-const exercise_1 = require("../../../exercises/exercise");
+exports.getCircleCircumference = exports.circleCircumference = void 0;
 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 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);
-};
+const uuid_1 = require("uuid");
 exports.circleCircumference = {
     id: 'circleCircumference',
     connector: '=',
+    instruction: '',
     label: "Calculer la circonférence d'un cercle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -40,5 +18,44 @@ 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,
+        getPropositions,
+        answerFormat: 'tex',
+        keys: [],
+    };
+    return question;
+}
+exports.getCircleCircumference = getCircleCircumference;

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

@@ -1,11 +1,4 @@
-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 {};
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const pythagore: MathExercise;
+export declare function getPythagore(): Question;
 //# 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,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"}
+{"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"}

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

@@ -1,51 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pythagore = void 0;
-const exercise_1 = require("../../../exercises/exercise");
+exports.getPythagore = exports.pythagore = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const triangles_1 = require("../../../math/geometry/triangles");
 const randint_1 = require("../../../math/utils/random/randint");
-const getPythagore = () => {
+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 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 sideA = triangle.getSideAName();
-    const sideB = triangle.getSideBName();
-    const sideC = triangle.getSideCName();
-    const answer = `${sideA}^2=${sideB}^2+${sideC}^2`;
+    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 question = {
         instruction: "Écrire l'égalité de Pythagore pour la figure suivante : ",
-        answer,
+        answer: `${triangle.getSideAName()}^2=${triangle.getSideBName()}^2+${triangle.getSideCName()}^2`,
         keys: [...vertices, 'equal'],
         commands: triangle.generateCommands({}),
         coords: triangle.generateCoords(),
+        getPropositions,
         answerFormat: 'tex',
-        qcmGeneratorProps: { answer, sideA, sideB, sideC },
     };
     return question;
-};
-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,
-};
+}
+exports.getPythagore = getPythagore;

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

@@ -1,8 +1,4 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-};
-type VEAProps = {};
-export declare const pythagoreCalcul: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const pythagoreCalcul: MathExercise;
+export declare function getPythagoreCalcul(): Question;
 //# 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,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"}
+{"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"}

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

@@ -1,14 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pythagoreCalcul = void 0;
-const exercise_1 = require("../../../exercises/exercise");
+exports.getPythagoreCalcul = exports.pythagoreCalcul = void 0;
 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 getPythagoreCalcul = () => {
+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 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++)
@@ -40,38 +52,42 @@ const getPythagoreCalcul = () => {
             highlightedSide: sides[randoms[2]],
         }),
     ];
-    answer = answer + '';
+    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);
+    };
     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;
-};
-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,
-};
+}
+exports.getPythagoreCalcul = getPythagoreCalcul;

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

@@ -1,8 +1,4 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-};
-type VEAProps = {};
-export declare const rectangleArea: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const rectangleArea: MathExercise;
+export declare function getRectangleArea(): Question;
 //# 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,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"}
+{"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"}

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

@@ -1,34 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rectangleArea = void 0;
-const exercise_1 = require("../../../exercises/exercise");
+exports.getRectangleArea = exports.rectangleArea = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
-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);
-};
+const uuid_1 = require("uuid");
 exports.rectangleArea = {
     id: 'rectangleArea',
     connector: '=',
+    instruction: '',
     label: "Calculer l'aire d'un rectangle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -36,5 +16,41 @@ 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,8 +1,4 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-};
-type VEAProps = {};
-export declare const rectanglePerimeter: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const rectanglePerimeter: MathExercise;
+export declare function getRectanglePerimeter(): Question;
 //# 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,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"}
+{"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"}

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

@@ -1,34 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rectanglePerimeter = void 0;
-const exercise_1 = require("../../../exercises/exercise");
+exports.getRectanglePerimeter = exports.rectanglePerimeter = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
-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);
-};
+const uuid_1 = require("uuid");
 exports.rectanglePerimeter = {
     id: 'rectanglePerimeter',
     connector: '=',
+    instruction: '',
     label: "Calculer le périmètre d'un rectangle",
     levels: ['4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -36,5 +16,41 @@ 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,8 +1,4 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-};
-type VEAProps = {};
-export declare const rightTriangleArea: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const rightTriangleArea: MathExercise;
+export declare function getRightTriangleArea(): Question;
 //# 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,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"}
+{"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"}

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

@@ -1,12 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rightTriangleArea = void 0;
-const exercise_1 = require("../../../exercises/exercise");
+exports.getRightTriangleArea = exports.rightTriangleArea = void 0;
 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 getRightTriangleArea = () => {
+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 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++)
@@ -19,35 +31,39 @@ const getRightTriangleArea = () => {
             setCaptions: [sidesLength[0] + '', sidesLength[1] + ''],
         }),
     ];
-    const answer = ((sidesLength[0] * sidesLength[1]) / 2 + '').replace('.', ',');
+    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 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,
+        answer: (sidesLength[0] * sidesLength[1]) / 2 + '',
         keys: [...vertices, 'equal', 'cm2'],
         commands,
         coords: triangle.generateCoords(),
+        getPropositions,
         answerFormat: 'tex',
-        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)(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,
-};
+}
+exports.getRightTriangleArea = getRightTriangleArea;