math-exercises 2.2.33 → 2.2.35

package/README.md

@@ -1,73 +1,17 @@
 # math-exercises
 
-This is a generator of Math exercises for middle school and high school.
-
-So far, exercises are written in French, but any translation is welcome !
-
-This library is used by [Mathlive.fr](https://www.mathlive.fr) for collaborative quizzes.
+This library is used by [Mathlive.fr](https://www.mathlive.fr) and [XPLive.fr](https://www.xplive.fr).
 
 ## 🚧 Work in progress !
 
 This library is still in beta and the architecture may very well completely change in the future.
 
-Incoming improvements :
-
-- Random images generation using tikZ
-
-- Steps within answers
-
-- Coverage of all topics up to 12th grade
-
-- Better classification of exercises
-
-## Exercises format
-
-Each Exercise has a `generator` that will return distinct questions for this exercise.
-
-The Question in itself has an `instruction`, a `startStatement` and an `answer` (which are all tex strings).
-
-You can see all the exercises implemented so far [by playing with the select input here](https://www.mathlive.fr/teacher/createActivity/quizCollab/623366c277e90f70691aee70/).
-
-## How to use
-
-Example with (ax+b)^2 questions :
-
-```js
-import { firstIdentity } from "exercises/calculLitteral/distributivity/firstIdentity";
-
-console.log(firstIdentity.instruction);
-const question = firstIdentity.generator(1);
-console.log(question.startStatement);
-console.log(question.answer);
-
-//output :
-// Développer et réduire :
-// (2x+3)^2
-// 4x^2 + 12x + 9
-```
-
-Some exercises do not have instructions, because the instruction is directly in the question itself.
-
-A list of all exercises is exported from root.
-
-## Expression tree and latex parser
-
-Math expressions are implemented via a tree of Nodes that you'll find inside `tree/nodes`.
-
-Any expression can be turned into a valid latex output via the `.toTex()` method.
-
-They also can be simplified via the `simplifyNode` method.
-
-## Math objects
-
-This library also aims to implement pretty much all mathematical objects and notions up to 12th grade : all types of numbers and operations on them, but also points, vectors, polynomials, sets... Thus it can also be used for basic mathematics work.
-
-## Minimal dependencies
+## CAS & ASTs
 
-We're trying to keep to our dependencies to a minimum. So far we're only using mathjs as an external library, to evaluate and simplify expression trees. We would love to have our own way of simplifying expressions in the future.
+Math expressions are implemented through ASTs.
 
-## How to contribute
+This library implements its own CAS.
 
-Any contribution is welcomed.
+## Copyright
 
-There are tons of exercises left to implement !
+All rights reserved. MathLive and XpLive are registered trademarks. MathLive and XpLive are edited by Heureux Hasard.

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/geometry/vectors/vectorNormCalculation.js

@@ -16,7 +16,7 @@ const getAnswer = (identifiers) => {
     return correctAnswer.simplify().toTex();
 };
 const getHint = (identifiers) => {
-    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. En d'autres termes, la norme du vecteur $$\\overrightarrow{u}\\begin{pmatrix}x\\\\y\\end{pmatrix}$$ est :
+    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. En d'autres termes, la norme du vecteur $$\\overrightarrow{u}\\begin{pmatrix}x\\\\y\\end{pmatrix}$$ est :
   
 $$
 \\lVert \\overrightarrow u \\rVert = \\sqrt{x^2+y^2}
@@ -27,7 +27,7 @@ const getCorrection = (identifiers) => {
     const x = identifiers.x.toTree();
     const y = identifiers.y.toTree();
     const answer = getAnswer(identifiers);
-    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. Ici, on a donc : 
+    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. Ici, on a donc : 
 
 ${(0, alignTex_1.alignTex)([
         [

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"}