math-exercises 3.0.150 → 3.0.152

package/lib/exercises/math/dataRepresentations/histogram/histogramIsSameData.js

@@ -0,0 +1,239 @@
+import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
+import { frenchify } from "../../../../math/utils/latex/frenchify.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { probaFlip } from "../../../../utils/alea/probaFlip.js";
+import { random } from "../../../../utils/alea/random.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
+const getStrStatClassForIndexCateg = (indexCateg, data, bounds) => {
+    const labels = bounds.map(frenchify);
+    const isLastCateg = indexCateg == data.length;
+    return `[${labels[indexCateg]};${labels[indexCateg + 1]}${isLastCateg ? "]" : "["}`;
+};
+const getStrTableForTableData = (data, bounds) => {
+    return `${mdTable([
+        [
+            "\\text{Diamètre(cm)}",
+            ...data.map((_, i) => getStrStatClassForIndexCateg(i, data, bounds)),
+        ],
+        ["\\text{effectif}", ...data.map((value) => value.frenchify())],
+    ], true)}`;
+};
+const getStrTableForHistogramData = (data, bounds) => {
+    const arrDict = data.map((_, i) => {
+        const upperBound = bounds[i + 1];
+        const lowerBound = bounds[i];
+        const nodeWidth = substract(upperBound, lowerBound).simplify();
+        const nodeHeight = frac(data[i], nodeWidth).simplify();
+        return {
+            width: nodeWidth.evaluate(),
+            height: nodeHeight.evaluate(),
+            area: data[i],
+        };
+    });
+    return `${mdTable([
+        [
+            "\\text{Diamètre(cm)}",
+            ...data.map((_, i) => getStrStatClassForIndexCateg(i, data, bounds)),
+        ],
+        ["\\text{largeur}", ...arrDict.map((dict) => dict["width"].frenchify())],
+        ["\\text{hauteur}", ...arrDict.map((dict) => dict["height"].frenchify())],
+        ["\\text{effectif}", ...arrDict.map((dict) => dict["area"].frenchify())],
+    ], true)}`;
+};
+const getPropositions = (_, { answer }) => {
+    const propositions = [];
+    ["Oui", "Non"].forEach((str) => {
+        if (str === answer) {
+            addValidProp(propositions, str, "raw");
+        }
+        else {
+            tryToAddWrongProp(propositions, str, "raw");
+        }
+    });
+    return propositions;
+};
+const getAnswer = (identifiers) => {
+    const { table } = identifiers;
+    const isSameData = table === undefined;
+    return ["Oui", "Non"][isSameData ? 0 : 1];
+};
+const getInstruction = (identifiers) => {
+    const { histogram, table } = identifiers;
+    const tableData = table ?? histogram;
+    return `Ci-dessous un tableau de données et un histogramme.
+Représentent-ils les mêmes données ?
+
+${getStrTableForTableData(tableData.data, tableData.bounds)}
+`;
+};
+const getHint = () => {
+    return `Dans un histogramme, l'effectif d'une classe est donné par l'aire du rectangle
+compris entre les deux bornes de la classe.`;
+};
+const getCorrection = (identifiers) => {
+    const { histogram, table } = identifiers;
+    const isSameData = table === undefined;
+    return `On peut représenter l'histogramme par le tableau suivant : 
+  
+${getStrTableForHistogramData(histogram.data, histogram.bounds)}
+
+Le tableau et l'histogramme ${isSameData
+        ? "représentent donc les mêmes données"
+        : "ne représentent donc pas les mêmes données"}.`;
+};
+const getGGBOptions = (identifiers) => {
+    const { histogram } = identifiers;
+    const [data, bounds] = [histogram.data, histogram.bounds];
+    const heights = [];
+    for (let i = 0; i < data.length; i++) {
+        const width = bounds[i + 1] - bounds[i];
+        const height = data[i] / width;
+        heights.push(height);
+    }
+    const offsetX = -bounds[0] + 1;
+    const offsettedBounds = bounds.map((bound) => bound + offsetX);
+    // const xMin = offsettedBounds[0];
+    const xMax = offsettedBounds[offsettedBounds.length - 1];
+    // const heightMin = 0;
+    const heightMax = Math.max(...heights);
+    const commands = [
+        `B = Histogram({${offsettedBounds}}, {${heights.join(",")}})`,
+        ...bounds.map((bound, i) => `XBound_{${i}} = Text("\\footnotesize ${bound.frenchify()}", (${offsettedBounds[i]}, 0), true, true, 0, -1)`),
+        `ShowLabel(B,false)`,
+        ...heights.map((height, i) => `YBound_{${i}} = Text("\\footnotesize ${round(height, 0).frenchify()}", (0, ${height}), true, true, 0, 0)`),
+    ];
+    const ggb = new GeogebraConstructor({
+        commands,
+        hideGrid: true,
+        fontSize: 16,
+        lockedAxesRatio: false,
+        xAxis: {
+            hideNumbers: true,
+            showPositive: true,
+            label: "$\\footnotesize Diamètre (cm)$",
+        },
+        yAxis: {
+            showPositive: true,
+            label: "$\\footnotesize Pommes/cm$",
+            hideNumbers: true,
+        },
+    });
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({
+            xMin: -xMax * 0.1,
+            xMax: xMax * 1.5,
+            yMin: -heightMax * 0.25,
+            yMax: heightMax * 1.5,
+        }),
+    });
+};
+const getHistogramIsSameDataQuestion = () => {
+    const boundsRaw = [11.5, 12, 13.5, 15, 15.5, 16, 16.2];
+    const nbBounds = 3;
+    const indexBoundPool = [...Array(boundsRaw.length - nbBounds + 1).keys()];
+    const indexBound1 = random(indexBoundPool);
+    const bounds = boundsRaw.slice(indexBound1, indexBound1 + nbBounds);
+    const heightPool = shuffle([...Array(10).keys()].map((i) => i * 100 + 300));
+    const data = [...Array(bounds.length - 1).keys()].map((i) => {
+        const nodeWidth = substract(bounds[i + 1], bounds[i]);
+        const nodeHeight = heightPool[i].toTree();
+        return multiply(nodeWidth, nodeHeight).simplify().evaluate();
+    });
+    const histogram = { data, bounds };
+    const isSameData = coinFlip();
+    let table;
+    if (isSameData) {
+        table = undefined;
+    }
+    else {
+        if (probaFlip(0.3)) {
+            //difference: categ
+            const indexBound2 = random(indexBoundPool.filter((i) => i !== indexBound1));
+            const bounds = boundsRaw.slice(indexBound2, indexBound2 + nbBounds);
+            table = {
+                bounds,
+                data,
+            };
+        }
+        else {
+            //difference: data
+            let data;
+            if (probaFlip(0.68)) {
+                //data -> height
+                data = [...Array(bounds.length - 1).keys()].map((i) => {
+                    // const nodeWidth = substract(bounds[i + 1], bounds[i]);
+                    const nodeHeight = heightPool[i].toTree();
+                    return nodeHeight.evaluate();
+                });
+            }
+            else {
+                //data[i] is height
+                const indexWrong = randint(0, bounds.length - 1);
+                data = [...Array(bounds.length - 1).keys()].map((i) => {
+                    const nodeWidth = substract(bounds[i + 1], bounds[i]);
+                    const nodeHeight = heightPool[i].toTree();
+                    if (indexWrong) {
+                        return nodeHeight.evaluate();
+                    }
+                    else {
+                        return multiply(nodeWidth, nodeHeight).simplify().evaluate();
+                    }
+                });
+            }
+            table = {
+                bounds,
+                data,
+            };
+        }
+    }
+    const identifiers = {
+        histogram,
+        table,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        ggbOptions: getGGBOptions(identifiers),
+        style: {
+            tableOptions: {
+                firstCellIsDivided: false,
+                firstColumnIsHeader: true,
+                firstRowIsHeader: false,
+            },
+        },
+    };
+};
+export const histogramIsSameData = {
+    id: "histogramIsSameData",
+    label: "Comparer les données d'un tableau et d'un histogramme",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getHistogramIsSameDataQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    subject: "Mathématiques",
+    getHint,
+    getCorrection,
+    getInstruction,
+    getAnswer,
+    getGGBOptions,
+    hasGeogebra: true,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+    answerType: "QCU",
+};

