math-exercises 2.2.33 → 2.2.34

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

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAmEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AA0EF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/math/calcul/proportionality/proportionalityTable.js

@@ -6,6 +6,18 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const integer_1 = require("../../../../math/numbers/integer/integer");
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
+const getInstruction = ({ x1, x2, x3, x4 }) => {
+    return `On considère le tableau de proportionnalité suivant : 
+
+${(0, mdTable_1.mdTable)([
+        [(0, dollarize_1.dollarize)(x1), (0, dollarize_1.dollarize)(x3)],
+        [(0, dollarize_1.dollarize)(x2), (0, dollarize_1.dollarize)(x4)],
+    ])}
+
+Déterminer le nombre manquant.`;
+};
 const getProportionalityTable = () => {
     const fact = (0, randint_1.randint)(2, 10);
     let [x1, x2] = integer_1.IntegerConstructor.randomDifferents(1, 100 / fact, 2);
@@ -30,19 +42,16 @@ const getProportionalityTable = () => {
             x4 = "?";
             break;
     }
+    const identifiers = { x1, x2, x3, x4, randQuation };
     const question = {
-        instruction: `On considère le tableau de proportionnalité suivant : 
-
-| | |
-|-|-|
-|${x1}|${x3}|
-|${x2}|${x4}|
-
-Déterminer le nombre manquant.`,
+        instruction: getInstruction(identifiers),
         answer: answer,
         keys: [],
         answerFormat: "tex",
         identifiers: { randQuation, x1, x2, x3, x4 },
+        style: {
+            tableHasNoHeader: true,
+        },
     };
     return question;
 };
@@ -70,4 +79,5 @@ exports.proportionalityTable = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTableCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/proportionalityTableCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAoDF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"proportionalityTableCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/proportionalityTableCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAuDF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAejE,CAAC"}

package/lib/exercises/math/calcul/proportionality/proportionalityTableCoefficient.js

@@ -6,25 +6,32 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const integer_1 = require("../../../../math/numbers/integer/integer");
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
+const getInstruction = ({ xValues, yValues }) => {
+    let dataTable = (0, mdTable_1.mdTable)([
+        xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify())),
+        yValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify())),
+    ]);
+    return `On considère le tableau de proportionnalité suivant : 
+  
+${dataTable}
+      
+Calculer le coefficient de proportionnalité.`;
+};
 const getProportionalityTableCoefficient = () => {
     const factor = (0, randint_1.randint)(2, 15);
     const xValues = integer_1.IntegerConstructor.randomDifferents(1, 100 / factor, 3).sort((a, b) => a - b);
     const yValues = xValues.map((x) => x * factor);
-    let dataTable = `
-| ${xValues.join(" | ")} |
-|-|-|-|
-| ${yValues.map((n) => n.frenchify()).join(" | ")} |
-  `;
-    const instruction = `On considère le tableau de proportionnalité suivant : ${dataTable}
-      
-    \n Calculer le coefficient de proportionnalité.`;
     const answer = factor.toTree().toTex();
+    const identifiers = { xValues, yValues };
     const question = {
-        instruction,
+        instruction: getInstruction(identifiers),
         answer,
         keys: [],
         answerFormat: "tex",
-        identifiers: { xValues, yValues },
+        identifiers,
+        style: { tableHasNoHeader: true },
     };
     return question;
 };
@@ -52,4 +59,5 @@ exports.proportionalityTableCoefficient = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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

@@ -4,6 +4,8 @@ type Identifiers = {
     G2x: number;
     G2y: number;
     G1y: number;
+    xValues: number[];
+    yValues: number[];
 };
 export declare const affineAdjustmentExercise: Exercise<Identifiers>;
 export {};

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,EAST,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAuJF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"affineAdjustment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA2JF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}

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

@@ -11,6 +11,18 @@ const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
+const getInstruction = ({ xValues, yValues }) => {
+    let dataTable = (0, mdTable_1.mdTable)([
+        ["$x$", ...xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+        ["$y$", ...yValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+    ]);
+    return `On considère la série statistique ci-dessous. Déterminez l'équation de la droite d'ajustement obtenue par la méthode des moindres carrés. 
+
+${dataTable}
+`;
+};
 function generateLinearData(n) {
     const slope = (0, randint_1.randint)(-500, 500, [0]) / 100;
     const intercept = (0, randint_1.randint)(100, 5000) / 100;
@@ -41,18 +53,13 @@ const getAffineAdjustmentQuestion = () => {
     const b = G2y - a * G2x;
     const bfixed = (0, round_1.round)(b, 1);
     const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(afixed), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(bfixed)).simplify({ forbidFactorize: true })).toTex();
-    let dataTable = `
-| $x$ | ${xValues.map((n) => n.frenchify()).join(" | ")} |
-|-|-|-|-|-|-|-|
-| $y$ | ${yValues.map((n) => n.frenchify()).join(" | ")} |
-  `;
+    const identifiers = { G1x, G2x, G1y, G2y, xValues, yValues };
     const question = {
         answer: answer,
-        instruction: `On considère la série statistique ci-dessous. Déterminez l'équation de la droite d'ajustement obtenue par la méthode des moindres carrés. ${dataTable}
-`,
+        instruction: getInstruction(identifiers),
         keys: ["equal", "y", "x", "a", "b"],
         answerFormat: "tex",
-        identifiers: { G1x, G2x, G1y, G2y },
+        identifiers,
         style: { tableHasNoHeader: true },
     };
     return question;
@@ -103,4 +110,5 @@ exports.affineAdjustmentExercise = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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

@@ -5,6 +5,8 @@ type Identifiers = {
     G2y: number;
     G1y: number;
     rSquared: number;
+    xValues: number[];
+    yValues: number[];
 };
 export declare const affineAdjustmentCompleteExercise: Exercise<Identifiers>;
 export {};

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,EAST,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAqLF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAelE,CAAC"}
+{"version":3,"file":"affineAdjustmentComplete.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentComplete.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmLF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAelE,CAAC"}

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

@@ -12,6 +12,8 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
 function generateLinearData(n) {
     const slope = (0, randint_1.randint)(-500, 500, [0]) / 100;
     const intercept = (0, randint_1.randint)(100, 5000) / 100;
@@ -58,18 +60,17 @@ const getAffineAdjustmentCompleteQuestion = () => {
     const bfixed = (0, round_1.round)(b, 1);
     const answerEq = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(afixed), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(bfixed)).simplify({ forbidFactorize: true })).toTex();
     const answerR = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), rSquared.toTree()).toTex();
