math-exercises 3.0.68 → 3.0.69

package/lib/exercises/math/calcul/fractions/fractionToPercentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionToPercentToDecimal.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionToPercentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AA+FrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAsFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"fractionToPercentToDecimal.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionToPercentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAkLF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAa5D,CAAC"}

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

@@ -9,67 +9,86 @@ import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { PercentNode } from "../../../../tree/nodes/numbers/percentNode.js";
 import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getFractionToPercentToDecimal = () => {
-    const denominator = 2 ** randint(0, 5) * 5 ** randint(0, 5);
-    const numerator = denominator !== 1 ? randint(1, denominator) : randint(1, 100);
+const getInstruction = (identifiers) => {
+    const { rand, numerator, denominator } = identifiers;
     const fraction = new FractionNode(new NumberNode(numerator), new NumberNode(denominator));
     const decimal = numerator / denominator;
     const percent = round((numerator / denominator) * 100, 2);
-    const rand = randint(1, 7);
-    let instruction = "";
-    let answer = "";
-    const percentTex = `${percent}\\%`;
+    switch (rand) {
+        case 1: {
+            return `Écrire le nombre $${decimal.frenchify()}$ sous forme de pourcentage.`;
+        }
+        case 2: {
+            return `Écrire le nombre $${decimal.frenchify()}$ sous forme de fraction irréductible.`;
+        }
+        case 3: {
+            return `Écrire le nombre $${percent.frenchify()}\\%$ sous forme décimale.`;
+        }
+        case 4: {
+            return `Écrire le nombre $${percent.frenchify()}\\%$ sous forme de fraction irréductible.`;
+        }
+        case 5: {
+            return `Écrire le nombre $${fraction.toTex()}$ sous forme décimale.`;
+        }
+        case 6:
+        default: {
+            return `Écrire le nombre $${fraction.toTex()}$ sous forme de pourcentage.`;
+        }
+    }
+};
+const getAnswer = (identifiers) => {
+    const { rand, numerator, denominator } = identifiers;
+    const decimal = numerator / denominator;
+    const percent = round((numerator / denominator) * 100, 2);
+    const percentTex = `${percent.frenchify()}\\%`;
     const fracTex = new Rational(numerator, denominator)
         .simplify()
         .toTree()
         .toTex();
-    const decimalTex = `${decimal}`;
+    const decimalTex = `${decimal.frenchify()}`;
     switch (rand) {
         case 1: {
-            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de pourcentage.`;
-            answer = percentTex;
-            break;
+            return percentTex;
         }
         case 2: {
-            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de fraction irréductible.`;
-            answer = fracTex;
-            break;
+            return fracTex;
         }
         case 3: {
-            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme décimale.`;
-            answer = decimalTex;
-            break;
+            return decimalTex;
         }
         case 4: {
-            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme de fraction irréductible.`;
-            answer = fracTex;
-            break;
+            return fracTex;
         }
         case 5: {
-            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme décimale.`;
-            answer = decimalTex;
-            break;
+            return decimalTex;
         }
-        case 6: {
-            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme de pourcentage.`;
-            answer = percentTex;
-            break;
+        case 6:
+        default: {
+            return percentTex;
         }
     }
-    answer = frenchify(answer);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction,
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["percent"],
         answerFormat: "tex",
-        identifiers: {
-            rand,
-            numerator,
-            denominator,
-        },
+        identifiers,
     };
     return question;
 };
+const getFractionToPercentToDecimal = () => {
+    const denominator = 2 ** randint(0, 5) * 5 ** randint(0, 5);
+    const numerator = denominator !== 1 ? randint(1, denominator) : randint(1, 100);
+    const rand = randint(1, 7);
+    const identifiers = {
+        rand,
+        numerator,
+        denominator,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, rand, numerator, denominator }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -142,8 +161,6 @@ export const 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) => getDistinctQuestions(getFractionToPercentToDecimal, nb),
     qcmTimer: 60,
@@ -151,4 +168,5 @@ export const fractionToPercentToDecimal = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AA2JF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAsBR,CAAC"}
+{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAkKF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAmBR,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.js

@@ -73,6 +73,9 @@ const getFractionsSumsMultiplesDenominatorsQuestion = (opts) => {
     const num1 = randint(1, 10, [denom1]);
     const num2 = randint(1, 10, [denom2]);
     const identifiers = { num1, num2, denom1, denom2 };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
         answer: getAnswer(identifiers, opts),
         instruction: getInstruction(identifiers, opts),
@@ -134,9 +137,6 @@ export const fractionsSumsMultiplesDenominators = {
     isAnswerValid,
     subject: "Mathématiques",
     options,
-    getInstruction,
-    getAnswer,
-    getHint,
-    getCorrection,
+    getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsPrimeDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAkBhE,CAAC"}
+{"version":3,"file":"fractionsSumsPrimeDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAkHF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAiBhE,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.js

@@ -6,33 +6,47 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { rationalParser } from "../../../../tree/parsers/rationalParser.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
-const getFractionsSumsPrimeDenominatorsQuestion = (opts) => {
-    const denom1 = randint(2, 13);
-    let denom2 = 0;
-    do {
-        denom2 = randint(2, 13);
-    } while (gcd(denom1, denom2) !== 1);
-    const num1 = randint(1, 10, [denom1]);
-    const num2 = randint(1, 10, [denom2]);
+const getInstruction = (identifiers, opts) => {
+    const { num1, num2, denom1, denom2 } = identifiers;
     const ratio1 = new Rational(num1, denom1);
     const ratio2 = new Rational(num2, denom2);
     const statement = new AddNode(ratio1.toTree(), ratio2.toTree()).toTex();
-    const answer = ratio1.add(ratio2).toTree().toTex();
-    const question = {
-        answer,
-        instruction: `Calculer ${opts?.allowNonIrreductible
-            ? ""
-            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
     
 $$
 ${statement}
-$$`,
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { num1, num2, denom1, denom2 } = identifiers;
+    const ratio1 = new Rational(num1, denom1);
+    const ratio2 = new Rational(num2, denom2);
+    const answer = ratio1.add(ratio2).toTree().toTex();
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { num1, num2, denom1, denom2 },
+        identifiers,
     };
     return question;
 };
+const getFractionsSumsPrimeDenominatorsQuestion = (opts) => {
+    const denom1 = randint(2, 13);
+    let denom2 = 0;
+    do {
+        denom2 = randint(2, 13);
+    } while (gcd(denom1, denom2) !== 1);
+    const num1 = randint(1, 10, [denom1]);
+    const num2 = randint(1, 10, [denom2]);
+    const identifiers = { num1, num2, denom1, denom2 };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, num1, denom1, denom2, num2 }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -75,9 +89,7 @@ export const fractionsSumsPrimeDenominators = {
     id: "fractionsSumsPrimeDenominators",
     connector: "=",
     label: "Sommes de fractions (avec dénominateurs premiers entre eux)",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb, opts) => getDistinctQuestions(() => getFractionsSumsPrimeDenominatorsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -85,4 +97,5 @@ export const fractionsSumsPrimeDenominators = {
     isAnswerValid,
     subject: "Mathématiques",
     options,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/fractions/fractionsSumsSameDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsSameDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsSameDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}
+{"version":3,"file":"fractionsSumsSameDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsSameDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAoKF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAkB/D,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsSameDenominators.js

@@ -10,55 +10,80 @@ import { rationalParser } from "../../../../tree/parsers/rationalParser.js";
 import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 import { alignTex } from "../../../../utils/latex/alignTex.js";
-const getFractionsSumsSameDenominatorsQuestion = (opts) => {
-    const denom = randint(2, 15);
-    const num1 = randint(1, denom + 10);
-    const num2 = randint(1, denom + 10);
+const getInstruction = (identifiers, opts) => {
+    const { denom, num1, num2 } = identifiers;
     const ratio1 = new Rational(num1, denom).toTree();
     const ratio2 = new Rational(num2, denom).toTree();
     const statement = new AddNode(ratio1, ratio2).toTex();
-    const answerRatio = new Rational(num1 + num2, denom);
-    const answer = answerRatio.simplify().toTree().toTex();
-    const question = {
-        answer,
-        instruction: `Calculer ${opts?.allowNonIrreductible
-            ? ""
-            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
     
 $$
 ${statement}
-$$`,
-        keys: [],
-        hint: `Pour additionner deux fractions qui ont le même dénominateur, on peut additionner leurs numérateurs.`,
-        correction: `Les deux fractions ont bien le même dénominateur, donc on additionne leurs numérateurs : 
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const { denom, num1, num2 } = identifiers;
+    const answerRatio = new Rational(num1 + num2, denom);
+    const answer = answerRatio.simplify().toTree().toTex();
+    return answer;
+};
+const getHint = (identifiers, opts) => {
+    const { denom, num1, num2 } = identifiers;
+    return `Pour additionner deux fractions qui ont le même dénominateur, on peut additionner leurs numérateurs.`;
+};
+const getCorrection = (identifiers, opts) => {
+    const { denom, num1, num2 } = identifiers;
+    const ratio1 = new Rational(num1, denom).toTree();
+    const ratio2 = new Rational(num2, denom).toTree();
+    const statement = new AddNode(ratio1, ratio2).toTex();
+    const answerRatio = new Rational(num1 + num2, denom);
+    const answer = answerRatio.simplify().toTree().toTex();
+    return `Les deux fractions ont bien le même dénominateur, donc on additionne leurs numérateurs : 
     
 ${alignTex([
-            [
-                statement,
-                "=",
-                new FractionNode(new AddNode(num1.toTree(), num2.toTree()), denom.toTree()).toTex(),
-            ],
-            ["", "=", answerRatio.toTree().toTex()],
-        ])}
+        [
+            statement,
+            "=",
+            new FractionNode(new AddNode(num1.toTree(), num2.toTree()), denom.toTree()).toTex(),
+        ],
+        ["", "=", answerRatio.toTree().toTex()],
+    ])}
 
 ${answerRatio.isSimplified && answerRatio.denum !== 1
-            ? "Cette fraction est bien simplifiée."
-            : `Puis on simplifie la fraction : 
+        ? "Cette fraction est bien simplifiée."
+        : `Puis on simplifie la fraction : 
     
 ${alignTex([
-                [
-                    answerRatio.toTree().toTex(),
-                    "=",
-                    new FractionNode(operatorComposition(MultiplyNode, primeFactors(num1 + num2).map((e) => e.toTree())), operatorComposition(MultiplyNode, primeFactors(denom).map((e) => e.toTree()))).toTex(),
-                ],
-                ["", "=", answer],
-            ])}`}
-    `,
+            [
+                answerRatio.toTree().toTex(),
+                "=",
+                new FractionNode(operatorComposition(MultiplyNode, primeFactors(num1 + num2).map((e) => e.toTree())), operatorComposition(MultiplyNode, primeFactors(denom).map((e) => e.toTree()))).toTex(),
+            ],
+            ["", "=", answer],
+        ])}`}
+    `;
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
+    const question = {
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: [],
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
         answerFormat: "tex",
-        identifiers: { denom, num1, num2 },
+        identifiers,
     };
     return question;
 };
+const getFractionsSumsSameDenominatorsQuestion = (opts) => {
+    const denom = randint(2, 15);
+    const num1 = randint(1, denom + 10);
+    const num2 = randint(1, denom + 10);
+    const identifiers = { denom, num1, num2 };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
 const getPropositions = (n, { answer, denom, num1, num2 }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -102,9 +127,7 @@ export const fractionsSumsSameDenominators = {
     id: "fractionsSumsSameDenominators",
     connector: "=",
     label: "Sommes de fractions (avec même dénominateur)",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb, opts) => getDistinctQuestions(() => getFractionsSumsSameDenominatorsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -113,4 +136,5 @@ export const fractionsSumsSameDenominators = {
     subject: "Mathématiques",
     hasHintAndCorrection: true,
     options,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.js

@@ -23,7 +23,7 @@ $$
 *Donner le couple solution sous la forme $\\left(x;y\\right)$ : par exemple, si la solution est $x=2$ et $y=3$, alors on écrira $\\left(2;3\\right)$.*`;
 };
 const getHint = (identifiers) => {
-    return `On peut utilise la méthode par substitution ou bien celle par combinaison : 
+    return `Utilise la méthode par substitution ou bien celle par combinaison : 
   
 - Si une des variables est facile à isoler dans une des équations, alors on utilise la méthode par substitution : on isole cette variable, puis on injecte le résultat obtenu dans l'autre équation.
 

package/lib/exercises/math/combinatory/anagrams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAsGrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsDF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}
+{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAsGrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAoEF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAY1C,CAAC"}

package/lib/exercises/math/combinatory/anagrams.js

@@ -97,8 +97,12 @@ const letters = [
     "à",
     "ç",
 ];
-const getAnagramsQuestion = () => {
-    const word = random(words);
+const getInstruction = (identifiers) => {
+    const { word } = identifiers;
+    return `Combien d'anagrammes mathématiques du mot ${word} sont possibles ?`;
+};
+const getAnswer = (identifiers) => {
+    const { word } = identifiers;
     const repeats = [];
     const wordLetters = word.split("");
     letters.forEach((letter) => {
@@ -120,12 +124,20 @@ const getAnagramsQuestion = () => {
         arrangements *= getFacto(nbOfRepeats);
     });
     const answer = facto / arrangements + "";
+    return answer;
+};
+const getAnagramsQuestion = () => {
+    const word = random(words);
+    const identifiers = { word };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Combien d'anagrammes mathématiques du mot ${word} sont possibles ? `,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { word },
+        identifiers,
     };
     return question;
 };
@@ -147,13 +159,12 @@ export const anagrams = {
     id: "anagrams",
     connector: "=",
     label: "Compter le nombre d'anagrammes d'un mot",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Combinatoire et dénombrement"],
     generator: (nb) => getDistinctQuestions(getAnagramsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/combinatory/ballsCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiJF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAe/C,CAAC"}
+{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAwJF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/math/combinatory/ballsCounting.js

@@ -58,8 +58,10 @@ const getInstruction = (identifiers) => {
             instruction = `comportant exactement une boule verte`;
     }
     return `Une urne contient $${blacks}$ boules noires numérotées de $1$ à $${blacks}$, $${reds}$ boules rouges numérotées de $1$ à $${reds}$ et $${greens}$ boules vertes numérotées de $1$ à $${greens}$.
-    On tire successivement et sans remise $3$ boules dans l'urne. 
-    Combien de tirages ${instruction} sont possibles ?`;
+
+On tire successivement et sans remise $3$ boules dans l'urne. 
+
+Combien de tirages ${instruction} sont possibles ?`;
 };
 const getBallsCountingQuestion = () => {
     const type = randint(0, 6);
@@ -67,6 +69,9 @@ const getBallsCountingQuestion = () => {
     const greens = randint(2, 6);
     const reds = randint(3, 6);
     const identifiers = { type, reds, greens, blacks };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -122,15 +127,12 @@ export const ballsCounting = {
     id: "ballsCounting",
     connector: "=",
     label: "Dénombrement avec des boules",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Combinatoire et dénombrement"],
     generator: (nb) => getDistinctQuestions(getBallsCountingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getAnswer,
-    getInstruction,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/combinatory/diceCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAkHF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAyJF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAY9C,CAAC"}

package/lib/exercises/math/combinatory/diceCounting.js

@@ -1,64 +1,100 @@
 import { shuffleProps, tryToAddWrongProp, addValidProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../math/utils/random/randint.js";
-const getDiceCountingQuestion = () => {
-    const type = randint(0, 8);
+const getInstruction = (identifiers) => {
+    const { type, face1, face2, face3 } = identifiers;
     let instruction = "";
-    let answer = "";
-    let face1;
-    let face2;
-    let face3;
     switch (type) {
         case 0:
             instruction = `avec exactement deux chiffres identiques`;
-            answer = 6 * 3 * 5 + "";
             break;
         case 1:
             instruction = `avec trois chiffres identiques`;
-            answer = 6 + "";
             break;
         case 2:
-            face1 = randint(1, 7);
             instruction = `avec exactement une fois la face $${face1}$`;
-            answer = 3 * 5 * 5 + "";
             break;
         case 3:
-            face1 = randint(1, 7);
             instruction = `avec exactement deux fois la face $${face1}$`;
-            answer = 3 * 5 + "";
             break;
         case 4:
-            face1 = randint(1, 7);
-            face2 = randint(1, 7, [face1]);
-            face3 = randint(1, 7, [face1, face2]);
             instruction = `avec exactement les faces $${face1}$, $${face2}$ et $${face3}$`;
-            answer = 6 + "";
             break;
         case 5:
-            face1 = randint(1, 7);
-            face2 = randint(1, 7, [face1]);
-            face3 = randint(1, 7, [face1, face2]);
             instruction = `avec exactement une fois la face $${face1}$ et une fois la face $${face2}$`;
-            answer = 3 * 5 + "";
             break;
         case 6:
             instruction = `dans lesquels toutes les faces sont différentes`;
-            answer = 6 * 5 * 4 + "";
             break;
         case 7:
+        default:
             instruction = "";
-            answer = 6 * 6 * 6 + "";
             break;
     }
+    return `On tire $3$ fois consécutivement un dé à six faces numérotées de $1$ à $6$. 
+  
+Combien de tirages ${instruction} sont possibles ?`;
+};
+const getAnswer = (identifiers) => {
+    const { type, face1, face2, face3 } = identifiers;
+    switch (type) {
+        case 0:
+            return 6 * 3 * 5 + "";
+        case 1:
+            return 6 + "";
+        case 2:
+            return 3 * 5 * 5 + "";
+        case 3:
+            return 3 * 5 + "";
+        case 4:
+            return 6 + "";
+        case 5:
+            return 3 * 5 + "";
+        case 6:
+            return 6 * 5 * 4 + "";
+        case 7:
+        default:
+            return 6 * 6 * 6 + "";
+    }
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answer,
-        instruction: `On tire $3$ fois consécutivement un dé à six faces numérotées de $1$ à $6$. Combien de tirages ${instruction} sont possibles ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { type, face1, face2, face3 },
+        identifiers,
     };
     return question;
 };
+const getDiceCountingQuestion = () => {
+    const type = randint(0, 8);
+    let face1;
+    let face2;
+    let face3;
+    switch (type) {
+        case 2:
+            face1 = randint(1, 7);
+            break;
+        case 3:
+            face1 = randint(1, 7);
+            break;
+        case 4:
+            face1 = randint(1, 7);
+            face2 = randint(1, 7, [face1]);
+            face3 = randint(1, 7, [face1, face2]);
+            break;
+        case 5:
+            face1 = randint(1, 7);
+            face2 = randint(1, 7, [face1]);
+            face3 = randint(1, 7, [face1, face2]);
+            break;
+        default:
+            break;
+    }
+    const identifiers = { type, face1, face2, face3 };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, type }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -110,13 +146,12 @@ export const diceCounting = {
     id: "diceCounting",
     connector: "=",
     label: "Dénombrement avec des dés",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Combinatoire et dénombrement"],
     generator: (nb) => getDistinctQuestions(getDiceCountingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/absolute/absolueValueAffineEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"absolueValueAffineEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/absolute/absolueValueAffineEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAGL,wBAAwB,EACzB,MAAM,yCAAyC,CAAC;AAOjD,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,wBAAwB,CAAC;IACtC,YAAY,EAAE,wBAAwB,CAAC;CACxC,CAAC;AA0KF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAiB5D,CAAC"}
+{"version":3,"file":"absolueValueAffineEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/absolute/absolueValueAffineEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAGL,wBAAwB,EACzB,MAAM,yCAAyC,CAAC;AAOjD,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,wBAAwB,CAAC;IACtC,YAAY,EAAE,wBAAwB,CAAC;CACxC,CAAC;AA+KF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAkB5D,CAAC"}