math-exercises 3.0.67 → 3.0.69

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

@@ -17,15 +17,44 @@ const doesTrinomialVanishInInterval = (trinomial, a, b) => {
     }
     return false;
 };
+const getInstruction = (identifiers) => {
+    const { lowerBound, upperBound, questionType, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const affine = trinom.derivate();
+    const polynomial = questionType === "Trinomial" ? trinom : affine;
+    const expU = new MultiplyNode(polynomial.derivate().toTree(), new ExpNode(polynomial.toTree()));
+    const integral = new IntegralNode(expU, lowerBound.toTree(), upperBound.toTree(), "x");
+    return `Calculer : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBound, upperBound, questionType, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const affine = trinom.derivate();
+    const polynomial = questionType === "Trinomial" ? trinom : affine;
+    const answer = new SubstractNode(new ExpNode(polynomial.calculate(upperBound).toTree()).simplify(), new ExpNode(polynomial.calculate(lowerBound).toTree()).simplify()).simplify();
+    return answer.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["epower", "e"],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getIntegralExpUQuestion = () => {
     const questionType = coinFlip() ? "Trinomial" : "Affine";
     let trinomial;
-    let affine;
     let lowerBound;
     let upperBound;
     do {
         trinomial = TrinomConstructor.random({ min: -5, max: 5, excludes: [0] }, { min: -5, max: 5, excludes: [0] }, { min: -5, max: 5, excludes: [0] });
-        affine = trinomial.derivate();
         lowerBound = randint(-5, 5, [0]);
         upperBound = randint(-5, 5, [0]);
         while (lowerBound >= upperBound) {
@@ -33,23 +62,13 @@ const getIntegralExpUQuestion = () => {
             upperBound = randint(-5, 5, [0]);
         }
     } while (doesTrinomialVanishInInterval(trinomial, lowerBound, upperBound));
-    const polynomial = questionType === "Trinomial" ? trinomial : affine;
-    const expU = new MultiplyNode(polynomial.derivate().toTree(), new ExpNode(polynomial.toTree()));
-    const integral = new IntegralNode(expU, lowerBound.toTree(), upperBound.toTree(), "x");
-    const answer = new SubstractNode(new ExpNode(polynomial.calculate(upperBound).toTree()).simplify(), new ExpNode(polynomial.calculate(lowerBound).toTree()).simplify()).simplify();
-    const question = {
-        answer: answer.toTex(),
-        instruction: `Calculer : $${integral.toTex()}$`,
-        keys: ["epower", "e"],
-        answerFormat: "tex",
-        identifiers: {
-            questionType,
-            trinomial: [trinomial.a, trinomial.b, trinomial.c],
-            upperBound,
-            lowerBound,
-        },
+    const identifiers = {
+        questionType,
+        trinomial: [trinomial.a, trinomial.b, trinomial.c],
+        upperBound,
+        lowerBound,
     };
-    return question;
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, questionType, trinomial, upperBound, lowerBound }) => {
     const propositions = [];
@@ -80,13 +99,12 @@ const isAnswerValid = (ans, { answer, questionType, upperBound, lowerBound, trin
 export const integralExpU = {
     id: "integralExpU",
     label: "Calcul d'intégrales de fonctions du type $u'e^u$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralExpUQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/integral/integralFractions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralFractions.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralFractions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAgMF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}
+{"version":3,"file":"integralFractions.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralFractions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAuNF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAYnD,CAAC"}

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

@@ -17,6 +17,39 @@ const doesTrinomialVanishInInterval = (trinomial, a, b) => {
     }
     return false;
 };
+const getInstruction = (identifiers) => {
+    const { lowerBound, upperBound, questionType, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const affine = trinom.derivate();
+    const fraction = questionType === "Trinomial"
+        ? new FractionNode(affine.toTree(), trinom.toTree())
+        : new FractionNode(affine.coefficients[1].toTree(), affine.toTree());
+    const integral = new IntegralNode(fraction, lowerBound.toTree(), upperBound.toTree(), "x");
+    return `Calculer : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBound, upperBound, questionType, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const affine = trinom.derivate();
+    const answer = questionType === "Trinomial"
+        ? new SubstractNode(new LogNode(Math.abs(trinom.calculate(upperBound)).toTree()).simplify(), new LogNode(Math.abs(trinom.calculate(lowerBound)).toTree()).simplify()).simplify()
+        : new SubstractNode(new LogNode(Math.abs(affine.calculate(upperBound)).toTree()).simplify(), new LogNode(Math.abs(affine.calculate(lowerBound)).toTree()).simplify()).simplify();
+    return answer.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["lnBrackets"],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getIntegralFractionsQuestion = () => {
     const questionType = coinFlip() ? "Trinomial" : "Affine";
     let trinomial;
@@ -34,26 +67,13 @@ const getIntegralFractionsQuestion = () => {
         }
     } while (doesTrinomialVanishInInterval(trinomial, lowerBound, upperBound) ||
         affine.calculate(lowerBound) === 0);
-    const fraction = questionType === "Trinomial"
-        ? new FractionNode(affine.toTree(), trinomial.toTree())
-        : new FractionNode(affine.coefficients[1].toTree(), affine.toTree());
-    const integral = new IntegralNode(fraction, lowerBound.toTree(), upperBound.toTree(), "x");
-    const answer = questionType === "Trinomial"
-        ? new SubstractNode(new LogNode(Math.abs(trinomial.calculate(upperBound)).toTree()).simplify(), new LogNode(Math.abs(trinomial.calculate(lowerBound)).toTree()).simplify()).simplify()
-        : new SubstractNode(new LogNode(Math.abs(affine.calculate(upperBound)).toTree()).simplify(), new LogNode(Math.abs(affine.calculate(lowerBound)).toTree()).simplify()).simplify();
-    const question = {
-        answer: answer.toTex(),
-        instruction: `Calculer : $${integral.toTex()}$`,
-        keys: ["lnBrackets"],
-        answerFormat: "tex",
-        identifiers: {
-            questionType,
-            trinomial: [trinomial.a, trinomial.b, trinomial.c],
-            upperBound,
-            lowerBound,
-        },
+    const identifiers = {
+        questionType,
+        trinomial: [trinomial.a, trinomial.b, trinomial.c],
+        upperBound,
+        lowerBound,
     };
-    return question;
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, questionType, trinomial, upperBound, lowerBound }) => {
     const propositions = [];
@@ -95,13 +115,12 @@ const isAnswerValid = (ans, { answer, questionType, upperBound, lowerBound, trin
 export const integralFractions = {
     id: "integralFractions",
     label: "Calcul d'intégrales de fonctions du type $\\frac{u'}{u}$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralFractionsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/integral/integralKCosinus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralKCosinus.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralKCosinus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8GF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"integralKCosinus.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralKCosinus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAYlD,CAAC"}

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

@@ -11,9 +11,29 @@ import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
 const selectedIndices = [0, 1, 2, 3, 4, 8];
 const trigValues = selectedIndices.map((index) => remarkableTrigoValues[index].angle);
+const getInstruction = (identifiers) => {
+    const { lowerBoundIndex, upperBoundIndex, k } = identifiers;
+    const lowerBound = trigValues[lowerBoundIndex];
+    const upperBound = trigValues[upperBoundIndex];
+    const cosine = new MultiplyNode(k.toTree(), new CosNode(new VariableNode("x")));
+    const integral = new IntegralNode(cosine, lowerBound, upperBound, "x");
+    return `Calculez la valeur de l'intégrale suivante : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBoundIndex, upperBoundIndex, k } = identifiers;
+    const lowerBound = trigValues[lowerBoundIndex];
+    const upperBound = trigValues[upperBoundIndex];
+    const sina = new SinNode(lowerBound);
+    const sinb = new SinNode(upperBound);
+    const answer = new SubstractNode(new MultiplyNode(k.toTree(), sinb), new MultiplyNode(k.toTree(), sina)).simplify();
+    return answer.toTex();
+};
 const getIntegralKCosinusQuestion = () => {
     const k = randint(-10, 10, [0]);
-    const cosine = new MultiplyNode(k.toTree(), new CosNode(new VariableNode("x")));
     let lowerBoundIndex = randint(0, trigValues.length);
     let upperBoundIndex = randint(0, trigValues.length);
     while (trigValues[lowerBoundIndex].evaluate({}) >=
@@ -21,18 +41,16 @@ const getIntegralKCosinusQuestion = () => {
         lowerBoundIndex = randint(0, trigValues.length);
         upperBoundIndex = randint(0, trigValues.length);
     }
-    const lowerBound = trigValues[lowerBoundIndex];
-    const upperBound = trigValues[upperBoundIndex];
-    const integral = new IntegralNode(cosine, lowerBound, upperBound, "x");
-    const sina = new SinNode(lowerBound);
-    const sinb = new SinNode(upperBound);
-    const answer = new SubstractNode(new MultiplyNode(k.toTree(), sinb), new MultiplyNode(k.toTree(), sina)).simplify();
+    const identifiers = { lowerBoundIndex, upperBoundIndex, k };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answer.toTex(),
-        instruction: `Calculez la valeur de l'intégrale suivante : $${integral.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { lowerBoundIndex, upperBoundIndex, k },
+        identifiers,
     };
     return question;
 };
@@ -68,13 +86,12 @@ const isAnswerValid = (ans, { answer, lowerBoundIndex, upperBoundIndex, k }) =>
 export const integralKCosinus = {
     id: "integralKCosinus",
     label: "Calcul d'intégrales de fonctions du type $k\\cos(x)$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralKCosinusQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/integral/integralKSinus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralKSinus.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralKSinus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2GF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAahD,CAAC"}
+{"version":3,"file":"integralKSinus.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralKSinus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkIF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAYhD,CAAC"}

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

@@ -11,9 +11,29 @@ import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
 const selectedIndices = [0, 1, 2, 3, 4, 8];
 const trigValues = selectedIndices.map((index) => remarkableTrigoValues[index].angle);
+const getInstruction = (identifiers) => {
+    const { lowerBoundIndex, upperBoundIndex, k } = identifiers;
+    const sine = new MultiplyNode(k.toTree(), new SinNode(new VariableNode("x")));
+    const lowerBound = trigValues[lowerBoundIndex];
+    const upperBound = trigValues[upperBoundIndex];
+    const integral = new IntegralNode(sine, lowerBound, upperBound, "x");
+    return `Calculer : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBoundIndex, upperBoundIndex, k } = identifiers;
+    const lowerBound = trigValues[lowerBoundIndex];
+    const upperBound = trigValues[upperBoundIndex];
+    const cosa = new CosNode(lowerBound);
+    const cosb = new CosNode(upperBound);
+    const answer = new SubstractNode(new MultiplyNode(k.toTree(), cosa), new MultiplyNode(k.toTree(), cosb)).simplify();
+    return answer.toTex();
+};
 const getIntegralKSinusQuestion = () => {
     const k = randint(-10, 10, [0]);
-    const sine = new MultiplyNode(k.toTree(), new SinNode(new VariableNode("x")));
     let lowerBoundIndex = randint(0, trigValues.length);
     let upperBoundIndex = randint(0, trigValues.length);
     while (trigValues[lowerBoundIndex].evaluate({}) >=
@@ -21,18 +41,16 @@ const getIntegralKSinusQuestion = () => {
         lowerBoundIndex = randint(0, trigValues.length);
         upperBoundIndex = randint(0, trigValues.length);
     }
-    const lowerBound = trigValues[lowerBoundIndex];
-    const upperBound = trigValues[upperBoundIndex];
-    const integral = new IntegralNode(sine, lowerBound, upperBound, "x");
-    const cosa = new CosNode(lowerBound);
-    const cosb = new CosNode(upperBound);
-    const answer = new SubstractNode(new MultiplyNode(k.toTree(), cosa), new MultiplyNode(k.toTree(), cosb)).simplify();
+    const identifiers = { lowerBoundIndex, upperBoundIndex, k };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answer.toTex(),
-        instruction: `Calculer : $${integral.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { lowerBoundIndex, upperBoundIndex, k },
+        identifiers,
     };
     return question;
 };
@@ -68,13 +86,12 @@ const isAnswerValid = (ans, { answer, lowerBoundIndex, upperBoundIndex, k }) =>
 export const integralKSinus = {
     id: "integralKSinus",
     label: "Calcul d'intégrales de fonctions du type $k\\sin(x)$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralKSinusQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/integral/integralTrinomials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralTrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralTrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAoGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"integralTrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralTrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAwGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAYpD,CAAC"}

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

@@ -41,6 +41,9 @@ const getIntegralTrinomialsQuestion = () => {
         upperBound,
         quadrinomial: quadCoeffs,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -85,6 +88,5 @@ export const integralTrinomials = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getAnswer,
-    getInstruction,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/logarithm/log10PowerSimplifying.d.ts

@@ -1,7 +1,6 @@
 import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     tenthPower: number;
-    nbTex: string;
 };
 export declare const log10PowerSimplifying: Exercise<Identifiers>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAsDF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}
+{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAmFF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}

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

@@ -5,18 +5,34 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { Log10Node } from "../../../../tree/nodes/functions/log10Node.js";
 import { PowerNode } from "../../../../tree/nodes/operators/powerNode.js";
 import { alignTex } from "../../../../utils/latex/alignTex.js";
-const getLog10PowerSimplifyingQuestion = () => {
-    const tenthPower = randint(-6, 8, [1]);
+const getInstruction = (identifiers) => {
+    const { tenthPower } = identifiers;
     const nb = new Decimal(1).multiplyByPowerOfTen(tenthPower).toTree();
+    return `Calculer : 
+
+$$
+${new Log10Node(nb).toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { tenthPower } = identifiers;
     const answer = tenthPower + "";
+    return answer;
+};
+const getLog10PowerSimplifyingQuestion = () => {
+    const tenthPower = randint(-6, 8, [1]);
+    const identifiers = { tenthPower };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Calculer : $${new Log10Node(nb).toTex()}$`,
-        hint: getHint(nb),
-        correction: getCorrection(tenthPower, nb),
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { tenthPower, nbTex: nb.toTex() },
+        identifiers,
     };
     return question;
 };
@@ -30,18 +46,24 @@ const getPropositions = (n, { answer, tenthPower }) => {
     tryToAddWrongProp(propositions, tenthPower - 2 + "");
     return shuffleProps(propositions, n);
 };
-const getHint = (nb) => {
-    return `Pour calculer $\\log(⁡${nb.toTex()})$, il est utile de transformer le nombre $${nb.toTex()}$ en une puissance de $10$.`;
+const getHint = (identifiers) => {
+    const { tenthPower } = identifiers;
+    const nb = new Decimal(1).multiplyByPowerOfTen(tenthPower).toTree();
+    const nbTex = nb.toTex();
+    return `Pour calculer $\\log(⁡${nbTex})$, il est utile de transformer le nombre $${nbTex}$ en une puissance de $10$.`;
 };
-const getCorrection = (tenthPower, nb) => {
+const getCorrection = (identifiers) => {
+    const { tenthPower } = identifiers;
+    const nb = new Decimal(1).multiplyByPowerOfTen(tenthPower).toTree();
+    const nbTex = nb.toTex();
     const powerTen = new PowerNode((10).toTree(), tenthPower.toTree());
-    return `On exprime $${nb.toTex()}$ en puissance de $10$ :
-  ${alignTex(`${nb.toTex()} = ${powerTen.toTex()}`)}
+    return `On exprime $${nbTex}$ en puissance de $10$ :
+  ${alignTex(`${nbTex} = ${powerTen.toTex()}`)}
   On utilise la propriété $\\log(a^{b}) = b\\times \\log(a)$.
 
   On a alors
   ${alignTex([
-        [`\\log(${nb.toTex()})`, `=`, `\\log(${powerTen.toTex()})`],
+        [`\\log(${nbTex})`, `=`, `\\log(${powerTen.toTex()})`],
         ["", "=", `${tenthPower}\\times \\log(10)`],
         ["", "=", `${tenthPower}`],
     ])}
@@ -54,9 +76,7 @@ export const log10PowerSimplifying = {
     id: "log10PowerSimplifying",
     connector: "=",
     label: "Calculer un logarithme décimal",
-    levels: ["TermTech", "MathComp"],
     isSingleStep: true,
-    sections: ["Logarithme décimal", "Puissances"],
     generator: (nb) => getDistinctQuestions(getLog10PowerSimplifyingQuestion, nb, 10),
     qcmTimer: 60,
     freeTimer: 60,
@@ -65,4 +85,5 @@ export const log10PowerSimplifying = {
     maxAllowedQuestions: 10,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

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,EAUT,MAAM,6BAA6B,CAAC;AAgBrC,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;AAEF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AA8FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkB9D,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkB5D,CAAC"}
+{"version":3,"file":"log10Simplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10Simplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAgBrC,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;AAEF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAuIF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB9D,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB5D,CAAC"}

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

@@ -10,20 +10,27 @@ import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { PowerNode } from "../../../../tree/nodes/operators/powerNode.js";
 import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
 import { random } from "../../../../utils/alea/random.js";
-const getKeys = (identifiers, opts) => {
-    return [opts?.isLog10 ? "logBrackets" : "lnBrackets"];
-};
-const getLog10SumSimplifyingQuestion = (opts) => {
-    const nb = randint(2, 10);
+const getInstruction = (identifiers, opts) => {
+    const { nb, powers, signs, isLog10 } = identifiers;
+    const nbNode = new NumberNode(nb);
+    const LNode = opts?.isLog10 ? Log10Node : LogNode;
+    const logs = powers.map((power, index) => nb ** power < 100
+        ? signs[index] > 0
+            ? new LNode(new NumberNode(nb ** power))
+            : new OppositeNode(new LNode(new NumberNode(nb ** power)))
+        : signs[index] > 0
+            ? new LNode(new PowerNode(nbNode, new NumberNode(power)))
+            : new OppositeNode(new LNode(new PowerNode(nbNode, new NumberNode(power)))));
     const trueNb = [2, 4, 8].includes(nb) ? 2 : [3, 9].includes(nb) ? 3 : nb;
-    const nbTerms = randint(2, 4);
-    const powers = [];
-    const signs = [];
-    for (let i = 0; i < nbTerms; i++) {
-        const power = randint(powers.includes(1) ? 2 : 1, 6, powers);
-        powers.push(power);
-        signs.push(random([-1, 1]));
-    }
+    const statement = operatorComposition(AddNode, logs);
+    return `Exprimer le nombre suivant sous la forme $a${opts?.isLog10 ? "\\log" : "\\ln"}\\left(${trueNb}\\right)$ : 
+    
+$$
+${statement.toTex()}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const { nb, powers, signs, isLog10 } = identifiers;
     const nbNode = new NumberNode(nb);
     const LNode = opts?.isLog10 ? Log10Node : LogNode;
     const logs = powers.map((power, index) => nb ** power < 100
@@ -35,16 +42,34 @@ const getLog10SumSimplifyingQuestion = (opts) => {
             : new OppositeNode(new LNode(new PowerNode(nbNode, new NumberNode(power)))));
     const statement = operatorComposition(AddNode, logs);
     const answer = statement.simplify();
-    const identifiers = { nb, powers, signs, isLog10: opts?.isLog10 ?? false };
+    return answer.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
-        answer: answer.toTex(),
-        instruction: `Exprimer le nombre suivant sous la forme $a${opts?.isLog10 ? "\\log" : "\\ln"}\\left(${trueNb}\\right)$ : $\\newline ${statement.toTex()}$`,
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
         keys: getKeys(identifiers, opts),
         answerFormat: "tex",
         identifiers,
     };
     return question;
 };
+const getKeys = (identifiers, opts) => {
+    return [opts?.isLog10 ? "logBrackets" : "lnBrackets"];
+};
+const getLog10SumSimplifyingQuestion = (opts) => {
+    const nb = randint(2, 10);
+    const nbTerms = randint(2, 4);
+    const powers = [];
+    const signs = [];
+    for (let i = 0; i < nbTerms; i++) {
+        const power = randint(powers.includes(1) ? 2 : 1, 6, powers);
+        powers.push(power);
+        signs.push(random([-1, 1]));
+    }
+    const identifiers = { nb, powers, signs, isLog10: opts?.isLog10 ?? false };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
 const getPropositions = (n, { answer, nb, isLog10 }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -75,29 +100,25 @@ export const log10SumSimplifying = {
     id: "log10SumSimplifying",
     connector: "=",
     label: "Simplifer une somme de logarithmes décimaux",
-    levels: ["TermTech"],
     isSingleStep: true,
-    sections: ["Logarithme décimal"],
     generator: (nb) => getDistinctQuestions(() => getLog10SumSimplifyingQuestion({ isLog10: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getKeys,
+    getQuestionFromIdentifiers,
 };
 export const logSumSimplifying = {
     id: "logSumSimplifying",
     connector: "=",
     label: "Simplifer une somme de logarithmes népériens",
-    levels: ["TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ["Logarithme népérien"],
     generator: (nb) => getDistinctQuestions(() => getLog10SumSimplifyingQuestion({ isLog10: false }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getKeys,
+    getQuestionFromIdentifiers,
 };

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,EAST,MAAM,6BAA6B,CAAC;AAcrC,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,CAc7C,CAAC"}
+{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAcrC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0FF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAY7C,CAAC"}

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

@@ -25,19 +25,30 @@ const getKeys = () => {
         "rbrace",
     ];
 };
+const getInstruction = (identifiers) => {
+    const { a, k } = identifiers;
+    const equation = new EqualNode(new MultiplyNode(new NumberNode(a), new LogNode(new VariableNode("x"))), new NumberNode(k));
+    return `Résoudre l'équation : 
+    
+$$
+${equation.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, k } = identifiers;
+    const answer = new EquationSolutionNode(new DiscreteSetNode([new ExpNode(new Rational(k, a).simplify().toTree())])).toTex();
+    return answer;
+};
 const getLnEquation = () => {
     const a = randint(-9, 20, [0]);
     const k = randint(-9, 20, [0]);
-    const equation = new EqualNode(new MultiplyNode(new NumberNode(a), new LogNode(new VariableNode("x"))), new NumberNode(k));
-    const answer = new EquationSolutionNode(new DiscreteSetNode([new ExpNode(new Rational(k, a).simplify().toTree())])).toTex();
     const identifiers = { a, k };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Résoudre l'équation : 
-    
-$$
-${equation.toTex()}
-$$`,
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
@@ -67,8 +78,6 @@ export const logEquation = {
     id: "logEquation",
     connector: "=",
     label: "Résoudre des équations de type $a \\times \\ln(x) = k$",
-    levels: ["1reSpé", "TermSpé", "MathComp"],
-    sections: ["Logarithme népérien", "Exponentielle"],
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getLnEquation, nb),
     getPropositions,
@@ -76,5 +85,5 @@ export const logEquation = {
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
-    getKeys,
+    getQuestionFromIdentifiers,
 };

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,EAUT,MAAM,6BAA6B,CAAC;AAmBrC,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;AAEF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAgGF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB3D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmB7D,CAAC"}
+{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,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;AAEF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAyHF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAc3D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB7D,CAAC"}