math-exercises 2.2.5 → 2.2.7

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.js

@@ -3,91 +3,71 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inverseImageFunctionTable = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const polynomial_1 = require("../../../../math/polynomials/polynomial");
+const randTupleInt_1 = require("../../../../math/utils/random/randTupleInt");
 const randint_1 = require("../../../../math/utils/random/randint");
+const arrayHasSameElement_1 = require("../../../../utils/arrayHasSameElement");
 const coinFlip_1 = require("../../../../utils/coinFlip");
 const random_1 = require("../../../../utils/random");
 const getInverseImageFunctionTableQuestion = () => {
-    const exercise = generateExercise();
-    const instruction = `Ci-dessous est donné le tableau de valeurs d'une fonction $f$. Déterminer ${exercise.isAskingImage ? `l'image de` : `le ou les antécédents de`} $${exercise.questionValue}$ par $f$
-    ${exercise.exoTable.table}`;
+    const xValues = (0, randTupleInt_1.randTupleInt)(5, {
+        from: -10,
+        to: 10,
+        allDifferent: true,
+    }).sort((a, b) => a - b);
+    const yValues = (0, randTupleInt_1.randTupleInt)(5, { from: -10, to: 10 });
+    let indexAsked = (0, randint_1.randint)(0, 5);
+    const valueAsked = xValues[indexAsked];
+    //on force un meme nombre dans les deux lignes pour complexifier
+    if (!yValues.includes(valueAsked) || yValues[indexAsked] === valueAsked) {
+        yValues[(0, randint_1.randint)(0, 5, [indexAsked])] = valueAsked;
+    }
+    const isAskingImage = (0, coinFlip_1.coinFlip)();
+    const answer = (isAskingImage
+        ? yValues[indexAsked]
+        : xValues
+            .filter((el, index) => yValues[index] === valueAsked)
+            .join("\\text{ et }")) + "";
+    const instruction = `Ci-dessous est donné le tableau de valeurs d'une fonction $f$. Déterminer ${isAskingImage ? `l'image de` : `le ou les antécédents de`} $${valueAsked}$ par $f$.
+
+  |$x$|${xValues.map((value) => `$${value}$`).join("|")}|
+  |-|-|-|-|-|-|
+  |$f(x)$|${yValues.map((value) => `$${value}$`).join("|")}|
+`;
     const question = {
-        answer: `${exercise.answer}`,
+        answer,
         instruction,
-        keys: ["x", "equal"],
+        keys: ["et"],
         answerFormat: "tex",
         style: { tableHasNoHeader: true },
         identifiers: {
-            xValues: exercise.exoTable.xValues,
-            imageValues: exercise.exoTable.imageValues,
+            xValues,
+            imageValues: yValues,
+            isAskingImage,
+            value: valueAsked,
         },
     };
     return question;
 };
