math-exercises 2.2.79 → 2.2.80

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

@@ -4,38 +4,77 @@ exports.signFunction = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
+const affine_1 = require("../../../../math/polynomials/affine");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
 const randint_1 = require("../../../../math/utils/random/randint");
+const inequationNode_1 = require("../../../../tree/nodes/inequations/inequationNode");
 const infiniteNode_1 = require("../../../../tree/nodes/numbers/infiniteNode");
 const closure_1 = require("../../../../tree/nodes/sets/closure");
 const intervalNode_1 = require("../../../../tree/nodes/sets/intervalNode");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const getSignFunction = () => {
-    const a = (0, randint_1.randint)(-9, 10, [0]);
-    const b = (0, randint_1.randint)(-9, 10);
+const getHint = (identifiers) => {
+    const { a, b, askingPositive } = identifiers;
     const affine = new polynomial_1.Polynomial([b, a]);
-    let instruction = `Soit $f$ la fonction définie par : $f(x) = ${affine.toTex()}$. Sur quel intervalle $f$ est-elle `;
-    let answer = "";
-    const askingPositive = (0, coinFlip_1.coinFlip)();
+    return `Pour déterminer l'intervalle sur lequel la fonction $f(x) = ${affine.toTex()}$ est ${askingPositive ? "positive" : "négative"}, il faut résoudre l'inéquation : 
+  
+$$
+${affine.toTex()} ${askingPositive ? "\\geq" : "\\leq"} 0
+$$
+`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, askingPositive } = identifiers;
+    const affine = new affine_1.Affine(a, b);
+    const answer = getAnswer(identifiers);
+    const order = askingPositive ? "\\ge" : "\\le";
+    return `On résout l'inéquation : 
+
+${(0, inequationNode_1.firstDegreeInequationResolutionTex)(affine, order, (0).toTree())}
+
+On en conclut que $f$ est ${identifiers.askingPositive ? "positive" : "négative"} sur l'intervalle : 
+
+$$
+${answer}
+$$
+`;
+};
+const getInstruction = (identifiers) => {
+    const { a, b, askingPositive } = identifiers;
+    const affine = new polynomial_1.Polynomial([b, a]);
+    return `Soit $f$ la fonction définie sur $\\mathbb{R}$ par : 
+  
+$$
+f(x) = ${affine.toTex()}
+$$
+
+Sur quel intervalle $f$ est-elle ${identifiers.askingPositive ? "positive" : "négative"} ?`;
+};
+const getAnswer = ({ a, b, askingPositive }) => {
     const root = new rational_1.Rational(-b, a).simplify().toTree();
     const toRightInfInterval = new intervalNode_1.IntervalNode(root, infiniteNode_1.PlusInfinityNode, closure_1.ClosureType.FO).toTex();
     const toLeftInfInteral = new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, root, closure_1.ClosureType.OF).toTex();
     if (askingPositive) {
-        instruction += "positive ?";
-        answer = a > 0 ? toRightInfInterval : toLeftInfInteral;
+        return a > 0 ? toRightInfInterval : toLeftInfInteral;
     }
     else {
-        instruction += "négative ?";
-        answer = a > 0 ? toLeftInfInteral : toRightInfInterval;
+        return a > 0 ? toLeftInfInteral : toRightInfInterval;
     }
