math-exercises 3.0.151 → 3.0.153

package/lib/exercises/math/probaStat/stats1var/averageWithClasses.js

@@ -0,0 +1,140 @@
+import { addValidProp, shuffleProps, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
+import { randfloat } from "../../../../math/utils/random/randfloat.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
+import { add, AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
+import { averageWithEffectifs } from "../../../../utils/average.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+import { approxOrEqual } from "../../../../utils/latex/approxOrEqual.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const nbAnwer = answer.unfrenchify();
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, round(nbAnwer + randfloat(-5, 5, 1), 4).frenchify());
+    });
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { bounds, effectifs } = identifiers;
+    const centers = bounds
+        .slice(0, bounds.length - 1)
+        .map((b, i) => round((b + bounds[i + 1]) / 2, 4));
+    return round(averageWithEffectifs(centers, effectifs), 1).frenchify();
+};
+const getInstruction = (identifiers) => {
+    const { bounds, effectifs } = identifiers;
+    const n = effectifs.reduce((acc, curr) => acc + curr, 0);
+    return `Un agriculteur a classé les $${n}$ oeufs pondus par ses poules selon leur calibre :
+  
+${mdTable([
+        [
+            "Masse $m$ (en $\\textrm{g})$",
+            ...bounds
+                .slice(0, bounds.length - 1)
+                .map((b, i) => `$${b}\\leq m < ${bounds[i + 1]}$`),
+        ],
+        ["Effectif", ...effectifs.map((e) => `$${e}$`)],
+    ])}
+
+Quel est le poids moyen des oeufs ?
+
+Arrondir au dixième.`;
+};
+const getHint = () => {
+    return `Calcule le centre de chaque classe en faisant la moyenne des valeurs extrêmes de la classe. Puis, calcule la moyenne de la série en prenant comme valeurs les centres des classes.`;
+};
+const getCorrection = (identifiers) => {
+    const { bounds, effectifs } = identifiers;
+    const centers = bounds
+        .slice(0, bounds.length - 1)
+        .map((b, i) => round((b + bounds[i + 1]) / 2, 4));
+    const n = effectifs.reduce((acc, curr) => acc + curr, 0);
+    const avg = averageWithEffectifs(centers, effectifs);
+    const sum = centers.reduce((acc, curr, i) => acc + curr * effectifs[i], 0);
+    return `On calcule d'abord le centre de chaque classe : 
+  
+${bounds
+        .slice(0, bounds.length - 1)
+        .map((b, i) => `$$
+${frac(add(b, bounds[i + 1]), 2).toTex()} = ${round((b + bounds[i + 1]) / 2, 4).frenchify()}
+$$`)
+        .join("\n \n")}
+  
+On calcule alors la moyenne en multipliant le centre de chaque classe par l'effectif correspondant : 
+
+${alignTex([
+        [
+            "",
+            frac(operatorComposition(AddNode, centers.map((c, i) => multiply(c, effectifs[i]))), n).toTex(),
+        ],
+        ["=", frac(sum, n).toTex()],
+        approxOrEqual(avg, 1),
+    ])}
+
+Le poids moyen des oeufs est donc de $${round(avg, 1).frenchify()} \\textrm{g}$.
+
+`;
+};
+const getKeys = () => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return numberVEA(ans, answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getAverageWithClassesQuestion = () => {
+    const effectifs = [randint(5, 20)];
+    const bounds = [randint(30, 50)];
+    for (let i = 0; i < 3; i++) {
+        effectifs.push(randint(5, 20));
+        bounds.push(bounds[i] + randint(2, 7));
+    }
+    bounds.push(bounds[bounds.length - 1] + randint(2, 7));
+    const identifiers = {
+        situation: 0,
+        effectifs: effectifs,
+        bounds,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+export const averageWithClasses = {
+    id: "averageWithClasses",
+    connector: "=",
+    label: "Calculer la moyenne d'une série regroupée en classes",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getAverageWithClassesQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/probaStat/stats1var/averageWithTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"averageWithTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/averageWithTable.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAsHF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"averageWithTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/averageWithTable.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AA4HF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/averageWithTable.js

@@ -70,7 +70,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
     };

package/lib/exercises/math/probaStat/stats1var/averageWithTableWithContext.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../exercise.js";
+type Identifiers = {
+    randomValues: number[];
+    randomEffectives: number[];
+};
+export declare const averageWithTableWithContext: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=averageWithTableWithContext.d.ts.map

package/lib/exercises/math/probaStat/stats1var/averageWithTableWithContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"averageWithTableWithContext.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/averageWithTableWithContext.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AA4HF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAe7D,CAAC"}

package/lib/exercises/math/probaStat/stats1var/averageWithTableWithContext.js

@@ -0,0 +1,113 @@
+import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
+import { dollarize } from "../../../../utils/latex/dollarize.js";
+import { addValidProp, propWhile, tryToAddWrongProp, } from "../../../exercise.js";
+import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
+import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
+import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+const getHint = () => {
+    return `Multiplie chaque note par son coefficient, puis additionne les résultats obtenus, et divise le tout par la somme des coefficients.`;
+};
+const getCorrection = (identifiers) => {
+    const { randomEffectives, randomValues } = identifiers;
+    const sumEff = operatorComposition(AddNode, randomEffectives.map((e) => e.toTree()));
+    const sumProd = operatorComposition(AddNode, randomValues.map((e, i) => multiply(randomEffectives[i].toTree(), e.toTree())));
+    const fraction = frac(sumProd, sumEff);
+    return `La moyenne est égale à :
+  
+$$
+${fraction.toSimplificationTex()}
+$$
+`;
+};
+const getInstruction = ({ randomEffectives, randomValues, }) => {
+    return `Voici les notes en mathématiques d'un élève au premier trimestre : 
+
+${mdTable([
+        ["Note sur $20$", ...randomValues.map((e) => dollarize(e))],
+        ["Coefficient", ...randomEffectives.map((e) => dollarize(e))],
+    ])}
+
+Calculer la moyenne (arrondir au centième).`;
+};
+const getAnswer = (identifiers) => {
+    const { randomEffectives, randomValues } = identifiers;
+    let average = 0;
+    for (let i = 0; i < randomValues.length; i++)
+        average += randomValues[i] * randomEffectives[i];
+    const sumEffectives = randomEffectives.reduce((sum, value) => sum + value, 0);
+    average /= sumEffectives;
+    average = round(average, 2);
+    const answer = (average + "").replace(".", ",");
+    return answer;
+};
+const getAverageWithTableQuestion = () => {
+    const getRandomUniqueValues = (count, min, max) => {
+        let counter = 0;
+        const uniqueValues = new Set();
+        while (uniqueValues.size < count) {
+            counter++;
+            if (counter > 1000)
+                throw new Error("Too many iterations in averageWithTable");
+            uniqueValues.add(randint(min, max));
+        }
+        return Array.from(uniqueValues).sort((a, b) => a - b);
+    };
+    const randomValues = getRandomUniqueValues(4, 1, 20);
+    const randomEffectives = [1, 2, 3, 4].map(() => randint(1, 6));
+    const identifiers = { randomEffectives, randomValues };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const average = Number(answer.replace(",", "."));
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, round(average + randint(-average, 20 - average, [0]) + randint(1, 100) / 100, 2)
+            .toString()
+            .replace(".", ","));
+    });
+    return shuffle(propositions);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return numberVEA(ans, answer);
+};
+export const averageWithTableWithContext = {
+    id: "averageWithTableWithContext",
+    connector: "=",
+    label: "Calcul de la moyenne de notes coefficientées",
+    isSingleStep: false,
+    generator: (nb) => getDistinctQuestions(getAverageWithTableQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+    shouldHaveCalculator: true,
+};

package/lib/exercises/math/probaStat/stats1var/calculateMeanFromFrequencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateMeanFromFrequencies.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/calculateMeanFromFrequencies.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAwGF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAqB9D,CAAC"}
+{"version":3,"file":"calculateMeanFromFrequencies.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/calculateMeanFromFrequencies.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA+GF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAqB9D,CAAC"}

package/lib/exercises/math/probaStat/stats1var/calculateMeanFromFrequencies.js

@@ -87,6 +87,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         identifiers,
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
     };
 };
 export const calculateMeanFromFrequencies = {

package/lib/exercises/math/probaStat/stats1var/cumulativeSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cumulativeSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/cumulativeSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4GF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAiB/C,CAAC"}
+{"version":3,"file":"cumulativeSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/cumulativeSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmHF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAiB/C,CAAC"}

package/lib/exercises/math/probaStat/stats1var/cumulativeSum.js

@@ -84,6 +84,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         identifiers,
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
     };
 };
 export const cumulativeSum = {

package/lib/exercises/math/probaStat/stats1var/etendueTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"etendueTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/etendueTable.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAuGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"etendueTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/etendueTable.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AA6GF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}