-const getPropositions = (n, { answer, xValues, imageValues }) => {
+const getPropositions = (n, { answer, xValues, imageValues, isAskingImage, value }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    generatePropositions(xValues, imageValues, answer).forEach((value) => (0, exercise_1.tryToAddWrongProp)(propositions, value));
+    if (isAskingImage) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, xValues[imageValues.indexOf(value)] + "");
+    }
+    else {
+        (0, exercise_1.tryToAddWrongProp)(propositions, imageValues[xValues.indexOf(value)] + "");
+    }
     while (propositions.length < n) {
-        let randProp = (0, randint_1.randint)(+answer - 10, +answer + 11, [+answer]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, randProp + "");
+        (0, exercise_1.tryToAddWrongProp)(propositions, ((0, coinFlip_1.coinFlip)() ? (0, random_1.random)(xValues) : (0, random_1.random)(imageValues)) + "");
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return [ans, ans.split("=")[1]].includes(answer);
-};
-const generateTable = (f) => {
-    const xValues = generateXValues();
-    const imageValues = xValues.map((value) => f.calculate(value));
-    return {
-        xValues,
-        imageValues,
-        table: `
-  |$x$|${xValues
-            .map((value) => `$${value}$`)
-            .reduce((prev, curr) => prev + "|" + curr)}|
-  |-|-|-|-|-|-|
-  |$f(x)$|${imageValues
-            .map((value) => `$${value}$`)
-            .reduce((prev, curr) => prev + "|" + curr)}|
-  `,
-    };
-};
-const generateXValues = () => {
-    const xValues = [];
-    for (let i = 0; i < 5; i++) {
-        let value;
-        do {
-            value = (0, randint_1.randint)(-11, 11);
-        } while (xValues.includes(value));
-        xValues.push(value);
-    }
-    xValues.sort((a, b) => {
-        return a - b;
-    });
-    return xValues;
-};
-const generateExercise = () => {
-    const polynom = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-5, 6, [0])]);
-    const exoTable = generateTable(polynom);
-    const isAskingImage = (0, coinFlip_1.coinFlip)();
-    const questionValue = isAskingImage
-        ? (0, random_1.random)(exoTable.xValues)
-        : (0, random_1.random)(exoTable.imageValues);
-    const answer = isAskingImage
-        ? polynom.calculate(questionValue)
-        : exoTable.xValues.find((value, index) => exoTable.imageValues[index] === questionValue);
-    return { polynom, exoTable, isAskingImage, questionValue, answer };
-};
-const generatePropositions = (xValues, imageValues, answer) => {
-    const filteredXValues = xValues.filter((value) => value !== +answer);
-    const firstProp = (0, random_1.random)(filteredXValues);
-    const secondProp = (0, random_1.random)(filteredXValues
-        .concat(imageValues)
-        .filter((value) => ![firstProp, +answer].includes(value)));
-    const thirdProp = (0, random_1.random)(imageValues.filter((value) => value !== secondProp));
-    return [firstProp + "", secondProp + "", thirdProp + ""];
+const isAnswerValid = (ans, { answer, xValues, imageValues, isAskingImage, value }) => {
+    const numbers = ans.split("\\text{ et }").map((el) => Number(el));
+    if (numbers.some((n) => isNaN(n)))
+        return false;
+    const answerNumbers = answer.split("\\text{ et }").map((el) => Number(el));
+    return ans === answer || (0, arrayHasSameElement_1.arrayHasSameElements)(numbers, answerNumbers);
 };
 exports.inverseImageFunctionTable = {
     id: "inverseImageFunctionTable",

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.js

@@ -64,7 +64,7 @@ const getSolveSecondDegreeEquationByFactorisationQuestion = () => {
             }
             break;
     }
-    const instruction = `Soit $f(x) = ${statement}$. Résoudre l'équation $f(x) = 0$.`;
+    const instruction = `Soit $f(x) = ${statement}$. Factoriser $f(x)$, puis résoudre l'équation $f(x) = 0$.`;
     answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots)).toTex();
     const question = {
         answer,

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationFromCano.js

@@ -9,7 +9,7 @@ const randint_1 = require("../../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const getSolveSecondDegreeEquationFromCanoQuestion = () => {
-    const trinom = trinom_1.TrinomConstructor.randomCanonical();
+    const trinom = trinom_1.TrinomConstructor.randomNiceRoots();
     const statement = trinom.getCanonicalForm().toTex();
     const roots = trinom.getRootsNode();
     const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots)).toTex();

package/lib/exercises/math/geometry/cartesian/placeAPoint.d.ts

@@ -1,5 +1,8 @@
 import { Exercise } from "../../../../exercises/exercise";
-type Identifiers = {};
+type Identifiers = {
+    x: number;
+    y: number;
+};
 export declare const testGGBAnswer: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=placeAPoint.d.ts.map

package/lib/exercises/math/geometry/cartesian/placeAPoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA+BtB,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}
+{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/math/geometry/cartesian/placeAPoint.js

@@ -24,7 +24,7 @@ const getPlaceAPointQuestion = () => {
             isGridSimple: true,
             enableShiftDragZoom: true,
         },
-        identifiers: {},
+        identifiers: { x: point.x.evaluate({}), y: point.y.evaluate({}) },
     };
     return question;
 };

package/lib/exercises/math/percent/averageEvolutionRate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"averageEvolutionRate.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/averageEvolutionRate.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA8CF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"averageEvolutionRate.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/averageEvolutionRate.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAqEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/math/percent/averageEvolutionRate.js