+};
+const getSignFunction = () => {
+    const a = (0, randint_1.randint)(-9, 10, [0]);
+    const b = (0, randint_1.randint)(-9, 10);
+    const askingPositive = (0, coinFlip_1.coinFlip)();
+    const identifiers = { a, askingPositive, b };
     const question = {
-        instruction,
-        startStatement: "S",
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["lbracket", "semicolon", "rbracket", "infty"],
         answerFormat: "tex",
-        identifiers: { a, askingPositive, b },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -53,21 +92,19 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b, askingPositive }) => {
-    const root = new rational_1.Rational(-b, a)
-        .simplify()
-        .toTree({ allowFractionToDecimal: true });
-    const toRightInfInterval = new intervalNode_1.IntervalNode(root, infiniteNode_1.PlusInfinityNode, closure_1.ClosureType.FO);
-    const toLeftInfInteral = new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, root, closure_1.ClosureType.OF);
-    let answer;
-    if (askingPositive) {
-        answer = a > 0 ? toRightInfInterval : toLeftInfInteral;
+const isAnswerValid = (ans, { answer, a, b, askingPositive }) => {
+    try {
+        const parsed = (0, intervalParser_1.intervalParser)(ans, {
+            allowCommaInsteadOfSemicolon: true,
+            allowNoBrackets: true,
+        });
+        if (!parsed)
+            return false;
+        return parsed.simplify().toTex() === answer;
     }
-    else {
-        answer = a > 0 ? toLeftInfInteral : toRightInfInterval;
+    catch (err) {
+        return false;
     }
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
 };
 exports.signFunction = {
     id: "signFunction",
@@ -82,4 +119,6 @@ exports.signFunction = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getHint,
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"graphicInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/graphicInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAM5D,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AA4LF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}
+{"version":3,"file":"graphicInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/graphicInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAO5D,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AAgNF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}

package/lib/exercises/math/functions/basics/graphicInequation.js

@@ -11,7 +11,42 @@ const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const closure_1 = require("../../../../tree/nodes/sets/closure");
 const intervalNode_1 = require("../../../../tree/nodes/sets/intervalNode");
 const unionIntervalNode_1 = require("../../../../tree/nodes/sets/unionIntervalNode");
+const unionIntervalParser_1 = require("../../../../tree/parsers/unionIntervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const getAnswer = (identifiers) => {
+    const intervalsNodes = identifiers.intervals.map((n) => new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(n.a), new numberNode_1.NumberNode(n.b), n.closure));
+    const intervalsTree = intervalsNodes.length === 1
+        ? intervalsNodes[0]
+        : new unionIntervalNode_1.UnionIntervalNode(intervalsNodes);
+    const answerTree = new inequationSolutionNode_1.InequationSolutionNode(intervalsTree);
+    return answerTree.toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Déterminer graphiquement les solutions de l'inéquation $f(x)${identifiers.isAskingSup
+        ? identifiers.isStrict
+            ? ">"
+            : "\\geq"
+        : identifiers.isStrict
+            ? "<"
+            : "\\leq"}${identifiers.yValue}$ où $f$ est la fonction représentée ci-dessous.`;
+};
+const getGGBOptions = (identifiers) => {
+    const commands = [
+        `S =Spline(${identifiers.splinePoints
+            .map((point) => `(${point[0]},${point[1]})`)
+            .join(",")})`,
+        "SetFixed(S, true)",
+        `SetColor(S, "${(0, colors_1.randomColor)()}")`,
+    ];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({ commands });
+    const xMin = Math.min(...identifiers.splinePoints.map((point) => point[0]));
+    const yMin = Math.min(...identifiers.splinePoints.map((point) => point[1]));
+    const xMax = Math.max(...identifiers.splinePoints.map((point) => point[0]));
+    const yMax = Math.max(...identifiers.splinePoints.map((point) => point[1]));
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+    });
+};
 const getGraphicInequationQuestion = () => {
     let xSolutions = [];
     const nb = (0, randint_1.randint)(2, 4);
@@ -70,25 +105,16 @@ const getGraphicInequationQuestion = () => {
         prevYWasAbove = y > 0;
         splinePoints.push([x, yValue + y]);
     }
-    const xMin = Math.min(...splinePoints.map((point) => point[0]));
-    const yMin = Math.min(...splinePoints.map((point) => point[1]));
-    const xMax = Math.max(...splinePoints.map((point) => point[0]));
-    const yMax = Math.max(...splinePoints.map((point) => point[1]));
-    const intervalsNodes = intervals.map((i) => new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(i.a), new numberNode_1.NumberNode(i.b), i.closure));
-    const answer = intervalsNodes.length === 1
-        ? `S=\\ ${intervalsNodes[0].toTex()}`
-        : `S=\\ ${new unionIntervalNode_1.UnionIntervalNode(intervalsNodes).toTex()}`;
-    const commands = [
-        `S =Spline(${splinePoints
-            .map((point) => `(${point[0]},${point[1]})`)
-            .join(",")})`,
-        "SetFixed(S, true)",
-        `SetColor(S, "${(0, colors_1.randomColor)()}")`,
-    ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor({ commands });
+    const identifiers = {
+        yValue,
+        splinePoints,
+        isAskingSup,
+        isStrict,
+        intervals,
+    };
     const question = {
-        answer,
-        instruction: `Déterminer graphiquement les solutions de l'inéquation $f(x)${isAskingSup ? (isStrict ? ">" : "\\geq") : isStrict ? "<" : "\\leq"}${yValue}$ où $f$ est la fonction représentée ci-dessous.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [
             "S",
             "equal",
@@ -101,16 +127,8 @@ const getGraphicInequationQuestion = () => {
             "varnothing",
         ],
         answerFormat: "tex",
-        ggbOptions: ggb.getOptions({
-            coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
-        }),
-        identifiers: {
-            yValue,
-            splinePoints,
-            isAskingSup,
-            isStrict,
-            intervals,
-        },
+        ggbOptions: getGGBOptions(identifiers),
+        identifiers,
     };
     return question;
 };
@@ -138,14 +156,17 @@ const getPropositions = (n, { answer, intervals, splinePoints, yValue }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { intervals }) => {
-    const intervalsNodes = intervals.map((n) => new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(n.a), new numberNode_1.NumberNode(n.b), n.closure));
-    const intervalsTree = intervalsNodes.length === 1
-        ? intervalsNodes[0]
-        : new unionIntervalNode_1.UnionIntervalNode(intervalsNodes);
-    const answerTree = new inequationSolutionNode_1.InequationSolutionNode(intervalsTree);
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, intervals }) => {
+    try {
+        const parsed = (0, unionIntervalParser_1.unionIntervalParser)(ans.replaceAll("S", "").replaceAll("=", ""));
+        if (!parsed)
+            return false;
+        console.log(parsed.simplify().toTex(), answer);
+        return "S=\\ " + parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.graphicInequation = {
     id: "graphicInequation",

package/lib/exercises/math/functions/exponential/expEquation.js

@@ -27,7 +27,7 @@ const getExpEquation = () => {
             "equal",
             "epower",
             "exp",
-            "ln",
+            "lnBrackets",
             "S",
             "lbrace",
             "semicolon",

package/lib/exercises/math/functions/integral/integralFractions.js

@@ -47,7 +47,7 @@ const getIntegralFractionsQuestion = () => {
     const question = {
         answer: answer.toTex(),
         instruction: `Calculer : $${integral.toTex()}$`,
-        keys: ["ln"],
+        keys: ["lnBrackets"],
         answerFormat: "tex",
         identifiers: {
             questionType,

package/lib/exercises/math/functions/logarithm/log10Simplifying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log10Simplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10Simplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AA8FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAiBrD,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAiBnD,CAAC"}
+{"version":3,"file":"log10Simplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10Simplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAkGF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAiBrD,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAiBnD,CAAC"}

package/lib/exercises/math/functions/logarithm/log10Simplifying.js

@@ -13,6 +13,9 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const operatorComposition_1 = require("../../../../tree/utilities/operatorComposition");
 const random_1 = require("../../../../utils/alea/random");
+const getKeys = (identifiers, opts) => {
+    return [opts?.isLog10 ? "logBrackets" : "lnBrackets"];
+};
 const getLog10SumSimplifyingQuestion = (opts) => {
     const nb = (0, randint_1.randint)(2, 10);
     const trueNb = [2, 4, 8].includes(nb) ? 2 : [3, 9].includes(nb) ? 3 : nb;
@@ -35,12 +38,13 @@ const getLog10SumSimplifyingQuestion = (opts) => {
             : new oppositeNode_1.OppositeNode(new LNode(new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(power)))));
     const statement = (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, logs);
     const answer = statement.simplify();
+    const identifiers = { nb, powers, signs, isLog10: opts?.isLog10 ?? false };
     const question = {
         answer: answer.toTex(),
         instruction: `Exprimer le nombre suivant sous la forme $a${opts?.isLog10 ? "\\log" : "\\ln"}\\left(${trueNb}\\right)$ : $\\newline ${statement.toTex()}$`,
-        keys: [opts?.isLog10 ? "log" : "ln"],
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
-        identifiers: { nb, powers, signs, isLog10: opts?.isLog10 ?? false },
+        identifiers,
     };
     return question;
 };

package/lib/exercises/math/functions/logarithm/logEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAclC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6EF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}

package/lib/exercises/math/functions/logarithm/logEquation.js

@@ -14,28 +14,36 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const getKeys = () => {
+    return [
+        "x",
+        "equal",
+        "lnBrackets",
+        "e",
+        "epower",
+        "exp",
+        "lbrace",
+        "S",
+        "semicolon",
+        "rbrace",
+    ];
+};
 const getLnEquation = () => {
     const a = (0, randint_1.randint)(-9, 20, [0]);
     const k = (0, randint_1.randint)(-9, 20, [0]);
     const equation = new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(k));
     const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree())])).toTex();
+    const identifiers = { a, k };
     const question = {
-        instruction: `Résoudre l'équation $${equation.toTex()}$.`,
+        instruction: `Résoudre l'équation : 
+    
+$$
+${equation.toTex()}
+$$`,
         answer,
-        keys: [
-            "x",
-            "equal",
-            "ln",
-            "e",
-            "epower",
-            "exp",
-            "lbrace",
-            "S",
-            "semicolon",
-            "rbrace",
-        ],
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { a, k },
+        identifiers,
     };
     return question;
 };

