math-exercises 3.0.158 → 3.0.159

package/lib/exercises/math/calculLitteral/equation/exp/expOfFEqualsExpOfGEquation.js

@@ -22,12 +22,13 @@ import { alignTex } from "../../../../../utils/latex/alignTex.js";
 import { frac } from "../../../../../tree/nodes/operators/fractionNode.js";
 import { substract } from "../../../../../tree/nodes/operators/substractNode.js";
 import { getCartesiansProducts } from "../../../../../utils/arrays/cartesianProducts.js";
+import { NamedIntervalIds, NamedIntervalNodeConstructor, } from "../../../../../tree/nodes/sets/namedIntervalNode.js";
 const texXDomain = `\\mathbb{R}`;
 const texNoSolution = (() => {
     const trinom = new Trinom(1, 1, 1);
     return trinom.getRootsEquationSolutionTex(true);
 })();
-const intervalbbR = new IntervalNode(MinusInfinityNode, PlusInfinityNode, ClosureType.OO);
+const intervalbbR = NamedIntervalNodeConstructor.fromName(NamedIntervalIds.R);
 const texbbR = intervalbbR.toTex();
 const createNodeForCoeffs = (coeffs) => {
     const [a, b, c] = coeffs.toReversed();
@@ -139,9 +140,9 @@ const getCorrection = (identifiers, optsIn) => {
     //workaround:
     const coeffsFMinusG = zip(coeffsF, coeffsG).map(([kF, kG]) => kF - kG);
     const nodeFMinusGSimplified = createNodeForCoeffs(coeffsFMinusG);
-    return `On va transformer l'équation originale pour se ramener à quelque chose que l'on connaît mieux.
-
-L'ensemble image de la fonction exponentielle est $\\mathbb{R}^{+*}$ donc on peut tout diviser par le membre de droite.
+    return `On transforme l’équation pour se ramener au cas $e^{f(x)} = 1$. 
+Il suffira alors de résoudre $f(x) = 0$, 
+car le seul antécédent de $1$ par la fonction exponentielle est $0$.
   
 ${alignTex([
         ["", "", getStatementNode(identifiers).toTex()],
@@ -214,7 +215,7 @@ const getKeys = (_, optsIn) => {
                 switch (answerInputType) {
                     case "x=... ou x=...":
                         return [
-                            ...["x", "equal", "ou"],
+                            ...["x", "equal", "ou", "lbrace", "rbrace", "in"],
                             ...[
                                 {
                                     id: "custom",
@@ -392,7 +393,7 @@ const getAnswerInputTypes = (opts) => {
     }
 };
 const optsDefault = {
-    solutionFormat: "Permettre les deux",
+    solutionFormat: "Ensemble",
     functionTypeF: "degré $1$",
     functionTypeG: "degré $1$",
 };

package/lib/exercises/math/calculLitteral/equation/exp/expOfTrinomEquals1Equation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expOfTrinomEquals1Equation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/calculLitteral/equation/exp/expOfTrinomEquals1Equation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAoBT,MAAM,6BAA6B,CAAC;AAyBrC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0TF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAgBF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBrE,CAAC"}
+{"version":3,"file":"expOfTrinomEquals1Equation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/calculLitteral/equation/exp/expOfTrinomEquals1Equation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAoBT,MAAM,6BAA6B,CAAC;AAmCrC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0YF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAgBF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBrE,CAAC"}

package/lib/exercises/math/calculLitteral/equation/exp/expOfTrinomEquals1Equation.js

@@ -14,6 +14,16 @@ import { SetVEA } from "../../../../../exercises/vea/setVEA.js";
 import { parseAlgebraic } from "../../../../../tree/parsers/latexParser.js";
 import { discreteSetParser } from "../../../../../tree/parsers/discreteSetParser.js";
 import { getCartesiansProducts } from "../../../../../utils/arrays/cartesianProducts.js";
+import { randomMany } from "../../../../../utils/alea/random.js";
+import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
+import { substract } from "../../../../../tree/nodes/operators/substractNode.js";
+import { power } from "../../../../../tree/nodes/operators/powerNode.js";
+import { multiply } from "../../../../../tree/nodes/operators/multiplyNode.js";
+import { round } from "../../../../../math/utils/round.js";
+import { opposite } from "../../../../../tree/nodes/functions/oppositeNode.js";
+import { frac } from "../../../../../tree/nodes/operators/fractionNode.js";
+import { sqrt } from "../../../../../tree/nodes/functions/sqrtNode.js";
+import { add } from "../../../../../tree/nodes/operators/addNode.js";
 const texXDomain = `\\mathbb{R}`;
 const texNoSolution = (() => {
     const trinom = new Trinom(1, 1, 1);
@@ -58,12 +68,13 @@ Quelle équation faut-il donc résoudre ?`;
 };
 const getCorrection = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
+    const { a, b, c } = identifiers;
     const nodeChildOfExp = getChildOfExpNode(identifiers);
+    const nodeDelta = substract(power(b, 2), multiply(4, multiply(a, c)));
+    const delta = nodeDelta.evaluate();
     return `L'équation est de la forme $e^{u(x)}=1$ avec $u(x)=${nodeChildOfExp.toTex()}$.
 
-La fonction exponentielle est strictement croissante de $\\mathbb{R}$ dans $\\mathbb{R}^{+*}$.
-
-Pour $t$ dans $\\mathbb{R}$, on a :
+Pour t dans $\\mathbb{R}$, on sait que :
 
 $$
 e^t=1 \\Leftrightarrow t=0
@@ -75,14 +86,56 @@ $$
 e^{u(x)}=1 \\Leftrightarrow u(x)=0
 $$
 
-Conclusion :
+Par conséquent : 
 
 ${alignTex([
         ["", "", `e^{${nodeChildOfExp.toTex()}}=1`],
         ["", `\\Leftrightarrow`, `${nodeChildOfExp.toTex()}=0`],
-        ["", `\\Leftrightarrow`, `${getAnswer(identifiers, opts)}`],
     ])}
 
+On calcule le discriminant : 
+
+$$
+\\Delta = ${nodeDelta.toTex()} = ${round(delta, 2).frenchify()}
+$$
+
+${(() => {
+        if (delta > 0) {
+            const nodeX1 = frac(substract(opposite(b), sqrt("\\Delta".toTree())), multiply(2, a));
+            const nodeX2 = frac(add(opposite(b), sqrt("\\Delta".toTree())), multiply(2, a));
+            return `$\\Delta > 0$ donc
+    
+$$
+x_1 = ${nodeX1.toTex()} = ${nodeX1.evaluate({ "\\Delta": delta }).frenchify()}
+$$
+
+$$
+x_2 = ${nodeX2.toTex()} = ${nodeX2.evaluate({ "\\Delta": delta }).frenchify()}
+$$
+
+`;
+        }
+        else if (delta === 0) {
+            const nodeX1 = frac(opposite(b), multiply(2, a));
+            return `$\\Delta = 0$ donc
+    
+$$
+x_1 = x_2 = ${nodeX1.toTex()} = ${nodeX1.evaluate().frenchify()}
+$$
+
+`;
+        }
+        else {
+            return `$\\Delta < 0$ donc il n'y a pas de racines réelles.`;
+        }
+    })()}
+
+Conclusion : 
+
+$$
+${getAnswer(identifiers, opts)}
+$$
+
 `;
 };
 const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
@@ -225,9 +278,35 @@ const isAnswerValid = (ans, { answer, ...identifiers }, optsIn) => {
 };
 const getExpOfTrinomEquals1EquationQuestion = (optsIn) => {
     const opts = optsIn ?? optsDefault;
-    const c = randint(-10, 11, [0]);
-    const b = randint(-10, 11, [0]);
-    const a = randint(-10, 11, [0, 1]);
+    function createRandomCoeffs(rootPool) {
+        const roots = randomMany(rootPool, randint(0, 3));
+        let a;
+        let b;
+        let c;
+        switch (roots.length) {
+            case 0:
+                {
+                    [a, b, c] = [...Array(3).keys()].map(() => randint(1, 10));
+                    const isPositive = coinFlip();
+                    if (!isPositive) {
+                        [a, b, c] = [a, b, c].map((v) => v * -1);
+                    }
+                }
+                break;
+            case 1:
+            case 2:
+                {
+                    const rootsExplicit = roots.length === 1 ? [roots[0], roots[0]] : roots;
+                    a = randint(1, 6);
+                    b = a * rootsExplicit.reduce((acc, v) => acc + v);
+                    c = a * rootsExplicit.reduce((acc, v) => acc * v);
+                }
+                break;
+        }
+        return [c, b, a];
+    }
+    const rootPool = [...Array(41).keys()].map((i) => i - 20);
+    const [c, b, a] = createRandomCoeffs(rootPool);
     const identifiers = { a, b, c };
     return getQuestionFromIdentifiers(identifiers, opts);
 };
@@ -258,7 +337,7 @@ const getAnswerInputTypes = (opts) => {
     }
 };
 const optsDefault = {
-    solutionFormat: "Permettre les deux",
+    solutionFormat: "Ensemble",
 };
 const options = [
     {

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

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

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

@@ -147,7 +147,14 @@ const getKeys = (_, optsIn) => {
                     case "x=... ou x=...":
                         return ["x", "equal", "ou"];
                     case "S={...;...}":
-                        return ["S", "equal", "lbrace", "semicolon", "rbrace"];
+                        return [
+                            "S",
+                            "equal",
+                            "lbrace",
+                            "semicolon",
+                            "rbrace",
+                            "varnothing",
+                        ];
                     default:
                         throw new Error("Unsupported answerInputType: " + answerInputType);
                 }
@@ -168,7 +175,6 @@ const isAnswerValid = (ans, { answer: _, ...identifiers }, optsIn) => {
                         .replaceAll("text{ ou }", ";")
                         .replaceAll("x", "")
                         .replaceAll("=", "");
-                    console.log("formated", formated);
                     // if (formated === "\\varnothing") {
                     //   return EmptySet;
                     // }

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

@@ -13,4 +13,5 @@ export * from "./solveByFactorizingWithIdRmq3.js";
 export * from "./equationFromFrenchDescription.js";
 export * from "./firstDegree/index.js";
 export * from "./square/index.js";
+export * from "./exp/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC"}

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

@@ -13,3 +13,4 @@ export * from "./solveByFactorizingWithIdRmq3.js";
 export * from "./equationFromFrenchDescription.js";
 export * from "./firstDegree/index.js";
 export * from "./square/index.js";
+export * from "./exp/index.js";

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

@@ -1 +1 @@
-{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAuCrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqMF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAsBF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAejE,CAAC"}
+{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAwCrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsOF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAsBF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAejE,CAAC"}

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

@@ -61,6 +61,32 @@ const getAnswer = (identifiers, optsIn) => {
     const answerNode = getAnswerNode(identifiers);
     return getTexForEquationSolutionNode(answerNode, opts);
 };
+const getKeys = (_, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { answerInputTypes } = opts;
+    return [
+        ...answerInputTypes.reduce((acc, answerInputType) => {
+            const specialSet = new Set((() => {
+                switch (answerInputType) {
+                    case "x=... ou x=...":
+                        return ["x", "equal", "ou"];
+                    case "S={...;...}":
+                        return [
+                            "S",
+                            "equal",
+                            "lbrace",
+                            "semicolon",
+                            "rbrace",
+                            "varnothing",
+                        ];
+                    default:
+                        throw new Error("Unsupported answerInputType: " + answerInputType);
+                }
+            })());
+            return new Set([...acc, ...specialSet]);
+        }, new Set()),
+    ];
+};
 const isAnswerValid = (ans, { answer: _, ...identifiers }, optsIn) => {
     const opts = optsIn ?? optsDefault;
     const answerNode = getAnswerNode(identifiers);
@@ -73,7 +99,6 @@ const isAnswerValid = (ans, { answer: _, ...identifiers }, optsIn) => {
                         .replaceAll("text{ ou }", ";")
                         .replaceAll("x", "")
                         .replaceAll("=", "");
-                    console.log("formated", formated);
                     // if (formated === "\\varnothing") {
                     //   return EmptySet;
                     // }
@@ -177,7 +202,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
         instruction: getInstruction(identifiers, opts),
         startStatement: getStartStatement(identifiers, opts),
         answer: getAnswer(identifiers, opts),
-        keys: ["x", "S", "equal", "lbrace", "rbrace", "semicolon", "ou"],
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
         identifiers,
         hint: getHint(identifiers, opts),

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

@@ -1 +1 @@
-{"version":3,"file":"solveByFactorizingWithIdRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/solveByFactorizingWithIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAW7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AA2LF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAUF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBvE,CAAC"}
+{"version":3,"file":"solveByFactorizingWithIdRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/solveByFactorizingWithIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAW7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AA0LF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAUF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBvE,CAAC"}

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

@@ -125,7 +125,6 @@ const isAnswerValid = (ans, { answer, ...identifiers }, opts) => {
         if (opts?.useSetAsAnswer) {
             const setParsed = discreteSetParser(ans);
             //!!!TODO
-            console.log(setParsed);
             return false;
         }
         else {

package/lib/exercises/math/calculLitteral/equation/square/equationSquareWithSteps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationSquareWithSteps.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/calculLitteral/equation/square/equationSquareWithSteps.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmKF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAkBzD,CAAC"}
+{"version":3,"file":"equationSquareWithSteps.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/calculLitteral/equation/square/equationSquareWithSteps.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkKF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAkBzD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/square/equationSquareWithSteps.js

@@ -102,7 +102,6 @@ const isAnswerValid = (ans, { answer }) => {
         const parsed = discreteSetParser(ans);
         if (!parsed)
             return false;
-        console.log(parsed.simplify().toTex());
         return "S=" + parsed.simplify().toTex() === answer;
     }
     catch (err) {

package/lib/exercises/math/calculLitteral/inequations/exp/expOfFEqualsExpOfGInequation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expOfFEqualsExpOfGInequation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/calculLitteral/inequations/exp/expOfFEqualsExpOfGInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAoBT,MAAM,6BAA6B,CAAC;AAqBrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAiH9C;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AAgYF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AA2BF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAuBvE,CAAC"}
+{"version":3,"file":"expOfFEqualsExpOfGInequation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/calculLitteral/inequations/exp/expOfFEqualsExpOfGInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAoBT,MAAM,6BAA6B,CAAC;AAqBrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAiH9C;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AAwYF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AA2BF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAuBvE,CAAC"}

package/lib/exercises/math/calculLitteral/inequations/exp/expOfFEqualsExpOfGInequation.js

@@ -29,6 +29,7 @@ import { inequationParser } from "../../../../../tree/parsers/inequationParser.j
 import { Trinom } from "../../../../../math/polynomials/trinom.js";
 import { UnionIntervalNode } from "../../../../../tree/nodes/sets/unionIntervalNode.js";
 import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
+import { NamedIntervalIds, NamedIntervalNodeConstructor, } from "../../../../../tree/nodes/sets/namedIntervalNode.js";
 const reuseSecondDegreeInequation = {
     getAnswerNode: (identifiers) => {
         const { a, b, c, ineqType } = identifiers;
@@ -69,7 +70,7 @@ const reuseFirstDegreeInequationsType3 = {
     },
 };
 const texXDomain = `\\mathbb{R}`;
-const intervalbbR = new IntervalNode(MinusInfinityNode, PlusInfinityNode, ClosureType.OO);
+const intervalbbR = NamedIntervalNodeConstructor.fromName(NamedIntervalIds.R);
 const texbbR = intervalbbR.toTex();
 const createNodeForCoeffs = (coeffs) => {
     //because Error: n-th coeff must be not null at new Polynomial
@@ -168,7 +169,7 @@ const getAnswer = (identifiers, optsIn) => {
     }
 };
 const getHint = () => {
-    return `Essaye de transformer l'équation originale en une équation du type $e^{h(x)}=1$, puis résous cette équation.`;
+    return `Essaye de transformer l'inéquation originale en une inéquation du type $e^{h(x)}=1$, puis résous cette inéquation.`;
 };
 const getCorrection = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
@@ -182,9 +183,9 @@ const getCorrection = (identifiers, optsIn) => {
     //workaround:
     const coeffsFMinusG = zip(coeffsF, coeffsG).map(([kF, kG]) => kF - kG);
     const nodeFMinusGSimplified = createNodeForCoeffs(coeffsFMinusG);
-    return `On va transformer l'équation originale pour se ramener à quelque chose que l'on connaît mieux.
+    return `On va transformer l'inéquation originale pour se ramener au cas $e^{f(x)} < 1$.
 
-L'ensemble image de la fonction exponentielle est $\\mathbb{R}^{+*}$ donc on peut tout diviser par le membre de droite sans changer le sens de l'inégalité.
+L'exponentielle est strictement positive sur $${intervalbbR.toTex()}$ donc on peut tout diviser par le membre de droite sans changer le sens de l'inégalité.
   
 ${alignTex([
         ["", "", getStatementNode(identifiers).toTex()],
@@ -203,6 +204,12 @@ ${alignTex([
             `\\Leftrightarrow`,
             new InequationNode([exp(nodeFMinusGSimplified), (1).toTree()], ineqType).toTex(),
         ],
+        [
+            "",
+            `\\Leftrightarrow`,
+            new InequationNode([exp(nodeFMinusGSimplified), "e^{0}".toTree()], //hack pour éviter de me battre avec toTex etc.
+            ineqType).toTex(),
+        ],
         [
             "",
             `\\Leftrightarrow`,

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAY9C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwLF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CActE,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAY9C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4LF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CActE,CAAC"}

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

@@ -23,7 +23,7 @@ $$
 ${affine1.toTex()} ${ineqType} ${affine2.toTex()}
 $$`;
 };
-const getAnswer = (identifiers, opts) => {
+const getAnswerNode = (identifiers, opts) => {
     const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
     const { ineqType, a, b, c, d, coeff } = identifiers;
     const affine1 = new Affine(a, b);
@@ -33,10 +33,13 @@ const getAnswer = (identifiers, opts) => {
         .toTree();
     const invIneqType = new InequationSymbol(ineqType).reversed();
     const ineq = new InequationNode(["x".toTree(), result], coeff > 0 ? ineqType : invIneqType);
-    const answer = isInterval
-        ? new InequationSolutionNode(ineq.toInterval()).toTex()
-        : ineq.toTex();
-    return answer;
+    const node = isInterval
+        ? new InequationSolutionNode(ineq.toInterval())
+        : ineq;
+    return node;
+};
+const getAnswer = (identifiers, opts) => {
+    return getAnswerNode(identifiers, opts).toTex();
 };
 // const getHint: GetHint<Identifiers, Options> = (identifiers, opts) => {
 //   return `Isole le terme $x$ dans le membre de gauche de l'inéquation. Attention : lorsqu'on multiplie (ou divise) les deux membres d'une inéquation par un nombre négatif, le sens de l'inéquation est inversé.`;
@@ -155,3 +158,6 @@ export const firstDegreeInequationsType3 = {
     options,
     getQuestionFromIdentifiers,
 };
+// export const reuseFirstDegreeInequationsType3 = {
+//   getAnswerNode,
+// };

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

@@ -8,4 +8,5 @@ export * from "./inequationsSign.js";
 export * from "./minNumberInequality.js";
 export * from "./isInequalityTrue.js";
 export * from "./inverseInequalityWithGraph.js";
+export * from "./exp/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gBAAgB,CAAC"}

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

@@ -8,3 +8,4 @@ export * from "./inequationsSign.js";
 export * from "./minNumberInequality.js";
 export * from "./isInequalityTrue.js";
 export * from "./inverseInequalityWithGraph.js";
+export * from "./exp/index.js";

package/lib/exercises/math/derivation/derivative/exp/expDerivativeFour.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/exp/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAyFF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAenD,CAAC"}
+{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/exp/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAiKF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}

package/lib/exercises/math/derivation/derivative/exp/expDerivativeFour.js

@@ -18,9 +18,6 @@ $$
 f(x) = ${fct.toTex()}
 $$`;
 };
-const getAnswer = (identifiers) => {
-    return getAnswerNode(identifiers).toTex();
-};
 const getAnswerNode = (identifiers) => {
     const { affine1Coeffs, affine2Coeffs } = identifiers;
     const affine1 = new Affine(affine1Coeffs[1], affine1Coeffs[0]);
@@ -29,25 +26,75 @@ const getAnswerNode = (identifiers) => {
     const deriv = new MultiplyNode(new Affine(affine2.a * affine1.a, affine1.a + affine2.a * affine1.b).toTree(), exp);
     return deriv.simplify();
 };
-const getExpDerivativeFourQuestion = () => {
-    const affine1 = AffineConstructor.random();
-    const affine2 = AffineConstructor.random();
-    const identifiers = {
-        affine1Coeffs: affine1.coefficients,
-        affine2Coeffs: affine2.coefficients,
-    };
-    //ae^cx+d  + c(ax+b)e^cx+d = (a+c(ax+b))e^cx+d = (cax + a +cb) e^cx+d
-    return getQuestionFromIdentifiers(identifiers);
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).toTex();
 };
-const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
-        keys: ["x", "epower", "exp"],
-        answerFormat: "tex",
-        identifiers,
-    };
-    return question;
+const getHint = () => {
+    return `Si $u$ et $v$ sont deux fonctions dérivables, alors : 
+
+$$
+(uv)'(x) = u'(x)v(x) + u(x)v'(x)
+$$
+
+Si $w$ est une fonction dérivable alors :
+
+$$
+(e^{w(x)})'(x) = w'(x) \\times e^{w(x)}
+$$
+  
+`;
+};
+const getCorrection = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine1 = new Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new Affine(affine2Coeffs[1], affine2Coeffs[0]);
+    return `Si $u$ et $v$ sont deux fonctions dérivables, alors : 
+
+$$
+(uv)'(x) = u'(x)v(x) + u(x)v'(x)
+$$
+
+Ici : 
+
+$$
+u(x) = ${affine1.toTex()}
+$$
+
+$$
+v(x) = e^{${affine2.toTex()}}
+$$
+
+$$
+u'(x) = ${affine1.toTree().derivative().simplify().toTex()}
+$$
+
+$$
+v'(x) = ${affine2
+        .toTree()
+        .derivative()
+        .simplify()
+        .toTex()} \\times e^{${affine2.toTex()}}
+$$
+
+Donc :
+
+$$
+f'(x) = ${affine1
+        .toTree()
+        .derivative()
+        .simplify()
+        .toTex()} \\times e^{${affine2.toTex()}} +  (${affine1.toTex()}) \\times (${affine2
+        .toTree()
+        .derivative()
+        .simplify()
+        .toTex()} \\times e^{${affine2.toTex()}})
+$$
+
+$$
+f'(x) = ${getAnswer(identifiers)}
+$$
+
+`;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -69,6 +116,28 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
         return handleVEAError(err);
     }
 };
+const getExpDerivativeFourQuestion = () => {
+    const affine1 = AffineConstructor.random();
+    const affine2 = AffineConstructor.random();
+    const identifiers = {
+        affine1Coeffs: affine1.coefficients,
+        affine2Coeffs: affine2.coefficients,
+    };
+    //ae^cx+d  + c(ax+b)e^cx+d = (a+c(ax+b))e^cx+d = (cax + a +cb) e^cx+d
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["x", "epower", "exp"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
 export const expDerivativeFour = {
     id: "expDerivativeFour",
     connector: "=",
@@ -83,4 +152,5 @@ export const expDerivativeFour = {
     getInstruction,
     getAnswer,
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/derivation/derivative/exp/expDerivativeOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/exp/expDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkHF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/exp/expDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8IF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}