math-exercises 2.2.79 → 2.2.81

package/lib/exercises/math/calcul/arithmetics/divisibiltyCriteria.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"divisibiltyCriteria.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/divisibiltyCriteria.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA0FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}
+{"version":3,"file":"divisibiltyCriteria.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/divisibiltyCriteria.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA0FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAmBrD,CAAC"}

package/lib/exercises/math/calcul/arithmetics/divisibiltyCriteria.js

@@ -104,4 +104,5 @@ exports.divisibiltyCriteria = {
     getAnswer,
     hasHintAndCorrection: true,
     answerType: "QCU",
+    getKeys,
 };

package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.d.ts

@@ -1,10 +1,14 @@
 import { Exercise } from "../../../../exercises/exercise";
 import { InegalitySymbols } from "../../../../math/inequations/inequation";
+/**x +b < c */
 type Identifiers = {
     b: number;
     c: number;
     ineqType: InegalitySymbols;
 };
-export declare const firstDegreeInequationsType0: Exercise<Identifiers>;
+type Options = {
+    inequationSolutionFormat: string;
+};
+export declare const firstDegreeInequationsType0: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=firstDegreeInequationsType0.d.ts.map

package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAW3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA4DF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAe3C,cAAc;AAEd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA2JF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqBtE,CAAC"}

