math-exercises 1.4.18 → 2.0.0

package/lib/exercises/calcul/fractions/fractionToPercentToDecimal.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionToPercentToDecimal = exports.fractionToPercentToDecimal = void 0;
+exports.fractionToPercentToDecimal = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
@@ -8,20 +9,7 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.fractionToPercentToDecimal = {
-    id: 'fractionToPercentToDecimal',
-    connector: '\\iff',
-    instruction: '',
-    label: "Passer d'une écriture d'un nombre à une autre",
-    levels: ['3ème', '2nde', '1reESM', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionToPercentToDecimal, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionToPercentToDecimal() {
+const getFractionToPercentToDecimal = () => {
     const denominator = 2 ** (0, randint_1.randint)(0, 5) * 5 ** (0, randint_1.randint)(0, 5);
     const numerator = denominator !== 1 ? (0, randint_1.randint)(1, denominator) : (0, randint_1.randint)(1, 100);
     const fraction = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator), new numberNode_1.NumberNode(denominator));
@@ -62,60 +50,62 @@ function getFractionToPercentToDecimal() {
             break;
         }
     }
-    const getPropositions = (n) => {
-        const propositions = [];
-        propositions.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 {
-                let statement = '';
-                switch (rand) {
-                    case 1:
-                        const temp1 = (0, randint_1.randint)(-5, 3, [0]);
-                        statement = `${(0, round_1.round)(percent * 10 ** temp1, -temp1 + 2)}\\%`;
-                        break;
-                    case 2:
-                        statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
-                        break;
-                    case 3:
-                        const temp3 = (0, randint_1.randint)(-5, 3, [0]);
-                        statement = `${(0, round_1.round)(percent * 10 ** temp3, -temp3 + 2)}`;
-                        break;
-                    case 4:
-                        statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
-                        break;
-                    case 5:
-                        statement = `${(0, round_1.round)(decimal + Math.random() * 10, 2)}`;
-                        break;
-                    case 6:
-                        statement = `${(0, round_1.round)(percent + Math.random() * 10, 2)}\\%`;
-                        break;
-                }
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            propositions.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(propositions);
-    };
     const question = {
         instruction,
         answer: answer.replace('.', ','),
         keys: ['percent'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: {
+            answer,
+            rand,
+            numerator,
+            denominator,
+        },
     };
     return question;
-}
-exports.getFractionToPercentToDecimal = getFractionToPercentToDecimal;
+};
+const getPropositions = (n, { answer, rand, numerator, denominator }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const decimal = numerator / denominator;
+    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
+    while (propositions.length < n) {
+        let statement = '';
+        switch (rand) {
+            case 1:
+                const temp1 = (0, randint_1.randint)(-5, 3, [0]);
+                statement = `${(0, round_1.round)(percent * 10 ** temp1, -temp1 + 2)}\\%`;
+                break;
+            case 2:
+                statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
+                break;
+            case 3:
+                const temp3 = (0, randint_1.randint)(-5, 3, [0]);
+                statement = `${(0, round_1.round)(percent * 10 ** temp3, -temp3 + 2)}`;
+                break;
+            case 4:
+                statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
+                break;
+            case 5:
+                statement = `${(0, round_1.round)(decimal + Math.random() * 10, 2)}`;
+                break;
+            case 6:
+                statement = `${(0, round_1.round)(percent + Math.random() * 10, 2)}\\%`;
+                break;
+        }
+        (0, exercise_1.tryToAddWrongProp)(propositions, statement);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.fractionToPercentToDecimal = {
+    id: 'fractionToPercentToDecimal',
+    connector: '\\iff',
+    label: "Passer d'une écriture d'un nombre à une autre",
+    levels: ['3ème', '2nde', '1reESM', 'CAP', '2ndPro', '1rePro'],
+    sections: ['Fractions'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionToPercentToDecimal, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calcul/fractions/fractionsDivision.d.ts

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

package/lib/exercises/calcul/fractions/fractionsDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,iBAAiB,EAAE,YAY/B,CAAC;AAEF,wBAAgB,oBAAoB,IAAI,QAAQ,CAqD/C"}
+{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AA2BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmBnB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}

package/lib/exercises/calcul/fractions/fractionsDivision.js

@@ -1,69 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionsDivision = exports.fractionsDivision = void 0;
+exports.fractionsDivision = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.fractionsDivision = {
-    id: 'fractionsDivision',
-    connector: '=',
-    instruction: '',
-    label: 'Divisions de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsDivision, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionsDivision() {
+const getFractionsDivision = () => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
     const rational2 = rational_1.RationalConstructor.randomIrreductible();
     const statementTree = new divideNode_1.DivideNode(rational.toTree(), rational2.toTree());
     const answerTree = rational.divide(rational2).toTree();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: rational.multiply(rational2).toTree().toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const randomRational = rational_1.RationalConstructor.randomIrreductible();
-                const wrongAnswerTree = randomRational.divide(rational2).toTree();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswerTree.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 = answerTree.toTex();
     const question = {
         instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: {
+            answer,
+            rationalNum: [rational.num, rational.denum],
+            rationalDenum: [rational2.num, rational2.denum],
+        },
     };
     return question;
-}
-exports.getFractionsDivision = getFractionsDivision;
+};
+const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    (0, exercise_1.tryToAddWrongProp)(propositions, rational.multiply(rational2).toTree().toTex());
+    while (propositions.length < n) {
+        const randomRational = rational_1.RationalConstructor.randomIrreductible();
+        const wrongAnswerTree = randomRational.divide(rational2).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.fractionsDivision = {
+    id: 'fractionsDivision',
+    connector: '=',
+    label: 'Divisions de fractions',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
+    sections: ['Fractions'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsDivision, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calcul/fractions/fractionsProduct.d.ts

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

package/lib/exercises/calcul/fractions/fractionsProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CA+C9C"}
+{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

package/lib/exercises/calcul/fractions/fractionsProduct.js

@@ -1,63 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionsProduct = exports.fractionsProduct = void 0;
+exports.fractionsProduct = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.fractionsProduct = {
-    id: 'fractionsProduct',
-    connector: '=',
-    instruction: '',
-    label: 'Produits de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionsProduct() {
+const getFractionsProduct = () => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
     const rational2 = rational_1.RationalConstructor.randomIrreductible();
     const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), rational2.toTree());
     const answerTree = rational.multiply(rational2).toTree();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const randomRational = rational_1.RationalConstructor.randomIrreductible();
-                const wrongAnswerTree = randomRational.multiply(rational2).toTree();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswerTree.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 = answerTree.toTex();
     const question = {
         instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: {
+            answer,
+            rationalNum: [rational.num, rational.denum],
+            rationalDenum: [rational2.num, rational2.denum],
+        },
     };
     return question;
-}
-exports.getFractionsProduct = getFractionsProduct;
+};
+const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    while (propositions.length < n) {
+        const randomRational = rational_1.RationalConstructor.randomIrreductible();
+        const wrongAnswerTree = randomRational.multiply(rational2).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.fractionsProduct = {
+    id: 'fractionsProduct',
+    connector: '=',
+    label: 'Produits de fractions',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
+    sections: ['Fractions'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calcul/fractions/fractionsSum.d.ts

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

package/lib/exercises/calcul/fractions/fractionsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,YAAY,EAAE,YAY1B,CAAC;AAEF,wBAAgB,eAAe,IAAI,QAAQ,CAuD1C"}
+{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

package/lib/exercises/calcul/fractions/fractionsSum.js

@@ -1,69 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionsSum = exports.fractionsSum = void 0;
+exports.fractionsSum = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.fractionsSum = {
-    id: 'fractionsSum',
-    connector: '=',
-    instruction: '',
-    label: 'Sommes de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsSum, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionsSum() {
+const getFractionsSum = () => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
     const rational2 = rational_1.RationalConstructor.randomIrreductible();
     const statementTree = new addNode_1.AddNode(rational.toTree(), rational2.toTree());
     const answerTree = rational.add(rational2).toTree();
-    const getPropositions = (n) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: new rational_1.Rational(rational.num + rational2.num, rational.denum + rational2.denum).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const incorrectRational = rational_1.RationalConstructor.randomIrreductible();
-                const incorrectRational2 = rational_1.RationalConstructor.randomIrreductible();
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: incorrectRational.add(incorrectRational2).toTree().toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            propositions.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(propositions);
-    };
+    const answer = answerTree.toTex();
     const question = {
         instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: {
+            answer,
+            rational: [rational.num, rational.denum],
+            rational2: [rational2.num, rational2.denum],
+        },
     };
     return question;
-}
-exports.getFractionsSum = getFractionsSum;
+};
+const getPropositions = (n, { answer, rational, rational2 }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(rational[0] + rational2[0], rational[1] + rational2[1]).toTex());
+    while (propositions.length < n) {
+        const incorrectRational = rational_1.RationalConstructor.randomIrreductible();
+        const incorrectRational2 = rational_1.RationalConstructor.randomIrreductible();
+        (0, exercise_1.tryToAddWrongProp)(propositions, incorrectRational.add(incorrectRational2).toTree().toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.fractionsSum = {
+    id: 'fractionsSum',
+    connector: '=',
+    label: 'Sommes de fractions',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
+    sections: ['Fractions'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsSum, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calcul/fractions/simplifyFraction.d.ts

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

package/lib/exercises/calcul/fractions/simplifyFraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM/E,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CA4C9C"}
+{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/simplifyFraction.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;AA4BnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

package/lib/exercises/calcul/fractions/simplifyFraction.js

@@ -1,58 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSimplifyFraction = exports.simplifyFraction = void 0;
+exports.simplifyFraction = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getSimplifyFraction = () => {
+    const rational = rational_1.RationalConstructor.randomSimplifiable(10);
+    const rationalTex = rational.toTree().toTex();
+    const answer = rational.simplify().toTree().toTex();
+    const question = {
+        instruction: `Simplifier : $${rationalTex}$`,
+        startStatement: rationalTex,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const incorrectRational = rational_1.RationalConstructor.randomSimplifiable(10);
+        (0, exercise_1.tryToAddWrongProp)(propositions, incorrectRational.simplify().toTree().toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.simplifyFraction = {
     id: 'simplifyFrac',
     connector: '=',
-    instruction: '',
     label: 'Simplification de fractions',
     levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
     sections: ['Fractions'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimplifyFraction, nb),
-    keys: [],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getSimplifyFraction() {
-    const rational = rational_1.RationalConstructor.randomSimplifiable(10);
-    const getPropositions = (n) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: rational.simplify().toTree().toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const incorrectRational = rational_1.RationalConstructor.randomSimplifiable(10);
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: incorrectRational.simplify().toTree().toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            propositions.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(propositions);
-    };
-    const question = {
-        instruction: `Simplifier : $${rational.toTree().toTex()}$`,
-        startStatement: rational.toTree().toTex(),
-        answer: rational.simplify().toTree().toTex(),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getSimplifyFraction = getSimplifyFraction;

package/lib/exercises/calcul/mentalCaluls.ts/mentalAddAndSub.d.ts

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

package/lib/exercises/calcul/mentalCaluls.ts/mentalAddAndSub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/mentalCaluls.ts/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAmE7C"}
+{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/mentalCaluls.ts/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAiDnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}