-    let dataTable = `
-| $x$ | ${xValues.join(" | ")} |
-|-|-|-|-|-|-|-|
-| $y$ | ${yValues.map((n) => n.frenchify()).join(" | ")} |
-  `;
+    let dataTable = (0, mdTable_1.mdTable)([
+        ["$x$", ...xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+        ["$y$", ...yValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+    ]);
     const question = {
         answer: `${answerEq}\\newline ${answerR}`,
         instruction: `On considère la série statistique ci-dessous. A l'aide de la calculatrice, déterminer l'équation de la droite d'ajustement et la valeur du coefficient de détermination. Arrondir au centième. ${dataTable}
 `,
         keys: [],
         answerFormat: "tex",
-        identifiers: { G1x, G2x, G1y, G2y, rSquared },
+        identifiers: { G1x, G2x, G1y, G2y, rSquared, xValues, yValues },
         style: { tableHasNoHeader: true },
     };
     return question;

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

@@ -1,6 +1,8 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
     rSquared: number;
+    xValues: number[];
+    yValues: number[];
 };
 export declare const affineAdjustmentRsquaredExercise: Exercise<Identifiers>;
 export {};

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,EAST,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA6HF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAclE,CAAC"}
+{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA2HF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAclE,CAAC"}

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

@@ -9,6 +9,8 @@ const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
 function generateLinearData(n) {
     const slope = (0, randint_1.randint)(-500, 500, [0]) / 100;
     const intercept = (0, randint_1.randint)(100, 5000) / 100;
@@ -46,18 +48,17 @@ const getAffineAdjustmentRsquaredQuestion = () => {
     const yValues = data.map((point) => (0, round_1.round)(point.y, 1));
     const rSquared = calculateRSquared(xValues, yValues);
     const answer = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), rSquared.toTree()).toTex();
-    let dataTable = `
-| $x$ | ${xValues.join(" | ")} |
-|-|-|-|-|-|-|-|
-| $y$ | ${yValues.map((n) => n.frenchify()).join(" | ")} |
-  `;
+    let dataTable = (0, mdTable_1.mdTable)([
+        ["$x$", ...xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+        ["$y$", ...yValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+    ]);
     const question = {
         answer: answer,
         instruction: `On considère la série statistique ci-dessous. Déterminez la valeur du coefficient de détermination. ${dataTable}
 `,
         keys: ["R", "equal"],
         answerFormat: "tex",
-        identifiers: { rSquared },
+        identifiers: { rSquared, xValues, yValues },
         style: { tableHasNoHeader: true },
     };
     return question;

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgFF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA8FF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAe3D,CAAC"}

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

@@ -8,6 +8,17 @@ const randint_1 = require("../../../../math/utils/random/randint");
 const arrayHasSameElement_1 = require("../../../../utils/arrays/arrayHasSameElement");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const random_1 = require("../../../../utils/alea/random");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const getInstruction = ({ imageValues, isAskingImage, value, xValues, }) => {
+    return `Ci-dessous est donné le tableau de valeurs d'une fonction $f$. Déterminer ${isAskingImage ? `l'image de` : `le ou les antécédents de`} $${value}$ par $f$.
+
+${(0, mdTable_1.mdTable)([
+        ["$x$", ...xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+        ["$f(x)$", ...imageValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+    ])}
+`;
+};
 const getInverseImageFunctionTableQuestion = () => {
     const xValues = (0, randTupleInt_1.randTupleInt)(5, {
         from: -10,
@@ -27,15 +38,15 @@ const getInverseImageFunctionTableQuestion = () => {
         : xValues
             .filter((el, index) => yValues[index] === valueAsked)
             .join("\\text{ et }")) + "";
-    const instruction = `Ci-dessous est donné le tableau de valeurs d'une fonction $f$. Déterminer ${isAskingImage ? `l'image de` : `le ou les antécédents de`} $${valueAsked}$ par $f$.
-
-  |$x$|${xValues.map((value) => `$${value}$`).join("|")}|
-  |-|-|-|-|-|-|
-  |$f(x)$|${yValues.map((value) => `$${value}$`).join("|")}|
-`;
+    const identifiers = {
+        xValues,
+        imageValues: yValues,
+        isAskingImage,
+        value: valueAsked,
+    };
     const question = {
         answer,
-        instruction,
+        instruction: getInstruction(identifiers),
         keys: ["et"],
         answerFormat: "tex",
         style: { tableHasNoHeader: true },
@@ -81,4 +92,5 @@ exports.inverseImageFunctionTable = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"cartesianEquationOfLine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/cartesianEquationOfLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAclC,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;AAgOF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"cartesianEquationOfLine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/cartesianEquationOfLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAclC,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;AAqOF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}

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

@@ -114,7 +114,9 @@ const isValidFormat = (ans) => {
     if (!ans.includes("="))
         return false;
     const splitted = ans.split("=");
-    if (splitted.length !== 2 || splitted[1] !== "0")
+    if (splitted.length !== 2 ||
+        splitted[1] !== "0" ||
+        (!splitted[0].includes("x") && !splitted[0].includes("y")))
         return false;
     return true;
 };

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

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

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

@@ -6,6 +6,7 @@ const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const shuffle_1 = require("../../../utils/alea/shuffle");
 const round_1 = require("../../../math/utils/round");
+const percentParser_1 = require("../../../tree/parsers/percentParser");
 const getGlobalPercentQuestion = () => {
     const tab = ["hausse", "baisse"];
     let ans = 1;
@@ -66,10 +67,8 @@ const getPropositions = (n, { answer }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    const allowedTex = [answer];
-    if (answer[0] !== "-")
-        allowedTex.push("+" + answer);
-    return allowedTex.includes(ans);
+    const parsed = (0, percentParser_1.percentParser)(ans);
+    return parsed === answer.replace("+", "");
 };
 exports.globalPercent = {
     id: "globalPercent",

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

@@ -1,5 +1,8 @@
 import { Exercise } from "../../../exercises/exercise";
-type Identifiers = {};
+type Identifiers = {
+    xValues: number[];
+    yValues: number[];
+};
 export declare const isTableProportional: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=isTableProportional.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"isTableProportional.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/isTableProportional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA8DtB,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}
+{"version":3,"file":"isTableProportional.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/isTableProportional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AA+D5D,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAgBrD,CAAC"}

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

@@ -6,6 +6,15 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const randTupleInt_1 = require("../../../math/utils/random/randTupleInt");
 const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const dollarize_1 = require("../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../utils/markdown/mdTable");
+const getInstruction = ({ xValues, yValues }) => {
+    return `Le tableau ci-dessous est-il un tableau de proportionnalité ?
+
+${(0, mdTable_1.mdTable)([xValues.map((v) => (0, dollarize_1.dollarize)(v)), yValues.map((v) => (0, dollarize_1.dollarize)(v))])}
+
+  `;
+};
 const getIsTableProportionalQuestion = () => {
     const xValues = (0, randTupleInt_1.randTupleInt)(3, {
         from: 1,
@@ -17,20 +26,14 @@ const getIsTableProportionalQuestion = () => {
     const yValues = isProportionnal
         ? xValues.map((value) => value * coeff)
         : xValues.map((value) => value * (0, randint_1.randint)(2, 5));
+    const identifiers = { xValues, yValues };
     const question = {
         answer: isProportionnal ? "Oui" : "Non",
-        instruction: `On considère le tableau ci-dessous. Est-ce un tableau de proportionnalité
- |${xValues.map((value) => `$${value}$`).join("|")}|
-  |-|-|-|
-  |${yValues.map((value) => `$${value}$`).join("|")}|
-  `,
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "raw",
         style: { tableHasNoHeader: true },
-        identifiers: {
-            xValues,
-            yValues,
-        },
+        identifiers,
         hint: "Pour passer de la ligne du haut à la ligne du bas, multiplie-t-on toujours par le même nombre ? Si oui, alors c'est un tableau de proportionnalité.",
         correction: `On divise les nombres de la deuxième ligne par les nombres de la première ligne. Si on obtient toujours le même résultat, alors c'est un tableau de proportionnalité. 
 
@@ -72,4 +75,5 @@ exports.isTableProportional = {
     answerType: "QCU",
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
 };

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

@@ -1 +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;AA6IF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAiBrE,CAAC"}
+{"version":3,"file":"populationEffectifFromSubPopulation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/populationEffectifFromSubPopulation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAgJF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAiBrE,CAAC"}

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

@@ -8,6 +8,7 @@ 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 mdTable_1 = require("../../../utils/markdown/mdTable");
 const getPropositions = (n, { answer, contextType, subPopulationEffectif, subPopulationPercent }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
@@ -51,9 +52,14 @@ const getCorrection = (identifiers) => {
   
   Pour cela, on peut faire un produit en croix : 
   
-|$?$|$100\\%$|
-|-|-|
-|$${identifiers.subPopulationEffectif}$|$${identifiers.subPopulationPercent.frenchify()}\\%$|
+${(0, mdTable_1.mdTable)([
+        ["$?$", "$100\\%$"],
+        [
+            `$${identifiers.subPopulationEffectif}$`,
+            `$${identifiers.subPopulationPercent.frenchify()}\\%$`,
+        ],
+    ])}
+
 
 Pour trouver la valeur manquante, il faut donc faire le calcul suivant : 
 

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

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

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

@@ -7,6 +7,7 @@ const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const shuffle_1 = require("../../../utils/alea/shuffle");
 const coinFlip_1 = require("../../../utils/alea/coinFlip");
 const round_1 = require("../../../math/utils/round");
+const percentParser_1 = require("../../../tree/parsers/percentParser");
 const getReciprocalPercentageQuestion = () => {
     const randPercent = (0, randint_1.randint)(1, 50);
     let ans = 0;
@@ -58,10 +59,8 @@ const getPropositions = (n, { answer }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    const allowedTex = [answer];
-    if (answer[0] === "+")
-        allowedTex.push(answer.slice(1));
-    return allowedTex.includes(ans);
+    const parsed = (0, percentParser_1.percentParser)(ans);
+    return parsed === answer.replace("+", "");
 };
 exports.reciprocalPercentage = {
     id: "reciprocalPercentage",

package/lib/exercises/math/probaStat/probaFromTableNoContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAmHF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAyIF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAgBzD,CAAC"}

package/lib/exercises/math/probaStat/probaFromTableNoContext.js

@@ -7,6 +7,29 @@ const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const random_1 = require("../../../utils/alea/random");
+const dollarize_1 = require("../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../utils/markdown/mdTable");
+const getInstruction = ({ aBarreCapB, aBarreCapBBarre, aCapB, aCapBBarre, event, probaFrac, type, }) => {
+    const total = aBarreCapB + aBarreCapBBarre + aCapB + aCapBBarre;
+    const aTotal = aCapB + aCapBBarre;
+    const bTotal = aCapB + aBarreCapB;
+    const aBarreTotal = aBarreCapB + aBarreCapBBarre;
+    const bBarreTotal = aBarreCapBBarre + aCapBBarre;
+    return `On considère deux événements $A$ et $B$. Le tableau suivant donne le nombre d'issues pour chacun des événements $A\\cap B$, $\\overline A\\cap B$, $A\\cap \\overline B$ et $\\overline A \\cap \\overline B$. Calculer la probabilité $${event}$.
+    
+${(0, mdTable_1.mdTable)([
+        [" ", "$B$", "$\\overline{B}$", "Total"],
+        ["$A$", (0, dollarize_1.dollarize)(aCapB), `$${aCapBBarre}$`, `$${aTotal}$`],
+        [
+            "$\\overline{A}$",
+            (0, dollarize_1.dollarize)(aBarreCapB),
+            (0, dollarize_1.dollarize)(aBarreCapBBarre),
+            (0, dollarize_1.dollarize)(aBarreTotal),
+        ],
+        ["Total", (0, dollarize_1.dollarize)(bTotal), (0, dollarize_1.dollarize)(bBarreTotal), (0, dollarize_1.dollarize)(total)],
+    ])}
+    `;
+};
 const getProbaFromTableNoContextQuestion = () => {
     const aCapB = (0, randint_1.randint)(1, 20);
     const aCapBBarre = (0, randint_1.randint)(1, 20, [aCapB]);
@@ -58,28 +81,21 @@ const getProbaFromTableNoContextQuestion = () => {
             ]);
     }
     const answer = new rational_1.Rational(proba[0], proba[1]).simplify().toTree().toTex();
+    const identifiers = {
+        aBarreCapB,
+        aBarreCapBBarre,
+        aCapB,
+        aCapBBarre,
+        event,
+        type,
+        probaFrac: proba,
+    };
     const question = {
         answer,
-        instruction: `On considère deux événements $A$ et $B$. Le tableau suivant donne le nombre d'issues pour chacun des événements $A\\cap B$, $\\overline A\\cap B$, $A\\cap \\overline B$ et $\\overline A \\cap \\overline B$. Calculer la probabilité $${event}$.
-    
-| | $B$ | $\\overline{B}$| Total
-|-|-|-|-|
-|$A$|${aCapB}|${aCapBBarre}|${aTotal}|
-|$\\overline{A}$|${aBarreCapB}|${aBarreCapBBarre}|${aBarreTotal}|
-|Total|${bTotal}|${bBarreTotal}|${total}|
-    
-    `,
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            aBarreCapB,
-            aBarreCapBBarre,
-            aCapB,
-            aCapBBarre,
-            event,
-            type,
-            probaFrac: proba,
-        },
+        identifiers,
     };
     return question;
 };
@@ -114,4 +130,5 @@ exports.probaFromTableNoContext = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

package/lib/exercises/math/probaStat/probaFromTableWithContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAsHF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAe3D,CAAC"}
+{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAoIF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAgB3D,CAAC"}

package/lib/exercises/math/probaStat/probaFromTableWithContext.js

@@ -7,6 +7,20 @@ const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const random_1 = require("../../../utils/alea/random");
+const dollarize_1 = require("../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../utils/markdown/mdTable");
+const getInstruction = ({ aBarreCapB, aBarreCapBBarre, aCapB, aCapBBarre, event, probaFrac, type, }) => {
+    return `Le tableau suivant donne le nombre de filles et de garçons portant des lunettes dans un lycée : 
+
+${(0, mdTable_1.mdTable)([
+        [" ", "Porte des lunettes", "Ne porte pas de lunettes"],
+        ["Filles", (0, dollarize_1.dollarize)(aCapB), (0, dollarize_1.dollarize)(aCapBBarre)],
+        ["Garçons", (0, dollarize_1.dollarize)(aBarreCapB), (0, dollarize_1.dollarize)(aBarreCapBBarre)],
+    ])}
+
+On choisit un élève au hasard. Quelle est la probabilité de tomber sur ${event} ?
+    `;
+};
 const getProbaFromTableWithContextQuestion = () => {
     const aCapB = (0, randint_1.randint)(1, 20);
     const aCapBBarre = (0, randint_1.randint)(1, 20);
@@ -63,28 +77,21 @@ const getProbaFromTableWithContextQuestion = () => {
             break;
     }
     const answer = new rational_1.Rational(proba[0], proba[1]).simplify().toTree().toTex();
+    const identifiers = {
+        aBarreCapB,
+        aBarreCapBBarre,
+        aCapB,
+        aCapBBarre,
+        event,
+        type,
+        probaFrac: proba,
+    };
     const question = {
         answer,
-        instruction: `Le tableau suivant donne le nombre de filles et de garçons portant des lunettes dans un lycée : 
-
-|       | Porte des lunettes     | Ne porte pas de lunettes   |
-|-------|:----------------------:|----------------------------|
-|Filles   |${aCapB}   |${aCapBBarre}|
-|Garçons   |${aBarreCapB}   |${aBarreCapBBarre}   |
-    
-On choisit un élève au hasard. Quelle est la probabilité de tomber sur ${event} ?
-    `,
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            aBarreCapB,
-            aBarreCapBBarre,
-            aCapB,
-            aCapBBarre,
-            event,
-            type,
-            probaFrac: proba,
-        },
+        identifiers,
     };
     return question;
 };
@@ -119,4 +126,5 @@ exports.probaFromTableWithContext = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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":"AAGA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAwEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"averageWithTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/averageWithTable.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAgFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

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

@@ -4,8 +4,20 @@ exports.averageWithTable = void 0;
 const randint_1 = require("../../../../math/utils/random/randint");
 const round_1 = require("../../../../math/utils/round");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
 const exercise_1 = require("../../../exercise");
 const getDistinctQuestions_1 = require("../../../utils/getDistinctQuestions");
+const getInstruction = ({ randomEffectives, randomValues, }) => {
+    return `On considère le tableau d'effectifs suivant : 
+
+${(0, mdTable_1.mdTable)([
+        ["Valeur", ...randomValues.map((e) => (0, dollarize_1.dollarize)(e))],
+        ["Effectif", ...randomEffectives.map((e) => (0, dollarize_1.dollarize)(e))],
+    ])}
+
+Calculer la moyenne de cette série de valeurs (arrondir au centième).`;
+};
 const getAverageWithTableQuestion = () => {
     const getRandomUniqueValues = (count, min, max) => {
         const uniqueValues = new Set();
@@ -22,20 +34,15 @@ const getAverageWithTableQuestion = () => {
         average += randomValues[i] * randomEffectives[i];
     average /= sumEffectives;
     average = (0, round_1.round)(average, 2);
+    const identifiers = { randomEffectives, randomValues };
     const answer = (average + "").replace(".", ",");
     const question = {
-        instruction: `On considère le tableau d'effectifs suivant : 
-
-| | | | | | |
-|-|-|-|-|-|-|
-|Valeur|${randomValues[0]}|${randomValues[1]}|${randomValues[2]}|${randomValues[3]}|${randomValues[4]}|
-|Effectif|${randomEffectives[0]}|${randomEffectives[1]}|${randomEffectives[2]}|${randomEffectives[3]}|${randomEffectives[4]}|
-
-Calculer la moyenne de cette série de valeurs (arrondir au centième).`,
+        instruction: getInstruction(identifiers),
         answer,
         keys: [],
         answerFormat: "tex",
-        identifiers: { randomEffectives, randomValues },
+        identifiers,
+        style: { tableHasNoHeader: true },
     };
     return question;
 };
@@ -66,4 +73,5 @@ exports.averageWithTable = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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":"AAIA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAG3B,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;AAmIF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAG3B,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;AA8KF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAejE,CAAC"}

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

@@ -4,93 +4,135 @@ exports.marginalAndConditionalFrequency = void 0;
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
 const exercise_1 = require("../../../exercise");
 const getDistinctQuestions_1 = require("../../../utils/getDistinctQuestions");
-const getAnswer = (rand, x1, x2, x3, x4) => {
+const getFreqStrings = (rand) => {
+    let freqString = "";
+    let frequence = "";
+    switch (rand) {
+        case 0:
+            freqString = "marginale de $A$";
+            frequence = "f(A)";
+            break;
+        case 1:
+            freqString = "marginale de $B$";
+            frequence = "f(B)";
+            break;
+        case 2:
+            freqString = "marginale de $C$";
+            frequence = "f(C)";
+            break;
+        case 3:
+            freqString = "marginale de $D$";
+            frequence = "f(D)";
+            break;
+        case 4:
+            freqString = "conditionnelle de $A$ parmi $C$";
+            frequence = "f_C(A)";
+            break;
+        case 5:
+            freqString = "conditionnelle de $A$ parmi $D$";
+            frequence = "f_D(A)";
+            break;
+        case 6:
+            freqString = "conditionnelle de $B$ parmi $C$";
+            frequence = "f_C(B)";
+            break;
+        case 7:
+            freqString = "conditionnelle de $B$ parmi $D$";
+            frequence = "f_D(B)";
+            break;
+        case 8:
+            freqString = "conditionnelle de $C$ parmi $A$";
+            frequence = "f_A(C)";
+            break;
+        case 9:
+            freqString = "conditionnelle de $C$ parmi $B$";
+            frequence = "f_B(C)";
+            break;
+        case 10:
+            freqString = "conditionnelle de $D$ parmi $A$";
+            frequence = "f_A(D)";
+            break;
+        case 11:
+            freqString = "conditionnelle de $D$ parmi $B$";
+            frequence = "f_B(D)";
+            break;
+        default:
+            throw Error("error");
+    }
+    return { freqString, frequence };
+};
+const getInstruction = ({ x1, x2, x3, x4, rand, }) => {
+    const { freqString } = getFreqStrings(rand);
+    return `On considère le tableau d'effectifs suivant : 
+
+${(0, mdTable_1.mdTable)([
+        [" ", "$A$", "$B$"],
+        ["$C$", (0, dollarize_1.dollarize)(x1), (0, dollarize_1.dollarize)(x2)],
+        ["$D$", (0, dollarize_1.dollarize)(x3), (0, dollarize_1.dollarize)(x4)],
+    ])}
+
+Calculer la fréquence ${freqString}.`;
+};
+const getAnswerNode = (rand, x1, x2, x3, x4) => {
     const x = x1 + x2 + x3 + x4;
     let freqString;
     let frequence;
     let answer;
     switch (rand) {
         case 0:
-            freqString = "marginale de A";
-            frequence = "f(A)";
             answer = new rational_1.Rational(x1 + x3, x).simplify().toTree();
             break;
         case 1:
-            freqString = "marginale de B";
-            frequence = "f(B)";
             answer = new rational_1.Rational(x2 + x4, x).simplify().toTree();
             break;
         case 2:
-            freqString = "marginale de C";
-            frequence = "f(C)";
             answer = new rational_1.Rational(x1 + x2, x).simplify().toTree();
             break;
         case 3:
-            freqString = "marginale de D";
-            frequence = "f(D)";
             answer = new rational_1.Rational(x3 + x4, x).simplify().toTree();
             break;
         case 4:
-            freqString = "conditionnelle de A parmi C";
-            frequence = "f_C(A)";
             answer = new rational_1.Rational(x1, x1 + x2).simplify().toTree();
             break;
         case 5:
-            freqString = "conditionnelle de A parmi D";
-            frequence = "f_D(A)";
             answer = new rational_1.Rational(x3, x3 + x4).simplify().toTree();
             break;
         case 6:
-            freqString = "conditionnelle de B parmi C";
-            frequence = "f_C(B)";
             answer = new rational_1.Rational(x2, x1 + x2).simplify().toTree();
             break;
         case 7:
-            freqString = "conditionnelle de B parmi D";
-            frequence = "f_D(B)";
             answer = new rational_1.Rational(x4, x3 + x4).simplify().toTree();
             break;
         case 8:
-            freqString = "conditionnelle de C parmi A";
-            frequence = "f_A(C)";
             answer = new rational_1.Rational(x1, x1 + x3).simplify().toTree();
             break;
         case 9:
-            freqString = "conditionnelle de C parmi B";
-            frequence = "f_B(C)";
             answer = new rational_1.Rational(x2, x2 + x4).simplify().toTree();
             break;
         case 10:
-            freqString = "conditionnelle de D parmi A";
-            frequence = "f_A(D)";
             answer = new rational_1.Rational(x3, x1 + x3).simplify().toTree();
             break;
         case 11:
-            freqString = "conditionnelle de D parmi B";
-            frequence = "f_B(D)";
             answer = new rational_1.Rational(x4, x2 + x4).simplify().toTree();
             break;
         default:
             throw Error("error");
     }
-    return { answer, freqString, frequence };
+    return answer;
 };
 const getMarginalAndConditionalFrequency = () => {
     const [x1, x2, x3, x4] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(1, 100));
     const rand = (0, randint_1.randint)(0, 12);
-    const { freqString, frequence, answer: answerTree, } = getAnswer(rand, x1, x2, x3, x4);
-    const answer = answerTree.toTex();
+    const answerNode = getAnswerNode(rand, x1, x2, x3, x4);
+    const answer = answerNode.toTex();
+    const identifiers = { rand, x1, x2, x3, x4 };
+    const { frequence } = getFreqStrings(rand);
     const question = {
-        instruction: `On considère le tableau d'effectifs suivant : 
-
-| |A|B|
-|-|-|-|
-|C|${x1}|${x2}|
-|D|${x3}|${x4}|
-
-Calculer la fréquence ${freqString}.`,
+        instruction: getInstruction(identifiers),
         startStatement: `${frequence}`,
         answer,
         keys: ["f", "cap", "underscore"],
@@ -105,13 +147,13 @@ const getPropositions = (n, { answer, rand, x1, x2, x3, x4 }) => {
     while (propositions.length < n) {
         const fakeRand = (0, randint_1.randint)(0, 12);
         // console.log("marg and cond freq", answer, rand, x1, x2, x3, x4);
-        const { answer: answerTree } = getAnswer(fakeRand, x1, x2, x3, x4);
+        const answerTree = getAnswerNode(fakeRand, x1, x2, x3, x4);
         (0, exercise_1.tryToAddWrongProp)(propositions, answerTree.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { rand, x1, x2, x3, x4 }) => {
-    const { answer: answerTree } = getAnswer(rand, x1, x2, x3, x4);
+    const answerTree = getAnswerNode(rand, x1, x2, x3, x4);
     const texs = answerTree.toAllValidTexs({ allowFractionToDecimal: true });
     return texs.includes(ans);
 };
@@ -128,4 +170,5 @@ exports.marginalAndConditionalFrequency = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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

@@ -1,6 +1,7 @@
 import { Exercise } from "../../../exercise";
 type Identifiers = {
     randomValues: number[];
+    randomEffectives: number[];
 };
 export declare const medianWithTable: Exercise<Identifiers>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/median.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA6EF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/median.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAmFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

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

@@ -3,8 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.medianWithTable = void 0;
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
 const exercise_1 = require("../../../exercise");
 const getDistinctQuestions_1 = require("../../../utils/getDistinctQuestions");
+const getInstruction = ({ randomValues, randomEffectives, }) => {
+    return `On considère le tableau d'effectifs suivant : 
+
+  ${(0, mdTable_1.mdTable)([
+        ["Valeur", ...randomValues.map((e) => (0, dollarize_1.dollarize)(e))],
+        ["Effectif", ...randomEffectives.map((e) => (0, dollarize_1.dollarize)(e))],
+    ])}
+  
+  Calculer la médiane de cette série de valeurs.`;
+};
 const getMedianWithTable = () => {
     const getRandomUniqueValues = (count, min, max) => {
         const uniqueValues = new Set();
@@ -28,19 +40,14 @@ const getMedianWithTable = () => {
     else {
         median = sortedValues[middleIndex];
     }
+    const identifiers = { randomValues, randomEffectives };
     const answer = (median + "").replace(".", ",");
     const question = {
-        instruction: `On considère le tableau d'effectifs suivant : 
-
-|Valeur|${randomValues[0]}|${randomValues[1]}|${randomValues[2]}|${randomValues[3]}|${randomValues[4]}|
-|-|-|-|-|-|-|
-|Effectif|${randomEffectives[0]}|${randomEffectives[1]}|${randomEffectives[2]}|${randomEffectives[3]}|${randomEffectives[4]}|
-
-Calculer la médiane de cette série de valeurs.`,
+        instruction: getInstruction(identifiers),
         answer,
         keys: [],
         answerFormat: "tex",
-        identifiers: { randomValues },
+        identifiers,
         style: { tableHasNoHeader: true },
     };
     return question;
@@ -69,4 +76,5 @@ exports.medianWithTable = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

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":"AAGA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAI3B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAiGF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAa3C,CAAC"}
+{"version":3,"file":"quartiles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartiles.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAI3B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAuFF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}

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

@@ -3,8 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.quartiles = void 0;
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
 const exercise_1 = require("../../../exercise");
 const getDistinctQuestions_1 = require("../../../utils/getDistinctQuestions");
+const getInstruction = ({ randomEffectives, randomQuartile, randomValues, }) => {
+    return `On considère le tableau d'effectifs suivant : 
+
+${(0, mdTable_1.mdTable)([
+        ["Valeur", ...randomValues.map((e) => (0, dollarize_1.dollarize)(e))],
+        ["Effectif", ...randomEffectives.map((e) => (0, dollarize_1.dollarize)(e))],
+    ])}
+
+Calculer le ${randomQuartile === 0 ? "premier" : "troisième"} quartile de cette série de valeurs.`;
+};
 const getQuartiles = () => {
     const getRandomUniqueValues = (count, min, max) => {
         const uniqueValues = new Set();
@@ -25,31 +37,10 @@ const getQuartiles = () => {
     const firstQuartile = sortedValues[firstQuartileIndex - 1];
     const thirdQuartile = sortedValues[thirdQuartileIndex - 1];
     const randomQuartile = (0, randint_1.randint)(0, 2);
-    let quartileToString;
-    let choosenQuartile;
-    switch (randomQuartile) {
-        case 0:
-            quartileToString = "premier quartile";
-            choosenQuartile = firstQuartile;
-            break;
-        case 1:
-            quartileToString = "troisième quartile";
-            choosenQuartile = thirdQuartile;
-            break;
-        default:
-            quartileToString = "troisième quartile";
-            choosenQuartile = thirdQuartile;
-            break;
-    }
-    const answer = choosenQuartile + "";
+    const answer = (randomQuartile === 0 ? firstQuartile : thirdQuartile) + "";
+    const identifiers = { randomValues, randomEffectives, randomQuartile };
     const question = {
-        instruction: `On considère le tableau d'effectifs suivant : 
-
-|Valeur|${randomValues[0]}|${randomValues[1]}|${randomValues[2]}|${randomValues[3]}|${randomValues[4]}|
-|-|-|-|-|-|-|
-|Effectif|${randomEffectives[0]}|${randomEffectives[1]}|${randomEffectives[2]}|${randomEffectives[3]}|${randomEffectives[4]}|
-
-Calculer le ${quartileToString} de cette série de valeurs.`,
+        instruction: getInstruction(identifiers),
         answer,
         keys: [],
         answerFormat: "tex",
@@ -82,4 +73,5 @@ exports.quartiles = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

package/lib/exercises/math/probaStat/stats2var/averagePoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"averagePoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats2var/averagePoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA+DF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"averagePoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats2var/averagePoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/probaStat/stats2var/averagePoint.js

@@ -10,24 +10,31 @@ const randTupleInt_1 = require("../../../../math/utils/random/randTupleInt");
 const randint_1 = require("../../../../math/utils/random/randint");
 const pointNode_1 = require("../../../../tree/nodes/geometry/pointNode");
 const average_1 = require("../../../../utils/average");
-const getAveragePointQuestion = () => {
-    const points = (0, randTupleInt_1.distinctRandTupleInt)(4, 2, { from: -9, to: 10 });
-    const sortedPoints = points.sort((a, b) => a[0] - b[0]);
-    const tab = `
-|x|${sortedPoints[0][0]}|${sortedPoints[1][0]}|${sortedPoints[2][0]}|${sortedPoints[3][0]}|
-|-|-|-|-|-|
-|y|${sortedPoints[0][1]}|${sortedPoints[1][1]}|${sortedPoints[2][1]}|${sortedPoints[3][1]}|
-  `;
-    const instruction = `On considère la liste de points suivante : ${tab}
+const dollarize_1 = require("../../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../../utils/markdown/mdTable");
+const getInstruction = ({ xValues, yValues }) => {
+    const tab = (0, mdTable_1.mdTable)([
+        ["$x$", ...xValues.map((el) => (0, dollarize_1.dollarize)(el))],
+        ["$y$", ...yValues.map((el) => (0, dollarize_1.dollarize)(el))],
+    ]);
+    return `On considère la liste de points suivante : ${tab}
   
   Déterminer les coordonnées du point moyen $G$.
   `;
+};
+const getAveragePointQuestion = () => {
+    const points = (0, randTupleInt_1.distinctRandTupleInt)(4, 2, { from: -9, to: 10 });
+    const sortedPoints = points.sort((a, b) => a[0] - b[0]);
     const xG = (0, frenchify_1.frenchify)((0, average_1.average)(sortedPoints.map((el) => el[0])) + "");
     const yG = (0, frenchify_1.frenchify)((0, average_1.average)(sortedPoints.map((el) => el[1])) + "");
     const answer = `\\left(${xG};${yG}\\right)`;
+    const identifiers = {
+        xValues: sortedPoints.map((el) => el[0]),
+        yValues: sortedPoints.map((el) => el[1]),
+    };
     const question = {
         answer,
-        instruction,
+        instruction: getInstruction(identifiers),
         keys: ["semicolon"],
         answerFormat: "tex",
         identifiers: {
@@ -71,4 +78,5 @@ exports.averagePoint = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

package/lib/index.d.ts

@@ -564,14 +564,20 @@ declare const mathExercises: (import("./exercises/exercise").Exercise<{
     G2x: number;
     G2y: number;
     G1y: number;
+    xValues: number[];
+    yValues: number[];
 }> | import("./exercises/exercise").Exercise<{
     rSquared: number;
+    xValues: number[];
+    yValues: number[];
 }> | import("./exercises/exercise").Exercise<{
     G1x: number;
     G2x: number;
     G2y: number;
     G1y: number;
     rSquared: number;
+    xValues: number[];
+    yValues: number[];
 }> | import("./exercises/exercise").Exercise<{
     trinomial: number[];
     leftbound: number;
@@ -1087,7 +1093,10 @@ declare const mathExercises: (import("./exercises/exercise").Exercise<{
 }> | import("./exercises/exercise").Exercise<{
     total: number;
     lefties: number;
-}> | import("./exercises/exercise").Exercise<{}> | import("./exercises/exercise").Exercise<{
+}> | import("./exercises/exercise").Exercise<{
+    xValues: number[];
+    yValues: number[];
+}> | import("./exercises/exercise").Exercise<{
     evolution: number;
 }> | import("./exercises/exercise").Exercise<{
     TVA: number;
@@ -1198,6 +1207,7 @@ declare const mathExercises: (import("./exercises/exercise").Exercise<{
     rand: number;
 }> | import("./exercises/exercise").Exercise<{
     randomValues: number[];
+    randomEffectives: number[];
 }> | import("./exercises/exercise").Exercise<{
     sortedValues: number[];
 }> | import("./exercises/exercise").Exercise<{

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,yBAAyB,CAAC;AAEjC,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA+B,CAAC;AACnD,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA6B,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,yBAAyB,CAAC;AAEjC,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA+B,CAAC;AACnD,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA6B,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC"}

package/lib/utils/latex/dollarize.d.ts

@@ -0,0 +1,2 @@
+export declare const dollarize: (text: string | number) => string;
+//# sourceMappingURL=dollarize.d.ts.map

package/lib/utils/latex/dollarize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dollarize.d.ts","sourceRoot":"","sources":["../../../src/utils/latex/dollarize.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,SAAU,MAAM,GAAG,MAAM,WAE9C,CAAC"}

package/lib/utils/latex/dollarize.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dollarize = void 0;
+const dollarize = (text) => {
+    return `$${text}$`;
+};
+exports.dollarize = dollarize;

package/lib/utils/markdown/mdTable.d.ts

@@ -0,0 +1,2 @@
+export declare const mdTable: (rows: (string | number)[][]) => string;
+//# sourceMappingURL=mdTable.d.ts.map

package/lib/utils/markdown/mdTable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mdTable.d.ts","sourceRoot":"","sources":["../../../src/utils/markdown/mdTable.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,OAAO,SAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAAE,WASlD,CAAC"}

package/lib/utils/markdown/mdTable.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mdTable = void 0;
+const rowBuilder = (row) => {
+    return "|" + row.join("|") + "|";
+};
+const mdTable = (rows) => {
+    const width = rows[0].length;
+    return `
+<!-- table -->
+${rowBuilder(rows[0])}
+${rowBuilder(new Array(width).fill("-"))}
+${rows.slice(1).map(rowBuilder).join("\n")}
+<!-- !table -->
+`;
+};
+exports.mdTable = mdTable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.2.33",
+  "version": "2.2.34",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [