math-exercises 2.2.26 → 2.2.28

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

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.evolutionRateFromValues = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randfloat_1 = require("../../../math/utils/random/randfloat");
+const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
+const percentParser_1 = require("../../../tree/parsers/percentParser");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const doWhile_1 = require("../../../utils/doWhile");
+const getPropositions = (n, { answer, vd, vf }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer({
+        vd: vf,
+        vf: vd,
+    }));
+    while (propositions.length < n) {
+        const sign = vf > vd ? 1 : -1;
+        (0, exercise_1.tryToAddWrongProp)(propositions, (sign * (0, randfloat_1.randfloat)(1, 100, 2)).frenchify() + "\\%");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const taux = (0, round_1.round)(((identifiers.vf - identifiers.vd) / identifiers.vd) * 100, 2);
+    return taux.frenchify() + "\\%";
+};
+const getInstruction = (identifiers) => {
+    return `Un prix passe de $${identifiers.vd.frenchify()}€$ à $${identifiers.vf.frenchify()}€$. Quel est le taux d'évolution du prix, en pourcentage ? Arrondir au centième de pourcentage.`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return ["percent"];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return (0, percentParser_1.percentParser)(ans) === answer;
+};
+const getEvolutionRateFromValuesQuestion = () => {
+    const vd = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(1, 100) : (0, randfloat_1.randfloat)(1, 100, 2);
+    const vf = (0, doWhile_1.doWhile)(() => ((0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(1, 100) : (0, randfloat_1.randfloat)(1, 100, 2)), (x) => x === vd);
+    const identifiers = {
+        vf,
+        vd,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.evolutionRateFromValues = {
+    id: "evolutionRateFromValues",
+    connector: "=",
+    label: "Calculer un taux d'évolution",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEvolutionRateFromValuesQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    ggbTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getAnswer,
+};

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"findStartValueAfterEvolution.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findStartValueAfterEvolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA6DF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAe9D,CAAC"}

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

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findStartValueAfterEvolution = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randfloat_1 = require("../../../math/utils/random/randfloat");
+const round_1 = require("../../../math/utils/round");
+const euroParser_1 = require("../../../tree/parsers/euroParser");
+const getPropositions = (n, { answer, percentRate, vf }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const invCm = 1 - percentRate / 100;
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(vf * invCm, 2).frenchify() + "€");
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((0, randfloat_1.randfloat)(1, 100, 2), 2).frenchify() + "€");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const cm = 1 + identifiers.percentRate / 100;
+    const vd = (0, round_1.round)(identifiers.vf / cm, 2);
+    return vd.frenchify() + "€";
+};
+const getInstruction = (identifiers) => {
+    const evolution = identifiers.percentRate < 0 ? "baisse" : "hausse";
+    return `Après une ${evolution} de $${identifiers.percentRate.frenchify()}\\%$, le prix d'un objet est de $${identifiers.vf.frenchify()}€$. Quel était son prix initial ? Arrondir au centième.`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return ["euro"];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return (0, euroParser_1.euroParser)(ans) === answer;
+};
+const getFindStartValueAfterEvolutionQuestion = () => {
+    const vf = (0, randfloat_1.randfloat)(1, 100, 2);
+    const percentRate = (0, randfloat_1.randfloat)(-100, 100, 2, [0]);
+    const identifiers = {
+        vf,
+        percentRate,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+exports.findStartValueAfterEvolution = {
+    id: "findStartValueAfterEvolution",
+    connector: "=",
+    label: "Retrouver un prix initial à partir du prix final et du taux d'évolution",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFindStartValueAfterEvolutionQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    ggbTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getAnswer,
+};

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

@@ -7,9 +7,9 @@ const randfloat_1 = require("../../../math/utils/random/randfloat");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
 const numberParser_1 = require("../../../tree/parsers/numberParser");
-const coinFlip_1 = require("../../../utils/coinFlip");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
 const alignTex_1 = require("../../../utils/latex/alignTex");
-const random_1 = require("../../../utils/random");
+const random_1 = require("../../../utils/alea/random");
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);

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

@@ -4,7 +4,7 @@ exports.globalPercent = void 0;
 const randint_1 = require("../../../math/utils/random/randint");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
-const shuffle_1 = require("../../../utils/shuffle");
+const shuffle_1 = require("../../../utils/alea/shuffle");
 const round_1 = require("../../../math/utils/round");
 const getGlobalPercentQuestion = () => {
     const tab = ["hausse", "baisse"];

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

@@ -7,8 +7,8 @@ const randfloat_1 = require("../../../math/utils/random/randfloat");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
 const numberParser_1 = require("../../../tree/parsers/numberParser");
-const coinFlip_1 = require("../../../utils/coinFlip");
-const random_1 = require("../../../utils/random");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const random_1 = require("../../../utils/alea/random");
 const getHtToTtcQuestion = () => {
     const TVA = (0, random_1.random)([20, 5.5]);
     const ht = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(50, 1000) : (0, randfloat_1.randfloat)(20, 200, 2);

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

@@ -11,4 +11,8 @@ export * from "./cmToEvolution";
 export * from "./htToTTC";
 export * from "./ttcToHT";
 export * from "./findTVA";
+export * from "./evolutionRateFromValues";
+export * from "./findStartValueAfterEvolution";
+export * from "./subPopulationEffectifFromPercent";
+export * from "./populationEffectifFromSubPopulation";
 //# 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;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,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;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC"}

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

@@ -27,3 +27,7 @@ __exportStar(require("./cmToEvolution"), exports);
 __exportStar(require("./htToTTC"), exports);
 __exportStar(require("./ttcToHT"), exports);
 __exportStar(require("./findTVA"), exports);
+__exportStar(require("./evolutionRateFromValues"), exports);
+__exportStar(require("./findStartValueAfterEvolution"), exports);
+__exportStar(require("./subPopulationEffectifFromPercent"), exports);
+__exportStar(require("./populationEffectifFromSubPopulation"), exports);

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

@@ -5,7 +5,7 @@ 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 coinFlip_1 = require("../../../utils/alea/coinFlip");
 const getIsTableProportionalQuestion = () => {
     const xValues = (0, randTupleInt_1.randTupleInt)(3, {
         from: 1,

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;AAuFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

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

@@ -4,36 +4,76 @@ exports.percentToDecimal = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const decimal_1 = require("../../../math/numbers/decimals/decimal");
+const integer_1 = require("../../../math/numbers/integer/integer");
 const randint_1 = require("../../../math/utils/random/randint");
-const coinFlip_1 = require("../../../utils/coinFlip");
+const round_1 = require("../../../math/utils/round");
+const numberParser_1 = require("../../../tree/parsers/numberParser");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const probaFlip_1 = require("../../../utils/alea/probaFlip");
+const getAnswer = ({ nb, isPercentToDecimal }) => {
+    const dec = new decimal_1.Decimal(nb);
+    const tex = dec.toTree().toTex();
+    const percentTex = dec.toPercentNode().toTex();
+    return isPercentToDecimal ? tex : percentTex;
+};
+const getInstruction = ({ isPercentToDecimal, nb, }) => {
+    const dec = new decimal_1.Decimal(nb);
+    const tex = dec.toTree().toTex();
+    const percentTex = dec.toPercentNode().toTex();
+    const instru = isPercentToDecimal ? percentTex : tex;
+    return `Ecrire le nombre suivant ${isPercentToDecimal
+        ? "sous forme de nombre décimal"
+        : "sous forme de pourcentage"} : $${instru}$`;
+};
+const getHint = ({ isPercentToDecimal }) => {
+    return `${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$.`}`;
+};
+const getCorrection = ({ isPercentToDecimal, nb, }) => {
+    const answer = getAnswer({ isPercentToDecimal, nb });
+    const nbPercent = (0, round_1.round)(nb * 100, 10).frenchify();
+    return `${isPercentToDecimal
+        ? `Le symbole $\\%$ signifie simplement "divisé par $100$". 
+
+On a donc $${nbPercent}\\% = \\frac{${nbPercent}}{100} = ${answer}$
+    `
+        : `Pour écrire un nombre sous la forme d'un pourcentage, il suffit de le multiplier par $100$. 
+    
+On a donc $${nb.frenchify()} = ${answer}$.
+
+En effet, on a bien $${answer} = \\frac{${answer.replace("\\%", "")}}{100} = ${nb.frenchify()}$.`}`;
+};
+const getKeys = (identifiers) => {
+    return ["percent"];
+};
 const getPercentToDecimalQuestion = () => {
     const isPercentToDecimal = (0, coinFlip_1.coinFlip)();
-    const nb = decimal_1.DecimalConstructor.random(0, 2);
-    const tex = nb.toTree().toTex();
-    const percentTex = nb.toPercentNode().toTex();
-    const instru = isPercentToDecimal ? percentTex : tex;
-    const answer = isPercentToDecimal ? tex : percentTex;
+    const isNatural = (0, coinFlip_1.coinFlip)();
+    const percentNb = (0, probaFlip_1.probaFlip)(0.3)
+        ? isNatural
+            ? new integer_1.Integer(integer_1.IntegerConstructor.random(1, [0]))
+            : decimal_1.DecimalConstructor.random(0, 10)
+        : (0, coinFlip_1.coinFlip)()
+            ? isNatural
+                ? new integer_1.Integer(integer_1.IntegerConstructor.random(2))
+                : decimal_1.DecimalConstructor.random(10, 100)
+            : isNatural
+                ? new integer_1.Integer(integer_1.IntegerConstructor.random(3))
+                : decimal_1.DecimalConstructor.random(100, 200);
+    const nb = percentNb.times(0.01);
+    const identifiers = {
+        isPercentToDecimal,
+        nb: nb.value,
+    };
     const question = {
-        answer,
-        instruction: `Ecrire le nombre suivant ${isPercentToDecimal
-            ? "sous forme de nombre décimal"
-            : "sous forme de pourcentage"} : $${instru}$`,
-        keys: ["percent"],
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
         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()}$.`}`,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -63,8 +103,11 @@ const isAnswerValid = (ans, { answer, isPercentToDecimal, nb }) => {
         return ans === answer;
     }
     else {
-        const texs = dec.toPercentNode().toAllValidTexs();
-        return texs.includes(ans);
+        const rawAns = ans.replace("\\%", "");
+        const parsed = (0, numberParser_1.numberParser)(rawAns);
+        if (!parsed)
+            return false;
+        return parsed + "\\%" === answer;
     }
 };
 exports.percentToDecimal = {

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"populationEffectifFromSubPopulation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/populationEffectifFromSubPopulation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAyGF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}

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

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.populationEffectifFromSubPopulation = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randfloat_1 = require("../../../math/utils/random/randfloat");
+const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
+const numberParser_1 = require("../../../tree/parsers/numberParser");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const getPropositions = (n, { answer, contextType, subPopulationEffectif, subPopulationPercent }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((subPopulationPercent * 100) / subPopulationEffectif, 0).frenchify());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((subPopulationPercent * subPopulationEffectif) / 100, 0).frenchify());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(subPopulationEffectif, subPopulationEffectif * 2 + 10).frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return (0, round_1.round)((identifiers.subPopulationEffectif * 100) /
+        identifiers.subPopulationPercent, 0).frenchify();
+};
+const getInstruction = (identifiers) => {
+    const arrondi = "Arrondir à l'unité si nécessaire.";
+    switch (identifiers.contextType) {
+        case 0:
+            return `Dans une classe, $${identifiers.subPopulationPercent.frenchify()}\\%$ des élèves sont des garcons, ce qui représente $${identifiers.subPopulationEffectif}$ élèves. Quel est le nombre d'élèves dans cette classe ? ${arrondi}`;
+        case 1:
+            return `Dans un collège, $${identifiers.subPopulationPercent.frenchify()}\\%$ des élèves sont gauchers, ce qui représente $${identifiers.subPopulationEffectif}$ élèves. Quel est le nombre d'élèves dans ce collège ? ${arrondi}`;
+        case 2:
+        default:
+            return `Dans une ville, $${identifiers.subPopulationPercent.frenchify()}\\%$ des habitants sont à la retraite, ce qui représente $${identifiers.subPopulationEffectif}$ habitants. Quel est le nombre d'habitants dans cette ville ? ${arrondi}`;
+    }
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return (0, numberParser_1.numberParser)(ans) === answer;
+};
+const getPopulationEffectifFromSubPopulationQuestion = () => {
+    const contextType = (0, randint_1.randint)(0, 3);
+    let subPopulationEffectif, subPopulationPercent;
+    switch (contextType) {
+        case 0:
+            subPopulationEffectif = (0, randint_1.randint)(5, 10);
+            subPopulationPercent = (0, coinFlip_1.coinFlip)()
+                ? (0, randint_1.randint)(30, 70)
+                : (0, randfloat_1.randfloat)(30, 70, 2);
+            break;
+        case 1:
+            subPopulationEffectif = (0, randint_1.randint)(100, 1000);
+            subPopulationPercent = (0, coinFlip_1.coinFlip)()
+                ? (0, randint_1.randint)(1, 100)
+                : (0, randfloat_1.randfloat)(1, 100, 2);
+            break;
+        case 2:
+        default:
+            subPopulationEffectif = (0, randint_1.randint)(1000, 10000);
+            subPopulationPercent = (0, coinFlip_1.coinFlip)()
+                ? (0, randint_1.randint)(1, 100)
+                : (0, randfloat_1.randfloat)(1, 100, 2);
+            break;
+    }
+    const identifiers = {
+        contextType,
+        subPopulationEffectif,
+        subPopulationPercent,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+exports.populationEffectifFromSubPopulation = {
+    id: "populationEffectifFromSubPopulation",
+    connector: "=",
+    label: "Calculer l'effectif d'un ensemble en connaissant la proportion et l'effectif d'un sous-ensemble",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPopulationEffectifFromSubPopulationQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    ggbTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

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

@@ -4,8 +4,8 @@ exports.reciprocalPercentage = void 0;
 const randint_1 = require("../../../math/utils/random/randint");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
-const shuffle_1 = require("../../../utils/shuffle");
-const coinFlip_1 = require("../../../utils/coinFlip");
+const shuffle_1 = require("../../../utils/alea/shuffle");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
 const round_1 = require("../../../math/utils/round");
 const getReciprocalPercentageQuestion = () => {
     const randPercent = (0, randint_1.randint)(1, 50);

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"subPopulationEffectifFromPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/subPopulationEffectifFromPercent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AA+EF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAclE,CAAC"}

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

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.subPopulationEffectifFromPercent = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randfloat_1 = require("../../../math/utils/random/randfloat");
+const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
+const numberParser_1 = require("../../../tree/parsers/numberParser");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const getPropositions = (n, { answer, total }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(0, total).frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return (0, round_1.round)(identifiers.total * (identifiers.populationPercent / 100), 0).frenchify();
+};
+const getInstruction = (identifiers) => {
+    const arrondi = "Arrondir à l'unité si nécessaire.";
+    switch (identifiers.contextType) {
+        case 0:
+            return `Dans une classe de $${identifiers.total}$ élèves, $${identifiers.populationPercent.frenchify()}\\%$ des élèves sont des garcons. Quel est le nombre de garcons dans cette classe ? ${arrondi}`;
+        case 1:
+            return `Dans un collège de $${identifiers.total}$ élèves, $${identifiers.populationPercent.frenchify()}\\%$ des élèves sont gauchers. Quel est le nombre de gauchers dans ce collège ? ${arrondi}`;
+        case 2:
+        default:
+            return `Dans une ville de $${identifiers.total}$ habitants, $${identifiers.populationPercent.frenchify()}\\%$ des habitants sont à la retraite. Quel est le nombre de retraités dans cette ville ? ${arrondi}`;
+    }
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return (0, numberParser_1.numberParser)(ans) === answer;
+};
+const getSubPopulationEffectifFromPercentQuestion = () => {
+    const contextType = (0, randint_1.randint)(0, 3);
+    let total, populationPercent;
+    switch (contextType) {
+        case 0:
+            total = (0, randint_1.randint)(20, 40);
+            populationPercent = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(1, 100) : (0, randfloat_1.randfloat)(1, 100, 2);
+            break;
+        case 1:
+            total = (0, randint_1.randint)(100, 1000);
+            populationPercent = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(1, 100) : (0, randfloat_1.randfloat)(1, 100, 2);
+            break;
+        case 2:
+        default:
+            total = (0, randint_1.randint)(1000, 10000);
+            populationPercent = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(1, 100) : (0, randfloat_1.randfloat)(1, 100, 2);
+            break;
+    }
+    const identifiers = {
+        contextType,
+        populationPercent,
+        total,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+exports.subPopulationEffectifFromPercent = {
+    id: "subPopulationEffectifFromPercent",
+    connector: "=",
+    label: "Calculer l'effectif d'un sous-ensemble via sa proportion",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSubPopulationEffectifFromPercentQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    ggbTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getAnswer,
+};

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

@@ -7,8 +7,8 @@ const randfloat_1 = require("../../../math/utils/random/randfloat");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
 const numberParser_1 = require("../../../tree/parsers/numberParser");
-const coinFlip_1 = require("../../../utils/coinFlip");
-const random_1 = require("../../../utils/random");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const random_1 = require("../../../utils/alea/random");
 const getTtcToHtQuestion = () => {
     const TVA = (0, random_1.random)([20, 5.5]);
     const TTC = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(50, 1000) : (0, randfloat_1.randfloat)(20, 200, 2);

package/lib/exercises/math/powers/decimalToScientific.js

@@ -7,7 +7,7 @@ const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
-const probaFlip_1 = require("../../../utils/probaFlip");
+const probaFlip_1 = require("../../../utils/alea/probaFlip");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const getDecimalToScientificQuestion = () => {

package/lib/exercises/math/powers/powersDivision.js

@@ -11,7 +11,7 @@ const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
 const alignTex_1 = require("../../../utils/latex/alignTex");
-const shuffle_1 = require("../../../utils/shuffle");
+const shuffle_1 = require("../../../utils/alea/shuffle");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const getPowersDivisionQuestion = (opts) => {

package/lib/exercises/math/powers/powersOfTenToDecimal.js

@@ -8,7 +8,7 @@ const power_1 = require("../../../math/numbers/integer/power");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
-const shuffle_1 = require("../../../utils/shuffle");
+const shuffle_1 = require("../../../utils/alea/shuffle");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const getPowersOfTenToDecimalQuestion = () => {

package/lib/exercises/math/powers/powersProduct.js

@@ -11,7 +11,7 @@ const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const alignTex_1 = require("../../../utils/latex/alignTex");
-const shuffle_1 = require("../../../utils/shuffle");
+const shuffle_1 = require("../../../utils/alea/shuffle");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const getPowersProductQuestion = (opts) => {

package/lib/exercises/math/primitive/constantPrimitive.js

@@ -7,7 +7,7 @@ const monom_1 = require("../../../math/polynomials/monom");
 const randint_1 = require("../../../math/utils/random/randint");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const shuffle_1 = require("../../../utils/shuffle");
+const shuffle_1 = require("../../../utils/alea/shuffle");
 const getConstantPrimitive = () => {
     const c = (0, randint_1.randint)(-19, 20, [0]);
     const monom = new monom_1.Monom(1, c);

package/lib/exercises/math/primitive/logarithmePrimitive.js

@@ -12,7 +12,7 @@ const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const shuffle_1 = require("../../../utils/shuffle");
+const shuffle_1 = require("../../../utils/alea/shuffle");
 const getLogarithmePrimitive = () => {
     const u = polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3));
     const uTree = u.toTree();