math-exercises 1.4.18 → 2.0.1

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

@@ -1 +1 @@
-{"version":3,"file":"squarePerimeter.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/squarePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CA2C7C"}
+{"version":3,"file":"squarePerimeter.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/squarePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0BnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY5D,CAAC"}

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"thales.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/thales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,MAAM,EAAE,YAWpB,CAAC;AAEF,wBAAgB,SAAS,IAAI,QAAQ,CA4GpC"}
+{"version":3,"file":"thales.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/thales.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+FnB,eAAO,MAAM,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnD,CAAC"}

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

@@ -1,23 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getThales = exports.thales = void 0;
+exports.thales = 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");
-exports.thales = {
-    id: 'thales',
-    connector: '=',
-    instruction: '',
-    label: "Ecrire l'égalité de Thalès",
-    levels: ['5ème', '4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getThales, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getThales() {
+const getThales = () => {
     const vertices = [];
     const code = 65 + (0, randint_1.randint)(0, 22); // Générer un code de caractère majuscule aléatoire (A-Z)
     for (let i = 0; i < 5; i++)
@@ -59,55 +47,49 @@ function getThales() {
         `ShowLabel(${vertices[3]}, true)`,
         `ShowLabel(${vertices[4]}, true)`,
     ];
-    const getPropositions = (n) => {
-        const res = [];
-        const wrongQuotients = [
-            vertices[0] + vertices[3],
-            vertices[0] + vertices[1],
-            vertices[0] + vertices[4],
-            vertices[0] + vertices[2],
-            vertices[3] + vertices[4],
-            vertices[1] + vertices[2],
-            vertices[1] + vertices[3],
-            vertices[2] + vertices[4],
-        ];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: `\\frac{${vertices[0]}${vertices[3]}}{${vertices[0]}${vertices[1]}} = 
-      \\frac{${vertices[0]}${vertices[4]}}{${vertices[0]}${vertices[2]}} = 
-      \\frac{${vertices[3]}${vertices[4]}}{${vertices[1]}${vertices[2]}}`,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const indexRange = Array.from({ length: 8 }, (_, i) => i);
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const rands = (0, shuffle_1.shuffle)(indexRange).slice(0, 6);
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: `\\frac{${wrongQuotients[rands[0]]}}{${wrongQuotients[rands[1]]}} = 
-          \\frac{${wrongQuotients[rands[2]]}}{${wrongQuotients[rands[3]]}} = 
-          \\frac{${wrongQuotients[rands[4]]}}{${wrongQuotients[rands[5]]}}`,
-                    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 = `\\frac{${vertices[0]}${vertices[3]}}{${vertices[0]}${vertices[1]}}=\\frac{${vertices[0]}${vertices[4]}}{${vertices[0]}${vertices[2]}}=\\frac{${vertices[3]}${vertices[4]}}{${vertices[1]}${vertices[2]}}`;
     const question = {
         instruction: `En utilisant le théoreme de Thalès, Écrire l'égalité des quotients sachant que :$\\\\$ (${vertices[3]}${vertices[4]})//(${vertices[1]}${vertices[2]})`,
-        answer: `\\frac{${vertices[0]}${vertices[3]}}{${vertices[0]}${vertices[1]}}=\\frac{${vertices[0]}${vertices[4]}}{${vertices[0]}${vertices[2]}}=\\frac{${vertices[3]}${vertices[4]}}{${vertices[1]}${vertices[2]}}`,
+        answer,
         keys: [...vertices, 'equal'],
         commands,
         coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, vertices },
     };
     return question;
-}
-exports.getThales = getThales;
+};
+const getPropositions = (n, { answer, vertices }) => {
+    const propositions = [];
+    const wrongQuotients = [
+        vertices[0] + vertices[3],
+        vertices[0] + vertices[1],
+        vertices[0] + vertices[4],
+        vertices[0] + vertices[2],
+        vertices[3] + vertices[4],
+        vertices[1] + vertices[2],
+        vertices[1] + vertices[3],
+        vertices[2] + vertices[4],
+    ];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const indexRange = Array.from({ length: 8 }, (_, i) => i);
+    while (propositions.length < n) {
+        const rands = (0, shuffle_1.shuffle)(indexRange).slice(0, 6);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `\\frac{${wrongQuotients[rands[0]]}}{${wrongQuotients[rands[1]]}} = 
+    \\frac{${wrongQuotients[rands[2]]}}{${wrongQuotients[rands[3]]}} = 
+    \\frac{${wrongQuotients[rands[4]]}}{${wrongQuotients[rands[5]]}}`);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.thales = {
+    id: 'thales',
+    connector: '=',
+    label: "Ecrire l'égalité de Thalès",
+    levels: ['5ème', '4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getThales, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/thalesCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,YAAY,EAAE,YAW1B,CAAC;AAEF,wBAAgB,SAAS,IAAI,QAAQ,CAmJpC"}
+{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/thalesCalcul.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;AAmInB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getThales = exports.thalesCalcul = void 0;
+exports.thalesCalcul = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
@@ -8,20 +9,7 @@ const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.thalesCalcul = {
-    id: 'thalesCalcul',
-    connector: '=',
-    instruction: '',
-    label: 'Utiliser le théoreme de Thalès pour faire des calculs',
-    levels: ['5ème', '4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getThales, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getThales() {
+const getThales = () => {
     const vertices = [];
     const code = 65 + (0, randint_1.randint)(0, 22); // Générer un code de caractère majuscule aléatoire (A-Z)
     for (let i = 0; i < 5; i++)
@@ -95,40 +83,36 @@ function getThales() {
         `ShowLabel(${vertices[3]}, true)`,
         `ShowLabel(${vertices[4]}, true)`,
     ];
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: statement.toTex(),
-            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, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode((0, randint_1.randint)(2, 30)), new numberNode_1.NumberNode((0, randint_1.randint)(2, 30)))).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 = statement.toTex();
     const question = {
         instruction,
         startStatement,
-        answer: statement.toTex(),
+        answer,
         keys: [],
         commands,
         coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getThales = getThales;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode((0, randint_1.randint)(2, 30)), new numberNode_1.NumberNode((0, randint_1.randint)(2, 30)))).toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.thalesCalcul = {
+    id: 'thalesCalcul',
+    connector: '=',
+    label: 'Utiliser le théoreme de Thalès pour faire des calculs',
+    levels: ['5ème', '4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getThales, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"triangleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/triangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,YAAY,EAAE,YAW1B,CAAC;AAEF,wBAAgB,eAAe,IAAI,QAAQ,CA6E1C"}
+{"version":3,"file":"triangleArea.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/triangleArea.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;AA6DnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

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

@@ -1,24 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTriangleArea = exports.triangleArea = void 0;
+exports.triangleArea = 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.triangleArea = {
-    id: 'triangleArea',
-    connector: '=',
-    instruction: '',
-    label: "Calculer l'aire d'un triangle (avec figure)",
-    levels: ['5ème', '4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTriangleArea, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getTriangleArea() {
+const getTriangleArea = () => {
     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++)
@@ -44,39 +32,35 @@ function getTriangleArea() {
         `alpha = Angle(${vertices[randoms[0]]},poi ,${vertices[randoms[1]]}, Line(${vertices[randoms[0]]},poi))`,
         `ShowLabel(alpha, false)`,
     ];
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: (sidesLength[randoms[0]] * height) / 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[randoms[0]] * height) / 2 + '').replace('.', ',');
     const question = {
         instruction: `Calculer l'aire du triangle ${triangle.getTriangleName()} sachant que ${sides[randoms[0]]} = $${sidesLength[randoms[0]]}$ cm et la hauteur ${vertices[randoms[0]]}${String.fromCharCode(code + 3)} = $${height}$ cm.`,
-        answer: ((sidesLength[randoms[0]] * height) / 2 + '').replace('.', ','),
+        answer,
         keys: [...vertices, 'equal', 'cm2'],
         commands,
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getTriangleArea = getTriangleArea;
+};
+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.triangleArea = {
+    id: 'triangleArea',
+    connector: '=',
+    label: "Calculer l'aire d'un triangle (avec figure)",
+    levels: ['5ème', '4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTriangleArea, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"triangleAreaV2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/triangleAreaV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAsE5C"}
+{"version":3,"file":"triangleAreaV2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/triangleAreaV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgDnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY3D,CAAC"}

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

@@ -1,14 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTriangleAreaV2 = exports.triangleAreaV2 = void 0;
+exports.triangleAreaV2 = 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 sides = [
+    [3, 4, 5],
+    [5, 12, 13],
+    [8, 15, 17],
+    [7, 24, 25],
+    [20, 21, 29],
+    [12, 35, 37],
+    [9, 40, 41],
+    [28, 45, 53],
+    [11, 60, 61],
+    [16, 63, 65],
+    [33, 56, 65],
+    [48, 55, 73],
+    [13, 84, 85],
+    [36, 77, 85],
+    [39, 80, 89],
+    [65, 72, 97],
+];
+const getTriangleAreaV2 = () => {
+    const randomSide = (0, randint_1.randint)(0, sides.length);
+    const area = (sides[randomSide][0] * sides[randomSide][1]) / 2;
+    const answer = area + '';
+    const question = {
+        instruction: `Calculer l'aire du triangle rectangle qui a pour côtés: $${sides[randomSide][0]}$ cm, $${sides[randomSide][1]}$ cm et $${sides[randomSide][2]}$ cm.`,
+        answer,
+        answerFormat: 'tex',
+        keys: [],
+        qcmGeneratorProps: { answer, randomSide },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, randomSide }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const area = Number(answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, sides[randomSide][0] + sides[randomSide][1] + sides[randomSide][2] + '');
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, area + (0, randint_1.randint)(-area + 1, 14, [0]) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.triangleAreaV2 = {
     id: 'triangleAreaV2',
     connector: '=',
-    instruction: '',
     label: "Calculer l'aire d'un triangle (sans figure)",
     levels: ['5ème', '4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -17,65 +57,5 @@ exports.triangleAreaV2 = {
     qcmTimer: 60,
     freeTimer: 60,
     maxAllowedQuestions: 16,
+    getPropositions,
 };
-function getTriangleAreaV2() {
-    const sides = [
-        [3, 4, 5],
-        [5, 12, 13],
-        [8, 15, 17],
-        [7, 24, 25],
-        [20, 21, 29],
-        [12, 35, 37],
-        [9, 40, 41],
-        [28, 45, 53],
-        [11, 60, 61],
-        [16, 63, 65],
-        [33, 56, 65],
-        [48, 55, 73],
-        [13, 84, 85],
-        [36, 77, 85],
-        [39, 80, 89],
-        [65, 72, 97],
-    ];
-    const randomSide = (0, randint_1.randint)(0, sides.length);
-    const area = (sides[randomSide][0] * sides[randomSide][1]) / 2;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: area + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: sides[randomSide][0] + sides[randomSide][1] + sides[randomSide][2] + '',
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: area + (0, randint_1.randint)(-area + 1, 14, [0]) + '',
-                    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 rectangle qui a pour côtés: $${sides[randomSide][0]}$ cm, $${sides[randomSide][1]}$ cm et $${sides[randomSide][2]}$ cm.`,
-        answer: area + '',
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getTriangleAreaV2 = getTriangleAreaV2;

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

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

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

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