math-exercises 2.2.78 → 2.2.80

package/lib/exercises/math/functions/exponentials/exponentialsVariations.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exponentialsVariations = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Strictement croissante", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Strictement décroissante", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Constante", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Non monotone", "raw");
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const qEv = (0, nodeConstructor_1.reifyAlgebraic)(identifiers.q).evaluate();
+    if (qEv > 1) {
+        return identifiers.a > 0
+            ? "Strictement croissante"
+            : "Strictement décroissante";
+    }
+    else {
+        return identifiers.a > 0
+            ? "Strictement décroissante"
+            : "Strictement croissante";
+    }
+};
+const getInstruction = (identifiers) => {
+    const q = (0, nodeConstructor_1.reifyAlgebraic)(identifiers.q);
+    const a = identifiers.a;
+    const statement = (0, multiplyNode_1.multiply)(a, (0, powerNode_1.power)(q, "x")).simplify();
+    return `Soit $f$ la fonction définie sur $[0; +\\infty[$ par 
+
+$$
+f(x) = ${statement.toTex()}
+$$
+
+Quel est le sens de variations de $f$ sur $[0; +\\infty[$ ?`;
+};
+const getHint = (identifiers) => {
+    return `Sur $[0; +\\infty[$, la fonction $f(x) = a^x$ est : 
+  
+- strictement croissante si $a>1$;
+- strictement décroissante si $0<a<1$. 
+
+Puis, multiplier $f$ par un nombre positif ne change pas son sens de variations, tandis que multiplier par un nombre negatif inverse le sens de variations.
+`;
+};
+const getCorrection = (identifiers) => {
+    const q = (0, nodeConstructor_1.reifyAlgebraic)(identifiers.q);
+    const qEv = q.evaluate();
+    const qLessThanOne = qEv < 1;
+    const a = identifiers.a;
+    const answer = getAnswer(identifiers);
+    const statement = (0, multiplyNode_1.multiply)(a, (0, powerNode_1.power)(q, "x")).simplify();
+    return `Puisque $${qLessThanOne ? `0 < ${q.toTex()} < 1` : `${q.toTex()}>1`}$, la fonction $${(0, powerNode_1.power)(q, "x").toTex()}$ est strictement ${qLessThanOne ? "décroissante" : " croissante"} sur $[0; +\\infty[$.
+  
+En multipliant $${(0, powerNode_1.power)(q, "x").toTex()}$ par $${a.frenchify()} ${a < 0 ? "<0" : ">0"}$, ${a < 0
+        ? `on inverse son sens de variations.`
+        : `on ne change pas son sens de variation.`}
+
+Ainsi, la fonction $f(x) = ${statement.toTex()}$ est ${answer.toLocaleLowerCase()} sur $[0; +\\infty[$.
+`;
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+const getExponentialsVariationsQuestion = (ops) => {
+    const a = (0, randfloat_1.randfloat)(0.1, 3, 2, [1]) * ((0, coinFlip_1.coinFlip)() ? 1 : -1);
+    const qLessThanOne = (0, coinFlip_1.coinFlip)();
+    let q;
+    if (qLessThanOne) {
+        q = (0, coinFlip_1.coinFlip)()
+            ? (0, randfloat_1.randfloat)(0.1, 1, 2).toTree()
+            : rational_1.RationalConstructor.randomIrreductibleProba().toTree();
+    }
+    else {
+        q = (0, coinFlip_1.coinFlip)()
+            ? (0, randfloat_1.randfloat)(1.1, 10, 2).toTree()
+            : rational_1.RationalConstructor.randomIrreductible(11, {
+                onlySupOne: true,
+            }).toTree();
+    }
+    const identifiers = {
+        a,
+        q: q.toIdentifiers(),
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "raw",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.exponentialsVariations = {
+    id: "exponentialsVariations",
+    label: "Déterminer le sens de variations d'une fonction exponentielle du type $f(x) = k\\times a^x$",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getExponentialsVariationsQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    answerType: "QCU",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/functions/exponentials/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./exponentialsVariations";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/functions/exponentials/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponentials/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}

package/lib/exercises/math/functions/exponentials/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./exponentialsVariations"), exports);

package/lib/exercises/math/functions/index.d.ts

@@ -9,4 +9,5 @@ export * from "./logarithm";
 export * from "./parity";
 export * from "./square";
 export * from "./integral";
+export * from "./exponentials";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/functions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/functions/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/functions/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC"}

package/lib/exercises/math/functions/index.js

@@ -25,3 +25,4 @@ __exportStar(require("./logarithm"), exports);
 __exportStar(require("./parity"), exports);
 __exportStar(require("./square"), exports);
 __exportStar(require("./integral"), exports);
+__exportStar(require("./exponentials"), exports);

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/areas/rectangleArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rectangleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/rectangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoCF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"rectangleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/rectangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAuCF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}

package/lib/exercises/math/geometry/areas/rectangleArea.js

@@ -5,17 +5,19 @@ const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const getKeys = (identifiers) => ["cm", "cm2"];
 const getRectangleArea = () => {
     const length = (0, randint_1.randint)(3, 13);
     const width = (0, randint_1.randint)(1, length);
     const answer = length * width + "";
     const answerTex = answer + "\\text{cm}^2";
+    const identifiers = { length, width };
     const question = {
         instruction: `Calculer l'aire d'un rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`,
         answer: answerTex,
         answerFormat: "tex",
-        keys: [],
-        identifiers: { length, width },
+        keys: getKeys(identifiers),
+        identifiers,
     };
     return question;
 };
@@ -44,4 +46,5 @@ exports.rectangleArea = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getKeys,
 };

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/index.d.ts

@@ -19,4 +19,5 @@ export * from "./spaceGeometry";
 export * from "./squareRoots";
 export * from "./trigonometry";
 export * from "./python";
+export * from "./sampling";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/math/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/math/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}

package/lib/exercises/math/index.js

@@ -35,3 +35,4 @@ __exportStar(require("./spaceGeometry"), exports);
 __exportStar(require("./squareRoots"), exports);
 __exportStar(require("./trigonometry"), exports);
 __exportStar(require("./python"), exports);
+__exportStar(require("./sampling"), exports);

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

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

package/lib/exercises/math/percent/applyPercent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAmFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}
+{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAoFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}

package/lib/exercises/math/percent/applyPercent.js

@@ -65,6 +65,8 @@ const getPropositions = (n, { answer }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const ansNb = Number(answer.replace(",", "."));
+        if (ansNb === 0)
+            (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-10, 10) + "");
         const deviation = Math.random() < 0.5 ? -1 : 1;
         const percentDeviation = Math.random() * 20 + 1;
         let wrongAnswer = ansNb + deviation * (percentDeviation / 100) * ansNb;

package/lib/exercises/math/percent/findEndValueAfterEvolution.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    vd: number;
+    percentRate: number;
+};
+export declare const findEndValueAfterEvolution: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=findEndValueAfterEvolution.d.ts.map

package/lib/exercises/math/percent/findEndValueAfterEvolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findEndValueAfterEvolution.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findEndValueAfterEvolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA4FF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAkB5D,CAAC"}

package/lib/exercises/math/percent/findEndValueAfterEvolution.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findEndValueAfterEvolution = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randfloat_1 = require("../../../math/utils/random/randfloat");
+const round_1 = require("../../../math/utils/round");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const euroParser_1 = require("../../../tree/parsers/euroParser");
+const alignTex_1 = require("../../../utils/latex/alignTex");
+const approxOrEqual_1 = require("../../../utils/latex/approxOrEqual");
+const getPropositions = (n, { answer, percentRate, vd }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const cm = 1 + percentRate / 100;
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(vd * percentRate, 2).frenchify());
+    const invCm = 1 - percentRate / 100;
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(vd * invCm, 2).frenchify());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((0, randfloat_1.randfloat)(1, 100, 2), 2).frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const cm = 1 + identifiers.percentRate / 100;
+    const vf = (0, round_1.round)(identifiers.vd * cm, 2);
+    return vf.frenchify();
+};
+const getInstruction = (identifiers) => {
+    const evolution = identifiers.percentRate < 0 ? "baisse" : "hausse";
+    return `Le prix initial d'un objet est $${identifiers.vd.frenchify()}€$. Quel sera son prix après une ${evolution} de $${identifiers.percentRate.frenchify()}\\%$ ? Arrondir au centième.`;
+};
+const getHint = (identifiers) => {
+    return `Transforme le taux d'évolution en coefficient multiplicateur. Puis, multiplie le prix initial par ce coefficient multiplicateur.`;
+};
+const getCorrection = (identifiers) => {
+    const evolution = identifiers.percentRate < 0 ? "baisse" : "hausse";
+    const answer = getAnswer(identifiers);
+    const cm = (0, round_1.round)(1 + identifiers.percentRate / 100, 4);
+    const vd = identifiers.vd;
+    const percentRate = identifiers.percentRate;
+    return `Le coefficient multiplicateur associé à une ${evolution} de $${percentRate.frenchify()}\\%$ est : 
+      
+${(0, alignTex_1.alignTex)([
+        ["CM", "=", "1+\\frac{t}{100}"],
+        ["", "=", `1+\\frac{${percentRate.frenchify()}}{100}`],
+        ["", "=", cm.frenchify()],
+    ])}
+
+Si on note $V_d$ la valeur de départ et $V_a$ la valeur d'arrivée, alors on sait que :
+
+$$
+V_d\\times CM = V_a
+$$
+
+Le prix final arrondi au centième est donc : 
+
+${(0, alignTex_1.alignTex)([
+        ["V_a", "=", (0, multiplyNode_1.multiply)(vd.frenchify(), cm.frenchify()).toTex()],
+        ["", ...(0, approxOrEqual_1.approxOrEqual)(cm * vd, 2)],
+    ])}
+`;
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return (0, euroParser_1.euroParser)(ans) === answer + "€";
+};
+const getFindEndValueAfterEvolutionQuestion = () => {
+    const vd = (0, randfloat_1.randfloat)(1, 100, 2);
+    const percentRate = (0, randfloat_1.randfloat)(-100, 100, 2, [0]);
+    const identifiers = {
+        vd,
+        percentRate,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.findEndValueAfterEvolution = {
+    id: "findEndValueAfterEvolution",
+    connector: "=",
+    label: "Retrouver un prix final à partir du prix initial et du taux d'évolution",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFindEndValueAfterEvolutionQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    ggbTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getAnswer,
+    getCorrection,
+    getHint,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/percent/index.d.ts

@@ -14,4 +14,5 @@ export * from "./evolutionRateFromValues";
 export * from "./findStartValueAfterEvolution";
 export * from "./subPopulationEffectifFromPercent";
 export * from "./populationEffectifFromSubPopulation";
+export * from "./findEndValueAfterEvolution";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/percent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC"}

package/lib/exercises/math/percent/index.js

@@ -30,3 +30,4 @@ __exportStar(require("./evolutionRateFromValues"), exports);
 __exportStar(require("./findStartValueAfterEvolution"), exports);
 __exportStar(require("./subPopulationEffectifFromPercent"), exports);
 __exportStar(require("./populationEffectifFromSubPopulation"), exports);
+__exportStar(require("./findEndValueAfterEvolution"), exports);

package/lib/exercises/math/powers/index.d.ts

@@ -7,4 +7,5 @@ export * from "./powersOfTenToDecimal";
 export * from "./powersPower";
 export * from "./powersProduct";
 export * from "./scientificToDecimal";
+export * from "./powersMixOperations";
 //# sourceMappingURL=index.d.ts.map