package/lib/exercises/math/dataRepresentations/histogram/histogramReading.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    bounds: number[];
+    data: number[];
+    itemAsked: number;
+};
+export declare const histogramReading: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=histogramReading.d.ts.map

package/lib/exercises/math/dataRepresentations/histogram/histogramReading.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"histogramReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/dataRepresentations/histogram/histogramReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAsMF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAmBlD,CAAC"}

package/lib/exercises/math/dataRepresentations/histogram/histogramReading.js

@@ -0,0 +1,163 @@
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
+import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
+import { frenchify } from "../../../../math/utils/latex/frenchify.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { random } from "../../../../utils/alea/random.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getPropositions = (n, { answer, ...identifiers }) => {
+    const propositions = [];
+    const { data, bounds } = identifiers;
+    addValidProp(propositions, answer);
+    const nodeWidths = [...Array(bounds.length - 1).keys()].map((i) => substract(bounds[i + 1], bounds[i]));
+    const nodeHeights = nodeWidths.map((nodeWidth, i) => frac(data[i], nodeWidth).simplify());
+    nodeHeights.forEach((nodeHeight) => {
+        tryToAddWrongProp(propositions, nodeHeight.toTex());
+    });
+    nodeHeights.forEach((nodeHeight, i) => {
+        if (propositions.length < n) {
+            tryToAddWrongProp(propositions, round(frac(nodeHeight, nodeWidths[i]).simplify().evaluate(), 0).frenchify());
+        }
+    });
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { data, itemAsked } = identifiers;
+    return data[itemAsked].frenchify();
+};
+const getInstruction = (identifiers) => {
+    const { bounds, itemAsked } = identifiers;
+    const labels = bounds.map(frenchify);
+    return `Un producteur trie sa récolte de pommes selon leur diamètre. L'histogramme ci-dessous représente ses résultats.
+
+Combien de pommes de diamètre entre $${labels[itemAsked]}$ et $${labels[itemAsked + 1]}\\ \\textrm{cm}$  le producteur a-t-il récoltées ?
+`;
+};
+const getHint = () => {
+    return `Dans un histogramme, l'effectif d'une classe est donné par l'aire du rectangle
+compris entre les deux bornes de la classe.`;
+};
+const getCorrection = (identifiers) => {
+    const { bounds, data, itemAsked } = identifiers;
+    const labels = bounds.map(frenchify);
+    const upperBound = bounds[itemAsked + 1];
+    const lowerBound = bounds[itemAsked];
+    const nodeWidth = substract(upperBound, lowerBound).simplify();
+    const nodeHeight = frac(data[itemAsked], nodeWidth).simplify();
+    const isLastClass = itemAsked == data.length;
+    return `Ici la classe est [$${labels[itemAsked]}$;$${labels[itemAsked + 1]}$${isLastClass ? "]" : "["}.
+Pour trouver l'effectif, on calcule l'aire du rectangle pour cette classe, 
+autrement dit le produit largeur $\\times$ hauteur.
+La largeur est l'étendue de la classe.
+${alignTex(`${upperBound} - ${lowerBound} = ${nodeWidth.toTex()}`)}
+Pour la hauteur, on lit $${nodeHeight.toTex()}$.
+${alignTex(`${nodeWidth.toTex()} \\times ${nodeHeight.toTex()} = ${data[itemAsked]}`)}
+Le producteur produit $${data[itemAsked]}$ pommes de diamètre entre $${lowerBound.frenchify()}$ et $${upperBound.frenchify()}\\ \\textrm{cm}$.
+`;
+};
+const getGGBOptions = (identifiers) => {
+    const { bounds, data } = identifiers;
+    const heights = [];
+    for (let i = 0; i < data.length; i++) {
+        const width = bounds[i + 1] - bounds[i];
+        const height = data[i] / width;
+        heights.push(height);
+    }
+    const offsetX = -bounds[0] + 1;
+    const offsettedBounds = bounds.map((bound) => bound + offsetX);
+    // const xMin = offsettedBounds[0];
+    const xMax = offsettedBounds[offsettedBounds.length - 1];
+    // const heightMin = 0;
+    const heightMax = Math.max(...heights);
+    const commands = [
+        `B = Histogram({${offsettedBounds}}, {${heights.join(",")}})`,
+        ...bounds.map((bound, i) => `XBound_{${i}} = Text("\\footnotesize ${bound.frenchify()}", (${offsettedBounds[i]}, 0), true, true, 0, -1)`),
+        `ShowLabel(B,false)`,
+        ...heights.map((height, i) => `YBound_{${i}} = Text("\\footnotesize ${round(height, 0).frenchify()}", (0, ${height}), true, true, 0, 0)`),
+    ];
+    const ggb = new GeogebraConstructor({
+        commands,
+        hideGrid: true,
+        fontSize: 16,
+        lockedAxesRatio: false,
+        xAxis: {
+            hideNumbers: true,
+            showPositive: true,
+            label: "$\\footnotesize Diamètre (cm)$",
+        },
+        yAxis: {
+            showPositive: true,
+            label: "$\\footnotesize Pommes/cm$",
+            hideNumbers: true,
+        },
+    });
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({
+            xMin: -xMax * 0.1,
+            xMax: xMax * 1.5,
+            yMin: -heightMax * 0.25,
+            yMax: heightMax * 1.5,
+        }),
+    });
+};
+const getKeys = () => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return numberVEA(ans, answer);
+};
+const getHistogramReadingQuestion = () => {
+    const boundsRaw = [11.5, 12, 13.5, 15, 15.5, 16, 16.2];
+    const nbBounds = 3;
+    const bounds = random([...Array(boundsRaw.length - nbBounds).keys()].map((i) => boundsRaw.slice(i, i + nbBounds)));
+    const heightPool = shuffle([...Array(10).keys()].map((i) => i * 100 + 300));
+    const data = [...Array(bounds.length - 1).keys()].map((i) => {
+        const nodeWidth = substract(bounds[i + 1], bounds[i]);
+        const nodeHeight = heightPool[i].toTree();
+        return multiply(nodeWidth, nodeHeight).simplify().evaluate();
+    });
+    const itemAsked = randint(0, bounds.length - 1);
+    const identifiers = {
+        bounds,
+        data,
+        itemAsked,
+    };
+    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),
+        ggbOptions: getGGBOptions(identifiers),
+    };
+};
+export const histogramReading = {
+    id: "histogramReading",
+    label: "Lire les effectifs sur un histogramme",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getHistogramReadingQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getHint,
+    getCorrection,
+    getInstruction,
+    getAnswer,
+    getGGBOptions,
+    hasGeogebra: true,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/dataRepresentations/histogram/index.d.ts

@@ -0,0 +1,6 @@
+export * from "./histogramReading.js";
+export * from "./histogramCommenting.js";
+export * from "./histogramIsSameData.js";
+export * from "./histogramFillDataTableFromHistogramData.js";
+export * from "./etendueHistogram.js";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/dataRepresentations/histogram/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/dataRepresentations/histogram/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8CAA8C,CAAC;AAC7D,cAAc,uBAAuB,CAAC"}

package/lib/exercises/math/dataRepresentations/histogram/index.js

@@ -0,0 +1,5 @@
+export * from "./histogramReading.js";
+export * from "./histogramCommenting.js";
+export * from "./histogramIsSameData.js";
+export * from "./histogramFillDataTableFromHistogramData.js";
+export * from "./etendueHistogram.js";

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

@@ -2,7 +2,6 @@ export * from "./tableReading.js";
 export * from "./barChartReading.js";
 export * from "./functionGraphReading.js";
 export * from "./pieChartReading.js";
-export * from "./histogramReading.js";
 export * from "./boxPlotReadingPercentages.js";
 export * from "./boxPlotReading.js";
 export * from "./compareBoxPlot.js";
@@ -15,4 +14,5 @@ export * from "./graphReading.js";
 export * from "./plausibleGraph.js";
 export * from "./halfPieChartReading.js";
 export * from "./halfPieChartCommenting.js";
+export * from "./histogram/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC"}

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