package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType0 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
+const inequationSolutionFormat_1 = require("../../../../exercises/options/inequationSolutionFormat");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const inequationKeys_1 = require("../../../../exercises/utils/keys/inequationKeys");
 const inequation_1 = require("../../../../math/inequations/inequation");
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
@@ -11,44 +11,112 @@ const inequationNode_1 = require("../../../../tree/nodes/inequations/inequationN
 const inequationSolutionNode_1 = require("../../../../tree/nodes/inequations/inequationSolutionNode");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const inequationParser_1 = require("../../../../tree/parsers/inequationParser");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-/**x +b < c */
-const getFirstDegreeInequationsQuestion = () => {
+const getHint = (identifiers) => {
+    return `Pour résoudre cette inéquation, il faut isoler $x$ à gauche. Pour cela, il faut effectuer des deux côtés de l'inéquation la bonne opération qui permet de supprimer le terme $${identifiers.b < 0 ? "" : "+"}${identifiers.b}$.`;
+};
+const getCorrection = (identifiers, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    const answer = getAnswer(identifiers, opts);
+    return `On isole $x$ à gauche en ${identifiers.b > 0 ? "soustrayant" : "additionnant"} les deux côtés de l'inéquation par $${Math.abs(identifiers.b)}$: 
+  
+${(0, inequationNode_1.firstDegreeInequationResolutionTex)(new affine_1.Affine(1, identifiers.b), identifiers.ineqType, identifiers.c.toTree())}
+
+${isInterval
+        ? `On traduit ensuite cette inéquation en intervalle :
+
+$$
+${answer}
+$$
+`
+        : ""}
+`;
+};
+const getInstruction = (identifiers) => {
+    const affine = new affine_1.Affine(1, identifiers.b);
+    return `Résoudre l'inéquation : 
+  
+$$
+${affine.toTex()} ${identifiers.ineqType} ${identifiers.c}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const result = identifiers.c - identifiers.b;
+    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(result)], identifiers.ineqType);
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    if (isInterval) {
+        return new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval()).toTex();
+    }
+    else
+        return ineq.toTex();
+};
+const getKeys = (identifiers, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    if (isInterval)
+        return ["S", "equal", "lbracket", "semicolon", "rbracket", "infty"];
+    return ["x", "inf", "sup", "leq", "geq"];
+};
+const getFirstDegreeInequationsQuestion = (opts) => {
     const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 11, [0]));
     const c = (0, randint_1.randint)(-10, 11);
-    const result = c - affine.b;
     const ineqType = inequation_1.InequationSymbolConstructor.random();
-    const answer = `x${ineqType.symbol}${result}`;
+    const identifiers = { ineqType: ineqType.symbol, b: affine.b, c };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType.symbol} ${c}$ `,
-        keys: inequationKeys_1.inequationKeys,
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
-        identifiers: { ineqType: ineqType.symbol, b: affine.b, c },
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
     };
     return question;
 };
-const getPropositions = (n, { answer, ineqType, b, c }) => {
+const getPropositions = (n, { answer, ineqType, b, c }, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
     const result = c - b;
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const ineqSymbol = new inequation_1.InequationSymbol(ineqType);
     const invIneqType = ineqSymbol.reversed();
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x${invIneqType}${result}`);
+    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(result)], invIneqType);
+    (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+        ? new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval()).toTex()
+        : ineq.toTex());
     while (propositions.length < n) {
-        const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        const fakeRes = (0, randint_1.randint)(-10, 11);
+        const fakeIneqType = (0, coinFlip_1.coinFlip)() ? ineqType : invIneqType;
+        const fakeIneq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(fakeRes)], fakeIneqType);
+        (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+            ? new inequationSolutionNode_1.InequationSolutionNode(fakeIneq.toInterval()).toTex()
+            : fakeIneq.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { answer, ineqType, b, c }) => {
-    const result = c - b;
-    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(result)], ineqType);
-    const tree = new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval());
-    const texs = tree.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, ineqType, b, c }, opts) => {
+    try {
+        const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+        if (isInterval) {
+            const parsed = (0, intervalParser_1.intervalParser)(ans.replaceAll("S", "").replaceAll("=", ""));
+            if (!parsed)
+                return false;
+            return "S=\\ " + parsed.simplify().toTex() === answer;
+        }
+        else {
+            const parsed = (0, inequationParser_1.inequationParser)(ans);
+            if (!parsed)
+                return false;
+            return parsed.simplify().toTex() === answer;
+        }
+    }
+    catch (err) {
+        return false;
+    }
 };
+const options = [inequationSolutionFormat_1.inequationSolutionFormat];
 exports.firstDegreeInequationsType0 = {
     id: "firstDegreeInequationsType0",
     connector: "\\iff",
@@ -56,10 +124,17 @@ exports.firstDegreeInequationsType0 = {
     levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
     sections: ["Inéquations"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFirstDegreeInequationsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    options,
+    hasHintAndCorrection: true,
+    getAnswer,
+    getCorrection,
+    getHint,
+    getInstruction,
+    getKeys,
 };

package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.d.ts

@@ -5,6 +5,9 @@ type Identifiers = {
     b: number;
     ineqType: InegalitySymbols;
 };
-export declare const firstDegreeInequationsType1: Exercise<Identifiers>;
+type Options = {
+    inequationSolutionFormat: string;
+};
+export declare const firstDegreeInequationsType1: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=firstDegreeInequationsType1.d.ts.map

package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAS3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AAqEF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAe7D,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAc3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA8KF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBtE,CAAC"}

package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType1 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
+const inequationSolutionFormat_1 = require("../../../../exercises/options/inequationSolutionFormat");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const inequationKeys_1 = require("../../../../exercises/utils/keys/inequationKeys");
 const inequation_1 = require("../../../../math/inequations/inequation");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../../math/polynomials/affine");
@@ -11,50 +11,121 @@ const randint_1 = require("../../../../math/utils/random/randint");
 const inequationNode_1 = require("../../../../tree/nodes/inequations/inequationNode");
 const inequationSolutionNode_1 = require("../../../../tree/nodes/inequations/inequationSolutionNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const inequationParser_1 = require("../../../../tree/parsers/inequationParser");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 /**ax<b */
-const getFirstDegreeInequationsQuestion = () => {
+const getHint = (identifiers) => {
+    return `Pour résoudre cette inéquation, il faut isoler $x$ à gauche. Pour cela, il faut effectuer des deux côtés de l'inéquation la bonne opération qui permet de supprimer le facteur $${identifiers.a}$.`;
+};
+const getCorrection = (identifiers, opts) => {
+    const { a, b, ineqType } = identifiers;
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    const answer = getAnswer(identifiers, opts);
+    return `On isole $x$ à gauche en divisant les deux côtés de l'inéquation par $${identifiers.a}$: 
+  
+${(0, inequationNode_1.firstDegreeInequationResolutionTex)(new affine_1.Affine(a, 0), ineqType, b.toTree())}
+
+${identifiers.a < 0
+        ? `On a changé le sens de l'inéquation, car $${a}$ est négatif.`
+        : ""}
+
+${isInterval
+        ? `On traduit ensuite cette inéquation en intervalle :
+
+$$
+${answer}
+$$
+`
+        : ""}
+`;
+};
+const getInstruction = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, 0);
+    return `Résoudre l'inéquation : 
+  
+$$
+${affine.toTex()} ${identifiers.ineqType} ${identifiers.b}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const { a, b, ineqType } = identifiers;
+    const result = new rational_1.Rational(b, a).simplify().toTree();
+    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), result], identifiers.ineqType);
+    const answerIneq = identifiers.a < 0 ? ineq.toSwitched() : ineq;
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    if (isInterval) {
+        return new inequationSolutionNode_1.InequationSolutionNode(answerIneq.toInterval()).toTex();
+    }
+    else
+        return answerIneq.toTex();
+};
+const getKeys = (identifiers, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    if (isInterval)
+        return ["S", "equal", "lbracket", "semicolon", "rbracket", "infty"];
+    return ["x", "inf", "sup", "leq", "geq"];
+};
+const getFirstDegreeInequationsQuestion = (opts) => {
     const affine = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, 1]), 0);
     const b = (0, randint_1.randint)(-10, 11);
