math-exercises 3.0.146 → 3.0.148

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

@@ -4,9 +4,11 @@ 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 { NodeSimplifier } from "../../../../tree/utilities/nodeSimplifier.js";
 import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const getInstruction = (identifiers) => {
     return `Calculer : 
   
@@ -25,16 +27,37 @@ 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 getHint = () => {
+    return `Il n'y a que des multiplications : 
+Tu peux effectuer les calculs de gauche à droite.`;
+};
+const getCorrection = (identifiers) => {
+    const node = getStatementNode(identifiers);
+    const arrTexNodeStepByStep = NodeSimplifier.arrTexStepByStep(node);
+    return `Il n'y a que des multiplications : 
+On va effectuer les calculs de gauche à droite.
+
+${alignTex([
+        [node.toTex(), "=", arrTexNodeStepByStep[0]],
+        ...arrTexNodeStepByStep.slice(1).map((tex) => ["", "=", tex]),
+    ])}
+
+`;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const result = answer.unfrenchify();
+    propWhile(propositions, n, () => {
+        const incorrectAnswer = round(result + (coinFlip() ? 1 : -1) * Math.random() * 10, 2);
+        tryToAddWrongProp(propositions, incorrectAnswer.toString().replace(".", ","));
+    });
+    return shuffle(propositions);
+};
+const isAnswerValid = (studentAns, { answer }) => {
+    const answerTree = new NumberNode(Number(answer.replace(",", ".")));
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(studentAns);
 };
 const getMentalMultiplications = () => {
     let numbers = [];
@@ -62,20 +85,18 @@ const getMentalMultiplications = () => {
     const identifiers = { numbers };
     return getQuestionFromIdentifiers(identifiers);
 };
-const getPropositions = (n, { answer }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    const result = answer.unfrenchify();
-    propWhile(propositions, n, () => {
-        const incorrectAnswer = round(result + (coinFlip() ? 1 : -1) * Math.random() * 10, 2);
-        tryToAddWrongProp(propositions, incorrectAnswer.toString().replace(".", ","));
-    });
-    return shuffle(propositions);
-};
-const isAnswerValid = (studentAns, { answer }) => {
-    const answerTree = new NumberNode(Number(answer.replace(",", ".")));
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(studentAns);
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
 };
 export const mentalMultiplications = {
     id: "mentalMultiplications",
@@ -89,4 +110,7 @@ export const mentalMultiplications = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

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,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0JF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAYlD,CAAC"}
+{"version":3,"file":"mentalPercentage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalPercentage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwXF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

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

@@ -2,26 +2,231 @@ import { addValidProp, propWhile, tryToAddWrongProp, } from "../../../../exercis
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const getInstruction = (identifiers) => {
     const { a, b } = identifiers;
-    return `Que vaut $${String(a).replace(".", ",")}\\%$ de $${b}$ ?`;
+    return `Que vaut $${a.frenchify()}\\%$ de $${b}$ ?`;
 };
 const getAnswer = (identifiers) => {
     const { a, b } = identifiers;
     const answer = ((a * b) / 100).frenchify();
     return answer;
 };
-const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
-        instruction: getInstruction(identifiers),
-        answer: getAnswer(identifiers),
-        keys: [],
-        answerFormat: "tex",
-        identifiers,
-    };
-    return question;
+const getHint = () => {
+    return `Pour prendre un pourcentage d'un nombre, il faut effectuer une multiplication.
+
+Essaye de rendre la multiplication plus facile à faire en la transformant en une expression équivalente 
+(transformer les facteurs ou même transformer la multiplication en division).
+
+À la fin, n'oublie par de diviser par $10$ ou par $100$ selon le cas, si nécessaire.`;
+};
+const getCorrection = (identifiers) => {
+    const { rand, a, b } = identifiers;
+    const texAnswer = multiply(frac(a, 100), b)
+        .simplify({ fractionsToDecimal: true })
+        .toTex();
+    if (b === 100) {
+        return `
+
+${alignTex([
+            [
+                `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                "=",
+                `\\frac{${a.frenchify()}}{100} \\times ${b.frenchify()}`,
+            ],
+            ["", "=", `${texAnswer}`],
+        ])}
+
+`;
+    }
+    if (a === 200) {
+        return `
+
+${alignTex([
+            [
+                `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                "=",
+                `2 \\times ${b.frenchify()}`,
+            ],
+            ["", "=", `${texAnswer}`],
+        ])}
+
+`;
+    }
+    switch (rand) {
+        case 1: // 10% de 70%
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a / 100).frenchify()} \\times ${b.frenchify()}`,
+                ],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+        case 2: // 30% de 9
+            return `
+        
+$$
+${a.frenchify()}\\% \\times ${b.frenchify()} = \\frac{${a.frenchify()}}{100} \\times ${b.frenchify()} = \\frac{1}{10} \\times ${(a / 10).frenchify()} \\times ${b.frenchify()}
+$$
+
+Or : 
+
+$$
+${(a / 10).frenchify()} \\times ${b.frenchify()} = ${((a / 10) * b).frenchify()}
+$$
+
+Donc :
+
+$$
+${a.frenchify()}\\% \\times ${b.frenchify()} = ${texAnswer}
+$$
+
+`;
+        case 3: // 32% de 10
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a / 100).frenchify()} \\times ${b.frenchify()}`,
+                ],
+                ["", "=", `${a.frenchify()} \\times \\frac{${b.frenchify()}}{100}`],
+                ["", "=", `${a.frenchify()} \\times \\frac{${(b / 10).frenchify()}}{10}`],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+        case 4: {
+            // 14% de 50 ou 230% de 20
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a / 100).frenchify()} \\times ${b.frenchify()}`,
+                ],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+        }
+        case 5: // 12.5% de 72
+            if (a === 12.5) {
+                return `
+
+${alignTex([
+                    [
+                        `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                        "=",
+                        `\\frac{1}{8} \\times ${b.frenchify()}`,
+                    ],
+                    ["", "=", `${(b / 8).frenchify()}`],
+                    ["", "=", `${texAnswer}`],
+                ])}
+
+`;
+            }
+            else {
+                return `
+
+${alignTex([
+                    [
+                        `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                        "=",
+                        `\\frac{9}{8} \\times ${b.frenchify()}`,
+                    ],
+                    ["", "=", `9 \\times ${(b / 8).frenchify()}`],
+                    ["", "=", `${texAnswer}`],
+                ])}
+
+`;
+            }
+        case 6: // 15% de 90
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a / 100).frenchify()} \\times ${b.frenchify()}`,
+                ],
+                [
+                    "",
+                    "=",
+                    `\\frac{${a.frenchify()}}{100} \\times ${(b / 10).frenchify()} \\times 10`,
+                ],
+                ["", "=", `${(a / 10).frenchify()} \\times ${(b / 10).frenchify()}`],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+        case 7: // 20% de x
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a / 100).frenchify()} \\times ${b.frenchify()}`,
+                ],
+                ["", "=", `\\frac{${(a / 20).frenchify()}}{5} \\times ${b.frenchify()}`],
+                ["", "=", `${(a / 20).frenchify()} \\times \\frac{${b.frenchify()}}{5}`],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+        case 8: // 75% de x
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a / 25).frenchify()} \\times 25\\% \\times ${b.frenchify()}`,
+                ],
+                [
+                    "",
+                    "=",
+                    `${(a / 25).frenchify()} \\times \\frac{1}{4} \\times ${b.frenchify()}`,
+                ],
+                ["", "=", `${(a / 25).frenchify()} \\times ${(b / 4).frenchify()}`],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+        case 9: //0.5 % de 1000
+            return `
+
+${alignTex([
+                [
+                    `${a.frenchify()}\\% \\times ${b.frenchify()}`,
+                    "=",
+                    `${(a * 10).frenchify()}\\% \\times \\frac{1}{10} \\times 1000`,
+                ],
+                ["", "=", `${(a * 10).frenchify()}\\% \\times 100`],
+                ["", "=", `${texAnswer}`],
+            ])}
+
+`;
+    }
+    throw new Error("Unsupported rand: " + rand);
+};
+const isAnswerValid = (studentAns, { answer }) => {
+    return rationalVEA(studentAns, answer, {
+        allowNonIrreductible: true,
+        allowDecimal: true,
+    });
 };
 const getMentalPercentage = () => {
     let a = 1, b = 1;
@@ -29,11 +234,11 @@ const getMentalPercentage = () => {
     switch (rand) {
         case 1: // 10% de 70%
             a = 10 * randint(1, 3);
-            b = randint(1, 200);
+            b = randint(1, 100);
             break;
         case 2: // 30% de 9
             a = randint(1, 10);
-            b = randint(1, 10) * a;
+            b = randint(1, 5) * a;
             a *= 10;
             break;
         case 3: // 32% de 10
@@ -46,19 +251,19 @@ const getMentalPercentage = () => {
             break;
         case 5: // 12.5% de 72
             a = coinFlip() ? 12.5 : 12.5 + 100;
-            b = 8 * randint(1, 25);
+            b = 8 * randint(1, 10);
             break;
         case 6: // 15% de 90
             a = coinFlip() ? 15 * randint(1, 6) : 30 * randint(1, 4, [2]) + 100;
-            b = 3 * randint(1, 10) * 10;
+            b = 3 * randint(1, 5) * 10;
             break;
         case 7: // 20% de x
             a = 20 * randint(1, 12, [5]);
-            b = 5 * randint(1, 21);
+            b = 5 * randint(1, 11);
             break;
         case 8: // 75% de x
             a = 25 * randint(1, 8, [4]);
-            b = 4 * randint(1, 75);
+            b = 4 * randint(1, 11);
             break;
         case 9: //0.5 % de 1000
             a = randint(1, 10) / 10;
@@ -94,7 +299,7 @@ const getPropositions = (n, { answer, rand }) => {
                 break;
             case 5: // 12.5% de 72
                 a = coinFlip() ? 12.5 : 12.5 + 100;
-                b = 8 * randint(1, 25);
+                b = 8 * randint(1, 11);
                 break;
             case 6: // 15% de 90
                 a = coinFlip() ? 15 * randint(1, 6) : 30 * randint(1, 4, [2]) + 100;
@@ -118,11 +323,17 @@ const getPropositions = (n, { answer, rand }) => {
     });
     return shuffle(propositions);
 };
-const isAnswerValid = (studentAns, { answer }) => {
-    return rationalVEA(studentAns, answer, {
-        allowNonIrreductible: true,
-        allowDecimal: true,
-    });
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
 };
 export const mentalPercentage = {
     id: "mentalPercentage",
@@ -136,4 +347,7 @@ export const mentalPercentage = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/operations/operationsPriorities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPriorities.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPriorities.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAQ7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEtB,YAAY,EAAE,eAAe,CAAC;CAC/B,CAAC;AAwJF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAYtD,CAAC"}
+{"version":3,"file":"operationsPriorities.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPriorities.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAU7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEtB,YAAY,EAAE,eAAe,CAAC;CAC/B,CAAC;AAkLF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPriorities.js

@@ -14,8 +14,10 @@ import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { NodeSimplifier } from "../../../../tree/utilities/nodeSimplifier.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const getStartStatement = (identifiers) => {
     const { statementIds } = identifiers;
     return reifyAlgebraic(statementIds).toTex();
@@ -31,16 +33,37 @@ const getAnswer = (identifiers) => {
     const { statementIds } = identifiers;
     return reifyAlgebraic(statementIds).simplify().toTex();
 };
-const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
-        instruction: getInstruction(identifiers),
-        startStatement: getStartStatement(identifiers),
-        answer: getAnswer(identifiers),
-        keys: [],
-        answerFormat: "tex",
-        identifiers,
-    };
-    return question;
+const getHint = () => {
+    return `Tu peux retenir le moyen mnémotechnique "PEMDAS" pour retenir l'ordre dans lequel effectuer les calculs : 
+- Parenthèses
+- Multiplications
+- Divisions
+- Additions
+- Soustractions
+`;
+};
+const getCorrection = (identifiers) => {
+    const node = reifyAlgebraic(identifiers.statementIds);
+    const arrTexNodeStepByStep = NodeSimplifier.arrTexStepByStep(node);
+    return `
+  
+${alignTex([
+        [node.toTex(), "=", arrTexNodeStepByStep[0]],
+        ...arrTexNodeStepByStep.slice(1).map((tex) => ["", "=", tex]),
+    ])}
+
+`;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, randint(-100, 100) + "");
+    });
+    return shuffle(propositions);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return numberVEA(ans, answer);
 };
 const getPriorityQuestions = () => {
     const type = randint(1, 9);
@@ -111,16 +134,18 @@ const getPriorityQuestions = () => {
     };
     return getQuestionFromIdentifiers(identifiers);
 };
-const getPropositions = (n, { answer }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    propWhile(propositions, n, () => {
-        tryToAddWrongProp(propositions, randint(-100, 100) + "");
-    });
-    return shuffle(propositions);
-};
-const isAnswerValid = (ans, { answer }) => {
-    return numberVEA(ans, answer);
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
 };
 export const operationsPriorities = {
     id: "operationsPriorities",
@@ -134,4 +159,7 @@ export const operationsPriorities = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAkIF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA4JF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAgBjE,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.js

@@ -6,7 +6,9 @@ import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+import { NodeSimplifier } from "../../../../tree/utilities/nodeSimplifier.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const getInstruction = (identifiers) => {
     const statement = reifyAlgebraic(identifiers.nodeIds);
     return `Calculer : 
@@ -19,15 +21,37 @@ const getAnswer = (identifiers) => {
     const statement = reifyAlgebraic(identifiers.nodeIds);
     return statement.simplify().toTex();
 };
-const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
-        keys: [],
-        answerFormat: "tex",
-        identifiers,
-    };
-    return question;
+const getHint = () => {
+    return `Tu peux retenir le moyen mnémotechnique "PEMDAS" pour retenir l'ordre dans lequel effectuer les calculs : 
+- Parenthèses
+- Multiplications
+- Divisions
+- Additions
+- Soustractions
+`;
+};
+const getCorrection = (identifiers) => {
+    const node = reifyAlgebraic(identifiers.nodeIds);
+    const arrTexNodeStepByStep = NodeSimplifier.arrTexStepByStep(node);
+    return `
+  
+${alignTex([
+        [node.toTex(), "=", arrTexNodeStepByStep[0]],
+        ...arrTexNodeStepByStep.slice(1).map((tex) => ["", "=", tex]),
+    ])}
+
+`;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, randint(-100, 100) + "");
+    });
+    return shuffleProps(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
 };
 const getOperationsPrioritiesParenthesisQuestion = () => {
     const type = randint(1, 5);
@@ -93,16 +117,17 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
     const identifiers = { nodeIds: statement.toIdentifiers(), type };
     return getQuestionFromIdentifiers(identifiers);
 };
-const getPropositions = (n, { answer }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    propWhile(propositions, n, () => {
-        tryToAddWrongProp(propositions, randint(-100, 100) + "");
-    });
-    return shuffleProps(propositions, n);
-};
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
 };
 export const operationsPrioritiesParenthesis = {
     id: "operationsPrioritiesParenthesis",
@@ -116,4 +141,7 @@ export const operationsPrioritiesParenthesis = {
     isAnswerValid,
     getQuestionFromIdentifiers,
     subject: "Mathématiques",
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA+HF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}
+{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAU7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAuJF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAuBR,CAAC"}