math-exercises 1.4.18 → 2.0.0

package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.d.ts

@@ -5,7 +5,11 @@
  * a*b±c*d
  * a/b ± c*d
  */
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const operationsPrioritiesWithoutRelative: MathExercise;
-export declare function getOperationsPrioritiesWithoutRelative(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+};
+type VEAProps = {};
+export declare const operationsPrioritiesWithoutRelative: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=operationsPrioritiesWithoutRelative.d.ts.map

package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,mCAAmC,EAAE,YAYjD,CAAC;AAEF,wBAAgB,sCAAsC,IAAI,QAAQ,CAmQjE"}
+{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmPnB,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhF,CAAC"}

package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.js

@@ -7,7 +7,8 @@
  * a/b ± c*d
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOperationsPrioritiesWithoutRelative = exports.operationsPrioritiesWithoutRelative = void 0;
+exports.operationsPrioritiesWithoutRelative = 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");
@@ -16,21 +17,7 @@ const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.operationsPrioritiesWithoutRelative = {
-    id: 'operationsPrioritiesWithoutRelative',
-    connector: '=',
-    instruction: '',
-    label: 'Priorités opératoires sans les nombres relatifs',
-    levels: ['6ème', '5ème', '4ème'],
-    sections: ['Calculs'],
-    isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getOperationsPrioritiesWithoutRelative, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getOperationsPrioritiesWithoutRelative() {
+const getOperationsPrioritiesWithoutRelative = () => {
     const type = (0, randint_1.randint)(1, 7);
     const flip = (0, randint_1.randint)(1, 4);
     let startStatement = '';
@@ -175,38 +162,33 @@ function getOperationsPrioritiesWithoutRelative() {
             }
             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 {
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: (0, randint_1.randint)(1, 50) + '',
-                    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: `Calculer : $${startStatement}$`,
         startStatement,
         answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getOperationsPrioritiesWithoutRelative = getOperationsPrioritiesWithoutRelative;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(1, 50) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.operationsPrioritiesWithoutRelative = {
+    id: 'operationsPrioritiesWithoutRelative',
+    connector: '=',
+    label: 'Priorités opératoires sans les nombres relatifs',
+    levels: ['6ème', '5ème', '4ème'],
+    sections: ['Calculs'],
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getOperationsPrioritiesWithoutRelative, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calcul/proportionality/proportionalityTable.d.ts

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

package/lib/exercises/calcul/proportionality/proportionalityTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,oBAAoB,EAAE,YAYlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAyElD"}
+{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.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;AAyDnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}

package/lib/exercises/calcul/proportionality/proportionalityTable.js

@@ -1,25 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProportionalityTable = exports.proportionalityTable = void 0;
+exports.proportionalityTable = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.proportionalityTable = {
-    id: 'proportionalityTable',
-    connector: '=',
-    instruction: '',
-    label: 'Calcul dans un tableau de proportionnalité',
-    levels: ['5ème', '4ème', '3ème', 'CAP', '2ndPro', '1rePro'],
-    isSingleStep: false,
-    sections: ['Proportionnalité'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProportionalityTable, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getProportionalityTable() {
+const getProportionalityTable = () => {
     const fact = (0, randint_1.randint)(2, 10);
     let [x1, x2] = integer_1.IntegerConstructor.randomDifferents(1, 100 / fact, 2);
     let [x3, x4] = [x1 * fact, x2 * fact];
@@ -43,30 +30,6 @@ function getProportionalityTable() {
             x4 = '?';
             break;
     }
-    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: answer + (0, randint_1.randint)(-answer + 1, 20, [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: `On considère le tableau de proportionnalité suivant : 
 
@@ -78,9 +41,28 @@ function getProportionalityTable() {
 Déterminer le nombre manquant.`,
         answer: answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getProportionalityTable = getProportionalityTable;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, Number(answer) + (0, randint_1.randint)(Number(-answer) + 1, 20, [0]) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.proportionalityTable = {
+    id: 'proportionalityTable',
+    connector: '=',
+    label: 'Calcul dans un tableau de proportionnalité',
+    levels: ['5ème', '4ème', '3ème', 'CAP', '2ndPro', '1rePro'],
+    isSingleStep: false,
+    sections: ['Proportionnalité'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProportionalityTable, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calcul/rounding/rounding.d.ts

@@ -1,20 +1,24 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    precisionAsked: number;
+    decimal: number;
+    precision: number;
+};
+type VEAProps = {};
+export declare const roundToUnit: MathExercise<QCMProps, VEAProps>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToUnit: MathExercise;
+export declare const roundToDixieme: MathExercise<QCMProps, VEAProps>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToDixieme: MathExercise;
+export declare const roundToCentieme: MathExercise<QCMProps, VEAProps>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToCentieme: MathExercise;
-/**
- * arrondi à l'unité
- */
-export declare const roundToMillieme: MathExercise;
-export declare const allRoundings: MathExercise;
-export declare function getRoundQuestions(precisionAsked?: number): Question;
+export declare const roundToMillieme: MathExercise<QCMProps, VEAProps>;
+export declare const allRoundings: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=rounding.d.ts.map

package/lib/exercises/calcul/rounding/rounding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,YAW5B,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAW7B,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAW7B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,YAW1B,CAAC;AASF,wBAAgB,iBAAiB,CAAC,cAAc,GAAE,MAAU,GAAG,QAAQ,CAyEtE"}
+{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAoClC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

package/lib/exercises/calcul/rounding/rounding.js

@@ -1,27 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRoundQuestions = exports.allRoundings = exports.roundToMillieme = exports.roundToCentieme = exports.roundToDixieme = exports.roundToUnit = void 0;
+exports.allRoundings = exports.roundToMillieme = exports.roundToCentieme = exports.roundToDixieme = exports.roundToUnit = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const decimal_1 = require("../../../math/numbers/decimals/decimal");
 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");
 /**
  * arrondi à l'unité
  */
+const instructions = [
+    "Arrondir à l'unité :",
+    'Arrondir au dixième :',
+    'Arrondir au centième :',
+    'Arrondir au millième :',
+];
+const getRoundQuestions = (opts) => {
+    const precisionAsked = opts?.precisionAsked || 0;
+    const precision = (0, randint_1.randint)(precisionAsked + 1, precisionAsked + 5);
+    const dec = decimal_1.DecimalConstructor.random(0, 1000, precision);
+    const decTex = dec.toTree().toTex();
+    const answer = dec.round(precisionAsked).toTree().toTex();
+    const question = {
+        instruction: `${instructions[precisionAsked]} ${decTex}`,
+        startStatement: decTex,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, precisionAsked, decimal: dec.value, precision },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, precisionAsked, decimal, precision }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const dec = new decimal_1.Decimal(decimal);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(dec.value, precisionAsked) === (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked)
+        ? (0, round_1.round)(dec.value - 0.5 * 10 ** -precisionAsked, precisionAsked) + ''
+        : (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked) + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, dec.toTree().toTex());
+    if (dec.decimalPart.length !== precisionAsked + 1)
+        (0, exercise_1.tryToAddWrongProp)(propositions, dec
+            .round(precisionAsked + 1)
+            .toTree()
+            .toTex());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, decimal_1.DecimalConstructor.random(0, 1000, precision).toTree().toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.roundToUnit = {
     id: 'roundToUnit',
     connector: '\\approx',
-    instruction: '',
     label: "Arrondir à l'unité",
     levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
     sections: ['Calculs'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions(0), nb),
-    keys: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 0 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 /**
  * arrondi à l'unité
@@ -29,14 +68,14 @@ exports.roundToUnit = {
 exports.roundToDixieme = {
     id: 'roundToDixieme',
     connector: '\\approx',
-    instruction: '',
     label: 'Arrondir au dixième',
     levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
     sections: ['Calculs'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions(1), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 1 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 /**
  * arrondi à l'unité
@@ -44,14 +83,14 @@ exports.roundToDixieme = {
 exports.roundToCentieme = {
     id: 'roundToCentieme',
     connector: '\\approx',
-    instruction: '',
     label: 'Arrondir au centième',
     levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
     sections: ['Calculs'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions(2), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 2 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 /**
  * arrondi à l'unité
@@ -59,93 +98,24 @@ exports.roundToCentieme = {
 exports.roundToMillieme = {
     id: 'roundToMillieme',
     connector: '\\approx',
-    instruction: '',
     label: 'Arrondir au millième',
     levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
     sections: ['Calculs'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions(3), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 3 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 exports.allRoundings = {
     id: 'allRoundings',
     connector: '\\approx',
-    instruction: '',
     label: 'Arrondir un nombre décimal',
     levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
     sections: ['Calculs'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions((0, randint_1.randint)(0, 4)), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: (0, randint_1.randint)(0, 4) }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-const instructions = [
-    "Arrondir à l'unité :",
-    'Arrondir au dixième :',
-    'Arrondir au centième :',
-    'Arrondir au millième :',
-];
-function getRoundQuestions(precisionAsked = 0) {
-    const precision = (0, randint_1.randint)(precisionAsked + 1, precisionAsked + 5);
-    const dec = decimal_1.DecimalConstructor.random(0, 1000, precision);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: dec.round(precisionAsked).toTree().toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: (0, round_1.round)(dec.value, precisionAsked) === (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked)
-                ? (0, round_1.round)(dec.value - 0.5 * 10 ** -precisionAsked, precisionAsked) + ''
-                : (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked) + '',
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: dec.toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3 && dec.decimalPart.length !== precisionAsked + 1)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: dec
-                    .round(precisionAsked + 1)
-                    .toTree()
-                    .toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; dec.decimalPart.length !== precisionAsked + 1 ? i < n - 4 : i < n - 3; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: decimal_1.DecimalConstructor.random(0, 1000, precision).toTree().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 question = {
-        instruction: `${instructions[precisionAsked]} ${dec.toTree().toTex()}`,
-        startStatement: dec.toTree().toTex(),
-        answer: dec.round(precisionAsked).toTree().toTex(),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getRoundQuestions = getRoundQuestions;

package/lib/exercises/calculLitteral/distributivity/allIdentities.d.ts

@@ -1,4 +1,13 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const allIdentities: MathExercise;
-export declare function getAllIdentitiesQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    type: number;
+    a?: number;
+    b?: number;
+    affine1Coeffs?: number[];
+    affine2Coeffs?: number[];
+};
+type VEAProps = {};
+export declare const allIdentities: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=allIdentities.d.ts.map

package/lib/exercises/calculLitteral/distributivity/allIdentities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allIdentities.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/allIdentities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAOlE,eAAO,MAAM,aAAa,EAAE,YAW3B,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CAOnD"}
+{"version":3,"file":"allIdentities.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/allIdentities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA6C,MAAM,0BAA0B,CAAC;AAMnG,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}

package/lib/exercises/calculLitteral/distributivity/allIdentities.js

@@ -1,15 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllIdentitiesQuestion = exports.allIdentities = void 0;
+exports.allIdentities = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const random_1 = require("../../../utils/random");
 const firstIdentity_1 = require("./firstIdentity");
 const secondIdentity_1 = require("./secondIdentity");
 const thirdIdentity_1 = require("./thirdIdentity");
+const getAllIdentitiesQuestion = () => {
+    const type = (0, random_1.random)([1, 2, 3]);
+    let question;
+    let qcmGeneratorProps;
+    switch (type) {
+        case 1:
+            question = (0, firstIdentity_1.getFirstIdentityQuestion)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 1 };
+            break;
+        case 2:
+            question = (0, secondIdentity_1.getSecondIdentityQuestion)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 2 };
+            break;
+        case 3:
+        default:
+            question = (0, thirdIdentity_1.getThirdIdentityQuestion)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 3 };
+            break;
+    }
+    return { ...question, qcmGeneratorProps };
+};
+const getPropositions = (n, { answer, type, a, b, affine1Coeffs, affine2Coeffs }) => {
+    switch (type) {
+        case 1:
+            return (0, firstIdentity_1.getFirstIdentityPropositions)(n, { a: a, answer, b: b });
+        case 2:
+            return (0, secondIdentity_1.getSecondIdentityPropositions)(n, { a: a, answer, b: b });
+        case 3:
+        default:
+            return (0, thirdIdentity_1.getThirdIdentityPropositions)(n, { affine1Coeffs: affine1Coeffs, affine2Coeffs: affine2Coeffs, answer });
+    }
+};
 exports.allIdentities = {
     id: 'allIdRmq',
     connector: '=',
-    instruction: 'Développer et réduire :',
     label: 'Identités remarquables (toutes)',
     levels: ['3ème', '2nde', '1reTech'],
     sections: ['Calcul littéral'],
@@ -17,13 +48,5 @@ exports.allIdentities = {
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAllIdentitiesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getAllIdentitiesQuestion() {
-    const rand = (0, random_1.random)([1, 2, 3]);
-    return rand === 1
-        ? (0, firstIdentity_1.getFirstIdentityQuestion)()
-        : rand === 2
-            ? (0, secondIdentity_1.getSecondIdentityQuestion)()
-            : (0, thirdIdentity_1.getThirdIdentityQuestion)();
-}
-exports.getAllIdentitiesQuestion = getAllIdentitiesQuestion;

package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,oBAAoB,EAAE,YAYlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CAsE1D"}
+{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkDnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}