-    const result = new rational_1.Rational(b, affine.a).simplify().toTree().toTex();
     const ineqType = inequation_1.InequationSymbolConstructor.random();
-    const invIneqType = ineqType.reversed();
-    const answer = `x${affine.a > 0 ? ineqType.symbol : invIneqType}${result}`;
+    const identifiers = { a: affine.a, b, ineqType: ineqType.symbol };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType.symbol} ${b}$ `,
-        keys: inequationKeys_1.inequationKeys,
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
-        identifiers: { a: affine.a, b, ineqType: ineqType.symbol },
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
     };
     return question;
 };
-const getPropositions = (n, { answer, a, ineqType, b }) => {
+const getPropositions = (n, { answer, a, ineqType, b }, opts) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
     const ineq = new inequation_1.InequationSymbol(ineqType);
     const invIneqType = ineq.reversed();
-    const result = new rational_1.Rational(b, a).simplify().toTree().toTex();
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
+    const result = new rational_1.Rational(b, a).simplify().toTree();
+    const inequation = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), result], a < 0 ? ineqType : invIneqType);
+    (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+        ? new inequationSolutionNode_1.InequationSolutionNode(inequation.toInterval()).toTex()
+        : inequation.toTex());
     while (propositions.length < n) {
-        const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        const fakeRes = (0, randint_1.randint)(-10, 11);
+        const fakeType = (0, coinFlip_1.coinFlip)() ? ineqType : invIneqType;
+        const fakeIneq = new inequationNode_1.InequationNode(["x".toTree(), fakeRes.toTree()], fakeType);
+        (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+            ? new inequationSolutionNode_1.InequationSolutionNode(fakeIneq.toInterval()).toTex()
+            : fakeIneq.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b, ineqType }) => {
-    const ineqSymbol = new inequation_1.InequationSymbol(ineqType);
-    const invIneqType = ineqSymbol.reversed();
-    const trueIneqType = a < 0 ? invIneqType : ineqType;
-    const result = new rational_1.Rational(b, a).simplify().toTree();
-    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), result], trueIneqType);
-    const answer = new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval(), {
-        opts: { allowFractionToDecimal: true },
-    });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, a, b, ineqType }, opts) => {
+    try {
+        const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+        if (isInterval) {
+            const parsed = (0, intervalParser_1.intervalParser)(ans.replaceAll("S", "").replaceAll("=", ""));
+            if (!parsed)
+                return false;
+            return ("S=\\ " + parsed.simplify({ decimalToFractions: true }).toTex() ===
+                answer);
+        }
+        else {
+            const parsed = (0, inequationParser_1.inequationParser)(ans);
+            if (!parsed)
+                return false;
+            return parsed.simplify({ decimalToFractions: true }).toTex() === answer;
+        }
+    }
+    catch (err) {
+        return false;
+    }
 };
+const options = [inequationSolutionFormat_1.inequationSolutionFormat];
 exports.firstDegreeInequationsType1 = {
     id: "firstDegreeInequationsType1",
     connector: "\\iff",
@@ -63,9 +134,16 @@ exports.firstDegreeInequationsType1 = {
     levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
     sections: ["Inéquations"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFirstDegreeInequationsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
+    options,
+    hasHintAndCorrection: true,
+    getAnswer,
+    getCorrection,
+    getHint,
+    getInstruction,
+    getKeys,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"lnDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/lnDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoDF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"lnDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/lnDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

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

@@ -10,22 +10,32 @@ const expNode_1 = require("../../../../tree/nodes/functions/expNode");
 const logNode_1 = require("../../../../tree/nodes/functions/logNode");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
-const getLnDerivative = () => {
-    const a = (0, randint_1.randint)(-9, 10, [0]);
-    const b = (0, randint_1.randint)(-9, 10);
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
     const polynom = new polynomial_1.Polynomial([b, a]);
     const logTree = new logNode_1.LogNode(polynom.toTree());
+    return `Déterminer la dérivée de la fonction : $f(x) = ${logTree.toTex()}$.`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const polynom = new polynomial_1.Polynomial([b, a]);
     const answer = new rationalFrac_1.RationalFrac(new polynomial_1.Polynomial([a]), polynom)
         .simplify()
         .toTree()
         .toTex();
+    return answer;
+};
+const getLnDerivative = () => {
+    const a = (0, randint_1.randint)(-9, 10, [0]);
+    const b = (0, randint_1.randint)(-9, 10);
+    const identifiers = { a, b };
     const question = {
-        instruction: `Déterminer la dérivée de la fonction $f(x) = ${logTree.toTex()}$.`,
+        instruction: getInstruction(identifiers),
         startStatement: "f'(x)",
-        answer,
-        keys: ["x", "ln", "epower"],
+        answer: getAnswer(identifiers),
+        keys: ["x", "lnBrackets", "epower"],
         answerFormat: "tex",
-        identifiers: { a, b },
+        identifiers,
     };
     return question;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"lnDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/lnDerivativeThree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6FF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}
+{"version":3,"file":"lnDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/lnDerivativeThree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8GF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}

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

@@ -12,20 +12,43 @@ const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
-const getLnDerivative = () => {
-    const a = (0, randint_1.randint)(-9, 10, [0]);
-    const b = (0, randint_1.randint)(-9, 10);
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
     const affine = new polynomial_1.Polynomial([b, a]).toTree();
     const myfunction = new multiplyNode_1.MultiplyNode(affine, new logNode_1.LogNode(new variableNode_1.VariableNode("x")));
+    return `Déterminer la dérivée de la fonction : 
+  
+$$
+f(x) = ${myfunction.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new polynomial_1.Polynomial([b, a]).toTree();
     const derivative = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode("x"))), new fractionNode_1.FractionNode(affine, new variableNode_1.VariableNode("x")));