package/lib/exercises/math/probaStat/stats1var/etendueTable.js

@@ -56,7 +56,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
     };

package/lib/exercises/math/probaStat/stats1var/getQuartileProportionQuestion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getQuartileProportionQuestion.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/getQuartileProportionQuestion.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAgOF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}
+{"version":3,"file":"getQuartileProportionQuestion.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/getQuartileProportionQuestion.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAuOF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}

package/lib/exercises/math/probaStat/stats1var/getQuartileProportionQuestion.js

@@ -173,6 +173,13 @@ const getQuestionFromIdentifiers = (identifiers) => ({
     identifiers,
     hint: getHint(identifiers),
     correction: getCorrection(identifiers),
+    style: {
+        tableOptions: {
+            firstColumnIsHeader: true,
+            firstCellIsDivided: false,
+            firstRowIsHeader: true,
+        },
+    },
 });
 export const getQuartileProportionQuestion = {
     id: "getQuartileProportionQuestion",

package/lib/exercises/math/probaStat/stats1var/index.d.ts

@@ -21,4 +21,6 @@ export * from "./getQuartileProportionQuestion.js";
 export * from "./interpretIndicatorsForLists.js";
 export * from "./plausibilityOfAverage.js";
 export * from "./etendueTable.js";
+export * from "./averageWithClasses.js";
+export * from "./averageWithTableWithContext.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/probaStat/stats1var/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC;AACnC,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC;AACnC,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kCAAkC,CAAC"}

package/lib/exercises/math/probaStat/stats1var/index.js

@@ -21,3 +21,5 @@ export * from "./getQuartileProportionQuestion.js";
 export * from "./interpretIndicatorsForLists.js";
 export * from "./plausibilityOfAverage.js";
 export * from "./etendueTable.js";
+export * from "./averageWithClasses.js";
+export * from "./averageWithTableWithContext.js";

package/lib/exercises/math/probaStat/stats1var/interquartilesTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interquartilesTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/interquartilesTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAmHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}
+{"version":3,"file":"interquartilesTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/interquartilesTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAuHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/interquartilesTable.js

@@ -92,7 +92,11 @@ const getQuestionFromIdentifiers = (identifiers) => {
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
         style: {
-            tableHasNoHeader: true,
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
         },
     };
     return question;

package/lib/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,QAAQ,EAYT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA4LF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,QAAQ,EAYT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAmMF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}