@@ -18,6 +18,21 @@ const getAverageEvolutionRate = () => {
         keys: ["percent"],
         answerFormat: "tex",
         identifiers: { nbMois, rate },
+        hint: `Commence par déterminer le coefficient multiplicateur assoicié à une hausse de $${rate}\\%$. Puis, élève ce coefficient à la puissance $\\frac{1}{${nbMois}}$. Enfin, transforme le coefficient multiplicateur obtenu en taux d'évolution.`,
+        correction: `Le coefficient multiplicateur associé à une hausse de $${rate}\\%$ est : 
+
+$1+\\frac{${rate}}{100} = ${(1 + rate / 100).frenchify()}$
+
+Le coefficient multiplicateur moyen pour chaque mois sur une période de $${nbMois}$ mois est donc de : 
+
+$\\left(${(1 +
+            rate / 100).frenchify()}\\right)^{\\frac{1}{${nbMois}}} = ${(0, round_1.round)(Math.pow(1 + rate / 100, 1 / nbMois), 4).frenchify()}$
+
+On transforme alors ce coefficient multiplicateur en taux d'évolution :
+
+$t = (${(0, round_1.round)(Math.pow(1 + rate / 100, 1 / nbMois), 4).frenchify()}-1)\\times 100 = ${answer.frenchify()}$
+
+Le taux d'évoution mensuel moyen est donc de $${answerTex}$.`,
     };
     return question;
 };
@@ -52,4 +67,5 @@ exports.averageEvolutionRate = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/cmToEvolution.d.ts

@@ -0,0 +1,7 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    evolution: number;
+};
+export declare const cmToEvolution: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=cmToEvolution.d.ts.map

package/lib/exercises/math/percent/cmToEvolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmToEvolution.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/cmToEvolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA8DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}

