math-exercises 1.4.18 → 2.0.0

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

@@ -1,14 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrianglePerimeter = exports.trianglePerimeter = void 0;
+exports.trianglePerimeter = 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 getTrianglePerimeter = () => {
+    const sides = [(0, randint_1.randint)(1, 13), (0, randint_1.randint)(1, 13), (0, randint_1.randint)(1, 13)];
+    const answer = sides[0] + sides[1] + sides[2] + '';
+    const question = {
+        instruction: `Calculer le périmètre d'un triangle qui a pour côtés: $${sides[0]}$ cm, $${sides[1]}$ cm et $${sides[2]}$ cm.`,
+        answer,
+        answerFormat: 'tex',
+        keys: [],
+        qcmGeneratorProps: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const perimeter = Number(answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, perimeter + (0, randint_1.randint)(-perimeter + 1, 14, [0]) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.trianglePerimeter = {
     id: 'trianglePerimeter',
     connector: '=',
-    instruction: '',
     label: "Calculer le périmètre d'un triangle",
     levels: ['5ème', '4ème', '3ème', '2nde'],
     isSingleStep: false,
@@ -16,41 +36,5 @@ exports.trianglePerimeter = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrianglePerimeter, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getTrianglePerimeter() {
-    const sides = [(0, randint_1.randint)(1, 13), (0, randint_1.randint)(1, 13), (0, randint_1.randint)(1, 13)];
-    const perimeter = sides[0] + sides[1] + sides[2];
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: perimeter + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: perimeter + (0, randint_1.randint)(-perimeter + 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 triangle qui a pour côtés: $${sides[0]}$ cm, $${sides[1]}$ cm et $${sides[2]}$ cm.`,
-        answer: sides[0] + sides[1] + sides[2] + '',
-        getPropositions,
-        answerFormat: 'tex',
-        keys: [],
-    };
-    return question;
-}
-exports.getTrianglePerimeter = getTrianglePerimeter;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/trigonometry.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,CA0F1C"}
+{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/trigonometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoEnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

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

@@ -1,29 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrigonometry = exports.trigonometry = void 0;
+exports.trigonometry = 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.trigonometry = {
-    id: 'trigonometry',
-    connector: '=',
-    instruction: '',
-    label: "Écrire le quotient égal au cosinus, au sinus ou à la tangente d'un angle dans un triangle rectangle",
-    levels: ['4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometry, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getTrigonometry() {
+const getTrigonometry = () => {
     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 trigo = ['le cosinus', 'le sinus', 'la tangente'];
     const randTrigo = (0, randint_1.randint)(0, 3);
     const angle = [triangle.vertexB.name, triangle.vertexC.name];
@@ -31,69 +22,57 @@ function getTrigonometry() {
     let quotient;
     switch (randAngle) {
         case 0:
-            quotient = [
-                `\\frac{${triangle.getSideCName()}}{${triangle.getSideAName()}}`,
-                `\\frac{${triangle.getSideBName()}}{${triangle.getSideAName()}}`,
-                `\\frac{${triangle.getSideBName()}}{${triangle.getSideCName()}}`,
-            ];
+            quotient = [`\\frac{${sideC}}{${sideA}}`, `\\frac{${sideB}}{${sideA}}`, `\\frac{${sideB}}{${sideC}}`];
             break;
         case 1:
-            quotient = [
-                `\\frac{${triangle.getSideBName()}}{${triangle.getSideAName()}}`,
-                `\\frac{${triangle.getSideCName()}}{${triangle.getSideAName()}}`,
-                `\\frac{${triangle.getSideCName()}}{${triangle.getSideBName()}}`,
-            ];
+            quotient = [`\\frac{${sideB}}{${sideA}}`, `\\frac{${sideC}}{${sideA}}`, `\\frac{${sideC}}{${sideB}}`];
             break;
         default:
             quotient = [''];
     }
-    const getPropositions = (n) => {
-        const res = [];
-        const wrongQuotients = [
-            `\\frac{${triangle.getSideCName()}}{${triangle.getSideAName()}}`,
-            `\\frac{${triangle.getSideBName()}}{${triangle.getSideAName()}}`,
-            `\\frac{${triangle.getSideBName()}}{${triangle.getSideCName()}}`,
-            `\\frac{${triangle.getSideBName()}}{${triangle.getSideAName()}}`,
-            `\\frac{${triangle.getSideCName()}}{${triangle.getSideAName()}}`,
-            `\\frac{${triangle.getSideCName()}}{${triangle.getSideBName()}}`,
-            `\\frac{${triangle.getSideAName()}}{${triangle.getSideCName()}}`,
-            `\\frac{${triangle.getSideAName()}}{${triangle.getSideBName()}}`,
-            `\\frac{${triangle.getSideCName()}}{${triangle.getSideBName()}}`,
-            `\\frac{${triangle.getSideAName()}}{${triangle.getSideBName()}}`,
-            `\\frac{${triangle.getSideAName()}}{${triangle.getSideCName()}}`,
-            `\\frac{${triangle.getSideBName()}}{${triangle.getSideCName()}}`,
-        ];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: quotient[randTrigo],
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongQuotients[(0, randint_1.randint)(0, 12)],
-                    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 = quotient[randTrigo];
     const question = {
         instruction: `À quel quotient est égal ${trigo[randTrigo]} de l'angle $\\widehat{${angle[randAngle]}}$?`,
-        answer: quotient[randTrigo],
+        answer,
         keys: [...vertices, 'equal'],
         commands: [...triangle.generateCommands({ highlightedAngle: angle[randAngle] })],
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, sideA, sideB, sideC },
     };
     return question;
-}
-exports.getTrigonometry = getTrigonometry;
+};
+const getPropositions = (n, { answer, sideA, sideB, sideC }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const wrongQuotients = [
+        `\\frac{${sideC}}{${sideA}}`,
+        `\\frac{${sideB}}{${sideA}}`,
+        `\\frac{${sideB}}{${sideC}}`,
+        `\\frac{${sideB}}{${sideA}}`,
+        `\\frac{${sideC}}{${sideA}}`,
+        `\\frac{${sideC}}{${sideB}}`,
+        `\\frac{${sideA}}{${sideC}}`,
+        `\\frac{${sideA}}{${sideB}}`,
+        `\\frac{${sideC}}{${sideB}}`,
+        `\\frac{${sideA}}{${sideB}}`,
+        `\\frac{${sideA}}{${sideC}}`,
+        `\\frac{${sideB}}{${sideC}}`,
+    ];
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongQuotients[(0, randint_1.randint)(0, 12)]);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.trigonometry = {
+    id: 'trigonometry',
+    connector: '=',
+    label: "Écrire le quotient égal au cosinus, au sinus ou à la tangente d'un angle dans un triangle rectangle",
+    levels: ['4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometry, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,uBAAuB,EAAE,YAWrC,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,QAAQ,CAqErD"}
+{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqDnB,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWpE,CAAC"}

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

@@ -1,25 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrigonometryAngleCalcul = exports.trigonometryAngleCalcul = void 0;
+exports.trigonometryAngleCalcul = 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 round_1 = require("../../../math/utils/round");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.trigonometryAngleCalcul = {
-    id: 'trigonometryAngleCalcul',
-    connector: '=',
-    instruction: '',
-    label: 'Utiliser la trigonométrie pour calculer un angle',
-    levels: ['4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometryAngleCalcul, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getTrigonometryAngleCalcul() {
+const getTrigonometryAngleCalcul = () => {
     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++)
@@ -33,39 +21,35 @@ function getTrigonometryAngleCalcul() {
     const answer = randAngle === 0
         ? Math.round((Math.acos(sideLengths[0] / sideLengths[2]) * 180) / Math.PI)
         : Math.round((Math.acos(sideLengths[1] / sideLengths[2]) * 180) / Math.PI);
-    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 {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: (0, randint_1.randint)(20, 80) + '°',
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
+    const answerTex = answer + '°';
     const question = {
         instruction: `Le triangle ${triangle.getTriangleName()} rectangle en ${triangle.getRightAngle()} est tel que ${sides[randSides[0]]} = $${sideLengths[randSides[0]]}$ cm et ${sides[randSides[1]]} = $${sideLengths[randSides[1]]}$ cm.$\\\\$ Calculer $\\widehat{${angle[randAngle]}}$ à 1° près.`,
-        answer: answer + '°',
+        answer: answerTex,
         keys: [...vertices, 'equal', 'degree', 'cos', 'sin', 'tan', 'arccos', 'arcsin', 'arctan'],
         commands: [...triangle.generateCommands({ highlightedAngle: angle[randAngle] })],
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer: answerTex },
     };
     return question;
-}
-exports.getTrigonometryAngleCalcul = getTrigonometryAngleCalcul;
+};
+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)(20, 80) + '°');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.trigonometryAngleCalcul = {
+    id: 'trigonometryAngleCalcul',
+    connector: '=',
+    label: 'Utiliser la trigonométrie pour calculer un angle',
+    levels: ['4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometryAngleCalcul, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,sBAAsB,EAAE,YAWpC,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CAgFpD"}
+{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgEnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}

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

@@ -1,25 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrigonometrySideCalcul = exports.trigonometrySideCalcul = void 0;
+exports.trigonometrySideCalcul = 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 round_1 = require("../../../math/utils/round");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.trigonometrySideCalcul = {
-    id: 'trigonometrySideCalcul',
-    connector: '=',
-    instruction: '',
-    label: 'Utiliser la trigonométrie pour calculer un côté',
-    levels: ['4ème', '3ème', '2nde'],
-    isSingleStep: false,
-    sections: ['Géométrie euclidienne'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometrySideCalcul, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getTrigonometrySideCalcul() {
+const getTrigonometrySideCalcul = () => {
     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 getTrigonometrySideCalcul() {
             highlightedSide: sides[randsideQuestion],
         }),
     ];
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: `${(0, round_1.round)(sideLengths[randsideQuestion], 1)}`,
-            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, round_1.round)((0, randint_1.randint)(11, 100) / 10, 1)}`,
-                    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 = `${((0, round_1.round)(sideLengths[randsideQuestion], 1) + '').replace('.', ',')}`;
     const question = {
         instruction: `Le triangle ${triangle.getTriangleName()} rectangle en ${triangle.getRightAngle()} tel que ${sides[randside]} = $${sideLengths[randside]}$ cm et $\\widehat{${angle[randAngle]}}$ = $${angleValue[randAngle]}$°.$\\\\$ Calculer ${sides[randsideQuestion]} à $0,1$ cm près.`,
-        answer: `${((0, round_1.round)(sideLengths[randsideQuestion], 1) + '').replace('.', ',')}`,
+        answer,
         keys: [...vertices, 'equal', 'degree', 'cos', 'sin', 'tan', 'arccos', 'arcsin', 'arctan'],
         commands,
         coords: triangle.generateCoords(),
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getTrigonometrySideCalcul = getTrigonometrySideCalcul;
+};
+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)((0, randint_1.randint)(11, 100) / 10, 1)}`);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.trigonometrySideCalcul = {
+    id: 'trigonometrySideCalcul',
+    connector: '=',
+    label: 'Utiliser la trigonométrie pour calculer un côté',
+    levels: ['4ème', '3ème', '2nde'],
+    isSingleStep: false,
+    sections: ['Géométrie euclidienne'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometrySideCalcul, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/geometry/vectors/chasles.d.ts

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

package/lib/exercises/geometry/vectors/chasles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chasles.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/vectors/chasles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,OAAO,EAAE,YAWrB,CAAC;AAIF,wBAAgB,kBAAkB,IAAI,QAAQ,CA0D7C"}
+{"version":3,"file":"chasles.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/vectors/chasles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA4CnB,eAAO,MAAM,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWpD,CAAC"}

package/lib/exercises/geometry/vectors/chasles.js

@@ -1,25 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChaslesQuestion = exports.chasles = void 0;
+exports.chasles = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.chasles = {
-    id: 'chasles',
-    connector: '=',
-    instruction: '',
-    label: 'Relation de Chasles pour les vecteurs',
-    levels: ['2nde', '1reESM', '1reSpé'],
-    isSingleStep: true,
-    sections: ['Vecteurs'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getChaslesQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
 const letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ';
-function getChaslesQuestion() {
+const getChaslesQuestion = () => {
     const nbOfVectors = (0, randint_1.randint)(2, 5);
     const randLetters = (0, shuffle_1.shuffle)(letters.split('')).slice(0, nbOfVectors + 2);
     let vectors = [];
@@ -34,41 +22,35 @@ function getChaslesQuestion() {
     let statement = vectors.join('');
     if (statement[0] === '+')
         statement = statement.slice(1, statement.length);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const a = (0, random_1.random)(randLetters);
-                const b = (0, random_1.random)(randLetters);
-                const wrongAnswer = `\\overrightarrow{${a}${b}}`;
-                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 = {
         answer: answer,
         instruction: `Simplifier : $${statement}$`,
         keys: ['overrightarrow', ...randLetters.sort((a, b) => a.localeCompare(b))],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randLetters },
     };
     return question;
-}
-exports.getChaslesQuestion = getChaslesQuestion;
+};
+const getPropositions = (n, { answer, randLetters }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const a = (0, random_1.random)(randLetters);
+        const b = (0, random_1.random)(randLetters);
+        const wrongAnswer = `\\overrightarrow{${a}${b}}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.chasles = {
+    id: 'chasles',
+    connector: '=',
+    label: 'Relation de Chasles pour les vecteurs',
+    levels: ['2nde', '1reESM', '1reSpé'],
+    isSingleStep: true,
+    sections: ['Vecteurs'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getChaslesQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/geometry/vectors/coordinatesReading.d.ts

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

package/lib/exercises/geometry/vectors/coordinatesReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coordinatesReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/vectors/coordinatesReading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAMhH,eAAO,MAAM,kBAAkB,EAAE,YAWhC,CAAC;AAEF,wBAAgB,6BAA6B,IAAI,QAAQ,CAsExD"}
+{"version":3,"file":"coordinatesReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/vectors/coordinatesReading.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsDnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}