package/lib/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.js

@@ -140,6 +140,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["f", "cap", "underscore"],
         answerFormat: "tex",
         identifiers,
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: true,
+            },
+        },
     };
     return question;
 };

package/lib/exercises/math/probaStat/stats1var/medianWithList.d.ts

@@ -4,7 +4,9 @@ type Identifiers = {
 };
 type Options = {
     nbValues: string;
+    isOrdered: boolean;
 };
 export declare const medianWithList: Exercise<Identifiers, Options>;
+export declare const medianWithListUnorderedVariant: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=medianWithList.d.ts.map

package/lib/exercises/math/probaStat/stats1var/medianWithList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"medianWithList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianWithList.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA2FF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAsBF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAezD,CAAC"}
+{"version":3,"file":"medianWithList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianWithList.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAyIF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAsBF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBzE,CAAC"}

package/lib/exercises/math/probaStat/stats1var/medianWithList.js

@@ -1,6 +1,7 @@
 import { randint } from "../../../../math/utils/random/randint.js";
 import { median } from "../../../../math/utils/stats/median.js";
 import { random } from "../../../../utils/alea/random.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercise.js";
 import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
 const getInstruction = (identifiers) => {
@@ -15,16 +16,37 @@ Déterminer la médiane de cette liste de valeurs.`;
 };
 const getAnswer = (identifiers) => {
     const { sortedValues } = identifiers;
-    return median(sortedValues).frenchify();
+    return median([...sortedValues].sort((a, b) => a - b)).frenchify();
 };
-const getHint = () => {
-    return `La médiane est la valeur centrale de la série : il y a autant de valeur inférieures à la médiane que de valeurs supérieures à la médiane.`;
+const getHint = (_, opts) => {
+    return `La médiane est la valeur centrale de la série : il y a autant de valeur inférieures à la médiane que de valeurs supérieures à la médiane.
+
+${opts?.isOrdered
+        ? "Les valeurs sont déjà rangées par ordre croissant."
+        : "Commence par ranger les valeurs dans l'ordre croissant."}`;
 };
-const getCorrection = (identifiers) => {
+const getCorrection = (identifiers, opts) => {
     const { sortedValues } = identifiers;
     const total = sortedValues.length;
     const rank = total / 2;
-    return `Il y a $${total}$ valeurs dans la liste. 
+    return `${(() => {
+        if (!opts?.isOrdered) {
+            const sorted = sortedValues.sort((a, b) => a - b);
+            return `On range les valeurs de la liste par ordre croissant : 
+      
+$$
+${sorted.join(";\\ ")}
+$$
+
+`;
+        }
+        else {
+            return `Les valeurs de la liste sont rangées dans l'ordre croissant.
+`;
+        }
+    })()}
+  
+Il y a $${total}$ valeurs dans la liste. 
   
 Puisque $\\frac{${total}}{2} = ${rank.frenchify()}$, la médiane est ${rank % 1 === 0
         ? `entre la $${rank}$ème et la $${rank + 1}$ème valeur.`
@@ -45,16 +67,33 @@ const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
 const getMedianList = (optsIn) => {
-    const arrayedOptions = optsIn ?? optsDefault;
+    const arrayedOptions = optsIn;
     const opts = {
-        nbValues: random(arrayedOptions.nbValues),
+        nbValues: random(arrayedOptions.nbValues ?? optsDefault.nbValues),
+        isOrdered: optsIn?.isOrdered ?? true,
     };
-    const randomValues = [];
     const length = Number(opts.nbValues);
-    for (let i = 0; i < length; i++)
-        randomValues.push(randint(1, 20));
+    const randomValues = [...Array(length).keys()].map(() => randint(1, 20));
     const sortedValues = randomValues.sort((a, b) => a - b);
-    const identifiers = { sortedValues };
+    let values;
+    if (opts.isOrdered) {
+        values = sortedValues;
+    }
+    else {
+        //ensure unordered
+        let counter = -1;
+        let isValid = false;
+        while (!isValid && counter < 100) {
+            counter++;
+            values = shuffle(randomValues);
+            isValid = !randomValues.every((v, i) => v === sortedValues[i]);
+        }
+        if (!isValid) {
+            const randomValuesDesperateCall = [...Array(length).keys()].map(() => randint(1, 20));
+            values = randomValuesDesperateCall;
+        }
+    }
+    const identifiers = { sortedValues: values };
     return getQuestionFromIdentifiers(identifiers);
 };
 const getQuestionFromIdentifiers = (identifiers, opts) => {
@@ -64,8 +103,8 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
         options: opts,
     };
     return question;
@@ -88,7 +127,7 @@ export const medianWithList = {
     connector: "=",
     label: "Calcul de la médiane d'une liste de valeurs",
     isSingleStep: false,
-    generator: (nb, opts) => getDistinctQuestions(() => getMedianList(opts), nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getMedianList(Object.assign({}, opts, { isOrdered: true })), nb),
     options,
     qcmTimer: 60,
     freeTimer: 60,
@@ -98,3 +137,17 @@ export const medianWithList = {
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };
+export const medianWithListUnorderedVariant = {
+    id: "medianWithListUnorderedVariant",
+    connector: "=",
+    label: "Calcul de la médiane d'une liste de valeurs non ordonnée",
+    isSingleStep: false,
+    generator: (nb, opts) => getDistinctQuestions(() => getMedianList(Object.assign({}, opts, { isOrdered: false })), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/probaStat/stats1var/medianWithTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"medianWithTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianWithTable.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AA2HF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"medianWithTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianWithTable.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAiIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/medianWithTable.js

@@ -79,7 +79,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
     };

package/lib/exercises/math/probaStat/stats1var/quartiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quartiles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartiles.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAgIF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}
+{"version":3,"file":"quartiles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartiles.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,QAAQ,EAcT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAsIF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}

package/lib/exercises/math/probaStat/stats1var/quartiles.js

@@ -86,7 +86,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
+        },
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
     };

package/lib/exercises/math/probaStat/stats1var/standardDeviationTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"standardDeviationTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/standardDeviationTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAkJF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}
+{"version":3,"file":"standardDeviationTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/standardDeviationTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAsJF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/standardDeviationTable.js

@@ -123,7 +123,11 @@ const getQuestionFromIdentifiers = (identifiers) => {
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
         style: {
-            tableHasNoHeader: true,
+            tableOptions: {
+                firstColumnIsHeader: true,
+                firstCellIsDivided: false,
+                firstRowIsHeader: false,
+            },
         },
     };
     return question;