math-exercises 3.0.31 → 3.0.33

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

@@ -1,24 +1,56 @@
-import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
 import { Rational } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getLeadingCoefficientCalculV1Question = () => {
-    const [xA, yA] = [1, 2].map((el) => randint(-9, 10));
+const getInstruction = (identifiers, opts) => {
+    const { xA, yA, xB, yB } = identifiers;
+    const usePoints = opts?.usePoints;
+    const useLinear = opts?.useLinear;
+    const fctTex = `Soit $f$ une fonction ${useLinear ? "linéaire" : "affine"}`;
+    // const values = usePoints ?
+    const pointA = usePoints
+        ? `$A\\left(${xA},${yA}\\right)$`
+        : `$f\\left(${xA}\\right) = ${yA}$`;
+    const pointB = usePoints
+        ? `$B\\left(${xB},${yB}\\right)$`
+        : `$f\\left(${xB}\\right) = ${yB}$`;
+    if (opts?.useLinear) {
+        return `${fctTex} telle que ${usePoints
+            ? `le point ${pointB} appartient à la droite représentant $f$`
+            : pointB}.
+    
+Quel est le coefficient directeur de $f$ ?`;
+    }
+    return `${fctTex} telle que ${usePoints
+        ? `les points ${pointA} et ${pointB} appartiennent à la droite représentant $f$`
+        : `${pointA} et ${pointB}`}.
+  
+Quel est le coefficient directeur de $f$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
+    const answer = new Rational(yB - yA, xB - xA).simplify().toTree().toTex();
+    return answer;
+};
+const getLeadingCoefficientCalculV1Question = (opts) => {
+    const useLinear = opts?.useLinear;
+    const [xA, yA] = useLinear ? [0, 0] : [1, 2].map((el) => randint(-9, 10));
     const xB = randint(-9, 10, [xA]);
     const yB = randint(-9, 10);
-    const answer = new Rational(yB - yA, xB - xA).simplify().toTree().toTex();
+    const identifiers = { xA, xB, yA, yB };
     const question = {
-        instruction: `Soit $f$ une fonction affine telle que $f(${xA})$ = $${yA}$ et $f(${xB})$ = $${yB}$.$\\\\$Quel est le coefficient directeur de $f$ ?`,
+        instruction: getInstruction(identifiers, opts),
         startStatement: "a",
-        answer,
+        answer: getAnswer(identifiers, opts),
         answerFormat: "tex",
         keys: [],
-        identifiers: { xA, xB, yA, yB },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+const getPropositions = (n, { answer, xA, xB, yA, yB }, opts) => {
     const propositions = [];
     addValidProp(propositions, answer);
     while (propositions.length < n) {
@@ -30,24 +62,37 @@ const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
-    const answer = new Rational(yB - yA, xB - xA)
-        .simplify()
-        .toTree({ allowFractionToDecimal: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, xA, xB, yA, yB }) => {
+    return rationalVEA(ans, answer);
 };
+const options = [
+    {
+        id: "useLinear",
+        label: "Utiliser des fonctions linéaires",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.checkbox,
+        defaultValue: false,
+    },
+    {
+        id: "usePoints",
+        label: "Utiliser des points plutôt que des images",
+        target: GeneratorOptionTarget.instruction,
+        type: GeneratorOptionType.checkbox,
+        defaultValue: false,
+    },
+];
 export const leadingCoefficientCalculV1 = {
     id: "leadingCoefficientCalculV1",
     connector: "=",
-    label: "Calculer le coefficient directeur d'une fonction affine",
-    levels: ["3ème", "2nde", "2ndPro", "1rePro", "1reTech"],
+    label: "Calculer le coefficient directeur à l'aide d'images/de points",
     isSingleStep: true,
-    sections: ["Fonctions affines", "Droites"],
-    generator: (nb) => getDistinctQuestions(getLeadingCoefficientCalculV1Question, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getLeadingCoefficientCalculV1Question(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    options,
+    getInstruction,
+    getAnswer,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAMrC,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;AAgDF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAUrC,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;AAgDF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAe5D,CAAC"}

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

@@ -39,7 +39,7 @@ const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
 export const leadingCoefficientCalculV2 = {
     id: "leadingCoefficientCalculV2",
     connector: "=",
-    label: "Coefficient directeur à l'aide de deux points",
+    label: "Calculer le coefficient directeur d'une fonction affine à l'aide de deux points",
     levels: ["3ème", "2nde", "2ndPro", "1rePro", "1reTech"],
     isSingleStep: false,
     sections: ["Droites", "Fonctions affines"],

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/parity/parityFromGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parityFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/parity/parityFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4GF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}
+{"version":3,"file":"parityFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/parity/parityFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAyGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/functions/parity/parityFromGraph.js

@@ -106,9 +106,6 @@ const getPropositions = (n, { answer }) => {
     tryToAddWrongProp(propositions, "On ne peut pas savoir", "raw");
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
 export const parityFromGraph = {
     id: "parityFromGraph",
     label: "Reconnaître graphiquement la parité d'une fonction",
@@ -119,7 +116,6 @@ export const parityFromGraph = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     answerType: "QCU",
     hasGeogebra: true,
     subject: "Mathématiques",

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/geometry/triangles/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./triangleNature.js";
 export * from "./triangleThirdAngleValue.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/geometry/triangles/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/triangles/index.ts"],"names":[],"mappings":"AAEA,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/triangles/index.ts"],"names":[],"mappings":"AACA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC"}

package/lib/exercises/math/geometry/triangles/index.js

@@ -1,3 +1,3 @@
 // export * from './traceMedianInTriangle'
-// export * from "./triangleNature.js";
+export * from "./triangleNature.js";
 export * from "./triangleThirdAngleValue.js";

package/lib/exercises/math/geometry/triangles/triangleNature.d.ts

@@ -3,6 +3,7 @@ import { TriangleIdentifiers } from "../../../../math/geometry/triangles/triangl
 type Identifiers = {
     triangleIdentifiers: TriangleIdentifiers;
     type: number;
+    useAngles: boolean;
 };
 export declare const triangleNature: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/geometry/triangles/triangleNature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangleNature.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/triangles/triangleNature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAInD,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA+GF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAkBhD,CAAC"}
+{"version":3,"file":"triangleNature.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/triangles/triangleNature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAKnD,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAqJF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAkBhD,CAAC"}