@@ -2,7 +2,6 @@ export * from "./tableReading.js";
 export * from "./barChartReading.js";
 export * from "./functionGraphReading.js";
 export * from "./pieChartReading.js";
-export * from "./histogramReading.js";
 export * from "./boxPlotReadingPercentages.js";
 export * from "./boxPlotReading.js";
 export * from "./compareBoxPlot.js";
@@ -15,6 +14,7 @@ export * from "./graphReading.js";
 export * from "./plausibleGraph.js";
 export * from "./halfPieChartReading.js";
 export * from "./halfPieChartCommenting.js";
+export * from "./histogram/index.js";
 // export * from "./placePointsFromDataTable.js";
 // export * from "./testGen.js";
 // export * from "./testGenGGB.js";

package/lib/exercises/math/dataRepresentations/tableReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tableReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/tableReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IAIjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA+FF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"tableReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/tableReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IAIjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAsGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}

package/lib/exercises/math/dataRepresentations/tableReading.js

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

package/lib/exercises/math/functions/affines/affineAdjustment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineAdjustment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAwKF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAa1D,CAAC"}
+{"version":3,"file":"affineAdjustment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA8KF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/math/functions/affines/affineAdjustment.js

@@ -73,7 +73,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["equal", "y", "x", "a", "b"],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstCellIsDivided: false,
+                firstColumnIsHeader: true,
+                firstRowIsHeader: false,
+            },
+        },
     };
     return question;
 };

package/lib/exercises/math/functions/affines/affineAdjustmentComplete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineAdjustmentComplete.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentComplete.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA0JF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAalE,CAAC"}
+{"version":3,"file":"affineAdjustmentComplete.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentComplete.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgKF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/math/functions/affines/affineAdjustmentComplete.js

@@ -52,7 +52,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstCellIsDivided: false,
+                firstColumnIsHeader: true,
+                firstRowIsHeader: false,
+            },
+        },
     };
     return question;
 };

package/lib/exercises/math/functions/affines/affineAdjustmentRsquared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA+GF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAalE,CAAC"}
+{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqHF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/math/functions/affines/affineAdjustmentRsquared.js

@@ -43,7 +43,13 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["R", "equal"],
         answerFormat: "tex",
         identifiers,
-        style: { tableHasNoHeader: true },
+        style: {
+            tableOptions: {
+                firstCellIsDivided: false,
+                firstColumnIsHeader: true,
+                firstRowIsHeader: false,
+            },
+        },
     };
     return question;
 };

package/lib/exercises/math/functions/affines/leadingCoeffAndOriginOrdinate.d.ts

@@ -4,6 +4,9 @@ type Identifiers = {
     b: number;
     isAskingA: boolean;
 };
-export declare const leadingCoeffAndOriginOrdinate: Exercise<Identifiers>;
+type Options = {
+    parameter: string;
+};
+export declare const leadingCoeffAndOriginOrdinate: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=leadingCoeffAndOriginOrdinate.d.ts.map