package/lib/exercises/math/functions/logarithm/logPowerEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AA0GF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}
+{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AA4GF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}

package/lib/exercises/math/functions/logarithm/logPowerEquation.js

@@ -16,6 +16,11 @@ const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 /**a*b^x+c=d */
+const getKeys = (identifiers, opts) => {
+    const keys = ["x", "equal", "S", "lbrace", "semicolon", "rbrace"];
+    keys.push(opts?.isLog10 ? "logBrackets" : "lnBrackets");
+    return keys;
+};
 const getLogPowerEquationQuestion = (opts) => {
     const powered = (0, randint_1.randint)(2, 8);
     const a = (0, randint_1.randint)(1, 10, [powered]);
@@ -29,22 +34,13 @@ const getLogPowerEquationQuestion = (opts) => {
         new fractionNode_1.FractionNode(new LNode(new numberNode_1.NumberNode(k)), new LNode(poweredNode)).simplify(),
     ])).toTex();
     const equation = new equalNode_1.EqualNode(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new powerNode_1.PowerNode(poweredNode, xNode)), new numberNode_1.NumberNode(c)).simplify(), new numberNode_1.NumberNode(d));
-    const keys = [
-        "log",
-        "x",
-        "equal",
-        "S",
-        "lbrace",
-        "semicolon",
-        "rbrace",
-    ];
-    keys.push(opts?.isLog10 ? "log" : "ln");
+    const identifiers = { a, c, k, powered, isLog10: opts?.isLog10 ?? false };
     const question = {
         answer,
         instruction: `Résoudre : $${equation.toTex()}$`,
-        keys,
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
-        identifiers: { a, c, k, powered, isLog10: opts?.isLog10 ?? false },
+        identifiers,
     };
     return question;
 };
