math-exercises 3.0.31 → 3.0.32

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

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAoBrC,KAAK,WAAW,GAAG;IAEjB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,CAAC;AAmNF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAoB9D,CAAC"}
+{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IAEjB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,CAAC;AAmNF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAoB9D,CAAC"}

package/lib/exercises/math/functions/sign/affineProductSign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineProductSign.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/affineProductSign.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAGL,wBAAwB,EACzB,MAAM,yCAAyC,CAAC;AAejD,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,wBAAwB,CAAC;IACrC,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AA8IF,KAAK,OAAO,GAAG;IACb,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAaF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB5D,CAAC"}
+{"version":3,"file":"affineProductSign.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/affineProductSign.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAGL,wBAAwB,EACzB,MAAM,yCAAyC,CAAC;AAejD,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,wBAAwB,CAAC;IACrC,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AA8IF,KAAK,OAAO,GAAG;IACb,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAaF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoB5D,CAAC"}

package/lib/exercises/math/functions/sign/affineProductSign.js

@@ -142,4 +142,7 @@ export const affineProductSign = {
     // getCorrection,
     getAnswer,
     options,
+    pdfOptions: {
+        shouldSpreadPropositions: true,
+    },
 };

package/lib/exercises/math/functions/trinoms/equation/solveSecondDegreeEquationByFactorisation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solveSecondDegreeEquationByFactorisation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/equation/solveSecondDegreeEquationByFactorisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,wCAAwC,EAAE,QAAQ,CAAC,WAAW,CAiB1E,CAAC"}
+{"version":3,"file":"solveSecondDegreeEquationByFactorisation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/equation/solveSecondDegreeEquationByFactorisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAoBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAiHF,eAAO,MAAM,wCAAwC,EAAE,QAAQ,CAAC,WAAW,CAiB1E,CAAC"}

package/lib/exercises/math/functions/trinoms/equation/solveSecondDegreeEquationByFactorisation.js

@@ -1,12 +1,15 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../../exercises/utils/getDistinctQuestions.js";
 import { equationKeys } from "../../../../../exercises/utils/keys/equationKeys.js";
-import { Rational } from "../../../../../math/numbers/rationals/rational.js";
 import { Trinom } from "../../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../../math/utils/random/randint.js";
+import { equal } from "../../../../../tree/nodes/equations/equalNode.js";
 import { EquationSolutionNode } from "../../../../../tree/nodes/equations/equationSolutionNode.js";
-import { DiscreteSetNode } from "../../../../../tree/nodes/sets/discreteSetNode.js";
+import { frac } from "../../../../../tree/nodes/operators/fractionNode.js";
+import { DiscreteSetNode, set } from "../../../../../tree/nodes/sets/discreteSetNode.js";
+import { discreteSetParser } from "../../../../../tree/parsers/discreteSetParser.js";
 import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
+import { handleVEAError } from "../../../../../utils/errors/handleVEAError.js";
 /**
  * Equation donnée sous forme ax^2 + bx ou bien forme développée d'une identité remarquable
  * type 1 ax^2 + bx
@@ -14,61 +17,69 @@ import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
  * type 3 (ax-b)^2
  * type 4 (ax+b)(ax-b)
  */
-const getSolveSecondDegreeEquationByFactorisationQuestion = () => {
-    const type = randint(1, 4);
-    let statement = "";
-    let roots = [];
-    let answer = "";
-    let a;
-    let b;
+const getStatementNode = (identifiers) => {
+    const { a, b, type } = identifiers;
+    let statement;
+    switch (type) {
+        case 1:
+            //ax^2 + bx
+            const trinom = new Trinom(a, b, 0);
+            return trinom.toTex();
+        case 2:
+            //(ax+b)^2
+            return new Trinom(a ** 2, 2 * a * b, b ** 2).toTex();
+        case 3:
+            //(ax-b)^2
+            return new Trinom(a ** 2, -2 * a * b, b ** 2).toTex();
+        case 4:
+        default:
+            //(ax+b)(ax-b)
+            return new Trinom(a ** 2, 0, -(b ** 2)).toTex();
+    }
+};
+const getInstruction = (identifiers) => {
+    const instruction = `Soit $f$ la fonction définie par : 
+  
+$$
+f(x) = ${getStatementNode(identifiers)}
+$$
+
+Factoriser $f(x)$, puis résoudre l'équation $f(x) = 0$.`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, type } = identifiers;
+    let roots;
     switch (type) {
         case 1:
-            {
-                //ax^2 + bx
-                const trinom = new Trinom(randint(-9, 10, [0]), randint(-9, 10), 0);
-                a = trinom.a;
-                b = trinom.b;
-                statement = trinom.toTex();
-                roots = trinom.getRootsNode();
-            }
+            roots = set([(0).toTree(), frac(-b, a)]).simplify();
             break;
         case 2:
-            {
-                //(ax+b)^2
-                a = randint(-9, 10, [0]);
-                b = randint(1, 10);
-                statement = new Trinom(a ** 2, 2 * a * b, b ** 2).toTex();
-                roots = [new Rational(-b, a).simplify().toTree()];
-            }
+            roots = set([frac(-b, a).simplify()]);
             break;
         case 3:
-            {
-                //(ax-b)^2
-                a = randint(-9, 10, [0]);
-                b = randint(-9, 0, [0]);
-                statement = new Trinom(a ** 2, -2 * a * b, b ** 2).toTex();
-                roots = [new Rational(b, a).simplify().toTree()];
-            }
+            roots = set([frac(b, a)]).simplify();
             break;
         case 4:
         default:
-            {
-                //(ax+b)(ax-b)
-                a = randint(-9, 10, [0]);
-                b = randint(1, 10);
-                statement = new Trinom(a ** 2, 0, -(b ** 2)).toTex();
-                roots = [b, -b].sort((a, b) => a - b).map((x) => x.toTree());
-            }
+            roots = set([frac(-b, a), frac(b, a)]).simplify();
             break;
     }
-    const instruction = `Soit $f(x) = ${statement}$. Factoriser $f(x)$, puis résoudre l'équation $f(x) = 0$.`;
-    answer = new EquationSolutionNode(new DiscreteSetNode(roots)).toTex();
+    return equal("S", roots).toTex();
+};
+const getSolveSecondDegreeEquationByFactorisationQuestion = () => {
+    const type = randint(1, 4);
+    let a;
+    let b;
+    a = randint(-9, 10, [0]);
+    b = randint([2, 4].includes(type) ? 1 : -9, 10, [0]);
+    const identifiers = { a, b, type };
     const question = {
-        answer,
-        instruction,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [...equationKeys],
         answerFormat: "tex",
-        identifiers: { a, b, type },
+        identifiers,
     };
     return question;
 };
@@ -86,46 +97,27 @@ const getPropositions = (n, { answer }) => {
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer, type, a, b }) => {
-    let roots = [];
-    switch (type) {
-        case 1:
-            {
-                const trinom = new Trinom(a, b, 0);
-                roots = trinom.getRootsNode();
-            }
-            break;
-        case 2:
-            {
-                roots = [new Rational(-b, a).simplify().toTree()];
-            }
-            break;
-        case 3:
-            {
-                roots = [new Rational(b, a).simplify().toTree()];
-            }
-            break;
-        case 4:
-            {
-                roots = [b, -b].sort((a, b) => a - b).map((x) => x.toTree());
-            }
-            break;
+    try {
+        const parsed = discreteSetParser(ans);
+        if (!parsed)
+            return false;
+        return ("S=" + parsed.simplify({ decimalToFractions: true }).toTex() === answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
     }
-    const answerTree = new EquationSolutionNode(new DiscreteSetNode(roots), {
-        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
-    });
-    return answerTree.toAllValidTexs().includes(ans);
 };
 export const solveSecondDegreeEquationByFactorisation = {
     id: "solveSecondDegreeEquationByFactorisation",
     connector: "\\iff",
     label: "Résoudre une équation du second degré par factorisation",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getSolveSecondDegreeEquationByFactorisationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/functions/trinoms/parabole/paraboleExpressionReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paraboleExpressionReading.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/parabole/paraboleExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CAIpB,CAAC;AAoSF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAmB3D,CAAC"}
+{"version":3,"file":"paraboleExpressionReading.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/parabole/paraboleExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CAIpB,CAAC;AAuSF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAmB3D,CAAC"}

package/lib/exercises/math/functions/trinoms/parabole/paraboleExpressionReading.js

@@ -29,7 +29,7 @@ const getPropositions = (n, { answer, ...identifiers }) => {
                 let x2 = randint(-8, 9, [0]);
                 if (x1 > x2)
                     [x1, x2] = [x2, x1];
-                tryToAddWrongProp(propositions, multiply(randint(-5, 6, [0]), multiply(substract("x", x1), substract("x", x2))).toTex());
+                tryToAddWrongProp(propositions, multiply(randint(-5, 6, [0]), multiply(substract("x", x1).simplify(), substract("x", x2).simplify())).toTex());
                 break;
         }
     }

package/lib/exercises/math/functions/trinoms/roots/rootsFromFactorizedForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsFromFactorizedForm.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/roots/rootsFromFactorizedForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"rootsFromFactorizedForm.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/roots/rootsFromFactorizedForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6FF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAgBzD,CAAC"}

package/lib/exercises/math/functions/trinoms/roots/rootsFromFactorizedForm.js

@@ -2,22 +2,33 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../../exercises/exerc
 import { getDistinctQuestions } from "../../../../../exercises/utils/getDistinctQuestions.js";
 import { Trinom, TrinomConstructor } from "../../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../../math/utils/random/randint.js";
-import { EquationSolutionNode } from "../../../../../tree/nodes/equations/equationSolutionNode.js";
 import { OppositeNode } from "../../../../../tree/nodes/functions/oppositeNode.js";
 import { NumberNode } from "../../../../../tree/nodes/numbers/numberNode.js";
-import { DiscreteSetNode } from "../../../../../tree/nodes/sets/discreteSetNode.js";
+import { discreteSetParser } from "../../../../../tree/parsers/discreteSetParser.js";
 import { shuffle } from "../../../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../../../utils/errors/handleVEAError.js";
+const getInstruction = (identifiers) => {
+    const { a, b, c } = identifiers;
+    const trinom = new Trinom(a, b, c);
+    return `Soit $f(x) = ${trinom
+        .toFactorized()
+        .toTex()}$. Résoudre l'équation $f(x) = 0$.`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c } = identifiers;
+    const trinom = new Trinom(a, b, c);
+    const answer = trinom.getRootsEquationSolutionTex();
+    return answer;
+};
 const getRootsFromFactorizedFormQuestion = () => {
     const trinom = TrinomConstructor.randomFactorized();
-    const answer = trinom.getRootsEquationSolutionTex();
+    const identifiers = { a: trinom.a, b: trinom.b, c: trinom.c };
     const question = {
-        answer: answer,
-        instruction: `Soit $f(x) = ${trinom
-            .getFactorizedForm()
-            .toTex()}$. Résoudre l'équation $f(x) = 0$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "varnothing"],
         answerFormat: "tex",
-        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
+        identifiers,
     };
     return question;
 };
@@ -44,12 +55,16 @@ const getPropositions = (n, { answer, a, b, c }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (ans, { a, b, c }) => {
-    const trinom = new Trinom(a, b, c);
-    const roots = trinom.getRootsNode();
-    const answer = new EquationSolutionNode(new DiscreteSetNode(roots));
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, a, b, c }) => {
+    try {
+        const parsed = discreteSetParser(ans);
+        if (!parsed)
+            return false;
+        return ("S=" + parsed.simplify({ decimalToFractions: true }).toTex() === answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const rootsFromFactorizedForm = {
     id: "rootsFromFactorizedForm",
@@ -64,4 +79,6 @@ export const rootsFromFactorizedForm = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };

package/lib/exercises/math/functions/trinoms/roots/rootsReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsReading.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/roots/rootsReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAgB9C,CAAC"}
+{"version":3,"file":"rootsReading.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/roots/rootsReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/functions/trinoms/roots/rootsReading.js

@@ -54,6 +54,7 @@ const getPropositions = (n, { answer }) => {
 const isAnswerValid = (ans, { answer, a, b, c }) => {
     const roots = new Trinom(a, b, c).getRoots();
     const studentNumbers = ans
+        .replaceAll("\\text{ }", "")
         .split("\\text{ et }")
         .map((n) => Number(n.replace(",", ".")))
         .filter((n) => !isNaN(n))
@@ -64,9 +65,7 @@ const isAnswerValid = (ans, { answer, a, b, c }) => {
 export const rootsReading = {
     id: "rootsReading",
     label: "Lire graphiquement les racines d'un trinôme",
-    levels: ["1reSpé", "1rePro"],
     isSingleStep: true,
-    sections: ["Second degré"],
     generator: (nb) => getDistinctQuestions(getRootsReadingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/math/functions/trinoms/sign/trinomSignFromFacto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trinomSignFromFacto.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/sign/trinomSignFromFacto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAwHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAiBrD,CAAC"}
+{"version":3,"file":"trinomSignFromFacto.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/sign/trinomSignFromFacto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAwHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAoBrD,CAAC"}

package/lib/exercises/math/functions/trinoms/sign/trinomSignFromFacto.js

@@ -117,4 +117,7 @@ export const trinomSignFromFacto = {
     getAnswer,
     hasHintAndCorrection: true,
     getInstruction,
+    pdfOptions: {
+        shouldSpreadPropositions: true,
+    },
 };

package/lib/exercises/math/functions/trinoms/sign/trinomSignFromRoots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trinomSignFromRoots.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/sign/trinomSignFromRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAuHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAiBrD,CAAC"}
+{"version":3,"file":"trinomSignFromRoots.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/sign/trinomSignFromRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAuHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAoBrD,CAAC"}

package/lib/exercises/math/functions/trinoms/sign/trinomSignFromRoots.js

@@ -116,4 +116,7 @@ export const trinomSignFromRoots = {
     getAnswer,
     hasHintAndCorrection: true,
     getInstruction,
+    pdfOptions: {
+        shouldSpreadPropositions: true,
+    },
 };

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

@@ -1 +1 @@
-{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAuEF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}
+{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmFF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}

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

@@ -5,18 +5,31 @@ import { distinctRandTupleInt } from "../../../../math/utils/random/randTupleInt
 import { PointNode } from "../../../../tree/nodes/geometry/pointNode.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getPoints = (identifiers) => {
+    const { coordsA, coordsB } = identifiers;
+    const A = new Point("A", new NumberNode(coordsA[0]), new NumberNode(coordsA[1]));
+    const B = new Point("B", new NumberNode(coordsB[0]), new NumberNode(coordsB[1]));
+    return [A, B];
+};
+const getInstruction = (identifiers) => {
+    const [A, B] = getPoints(identifiers);
+    return `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Quelles sont les coordonnées du milieu $I$ de $[AB]$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const [A, B] = getPoints(identifiers);
+    const answer = A.midpoint(B).toTexWithCoords();
+    return answer;
+};
 const getMidpointQuestion = () => {
     const [coords1, coords2] = distinctRandTupleInt(2, 2, { from: -9, to: 10 });
-    const A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
-    const B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
-    const answer = A.midpoint(B).toTexWithCoords();
+    const identifiers = { coordsA: coords1, coordsB: coords2 };
     const question = {
-        instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Quelles sont les coordonnées du milieu $I$ de $[AB]$ ?`,
+        instruction: getInstruction(identifiers),
         startStatement: "I",
-        answer,
+        answer: getAnswer(identifiers),
         keys: ["I", "semicolon"],
         answerFormat: "tex",
-        identifiers: { coordsA: coords1, coordsB: coords2 },
+        identifiers,
     };
     return question;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"pointCoordinates.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinates.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"pointCoordinates.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinates.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"pointCoordinatesNoAxisNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinatesNoAxisNumbers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6HF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAc/D,CAAC"}
+{"version":3,"file":"pointCoordinatesNoAxisNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinatesNoAxisNumbers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6HF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAc/D,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"pointCoordinatesNoOrthonorm.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinatesNoOrthonorm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2GF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}
+{"version":3,"file":"pointCoordinatesNoOrthonorm.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinatesNoOrthonorm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2GF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ballsBasicProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/ballsBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAiEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"ballsBasicProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/ballsBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAyEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAgBlD,CAAC"}

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

@@ -2,21 +2,32 @@ import { shuffleProps, tryToAddWrongProp, addValidProp, } from "../../../exercis
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Rational } from "../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../math/utils/random/randint.js";
-const getBallsBasicProbasQuestion = () => {
+import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
+const getInstruction = (identifiers) => {
+    const { repartitions, colorAskedIndex } = identifiers;
     const colors = ["rouge", "jaune", "verte"];
-    const repartitions = [randint(1, 4), randint(1, 4), randint(1, 4)];
-    const total = repartitions.reduce((acc, curr) => (acc += curr), 0);
-    const colorAskedIndex = randint(0, 3);
     const colorAsked = colors[colorAskedIndex];
+    return `Dans un sac, il y a $${repartitions[0]}$ boules ${colors[0]}${repartitions[0] > 1 ? "s" : ""}, 
+    $${repartitions[1]}$ boules ${colors[1]}${repartitions[1] > 1 ? "s" : ""} et $${repartitions[2]}$ boules ${colors[2]}${repartitions[2] > 1 ? "s" : ""}. Quelle est la probabilité de tirer une boule ${colorAsked} ?`;
+};
+const getAnswer = (identifiers) => {
+    const { repartitions, colorAskedIndex } = identifiers;
     const nbColorAsked = repartitions[colorAskedIndex];
+    const total = repartitions.reduce((acc, curr) => (acc += curr), 0);
     const answer = new Rational(nbColorAsked, total).simplify().tex;
+    return answer;
+};
+const getBallsBasicProbasQuestion = () => {
+    const repartitions = [randint(1, 4), randint(1, 4), randint(1, 4)];
+    const colorAskedIndex = randint(0, 3);
+    const identifiers = { colorAskedIndex, repartitions };
     const question = {
-        answer,
-        instruction: `Dans un sac, il y a $${repartitions[0]}$ boules ${colors[0]}${repartitions[0] > 1 ? "s" : ""}, 
-    $${repartitions[1]}$ boules ${colors[1]}${repartitions[1] > 1 ? "s" : ""} et $${repartitions[2]}$ boules ${colors[2]}${repartitions[2] > 1 ? "s" : ""}. Quelle est la probabilité de tirer une boule ${colorAsked} ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { colorAskedIndex, repartitions },
+        identifiers,
     };
     return question;
 };
@@ -36,14 +47,14 @@ const getPropositions = (n, { answer, colorAskedIndex, repartitions }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { colorAskedIndex, repartitions }) => {
-    const total = repartitions.reduce((acc, curr) => (acc += curr), 0);
-    const nbColorAsked = repartitions[colorAskedIndex];
-    const answer = new Rational(nbColorAsked, total)
-        .simplify()
-        .toTree({ allowFractionToDecimal: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { colorAskedIndex, repartitions, answer }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        return parsed.simplify({ decimalToFractions: true }).toTex() === answer;
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const ballsBasicProbas = {
     id: "ballsBasicProbas",
@@ -58,4 +69,6 @@ export const ballsBasicProbas = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"cardBasicProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/cardBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,UAAU,EAAe,MAAM,oCAAoC,CAAC;AAE7E,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB,CAAC;AA6FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}
+{"version":3,"file":"cardBasicProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/cardBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,UAAU,EAAe,MAAM,oCAAoC,CAAC;AAI7E,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB,CAAC;AAsGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAgBjD,CAAC"}

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

@@ -4,44 +4,66 @@ import { Rational } from "../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { probaLawFlip } from "../../../utils/alea/probaLawFlip.js";
 import { randomEnumValue } from "../../../utils/alea/randomEnumValue.js";
-import { FractionNode } from "../../../tree/nodes/operators/fractionNode.js";
-import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
 import { CardsColor, CardsValues } from "../../../exercises/utils/cardsData.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
+import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
+const getInstruction = (identifiers) => {
+    const { questionType, value, color } = identifiers;
+    let target;
+    switch (questionType) {
+        case "oneCard":
+            target = `${value === "dame" ? "une" : "un"} ${value} de ${color}`;
+            break;
+        case "valueCard":
+            target = `${value === "dame" ? "une" : "un"} ${value}`;
+            break;
+        case "colorCard":
+        default:
+            target = `un ${color}`;
+            break;
+    }
+    return `On tire une carte dans un jeu de $52$ cartes. Quelle est la probabilité d'obtenir ${target} ?`;
+};
+const getAnswer = (identifiers) => {
+    const { questionType, value, color } = identifiers;
+    switch (questionType) {
+        case "oneCard":
+            return `\\frac{1}{52}`;
+        case "valueCard":
+            return "\\frac{1}{13}";
+        case "colorCard":
+        default:
+            return `\\frac{1}{4}`;
+    }
+};
 const getCardBasicProbasQuestion = () => {
     const questionType = probaLawFlip([
         ["oneCard", 0.33],
         ["valueCard", 0.33],
         ["colorCard", 0.33],
     ]);
-    let answer = "";
-    let target = "";
     let value = "";
     let color;
     switch (questionType) {
         case "oneCard":
             value = randomEnumValue(CardsValues);
             color = randomEnumValue(CardsColor);
-            target = `${value === "dame" ? "une" : "un"} ${value} de ${color}`;
-            answer = `\\frac{1}{52}`;
             break;
         case "valueCard":
             value = randomEnumValue(CardsValues);
-            target = `${value === "dame" ? "une" : "un"} ${value}`;
-            answer = "\\frac{1}{13}";
             break;
         case "colorCard":
         default:
             color = randomEnumValue(CardsColor);
-            target = `un ${color}`;
-            answer = `\\frac{1}{4}`;
             break;
     }
+    const identifiers = { questionType, value, color: color };
     const question = {
-        answer,
-        instruction: `On tire une carte dans un jeu de $52$ cartes. Quelle est la probabilité d'obtenir ${target} ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { questionType, value, color: color },
+        identifiers,
     };
     return question;
 };
@@ -65,26 +87,14 @@ const getPropositions = (n, { answer, questionType }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { questionType }) => {
-    let denum;
-    switch (questionType) {
-        case "oneCard":
-            denum = 52;
-            break;
-        case "valueCard":
-            denum = 13;
-            break;
-        case "colorCard":
-            denum = 4;
-            break;
-        default:
-            throw Error("wrong questionType in card Basic Probas");
+const isAnswerValid = (ans, { answer, questionType }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        return parsed.simplify({ decimalToFractions: true }).toTex() === answer;
+    }
+    catch (err) {
+        return handleVEAError(err);
     }
-    const answer = new FractionNode(new NumberNode(1), new NumberNode(denum), {
-        allowFractionToDecimal: true,
-    });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
 };
 export const cardBasicProbas = {
     id: "cardBasicProbas",
@@ -99,4 +109,6 @@ export const cardBasicProbas = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };