math-exercises 3.0.68 → 3.0.70

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/calcul/mentalCaluls/mentalAddAndSub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA8DF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAWjD,CAAC"}
+{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAoFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSub.js

@@ -3,10 +3,38 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
-import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    return `Calculer : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getStatementNode = (identifiers) => {
+    const { numbers } = identifiers;
+    return operatorComposition(AddNode, numbers.map((e) => e.toTree()));
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getAnswer = (identifiers) => {
+    return getStatementNode(identifiers).simplify().toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getMentalAddAndSub = () => {
     let numbers = [];
     const nbrOperations = coinFlip() ? 2 : 3;
@@ -24,22 +52,9 @@ const getMentalAddAndSub = () => {
         numbers[2] = round(sum / 10 - numbers[0] - numbers[1], 2);
         sum = numbers[0] + numbers[1] + numbers[2];
     }
-    const allNumbersNodes = numbers.map((nb) => new NumberNode(nb));
-    let statementTree = new AddNode(allNumbersNodes[0], allNumbersNodes[1]);
-    for (let i = 2; i < nbrOperations; i++)
-        statementTree = new AddNode(statementTree, allNumbersNodes[i]);
-    statementTree = statementTree.shuffle();
-    const statement = statementTree.toTex();
-    const answer = (round(sum, 2) + "").replace(".", ",");
-    const question = {
-        instruction: `Calculer : $${statement}$`,
-        startStatement: statement,
-        answer,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { numbers },
-    };
-    return question;
+    numbers = shuffle(numbers);
+    const identifiers = { numbers };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, numbers }) => {
     const propositions = [];
@@ -65,4 +80,5 @@ export const mentalAddAndSub = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalAddAndSubNoRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgEF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"mentalAddAndSubNoRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAwFF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAa3D,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.js

@@ -6,9 +6,41 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+const getInstruction = (identifiers) => {
+    return `Calculer : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const numbers = identifiers.numbers;
+    const answer = round(numbers.reduce((a, b) => a + b), 2);
+    const answerTex = answer.frenchify();
+    return answerTex;
+};
+const getStartStatement = (identifiers) => {
+    const numbers = identifiers.numbers;
+    const allNumbersNodes = numbers.map((nb) => new NumberNode(nb));
+    let statementTree = new AddNode(allNumbersNodes[0], allNumbersNodes[1]);
+    for (let i = 2; i < allNumbersNodes.length; i++) {
+        statementTree = new AddNode(statementTree, allNumbersNodes[i]);
+    }
+    return statementTree.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getMentalAddAndSubNoRelativeQuestion = () => {
     let answer = -1;
-    let statementTree;
     let numbers = [];
     while (answer < 0) {
         const nbOperations = randint(2, 4);
@@ -22,23 +54,10 @@ const getMentalAddAndSubNoRelativeQuestion = () => {
                 sum += numbers[i];
             }
         } while (numbers.every((a) => a > 0));
-        const allNumbersNodes = numbers.map((nb) => new NumberNode(nb));
-        statementTree = new AddNode(allNumbersNodes[0], allNumbersNodes[1]);
-        for (let i = 2; i < allNumbersNodes.length; i++) {
-            statementTree = new AddNode(statementTree, allNumbersNodes[i]);
-        }
         answer = round(numbers.reduce((a, b) => a + b), 2);
     }
-    const answerTex = answer.frenchify();
-    const question = {
-        answer: answerTex,
-        instruction: `Calculer : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { numbers },
-    };
-    return question;
+    const identifiers = { numbers };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -57,13 +76,12 @@ export const mentalAddAndSubNoRelative = {
     id: "mentalAddAndSubNoRelative",
     connector: "=",
     label: "Additions et soustractions avec des décimaux (sans relatifs)",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getMentalAddAndSubNoRelativeQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalDivisions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalDivisions.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalDivisions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAuBjD,CAAC"}
+{"version":3,"file":"mentalDivisions.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalDivisions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwHF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalDivisions.js

@@ -6,6 +6,41 @@ import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    const { rand, a, b, c } = identifiers;
+    return `Calculer : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { rand, a, b, c } = identifiers;
+    const answer = rand === 6 ? a / (b / c) : a / b;
+    const answerTex = round(answer, 2).frenchify();
+    return answerTex;
+};
+const getStartStatement = (identifiers) => {
+    const { rand, a, b, c } = identifiers;
+    const allNumbersNodes = rand === 6
+        ? [a, b, c].map((nb) => new NumberNode(nb))
+        : [a, b].map((nb) => new NumberNode(nb));
+    const statementTree = rand === 6
+        ? new DivideNode(allNumbersNodes[0], new DivideNode(allNumbersNodes[1], allNumbersNodes[2]))
+        : new DivideNode(allNumbersNodes[0], allNumbersNodes[1]);
+    return statementTree.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getMentalDivisions = () => {
     let a = 1, b = 1, c = 1;
     const rand = randint(1, 7);
@@ -39,24 +74,8 @@ const getMentalDivisions = () => {
             a = (b / c) * randint(2, 10);
             break;
     }
-    const allNumbersNodes = rand === 6
-        ? [a, b, c].map((nb) => new NumberNode(nb))
-        : [a, b].map((nb) => new NumberNode(nb));
-    const statementTree = rand === 6
-        ? new DivideNode(allNumbersNodes[0], new DivideNode(allNumbersNodes[1], allNumbersNodes[2]))
-        : new DivideNode(allNumbersNodes[0], allNumbersNodes[1]);
-    const statementTex = statementTree.toTex();
-    const answer = rand === 6 ? a / (b / c) : a / b;
-    const answerTex = (round(answer, 2) + "").replace(".", ",");
-    const question = {
-        instruction: `Calculer : $${statementTex}$`,
-        startStatement: statementTex,
-        answer: answerTex,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { rand, a, b, c },
-    };
-    return question;
+    const identifiers = { rand, a, b, c };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -77,18 +96,6 @@ export const mentalDivisions = {
     id: "mentalDivisions",
     connector: "=",
     label: "Effectuer mentalement des divisions simples",
-    levels: [
-        "6ème",
-        "5ème",
-        "4ème",
-        "3ème",
-        "2nde",
-        "1reESM",
-        "CAP",
-        "2ndPro",
-        "1rePro",
-    ],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getMentalDivisions, nb),
     qcmTimer: 60,
@@ -96,4 +103,5 @@ export const mentalDivisions = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalMultiplications.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplications.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA6EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAWvD,CAAC"}
+{"version":3,"file":"mentalMultiplications.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplications.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAuFF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAYvD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplications.js

@@ -4,13 +4,41 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    return `Calculer : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getStatementNode = (identifiers) => {
+    const { numbers } = identifiers;
+    return operatorComposition(MultiplyNode, numbers.map((e) => e.toTree()));
+};
+const getAnswer = (identifiers) => {
+    const statement = getStatementNode(identifiers);
+    return statement.simplify().toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getMentalMultiplications = () => {
-    const numbers = [];
+    let numbers = [];
     const nbOfOperations = randint(2, 4);
-    let statementTree;
-    let answer;
     if (nbOfOperations === 2) {
         const a = randint(-9, 10, [-1, 0, 1]);
         const b = coinFlip()
@@ -20,9 +48,6 @@ const getMentalMultiplications = () => {
                 : randint(2, 10) + randint(-1, 2, [0]) / 10;
         numbers.push(a);
         numbers.push(b);
-        const allNumbersNodes = numbers.map((nb) => new NumberNode(nb));
-        statementTree = new MultiplyNode(allNumbersNodes[0], allNumbersNodes[1]);
-        answer = numbers[0] * numbers[1];
     }
     else {
         //nbOfOperations = 3
@@ -32,22 +57,10 @@ const getMentalMultiplications = () => {
         numbers.push(c);
         numbers.push(d);
         numbers.push(f);
-        const allNumbersNodes = numbers.map((nb) => new NumberNode(nb));
-        statementTree = new MultiplyNode(allNumbersNodes[0], new MultiplyNode(allNumbersNodes[1], allNumbersNodes[2]));
-        answer = numbers[0] * numbers[1] * numbers[2];
     }
-    statementTree = statementTree.shuffle();
-    const statementTex = statementTree.toTex();
-    const answerTex = round(answer, 2).frenchify();
-    const question = {
-        instruction: `Calculer : $${statementTex}$`,
-        startStatement: statementTex,
-        answer: answerTex,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { numbers },
-    };
-    return question;
+    numbers = shuffle(numbers);
+    const identifiers = { numbers };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -75,4 +88,5 @@ export const mentalMultiplications = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalMultiplicationsNoRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkFF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"mentalMultiplicationsNoRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAwFF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAejE,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.js

@@ -49,6 +49,9 @@ const getMentalMultiplicationsNoRelative = () => {
         numbers.push(f);
     }
     const identifiers = { numbers: shuffle(numbers) };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
         startStatement: getStartStatement(identifiers),
@@ -85,4 +88,5 @@ export const mentalMultiplicationsNoRelative = {
     subject: "Mathématiques",
     getAnswer,
     getInstruction,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalPercentage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalPercentage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalPercentage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AA0ErC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAWlD,CAAC"}
+{"version":3,"file":"mentalPercentage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalPercentage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuJF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAYlD,CAAC"}