math-exercises 3.0.156 → 3.0.157

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

@@ -25,7 +25,7 @@ const getAnswer = (identifiers) => {
     return answer;
 };
 const getHint = () => {
-    return `Le coefficient de proportionnalité est le nomber par lequel on multiplie les valeurs de la première ligne pour obtenir les valeurs de la deuxième ligne.`;
+    return `Le coefficient de proportionnalité est le nombre par lequel on multiplie les valeurs de la première ligne pour obtenir les valeurs de la deuxième ligne.`;
 };
 const getCorrection = (identifiers) => {
     const { xValues, yValues } = identifiers;

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

@@ -4,6 +4,9 @@ type Identifiers = {
     isSum: boolean;
     b: number;
 };
-export declare const factorizeEquation: Exercise<Identifiers>;
+type Options = {
+    answerInputTypes: string[];
+};
+export declare const factorizeEquation: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=factorizeEquation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"factorizeEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/factorizeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2JF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAkBnD,CAAC"}
+{"version":3,"file":"factorizeEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/factorizeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAyCrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+QF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAsBF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAyB5D,CAAC"}

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

@@ -1,5 +1,6 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile, } from "../../../../exercises/exercise.js";
+import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile, GeneratorOptionTarget, GeneratorOptionType, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { SetVEA } from "../../../../exercises/vea/setVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { EquationSolutionNode } from "../../../../tree/nodes/equations/equationSolutionNode.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
@@ -9,9 +10,30 @@ import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { square } from "../../../../tree/nodes/operators/powerNode.js";
 import { DiscreteSetNode } from "../../../../tree/nodes/sets/discreteSetNode.js";
 import { discreteSetParser } from "../../../../tree/parsers/discreteSetParser.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
-import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
-const getPropositions = (n, { answer, ...identifiers }) => {
+const getTexForEquationSolutionNode = (nodeAnswer, opts) => {
+    const answerInputTypeDefault = "S={...;...}";
+    const answerInputType = opts.answerInputTypes.includes(answerInputTypeDefault)
+        ? answerInputTypeDefault
+        : opts.answerInputTypes[0];
+    switch (answerInputType) {
+        case "x=... ou x=...":
+            {
+                const arrNodeAnswer = nodeAnswer.solutionsSet.elements;
+                return arrNodeAnswer
+                    .map((node) => `x=${node.toTex()}`)
+                    .join("\\text{ ou }");
+            }
+            break;
+        case "S={...;...}":
+            return nodeAnswer.toTex();
+        default:
+            throw new Error("Unsupported answerInputType: " + answerInputType);
+    }
+};
+const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
     const { a, isSum, b } = identifiers;
     const propositions = [];
     addValidProp(propositions, answer);
@@ -19,19 +41,19 @@ const getPropositions = (n, { answer, ...identifiers }) => {
         new NumberNode(0),
         frac(multiply(isSum ? 1 : -1, b), a),
     ]);
-    tryToAddWrongProp(propositions, new EquationSolutionNode(solutions).simplify().toTex());
+    tryToAddWrongProp(propositions, getTexForEquationSolutionNode(new EquationSolutionNode(solutions).simplify(), opts));
     solutions = new DiscreteSetNode([new NumberNode(0)]);
     tryToAddWrongProp(propositions, new EquationSolutionNode(solutions).simplify().toTex());
     solutions = new DiscreteSetNode([frac(multiply(isSum ? 1 : -1, b), a)]);
-    tryToAddWrongProp(propositions, new EquationSolutionNode(solutions).simplify().toTex());
+    tryToAddWrongProp(propositions, getTexForEquationSolutionNode(new EquationSolutionNode(solutions).simplify(), opts));
     solutions = new DiscreteSetNode([frac(multiply(isSum ? -1 : 1, b), a)]);
