math-exercises 3.0.30 → 3.0.32

package/lib/exercises/math/calculLitteral/equation/equa4.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"equa4.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equa4.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAkBrC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAoBvD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equa4.js

@@ -0,0 +1,106 @@
+import { addValidProp, 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 { Affine } from "../../../../math/polynomials/affine.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { EqualNode, equationResolutionTex, } from "../../../../tree/nodes/equations/equalNode.js";
+import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { equationVEA } from "../../../../exercises/vea/equationVEA.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+const getStatementNode = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    const affines = [new Affine(a, b), new Affine(c, d)];
+    const statementTree = new EqualNode(affines[0].toTree(), affines[1].toTree());
+    return statementTree;
+};
+const getInstruction = (identifiers) => {
+    return `Résoudre : 
+
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    const solution = new Rational(d - b, a - c).simplify();
+    const answerTree = new EqualNode(new VariableNode("x"), solution.toTree());
+    const answer = answerTree.toTex();
+    return answer;
+};
+const getEquationType4ExerciseQuestion = () => {
+    const a = randint(-10, 11, [0, 1]);
+    const b = randint(-10, 11, [0]);
+    const c = randint(-10, 11, [0, a]);
+    const d = randint(-10, 11, [0]);
+    const identifiers = {
+        a,
+        b,
+        c,
+        d,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: equationKeys,
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+const getHint = (identifiers) => {
+    return `Commence par regrouper les termes en $x$ d'un même côté de l'équation. Puis, isole $x$ en effectuant les bonnes opérations.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    return `On regroupe les nombres d'un côté, et les termes en $x$ de l'autre :
+  
+$$
+${equationResolutionTex(a.toTree(), b.toTree(), c.toTree(), d.toTree())}
+$$`;
+};
+const getPropositions = (n, { answer, a, b, c, d }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = new Rational(d - b + randint(-7, 8, [0, -d + b]), a - c + randint(-7, 8, [-a + c, 0])).simplify();
+        tryToAddWrongProp(propositions, new EqualNode(new VariableNode("x"), wrongAnswer.toTree()).toTex());
+    }
+    return shuffle(propositions);
+};
+const isAnswerValid = (ans, { a, b, c, d }) => {
+    const solution = frac(d - b, a - c)
+        .simplify()
+        .toTex();
+    return equationVEA(ans, solution);
+};
+export const equationType4Exercise = {
+    id: "equa4",
+    connector: "\\iff",
+    label: "Résoudre une équation du type  $ax+b=cx+d$",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
+    sections: ["Équations"],
+    isSingleStep: false,
+    generator: (nb) => getDistinctQuestions(getEquationType4ExerciseQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/equation/index.d.ts

@@ -1,8 +1,8 @@
 export * from "./equationSimpleSquare.js";
-export * from "./equationType1Exercise.js";
-export * from "./equationType2Exercise.js";
-export * from "./equationType3Exercise.js";
-export * from "./equationType4Exercise.js";
+export * from "./equa1.js";
+export * from "./equa2.js";
+export * from "./equa3.js";
+export * from "./equa4.js";
 export * from "./fractionEquation.js";
 export * from "./multiplicationEquation.js";
 export * from "./firstDegreeEquation.js";

package/lib/exercises/math/calculLitteral/equation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC"}

package/lib/exercises/math/calculLitteral/equation/index.js

@@ -1,8 +1,8 @@
 export * from "./equationSimpleSquare.js";
-export * from "./equationType1Exercise.js";
-export * from "./equationType2Exercise.js";
-export * from "./equationType3Exercise.js";
-export * from "./equationType4Exercise.js";
+export * from "./equa1.js";
+export * from "./equa2.js";
+export * from "./equa3.js";
+export * from "./equa4.js";
 export * from "./fractionEquation.js";
 export * from "./multiplicationEquation.js";
 export * from "./firstDegreeEquation.js";

package/lib/exercises/math/derivation/derivative/expDerivativeOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/math/derivation/derivative/expDerivativeOne.js

@@ -58,12 +58,6 @@ const isAnswerValid = (ans, { answer, a, b }) => {
         const parsed = parseAlgebraic(ans);
         if (!parsed)
             return false;
-        console.log(parsed
-            .simplify({
-            towardsDistribute: true,
-            forbidFactorize: true,
-        })
-            .toTex());
         return (parsed
             .simplify({
             towardsDistribute: true,

package/lib/exercises/math/derivation/derivative/powerFunctionDerivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powerFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/powerFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA0HF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"powerFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/powerFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAsJF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAiBzD,CAAC"}

package/lib/exercises/math/derivation/derivative/powerFunctionDerivative.js

@@ -7,6 +7,31 @@ import { PowerNode } from "../../../../tree/nodes/operators/powerNode.js";
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
 import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getHint = (identifiers) => {
+    return `On rappelle que la dérivée de la fonction $kx^n$ est : 
+
+$$
+k\\times n \\times x^{n-1}
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { a, power } = identifiers;
+    return `La dérivée de la fonction $kx^n$ est : 
+
+$$
+k\\times n \\times x^{n-1}
+$$
+
+Ici, on a $k = ${a}$ et $n = ${power}$.
+
+On obtient donc : 
+
+${alignTex([
+        ["f'(x)", "=", `${a} \\times ${power} \\times x^{${power}-1}`],
+        ["", "=", getAnswer(identifiers)],
+    ])}`;
+};
 const getInstruction = (identifiers) => {
     const { a, power } = identifiers;
     const statement = new MultiplyNode(new NumberNode(a), new PowerNode(new VariableNode("x"), new NumberNode(power)));
@@ -35,6 +60,8 @@ const getPowerFunctionDerivative = () => {
         keys: ["x"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -85,4 +112,7 @@ export const powerFunctionDerivative = {
     subject: "Mathématiques",
     getInstruction,
     getAnswer,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAYrC,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;AAgEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAYrC,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;AA4EF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}

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

@@ -8,13 +8,17 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getLeadingCoefficientQuestion = () => {
-    let xA, yA, xB, yB;
-    [xA, yA] = [1, 2].map((el) => randint(-5, 6));
-    xB = xA > 0 ? randint(xA - 4, 6, [xA]) : randint(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
-    yB = yA > 0 ? randint(yA - 4, 6) : randint(-4, yA + 5);
+const getInstruction = (identifiers) => {
+    return "Déterminer le coefficient directeur de la droite représentée ci-dessous : ";
+};
+const getAnswer = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
     const a = frac(yB - yA, xB - xA).simplify();
     const answer = a.toTex();
+    return answer;
+};
+const getGGBOptions = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
     const xMin = Math.min(xA, xB);
     const xMax = Math.max(xA, xB);
     const yMin = Math.min(yA, yB);
@@ -27,15 +31,23 @@ const getLeadingCoefficientQuestion = () => {
     const ggb = new GeogebraConstructor({
         commands,
     });
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+    });
+};
+const getLeadingCoefficientQuestion = () => {
+    let xA, yA, xB, yB;
+    [xA, yA] = [1, 2].map((el) => randint(-5, 6));
+    xB = xA > 0 ? randint(xA - 4, 6, [xA]) : randint(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
+    yB = yA > 0 ? randint(yA - 4, 6) : randint(-4, yA + 5);
+    const identifiers = { xA, xB, yA, yB };
     const question = {
-        instruction: "Déterminer le coefficient directeur de la droite représentée ci-dessous : ",
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: [],
-        ggbOptions: ggb.getOptions({
-            coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
-        }),
+        ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
-        identifiers: { xA, xB, yA, yB },
+        identifiers,
     };
     return question;
 };
@@ -67,4 +79,7 @@ export const leadingCoefficient = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getGGBOptions,
 };

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/logarithm/logSimplifiying.js

@@ -21,7 +21,7 @@ const getStatementNode = (identifiers) => {
     }
 };
 const getInstruction = (identifiers) => {
-    return `Ecrire le nombre suivant sous la forme $\\ln\\left(a\\right)$ : 
+    return `Écrire le nombre suivant sous la forme $\\ln\\left(a\\right)$ : 
   
 $$
 ${getStatementNode(identifiers).toTex()}

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,
+    },
 };