@@ -64,6 +60,12 @@ const getPropositions = (n, { answer, isLog10, a, c, k, powered }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { a, c, k, powered, isLog10 }) => {
+    try {
+        //!TODO parse equation solution
+    }
+    catch (err) {
+        return false;
+    }
     const LNode = isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
     const poweredNode = new numberNode_1.NumberNode(powered);
     const answerSimp = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([

package/lib/exercises/math/functions/logarithm/logSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/functions/logarithm/logSimplifiying.js

@@ -11,31 +11,51 @@ const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const getStatementNode = (identifiers) => {
+    const { a, b, pm } = identifiers;
+    const opts = { allowLnOfOne: true };
+    const aNode = new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts);
+    const bNode = new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts);
+    if (pm === 1) {
+        return new addNode_1.AddNode(aNode, bNode);
+    }
+    else {
+        return new substractNode_1.SubstractNode(aNode, bNode);
+    }
+};
+const getInstruction = (identifiers) => {
+    return `Ecrire le nombre suivant sous la forme $\\ln\\left(a\\right)$ : 
+  
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, pm } = identifiers;
+    if (pm === 1) {
+        return new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex();
+    }
+    else {
+        return new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree()).toTex();
+    }
+};
+const getKeys = (identifiers) => {
+    return ["lnBrackets"];
+};
 const getExpSimplifiying = () => {
-    let expression;
-    let simplifiedExpression;
     let pm = (0, coinFlip_1.coinFlip)() ? 1 : -1;
     const a = (0, randint_1.randint)(1, 10);
     let b;
     do {
         b = (0, randint_1.randint)(1, 10);
     } while (pm === -1 && a === b);
-    const opts = { allowLnOfOne: true };
-    if (pm === 1) {
-        expression = new addNode_1.AddNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts), new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts));
-        simplifiedExpression = new logNode_1.LogNode(new numberNode_1.NumberNode(a * b));
-    }
-    else {
-        expression = new substractNode_1.SubstractNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts), new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts));
-        simplifiedExpression = new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree());
-    }
-    const answer = simplifiedExpression.toTex();
+    const identifiers = { pm, a, b };
     const question = {
-        instruction: `Ecrire le nombre suivant sous la forme $\\ln\\left(a\\right)$ : $\\newline ${expression.toTex()}$.`,
-        answer,
-        keys: ["ln"],
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { pm, a, b },
+        identifiers,
     };
     return question;
 };

package/lib/exercises/math/geometry/vectors/vectorLinearCombination.js

@@ -15,12 +15,12 @@ const getVectorLinearCombinationQuestion = () => {
     const a = (0, randint_1.randint)(-10, 11, [0]);
     const b = (0, randint_1.randint)(-10, 11, [0]);
     const uCoords = {
-        x: u.x.simplify().value,
-        y: u.y.simplify().value,
+        x: u.x.simplify().evaluate(),
+        y: u.y.simplify().evaluate(),
     };
     const vCoords = {
-        x: v.x.simplify().value,
-        y: v.y.simplify().value,
+        x: v.x.simplify().evaluate(),
+        y: v.y.simplify().evaluate(),
     };
     const instruction = `Soient deux vecteurs $${u.toTexWithCoords()}$ et $${v.toTexWithCoords()}$. 
   Calculer les coordonnées du vecteur $${getAddVectorTex(getMultiplyVectorTex(a, u), getMultiplyVectorTex(b, v))}$`;

package/lib/exercises/math/matrices/matrixInversibilityDomain.js

@@ -94,3 +94,4 @@ exports.matrixInversibilityDomain = {
     subject: "Mathématiques",
     pdfOptions: { shouldSpreadPropositions: true },
 };
+//lbracket

package/lib/exercises/math/primitive/logarithmePrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logarithmePrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/logarithmePrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,WAAW,CAgBjE,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,WAAW,CAsCxE,CAAC;AAeF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}
+{"version":3,"file":"logarithmePrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/logarithmePrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,YAAY,EAEZ,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAKF,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,WAAW,CAsBjE,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,WAAW,CAsCxE,CAAC;AAeF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

package/lib/exercises/math/primitive/logarithmePrimitive.js

@@ -13,19 +13,27 @@ const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/alea/shuffle");
+const getKeys = () => {
+    return ["x", "C", "lnBrackets", "abs"];
+};
 const getLogarithmePrimitive = () => {
     const u = polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3));
     const uTree = u.toTree();
     const selectedFunction = new fractionNode_1.FractionNode(u.derivate().toTree(), uTree);
     const integratedFuction = new logNode_1.LogNode(new absNode_1.AbsNode(uTree));
     const answer = new addNode_1.AddNode(integratedFuction, new variableNode_1.VariableNode("C")).toTex();
+    const identifiers = { coeffs: u.coefficients };
     const question = {
-        instruction: `Déterminer la forme générale des primitives de la fonction $f$ définie par $f(x) = ${selectedFunction.toTex()}$.`,
+        instruction: `Déterminer la forme générale des primitives de la fonction $f$ définie par :  
+    
+$$
+f(x) = ${selectedFunction.toTex()}
+$$`,
         startStatement: `F(x)`,
         answer,
-        keys: ["x", "C", "ln", "abs"],
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { coeffs: u.coefficients },
+        identifiers,
     };
     return question;
 };

package/lib/exercises/math/sets/intervals/inequalityToInterval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inequalityToInterval.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sets/intervals/inequalityToInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAK5D,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAwFF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"inequalityToInterval.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sets/intervals/inequalityToInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAO5D,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAkFF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/math/sets/intervals/inequalityToInterval.js

@@ -4,8 +4,7 @@ exports.inequalityToInterval = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const intervals_1 = require("../../../../math/sets/intervals/intervals");
-const belongsNode_1 = require("../../../../tree/nodes/sets/belongsNode");
-const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 const getInequalityToIntervalQuestion = () => {
     const interval = intervals_1.IntervalConstructor.random();
@@ -55,15 +54,16 @@ const getPropositions = (n, { answer, intervalClosure, intervalMax, intervalMin
     });
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { intervalClosure, intervalMax, intervalMin }) => {
-    const min = intervalMin === "-infty" ? -Infinity : intervalMin;
-    const max = intervalMax === "infty" ? Infinity : intervalMax;
-    const interval = new intervals_1.Interval(min.toTree(), max.toTree(), intervalClosure).toTree();
-    const answer = new belongsNode_1.BelongsNode(new variableNode_1.VariableNode("x"), interval, {
-        allowRawRightChildAsSolution: true,
-    });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { intervalClosure, intervalMax, intervalMin, answer }) => {
+    try {
+        const parsed = (0, intervalParser_1.intervalParser)(ans.replaceAll("x\\in", ""));
+        if (!parsed)
+            return false;
+        return "x\\in\\ " + parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.inequalityToInterval = {
     id: "inequalityToInterval",

package/lib/exercises/options/inequationSolutionFormat.d.ts

@@ -0,0 +1,3 @@
+import { GeneratorOption } from "../exercise";
+export declare const inequationSolutionFormat: GeneratorOption;
+//# sourceMappingURL=inequationSolutionFormat.d.ts.map

package/lib/exercises/options/inequationSolutionFormat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inequationSolutionFormat.d.ts","sourceRoot":"","sources":["../../../src/exercises/options/inequationSolutionFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB,eAAO,MAAM,wBAAwB,EAAE,eAOtC,CAAC"}

package/lib/exercises/options/inequationSolutionFormat.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inequationSolutionFormat = void 0;
+const exercise_1 = require("../exercise");
+exports.inequationSolutionFormat = {
+    id: "inequationSolutionFormat",
+    label: "Format de la solution",
+    target: exercise_1.GeneratorOptionTarget.answer,
+    type: exercise_1.GeneratorOptionType.select,
+    values: ["Intervalle (S = [a;b])", "Inégalité (x>a)"],
+    defaultValue: "Inégalité (x>a)",
+};

package/lib/exercises/pc/pH.js

@@ -24,7 +24,7 @@ const getpH = () => {
         answer,
         hint,
         correction,
-        keys: ["log"],
+        keys: ["logBrackets"],
         answerFormat: "tex",
         identifiers: { randomNumber, randomTenPower },
     };