-    tryToAddWrongProp(propositions, new EquationSolutionNode(solutions).simplify().toTex());
+    tryToAddWrongProp(propositions, getTexForEquationSolutionNode(new EquationSolutionNode(solutions).simplify(), opts));
     propWhile(propositions, n, () => {
         throw Error("QCM not implemented");
     });
     return shuffleProps(propositions, n);
 };
-const getAnswer = (identifiers) => {
+const getAnswerNode = (identifiers) => {
     const { a, b, isSum } = identifiers;
     // ax^2 + bx = x(ax + b) -> S = {0, -b/a}
     // ax^2 - bx = x(ax - b) -> S = {0, b/a}
@@ -39,8 +61,13 @@ const getAnswer = (identifiers) => {
         new NumberNode(0),
         frac(multiply(isSum ? -1 : 1, b), a),
     ]);
-    const answer = new EquationSolutionNode(solutions).simplify().toTex();
-    return answer;
+    const nodeAnswer = new EquationSolutionNode(solutions).simplify();
+    return nodeAnswer;
+};
+const getAnswer = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const answerNode = getAnswerNode(identifiers);
+    return getTexForEquationSolutionNode(answerNode, opts);
 };
 const getInstruction = (identifiers) => {
     const { a, isSum, b } = identifiers;
@@ -49,7 +76,7 @@ const getInstruction = (identifiers) => {
     const eq = add(left, multiply(isSum ? 1 : -1, right));
     return `En factorisant $${eq
         .simplify({ forbidFactorize: true })
-        .toTex()}$, résoudre l'équation:
+        .toTex()}$, résoudre l'équation :
 $$
 ${left.toTex()} = ${multiply(isSum ? -1 : 1, right).toTex()}
 $$`;
@@ -67,7 +94,12 @@ ${left.toTex()} = ${multiply(isSum ? -1 : 1, right).toTex()} \\iff ${eq
         .toTex()} = 0
 $$`;
 };
-const getCorrection = (identifiers) => {
+const getCorrection = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const answerInputTypeDefault = "S={...;...}";
+    const answerInputType = opts.answerInputTypes.includes(answerInputTypeDefault)
+        ? answerInputTypeDefault
+        : opts.answerInputTypes[0];
     const { a, isSum, b } = identifiers;
     const left = multiply(a, square("x"));
     const right = multiply(b, "x");
@@ -82,55 +114,140 @@ $$
 x\\left(${factorizedInside}\\right) = 0
 $$
 
-Cette équation a deux solutions possibles: 
+Cette équation a deux solutions possibles : 
 
 - $x = 0$
-- ou $${factorizedInside} = 0 \\iff x = ${factorizedAnswer}$
 
-L'ensemble solution de l'équation est donc : 
+ou
+
+- $${factorizedInside} = 0 \\iff x = ${factorizedAnswer}$
+
+${(() => {
+        switch (answerInputType) {
+            case "x=... ou x=...":
+                return `Les solutions sont donc :`;
+            case "S={...;...}":
+                return `L'ensemble solution de l'équation est donc :`;
+            default:
+                throw new Error("Unsupported answerInputType: " + answerInputType);
+        }
+    })()}
 
 $$
-${getAnswer(identifiers)}
+${getAnswer(identifiers, opts)}
 $$`;
 };
-const getKeys = () => {
-    return ["S", "equal", "lbrace", "semicolon", "rbrace"];
+const getKeys = (_, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { answerInputTypes } = opts;
+    return [
+        ...answerInputTypes.reduce((acc, answerInputType) => {
+            const specialSet = new Set((() => {
+                switch (answerInputType) {
+                    case "x=... ou x=...":
+                        return ["x", "equal", "ou"];
+                    case "S={...;...}":
+                        return ["S", "equal", "lbrace", "semicolon", "rbrace"];
+                    default:
+                        throw new Error("Unsupported answerInputType: " + answerInputType);
+                }
+            })());
+            return new Set([...acc, ...specialSet]);
+        }, new Set()),
+    ];
 };
-const isAnswerValid = (ans, { answer }) => {
-    try {
-        const parsed = discreteSetParser(ans);
-        if (!parsed)
-            return false;
-        return "S=" + parsed.simplify().toTex() === answer;
+const isAnswerValid = (ans, { answer: _, ...identifiers }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const answerNode = getAnswerNode(identifiers);
+    const arrNodeAnswer = answerNode.solutionsSet.elements;
+    function getParsedNodesForAnswerInputType(ans, answerInputType) {
+        switch (answerInputType) {
+            case "x=... ou x=...":
+                {
+                    const formated = ans
+                        .replaceAll("text{ ou }", ";")
+                        .replaceAll("x", "")
+                        .replaceAll("=", "");
+                    console.log("formated", formated);
+                    // if (formated === "\\varnothing") {
+                    //   return EmptySet;
+                    // }
+                    const elements = formated.split(";").map((e) => parseAlgebraic(e));
+                    return elements;
+                }
+                break;
+            case "S={...;...}":
+                {
+                    const discreteSetNodeCandidate = discreteSetParser(ans);
+                    if (discreteSetNodeCandidate) {
+                        return discreteSetNodeCandidate.elements;
+                    }
+                    else {
+                        return [];
+                    }
+                }
+                break;
+            default:
+                throw new Error("Unsupported answerInputType: " + answerInputType);
+        }
     }
-    catch (err) {
-        return handleVEAError(err);
+    function isAnswerValidForAnswerInputType(answerInputType) {
+        try {
+            const arrAns = getParsedNodesForAnswerInputType(ans, answerInputType);
+            return SetVEA.isArrayOfNodesValid(arrAns, arrNodeAnswer);
+        }
+        catch (_) {
+            return false;
+        }
     }
+    return opts.answerInputTypes.some((answerInputType) => isAnswerValidForAnswerInputType(answerInputType));
 };
-const getFactorizeEquationQuestion = () => {
+const getFactorizeEquationQuestion = (optsIn) => {
+    const opts = optsIn ?? optsDefault;
     const a = randint(1, 10);
     const b = randint(1, 10);
     const isSum = coinFlip();
     const identifiers = { a, isSum, b };
-    return getQuestionFromIdentifiers(identifiers);
+    return getQuestionFromIdentifiers(identifiers, opts);
 };
-const getQuestionFromIdentifiers = (identifiers) => {
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     return {
-        answer: getAnswer(identifiers),
+        answer: getAnswer(identifiers, opts),
         instruction: getInstruction(identifiers),
-        keys: getKeys(identifiers),
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
         identifiers,
         hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        correction: getCorrection(identifiers, opts),
+        options: opts,
     };
 };
+const optsDefault = {
+    answerInputTypes: ["x=... ou x=...", "S={...;...}"],
+};
+const options = [
+    {
+        id: "answerInputTypes",
+        label: "Format(s) de réponse",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.multiselect,
+        values: ["x=... ou x=...", "S={...;...}"],
+        defaultValue: optsDefault.answerInputTypes,
+    },
+];
 export const factorizeEquation = {
     id: "factorizeEquation",
     connector: "=",
     label: "Résoudre une équation se ramenant au premier degré",
     isSingleStep: true,
     generator: (nb, opts) => getDistinctQuestions(() => getFactorizeEquationQuestion(opts), nb),
+    options,
+    validateOptions: (opts) => {
+        return {
+            valid: !!(opts?.answerInputTypes && opts?.answerInputTypes.length > 0),
+            message: "Veuillez choisir au moins un format de réponse.",
+        };
+    },
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

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

@@ -5,6 +5,9 @@ type Identifiers = {
     c: number;
     d: number;
 };
-export declare const multiplicationEquation: Exercise<Identifiers>;
+type Options = {
+    answerInputTypes: string[];
+};
+export declare const multiplicationEquation: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=multiplicationEquation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAarC,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;AAkIF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAuCrC,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;AAqMF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAsBF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAejE,CAAC"}

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

@@ -1,4 +1,4 @@
-import { addValidProp, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Rational } from "../../../../math/numbers/rationals/rational.js";
 import { Polynomial } from "../../../../math/polynomials/polynomial.js";
@@ -10,6 +10,27 @@ import { alignTex } from "../../../../utils/latex/alignTex.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { SetVEA } from "../../../../exercises/vea/setVEA.js";
 import { discreteSetParser } from "../../../../tree/parsers/discreteSetParser.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+const getTexForEquationSolutionNode = (nodeAnswer, opts) => {
+    const answerInputTypeDefault = "S={...;...}";
+    const answerInputType = opts.answerInputTypes.includes(answerInputTypeDefault)
+        ? answerInputTypeDefault
+        : opts.answerInputTypes[0];
+    switch (answerInputType) {
+        case "x=... ou x=...":
+            {
+                const arrNodeAnswer = nodeAnswer.solutionsSet.elements;
+                return arrNodeAnswer
+                    .map((node) => `x=${node.toTex()}`)
+                    .join("\\text{ ou }");
+            }
+            break;
+        case "S={...;...}":
+            return nodeAnswer.toTex();
+        default:
+            throw new Error("Unsupported answerInputType: " + answerInputType);
+    }
+};
 const getStatementNode = (identifiers) => {
     const { a, b, c, d } = identifiers;
     const polynome1 = new Polynomial([b, a]);
@@ -27,13 +48,88 @@ $$
 ${getStartStatement(identifiers)}
 $$`;
 };
-const getAnswer = (identifiers) => {
+const getAnswerNode = (identifiers) => {
     const { a, b, c, d } = identifiers;
     const sol1 = new Rational(-b, a).simplify().toTree();
     const sol2 = new Rational(-d, c).simplify().toTree();
     const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
-    const answer = new EquationSolutionNode(new DiscreteSetNode(sortedSols)).toTex();
-    return answer;
+    const nodeAnswer = new EquationSolutionNode(new DiscreteSetNode(sortedSols));
+    return nodeAnswer;
+};
+const getAnswer = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const answerNode = getAnswerNode(identifiers);
+    return getTexForEquationSolutionNode(answerNode, opts);
+};
+const isAnswerValid = (ans, { answer: _, ...identifiers }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const answerNode = getAnswerNode(identifiers);
+    const arrNodeAnswer = answerNode.solutionsSet.elements;
+    function getParsedNodesForAnswerInputType(ans, answerInputType) {
+        switch (answerInputType) {
+            case "x=... ou x=...":
+                {
+                    const formated = ans
+                        .replaceAll("text{ ou }", ";")
+                        .replaceAll("x", "")
+                        .replaceAll("=", "");
+                    console.log("formated", formated);
+                    // if (formated === "\\varnothing") {
+                    //   return EmptySet;
+                    // }
+                    const elements = formated.split(";").map((e) => parseAlgebraic(e));
+                    return elements;
+                }
+                break;
+            case "S={...;...}":
+                {
+                    const discreteSetNodeCandidate = discreteSetParser(ans);
+                    if (discreteSetNodeCandidate) {
+                        return discreteSetNodeCandidate.elements;
+                    }
+                    else {
+                        return [];
+                    }
+                }
+                break;
+            default:
+                throw new Error("Unsupported answerInputType: " + answerInputType);
+        }
+    }
+    function isAnswerValidForAnswerInputType(answerInputType) {
+        try {
+            const arrAns = getParsedNodesForAnswerInputType(ans, answerInputType);
+            return SetVEA.isArrayOfNodesValid(arrAns, arrNodeAnswer);
+        }
+        catch (_) {
+            return false;
+        }
+    }
+    return opts.answerInputTypes.some((answerInputType) => isAnswerValidForAnswerInputType(answerInputType));
+};
+const getPropositions = (n, { answer }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const propositions = [];
+    addValidProp(propositions, answer);
+    propWhile(propositions, n, () => {
+        let a, b, c, d;
+        let counter = 0;
+        do {
+            counter++;
+            if (counter > 1000)
+                throw new Error("Too many iterations in multiplicationEquation");
+            a = randint(-9, 10, [0]);
+            b = randint(-9, 10, [0]);
+            c = randint(-9, 10, [0]);
+            d = randint(-9, 10, [0]);
+        } while (a / c === b / d);
+        const sol1 = new Rational(-b, a).simplify().toTree();
+        const sol2 = new Rational(-d, c).simplify().toTree();
+        const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
+        const wrongAnswer = getTexForEquationSolutionNode(new EquationSolutionNode(new DiscreteSetNode(sortedSols)), opts);
+        tryToAddWrongProp(propositions, wrongAnswer);
+    });
+    return shuffle(propositions);
 };
 const getHint = () => {
     return "Un produit est nul si et seulement si un des deux facteurs est nul. Il faut donc trouver les valeurs de $x$ qui rendent un des deux facteurs nul.";
@@ -59,7 +155,8 @@ ${alignTex([
   
   Ainsi, $${getAnswer(identifiers)}$`;
 };
-const getMultiplicationEquation = () => {
+const getMultiplicationEquation = (optsIn) => {
+    const opts = optsIn ?? optsDefault;
     // (ax + b)(cx + d) = 0
     let a, b, c, d;
     let counter = 0;
@@ -73,59 +170,42 @@ const getMultiplicationEquation = () => {
         d = randint(-9, 10, [0]);
     } while (a / c === b / d);
     const identifiers = { a, b, c, d };
-    return getQuestionFromIdentifiers(identifiers);
+    return getQuestionFromIdentifiers(identifiers, opts);
 };
-const getQuestionFromIdentifiers = (identifiers) => {
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
-        instruction: getInstruction(identifiers),
-        startStatement: getStartStatement(identifiers),
-        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers, opts),
+        startStatement: getStartStatement(identifiers, opts),
+        answer: getAnswer(identifiers, opts),
         keys: ["x", "S", "equal", "lbrace", "rbrace", "semicolon", "ou"],
         answerFormat: "tex",
         identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
+        options: opts,
     };
     return question;
 };
-const getPropositions = (n, { answer }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    propWhile(propositions, n, () => {
-        let a, b, c, d;
-        let counter = 0;
-        do {
-            counter++;
-            if (counter > 1000)
-                throw new Error("Too many iterations in multiplicationEquation");
-            a = randint(-9, 10, [0]);
-            b = randint(-9, 10, [0]);
-            c = randint(-9, 10, [0]);
-            d = randint(-9, 10, [0]);
-        } while (a / c === b / d);
-        const sol1 = new Rational(-b, a).simplify().toTree();
-        const sol2 = new Rational(-d, c).simplify().toTree();
-        const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
-        const wrongAnswer = new EquationSolutionNode(new DiscreteSetNode(sortedSols)).toTex();
-        tryToAddWrongProp(propositions, wrongAnswer);
-    });
-    return shuffle(propositions);
-};
-const isAnswerValid = (ans, { a, b, c, d }) => {
-    const parsed = discreteSetParser(ans);
-    if (!parsed)
-        return false;
-    const sol1 = new Rational(-b, a).simplify().toTree();
-    const sol2 = new Rational(-d, c).simplify().toTree();
-    const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
-    return SetVEA.isArrayOfNodesValid(parsed.elements, sortedSols);
+const optsDefault = {
+    answerInputTypes: ["x=... ou x=...", "S={...;...}"],
 };
+const options = [
+    {
+        id: "answerInputTypes",
+        label: "Format(s) de réponse",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.multiselect,
+        values: ["x=... ou x=...", "S={...;...}"],
+        defaultValue: optsDefault.answerInputTypes,
+    },
+];
 export const multiplicationEquation = {
     id: "multiplicationEquation",
     connector: "\\iff",
     label: "Résoudre une équation produit nul",
     isSingleStep: false,
-    generator: (nb) => getDistinctQuestions(getMultiplicationEquation, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getMultiplicationEquation(opts), nb),
+    options,
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

package/lib/exercises/math/dataRepresentations/halfPieChartCommenting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"halfPieChartCommenting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/halfPieChartCommenting.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6PF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}
+{"version":3,"file":"halfPieChartCommenting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/halfPieChartCommenting.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoQF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}

package/lib/exercises/math/dataRepresentations/halfPieChartCommenting.js

@@ -79,7 +79,10 @@ const getGGBOptions = (identifiers) => {
         // const angleM = (angleA + angleB) / 2;
         const angleM = angleA +
             Math.atan2(Math.sin(angleB - angleA), Math.cos(angleB - angleA)) / 2;
-        return [0.8 * Math.cos(angleM), 1.2 * Math.sin(angleM)];
+        const cosM = Math.cos(angleM);
+        const sinM = Math.sin(angleM);
+        const offsetY = cosM > 0 ? -0.1 : 0;
+        return [0.8 * cosM, 1.2 * sinM + offsetY];
     };
     const ggb = new GeogebraConstructor({
         commands: [

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

@@ -1 +1 @@
-{"version":3,"file":"drawAffineFromPointAndLeadingCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/drawAffineFromPointAndLeadingCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAI7C,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,YAAY,EAAE,eAAe,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA4FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAqBR,CAAC"}
+{"version":3,"file":"drawAffineFromPointAndLeadingCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/drawAffineFromPointAndLeadingCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAI7C,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,YAAY,EAAE,eAAe,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAyJF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA4FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAqBR,CAAC"}

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

@@ -27,6 +27,7 @@ const getCorrection = (identifiers) => {
     const offsetVert = coeff.leftChild.evaluate();
     const isUp = Math.sign(offsetVert) >= 0;
     const offsetHoriz = coeff.rightChild.evaluate();
+    const [vAbsOffsetHoriz, vAbsOffsetVert] = [offsetHoriz, offsetVert].map((v) => Math.abs(v));
     return `La fonction $${funcName}$ est une fonction affine.
 Sa représentation graphique est une droite, que l'on va nommer $d$.
 
@@ -37,12 +38,12 @@ Comme le coefficient directeur est égal à $${texCoeff} = ${coeff.toTex({
         allowMinusAnywhereInFraction: true,
         explicitNumberWriting: true,
     })}$ 
-alors à partir de $A$, on se déplace verticalement de $${Math.abs(offsetVert).frenchify()}$ carreaux vers le ${isUp ? `haut` : `bas`} 
-quand on se déplace horizontalement de $${offsetHoriz.frenchify()}$ carreaux vers la droite.
+alors à partir de $A$, on se déplace verticalement de $${vAbsOffsetVert.frenchify()}$ carreau${vAbsOffsetVert > 1 ? "x" : ""} vers le ${isUp ? `haut` : `bas`} 
+quand on se déplace horizontalement de $${vAbsOffsetHoriz.frenchify()}$ carreau${vAbsOffsetHoriz > 1 ? "x" : ""} vers la droite.
 
 C'est-à-dire que le point $B$ de coordonnées $(${pointB.x.toTex()}; ${pointB.y.toTex()})$ appartient à $d$.
 
-On trace donc la droite passant $A(${pointA.x.toTex()}; ${pointA.y.toTex()})$ et $B(${pointB.x
+On trace donc la droite passant par $A(${pointA.x.toTex()}; ${pointA.y.toTex()})$ et par $B(${pointB.x
         .evaluate()
         .frenchify()}; ${pointB.y.evaluate().frenchify()})$.`;
 };
@@ -51,7 +52,7 @@ const getInstruction = (identifiers) => {
     const pointA = PointConstructor.fromIdentifiers(pointIdsA);
     const coeff = NodeConstructor.fromIdentifiers(leadingCoeff);
     const texCoeff = numberType === "Fraction" ? coeff.toTex() : coeff.evaluate().frenchify();
-    return `La fonction affine $${funcName}$ a pour représentation graphique une droite de  coefficient directeur $${texCoeff}$ et qui passe par le point de coordonnées $\\left(${pointA.x.toTex()}; ${pointA.y.toTex()}\\right)$.
+    return `La fonction affine $${funcName}$ a pour représentation graphique une droite de coefficient directeur $${texCoeff}$ et qui passe par le point de coordonnées $\\left(${pointA.x.toTex()}; ${pointA.y.toTex()}\\right)$.
 
 Dans le repère, tracer la représentation graphique de la fonction $${funcName}$.`;
 };

package/lib/exercises/math/functions/linear/linearFromExercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linearFromExercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/linear/linearFromExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAqCrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuWF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}
+{"version":3,"file":"linearFromExercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/linear/linearFromExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAqCrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAwWF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}

package/lib/exercises/math/functions/linear/linearFromExercise.js

@@ -217,7 +217,7 @@ La distance parcourue en $\\textrm{km}$ en $x \\ \\textrm{h}$ est $${texADecimal
 Quel est la masse de fientes de pigeon en $\\textrm{g}$ pour $x$ jours ?`,
         hint: `Quel calcul permet de trouver la masse reçue en $1$ jour ?
     
-Inspire toi de ce calcul pour déterminer la masse reçue en $x \\ \\textrm{h}$.`,
+Inspire toi de ce calcul pour déterminer la masse reçue en $x \\ \\textrm{jours}$.`,
         correction: (x1, y1) => {
             const nodeA = frac(y1, x1);
             const texADecimal = nodeA.simplify({ fractionsToDecimal: true }).toTex();
@@ -265,8 +265,9 @@ const getCorrection = (identifiers) => {
 };
 const isAnswerValid = (ans, { answer }) => {
     return parseAlgebraic(ans)
-        .simplify()
-        .equals(parseAlgebraic(answer).simplify());
+        .evaluate({ x: 1 })
+        .toTree()
+        .equals(parseAlgebraic(answer).evaluate({ x: 1 }).toTree());
 };
 const getPropositions = (n, { answer, ...identifiers }) => {
     const propositions = [];

package/lib/exercises/math/geometry/euclidian/pinSegmentFromRotation.js

@@ -113,7 +113,7 @@ const getCorrection = (identifiers) => {
     const { nameObjSrc, nameObjDst, transformationIds, pointsDict } = identifiers;
     const pointsIds = Object.values(pointsDict);
     return `L'angle $\\widehat{${pointsIds[1].name}${pointsIds[0].name}${pointsIds[2].name}}$ vaut $60°$.
-L'image de $${nameObjSrc[0]}$ par ${getStrForTransformation(transformationIds)} est $${nameObjDst[1]}$ et celle de $${nameObjSrc[0]}$ est $${nameObjDst[1]}$.
+L'image de $${nameObjSrc[0]}$ par ${getStrForTransformation(transformationIds)} est $${nameObjDst[0]}$ et celle de $${nameObjSrc[1]}$ est $${nameObjDst[1]}$.
 L'image de $[${nameObjSrc}]$ par ${getStrForTransformation(transformationIds)} est donc $[${nameObjDst}]$.`;
 };
 const getSegmentSrc = (identifiers) => {

package/lib/exercises/math/geometry/euclidian/recognizeHomothetyCenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recognizeHomothetyCenter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/euclidian/recognizeHomothetyCenter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAiE7C,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC7C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAuSF,KAAK,OAAO,GAAG;IACb,oBAAoB,EAAE,OAAO,CAAC;IAC9B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAyBF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBnE,CAAC"}
+{"version":3,"file":"recognizeHomothetyCenter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/euclidian/recognizeHomothetyCenter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAiE7C,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC7C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAsSF,KAAK,OAAO,GAAG;IACb,oBAAoB,EAAE,OAAO,CAAC;IAC9B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAyBF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBnE,CAAC"}