package/lib/exercises/math/functions/affines/leadingCoeffAndOriginOrdinate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoeffAndOriginOrdinate.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoeffAndOriginOrdinate.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AA+FF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAkB/D,CAAC"}
+{"version":3,"file":"leadingCoeffAndOriginOrdinate.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoeffAndOriginOrdinate.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAsGF,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAWF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBxE,CAAC"}

package/lib/exercises/math/functions/affines/leadingCoeffAndOriginOrdinate.js

@@ -1,4 +1,4 @@
-import { addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { Affine, AffineConstructor } from "../../../../math/polynomials/affine.js";
@@ -44,8 +44,12 @@ const getAnswer = (identifiers) => {
     const correctAnwer = isAskingA ? a : b;
     return correctAnwer.frenchify();
 };
-const getLeadingCoeffAndOriginOrdinateQuestion = () => {
-    const isAskingA = coinFlip();
+const getLeadingCoeffAndOriginOrdinateQuestion = (opts) => {
+    const isAskingA = opts?.parameter === "Coefficient directeur"
+        ? true
+        : opts?.parameter === "Ordonnée à l'origine"
+            ? false
+            : coinFlip();
     const f = AffineConstructor.random();
     const identifiers = { a: f.a, b: f.b, isAskingA };
     return getQuestionFromIdentifiers(identifiers);
@@ -78,11 +82,21 @@ const getPropositions = (n, { answer, a, b, isAskingA }) => {
 const isAnswerValid = (ans, { answer }) => {
     return numberVEA(ans, answer);
 };
+const options = [
+    {
+        id: "parameter",
+        label: "Paramètre demandé",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["Coefficient directeur", "Ordonnée à l'origine", "Les deux"],
+        defaultValue: "Les deux",
+    },
+];
 export const leadingCoeffAndOriginOrdinate = {
     id: "leadingCoeffAndOriginOrdinate",
     label: "Identifier le coefficient directeur ou l'ordonnée à l'origine d'une fonction affine",
     isSingleStep: true,
-    generator: (nb) => getDistinctQuestions(getLeadingCoeffAndOriginOrdinateQuestion, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getLeadingCoeffAndOriginOrdinateQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -94,4 +108,5 @@ export const leadingCoeffAndOriginOrdinate = {
     getCorrection,
     hasHintAndCorrection: true,
     getQuestionFromIdentifiers,
+    options,
 };

package/lib/exercises/math/functions/affines/leadingCoefficient.d.ts

@@ -7,6 +7,7 @@ type Identifiers = {
 };
 type Options = {
     functionType?: string;
+    coefType?: string;
 };
 export declare const leadingCoefficient: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/functions/affines/leadingCoefficient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA6HF,KAAK,OAAO,GAAG;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAYF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB7D,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAkIF,KAAK,OAAO,GAAG;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAoBF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB7D,CAAC"}