package/lib/exercises/math/percent/cmToEvolution.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cmToEvolution = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
+const alignTex_1 = require("../../../utils/alignTex");
+const coinFlip_1 = require("../../../utils/coinFlip");
+const getCmToEvolutionQuestion = () => {
+    const evolution = (0, randint_1.randint)(-99, 101, [0]);
+    const isHausse = evolution > 0;
+    const CM = ((0, round_1.round)(1 + evolution / 100, 2) + "").replaceAll(".", ",");
+    const answer = (isHausse ? "+" : "") + evolution + "\\%";
+    const question = {
+        answer: answer,
+        instruction: `Quelle est l'évolution en pourcentage associée à un coefficient multiplicateur de $${CM}$ ?`,
+        keys: ["percent"],
+        answerFormat: "tex",
+        identifiers: { evolution },
+        hint: "Pour trouver le taux d'évolution $t$ à partir du coefficient multiplicateur (CM) utilise la formule $t = \\left(\\text{CM}-1\\right)\\times 100$.",
+        correction: `Le taux d'évolution $t$ s'obtient par la formule 
+    
+$$t = \\left(\\text{CM}-1\\right)\\times 100$$
+
+Ici, on a donc : 
+
+${(0, alignTex_1.alignTex)([
+            ["t", "=", `\\left(${CM}-1\\right)\\times 100`],
+            ["", "=", evolution + ""],
+        ])}
+    
+Le taux d'évolution est donc de $${answer}$.
+    `,
+    };
+    return question;
+};
+const getPropositions = (n, { answer, evolution }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, "+" + ((0, round_1.round)(1 + evolution / 100, 2) * 100 + "\\%").replaceAll(".", ","));
+    while (propositions.length < n) {
+        const wrongAnswer = ((0, coinFlip_1.coinFlip)() ? "+" : "-") + (0, randint_1.randint)(1, 100) + "\\%";
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    const allowedTex = [answer, answer.replace("\\%", "")];
+    if (answer[0] === "+") {
+        allowedTex.push(answer.slice(1));
+        allowedTex.push(answer.slice(1).replace("\\%", ""));
+    }
+    return allowedTex.includes(ans);
+};
+exports.cmToEvolution = {
+    id: "cmToEvolution",
+    connector: "=",
+    label: "Passer de coefficient multiplicateur à évolution en pourcentage",
+    levels: ["2ndPro", "2nde", "1rePro", "1reTech", "1reESM"],
+    isSingleStep: true,
+    sections: ["Pourcentages"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCmToEvolutionQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/percent/evolutionToCM.d.ts

@@ -1,6 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
 type Identifiers = {
-    isFromEvolutionToCM: boolean;
     evolution: number;
 };
 export declare const evolutionToCM: Exercise<Identifiers>;

package/lib/exercises/math/percent/evolutionToCM.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evolutionToCM.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/evolutionToCM.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA6DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"evolutionToCM.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/evolutionToCM.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAsEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}

package/lib/exercises/math/percent/evolutionToCM.js

@@ -5,49 +5,44 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
-const coinFlip_1 = require("../../../utils/coinFlip");
 const getEvolutionToCmQuestion = () => {
-    const isFromEvolutionToCM = (0, coinFlip_1.coinFlip)();
     const evolution = (0, randint_1.randint)(-99, 101, [0]);
     const isHausse = evolution > 0;
     const CM = ((0, round_1.round)(1 + evolution / 100, 2) + "").replaceAll(".", ",");
-    const answer = isFromEvolutionToCM
-        ? CM
-        : (isHausse ? "+" : "") + evolution + "\\%";
+    const answer = CM;
     const question = {
         answer: answer,
-        instruction: isFromEvolutionToCM
-            ? `Quel est le coefficient multiplicateur associé à une ${isHausse ? "hausse" : "baisse"} de $${isHausse ? evolution : evolution.toString().slice(1)}\\%$ ?`
-            : `Quelle est l'évolution en pourcentage associée à un coefficient multiplicateur de $${CM}$ ?`,
+        instruction: `Quel est le coefficient multiplicateur associé à une ${isHausse ? "hausse" : "baisse"} de $${isHausse ? evolution : evolution.toString().slice(1)}\\%$ ?`,
         keys: ["percent"],
         answerFormat: "tex",
-        identifiers: { isFromEvolutionToCM, evolution },
+        identifiers: { evolution },
+        hint: `Le coefficient multiplicateur associé à une ${isHausse ? "hausse" : "baisse"}  de $t\\%$ est donné par $${isHausse ? "1+\\frac{t}{100}" : "1-\\frac{t}{100}"}$.
+    `,
+        correction: `Le coefficient multiplicateur associé à une ${isHausse ? "hausse" : "baisse"}  de $t\\%$ est donné par $${isHausse ? "1+\\frac{t}{100}" : "1-\\frac{t}{100}"}$.
+
+Ici, on a $t = ${Math.abs(evolution)}$\\%, donc le coefficient multiplicateur vaut : 
+
+$$
+1${isHausse ? "+" : "-"}\\frac{${Math.abs(evolution)}}{100} = ${CM}
+$$
+
+    `,
     };
     return question;
 };
-const getPropositions = (n, { answer, isFromEvolutionToCM, evolution }) => {
+const getPropositions = (n, { answer, evolution }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    if (isFromEvolutionToCM) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, ((0, round_1.round)(evolution / 100, 2) + "").replaceAll(".", ","));
-        (0, exercise_1.tryToAddWrongProp)(propositions, evolution + "");
-    }
-    else {
-        (0, exercise_1.tryToAddWrongProp)(propositions, "+" + ((0, round_1.round)(1 + evolution / 100, 2) * 100 + "\\%").replaceAll(".", ","));
-    }
+    (0, exercise_1.tryToAddWrongProp)(propositions, ((0, round_1.round)(evolution / 100, 2) + "").replaceAll(".", ","));
+    (0, exercise_1.tryToAddWrongProp)(propositions, evolution + "");
     while (propositions.length < n) {
-        const wrongAnswer = isFromEvolutionToCM
-            ? ((0, round_1.round)((0, randint_1.randint)(1, 200) / 100, 2) + "").replaceAll(".", ",")
-            : ((0, coinFlip_1.coinFlip)() ? "+" : "-") + (0, randint_1.randint)(1, 100) + "\\%";
+        const wrongAnswer = ((0, round_1.round)((0, randint_1.randint)(1, 200) / 100, 2) + "").replaceAll(".", ",");
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
-    const allowedTex = [answer];
-    if (answer[0] === "+")
-        allowedTex.push(answer.slice(1));
-    return allowedTex.includes(ans);
+    return ans === answer;
 };
 exports.evolutionToCM = {
     id: "evolutionToCM",
@@ -62,4 +57,5 @@ exports.evolutionToCM = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/findProportion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findProportion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findProportion.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwCF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAchD,CAAC"}
+{"version":3,"file":"findProportion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findProportion.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAsDF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}

package/lib/exercises/math/percent/findProportion.js

@@ -16,6 +16,20 @@ const getFindProportionQuestion = () => {
         keys: ["percent"],
         answerFormat: "tex",
         identifiers: { total, lefties },
+        hint: `La proportion de gauchers s'obtient par la formule  :
+    
+$$
+\\frac{\\text{nombre de gauchers}}{\\text{nombre d'élèves}}\\times 100
+$$
+
+  `,
+        correction: `Le pourcentage de gauchers dans ce lycée est de : 
+
+$$
+\\frac{${lefties}}{${total}}\\times 100 = ${answer}
+$$
+
+    `,
     };
     return question;
 };
@@ -45,4 +59,5 @@ exports.findProportion = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/globalPercent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"globalPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/globalPercent.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAMxB,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AA8DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}
+{"version":3,"file":"globalPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/globalPercent.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAMxB,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAuFF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAe/C,CAAC"}

package/lib/exercises/math/percent/globalPercent.js

@@ -34,6 +34,19 @@ const getGlobalPercentQuestion = () => {
         keys: ["percent"],
         answerFormat: "tex",
         identifiers: { evolutions },
+        hint: "Transforme chaque taux d'évolution en coefficient multiplicateur, puis multiplie ces coefficients multiplicateurs entre eux pour obtenir le coefficient multiplicateur global. Transforme alors ce CM global en taux d'évolution.",
+        correction: `On transforme les taux d'évolution en coefficients multiplicateurs puis on les multiplie entre eux : 
+
+$${evolutions
+            .map((e) => (0, round_1.round)(1 + Number(e) / 100, 2).frenchify())
+            .join(" \\times ")} = ${(0, round_1.round)(evolutions.reduce((acc, curr) => acc * (0, round_1.round)(1 + Number(curr) / 100, 2), 1), 4).frenchify()}$
+    
+Enfin, on transforme ce CM global en taux d'évolution : 
+
+$(${(0, round_1.round)(evolutions.reduce((acc, curr) => acc * (0, round_1.round)(1 + Number(curr) / 100, 2), 1), 4).frenchify()} - 1)\\times 100 = ${answer.replace("\\%", "")}$
+
+Le taux d'évolution global est donc de $${answer}$.
+    `,
     };
     return question;
 };
@@ -69,4 +82,5 @@ exports.globalPercent = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/index.d.ts

@@ -7,4 +7,5 @@ export * from "./percentToDecimal";
 export * from "./valuePercent";
 export * from "./findProportion";
 export * from "./isTableProportional";
+export * from "./cmToEvolution";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/percent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC"}

package/lib/exercises/math/percent/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./percentToDecimal"), exports);
 __exportStar(require("./valuePercent"), exports);
 __exportStar(require("./findProportion"), exports);
 __exportStar(require("./isTableProportional"), exports);
+__exportStar(require("./cmToEvolution"), exports);

package/lib/exercises/math/percent/isTableProportional.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isTableProportional.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/isTableProportional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG,EAAE,CAAC;AAkEtB,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}
+{"version":3,"file":"isTableProportional.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/isTableProportional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA8DtB,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}

package/lib/exercises/math/percent/isTableProportional.js

@@ -3,17 +3,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTableProportional = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randTupleInt_1 = require("../../../math/utils/random/randTupleInt");
 const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const getIsTableProportionalQuestion = () => {
-    const table = generateTable();
+    const xValues = (0, randTupleInt_1.randTupleInt)(3, {
+        from: 1,
+        to: 15,
+        allDifferent: true,
+    }).sort((a, b) => a - b);
+    const isProportionnal = (0, coinFlip_1.coinFlip)();
+    const coeff = (0, randint_1.randint)(2, 6);
+    const yValues = isProportionnal
+        ? xValues.map((value) => value * coeff)
+        : xValues.map((value) => value * (0, randint_1.randint)(2, 5));
     const question = {
-        answer: table.coeff ? "Oui" : "Non",
-        instruction: `On considère le tableau ci-dessous. Est-ce un tableau de proportionnalité ?${table.table}`,
+        answer: isProportionnal ? "Oui" : "Non",
+        instruction: `On considère le tableau ci-dessous. Est-ce un tableau de proportionnalité
+ |${xValues.map((value) => `$${value}$`).join("|")}|
+  |-|-|-|
+  |${yValues.map((value) => `$${value}$`).join("|")}|
+  `,
         keys: [],
         answerFormat: "raw",
         style: { tableHasNoHeader: true },
-        identifiers: {},
+        identifiers: {
+            xValues,
+            yValues,
+        },
+        hint: "Pour passer de la ligne du haut à la ligne du bas, multiplie-t-on toujours par le même nombre ? Si oui, alors c'est un tableau de proportionnalité.",
+        correction: `On divise les nombres de la deuxième ligne par les nombres de la première ligne. Si on obtient toujours le même résultat, alors c'est un tableau de proportionnalité. 
+
+- $${yValues[0]}\\div ${xValues[0]} = ${yValues[0] / xValues[0]}$
+
+- $${yValues[1]}\\div ${xValues[1]} = ${yValues[1] / xValues[1]}$
+
+- $${yValues[2]}\\div ${xValues[2]} = ${yValues[2] / xValues[2]}$
+
+${isProportionnal
+            ? "Puisque tous les résultats sont égaux, c'est bien un tableau de proportionnalité."
+            : "Puisque les résultats ne sont pas tous égaux, ce n'est pas un tableau de proportionnalité."}
+    `,
     };
     return question;
 };
@@ -28,35 +58,6 @@ const getPropositions = (n, { answer }) => {
 const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
-const generateTable = () => {
-    const xValues = [(0, randint_1.randint)(1, 11)];
-    while (xValues.length < 3) {
-        let lastNb = xValues[xValues.length - 1];
-        let random = (0, randint_1.randint)(lastNb, lastNb + 11, [...xValues]);
-        xValues.push(random);
-    }
-    const yValues = generateYValues(xValues);
-    return {
-        table: ` 
-  |${xValues.map((value) => `$${value}$`).join("|")}|
-  |-|-|-|
-  |${yValues.values.map((value) => `$${value}$`).join("|")}|
-    `,
-        coeff: yValues.coeff,
-    };
-};
-const generateYValues = (xValues) => {
-    const flip = (0, coinFlip_1.coinFlip)();
-    const coeff = (0, randint_1.randint)(2, 6);
-    return flip
-        ? {
-            values: xValues.map((value) => value * (0, randint_1.randint)(2, 5)),
-        }
-        : {
-            values: xValues.map((value) => value * coeff),
-            coeff,
-        };
-};
 exports.isTableProportional = {
     id: "isVTableProportional",
     label: "Reconnaître un tableau de proportionnalité",
@@ -70,4 +71,5 @@ exports.isTableProportional = {
     isAnswerValid,
     answerType: "QCU",
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/percentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAkEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAwFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

package/lib/exercises/math/percent/percentToDecimal.js

@@ -21,6 +21,19 @@ const getPercentToDecimalQuestion = () => {
         keys: ["percent"],
         answerFormat: "tex",
         identifiers: { isPercentToDecimal, nb: nb.value },
+        hint: `${isPercentToDecimal
+            ? `Pour écrire $x\\%$ en décimal, rappelle toi que $x\\% = \\frac{x}{100}$.`
+            : `Pour écrire un nombre $x$ en pourcentage, on multiplie $x$ par $100$.`}`,
+        correction: `${isPercentToDecimal
+            ? `Le symbole $\\%$ signifie simplement "divisé par $100$". 
+
+On a donc $${(nb.value * 100).frenchify()}\\% = \\frac{${(nb.value * 100).frenchify()}}{100} = ${answer}$
+      `
+            : `Pour écrire un nombre sous la forme d'un pourcentage, il suffit de le multiplier par $100$. 
+      
+On a donc $${nb.value.frenchify()} = ${answer}$.
+
+En effet, on a bien $${answer} = \\frac{${answer.replace("\\%", "")}}{100} = ${nb.value.frenchify()}$.`}`,
     };
     return question;
 };
@@ -68,4 +81,5 @@ exports.percentToDecimal = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/reciprocalPercentage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reciprocalPercentage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/reciprocalPercentage.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAKxB,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AA2DF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"reciprocalPercentage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/reciprocalPercentage.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAKxB,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAiFF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}