-    const answer = derivative.toTex();
+    return derivative
+        .simplify({
+        forbidFactorize: true,
+        forceDistributeFractions: true,
+        towardsDistribute: true,
+    })
+        .toTex();
+};
+const getKeys = (identifiers) => {
+    return ["x", "lnBrackets", "epower"];
+};
+const getLnDerivative = () => {
+    const a = (0, randint_1.randint)(-9, 10, [0]);
+    const b = (0, randint_1.randint)(-9, 10);
+    const identifiers = { a, b };
     const question = {
-        instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()} $.`,
+        instruction: getInstruction(identifiers),
         startStatement: "f'(x)",
-        answer,
-        keys: ["x", "ln", "epower"],
+        answer: getAnswer(identifiers),
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { a, b },
+        identifiers,
     };
     return question;
 };
@@ -46,26 +69,22 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { a, b }) => {
-    const affine = new affine_1.Affine(a, b);
-    const xNode = new variableNode_1.VariableNode("x");
-    const aNode = new numberNode_1.NumberNode(a);
-    const bNode = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(b), xNode);
-    const fracNode = new fractionNode_1.FractionNode(affine.toTree(), xNode);
-    const logNode = new logNode_1.LogNode(xNode);
-    const raw = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(aNode, logNode), fracNode);
-    let developped = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(aNode, logNode), fracNode);
-    let simplified = new multiplyNode_1.MultiplyNode(aNode, new addNode_1.AddNode(logNode, new numberNode_1.NumberNode(1)));
-    if (b !== 0) {
-        developped = new addNode_1.AddNode(developped, bNode);
-        simplified = new addNode_1.AddNode(simplified, bNode);
+const isAnswerValid = (ans, { a, b, answer }) => {
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({
+            forbidFactorize: true,
+            forceDistributeFractions: true,
+            towardsDistribute: true,
+        })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return false;
     }
-    const texs = [
-        ...raw.toAllValidTexs(),
-        ...developped.toAllValidTexs(),
-        ...simplified.toAllValidTexs(),
-    ];
-    return texs.includes(ans);
 };
 exports.lnDerivativeThree = {
     id: "lnDerivativeThree",
@@ -80,4 +99,7 @@ exports.lnDerivativeThree = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getKeys,
+    getAnswer,
+    getInstruction,
 };

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

@@ -22,7 +22,7 @@ const getLnDerivative = () => {
         instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()}$.`,
         startStatement: "f'(x)",
         answer,
-        keys: ["x", "ln", "epower"],
+        keys: ["x", "lnBrackets", "epower"],
         answerFormat: "tex",
         identifiers: { a, b },
     };

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

@@ -15,7 +15,7 @@ const getSecondDerivativeOfExpoFunctionQuestion = () => {
     const question = {
         answer: correctAnswer.toTex(),
         instruction: `Déterminer la fonction dérivée seconde $f''$ de la fonction $f$ définie par $f(x)=${funct.toTex()}$`,
-        keys: ["epower", "x", "ln"],
+        keys: ["epower", "x", "lnBrackets"],
         answerFormat: "tex",
         identifiers: { coeffs: polynom.coefficients },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"signFunction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/signFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAyFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"signFunction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/signFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AA8HF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAe9C,CAAC"}