math-exercises 3.0.68 → 3.0.69

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

@@ -46,6 +46,9 @@ const getInverseImageFunction = () => {
     const xValue = randint(-9, 10);
     const y = polynome1.calculate(xValue);
     const identifiers = { coeffs: polynome1.coefficients, yValue: y };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
         startStatement: getStartStatement(identifiers),
@@ -122,11 +125,6 @@ export const inverseImageFunction = {
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
-    getInstruction,
-    getAnswer,
-    getStartStatement,
-    rebuildIdentifiers,
-    getCorrection,
-    getHint,
+    getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IAEjB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,CAAC;AAmNF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAoB9D,CAAC"}
+{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IAEjB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,CAAC;AAmNF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAkB9D,CAAC"}

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

@@ -205,8 +205,6 @@ export const inverseImageFunctionGeogebra = {
     id: "inverseImageFunctionGeogebra",
     connector: "\\iff",
     label: "Lecture d'antécédents",
-    levels: ["3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
-    sections: ["Fonctions"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getInverseImageFunctionGeogebra, nb),
     qcmTimer: 60,

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

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA8FF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAe3D,CAAC"}
+{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA2GF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAa3D,CAAC"}

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

@@ -16,6 +16,16 @@ ${mdTable([
     ])}
 `;
 };
+const getAnswer = (identifiers) => {
+    const { xValues, imageValues, isAskingImage, value: valueAsked, } = identifiers;
+    const indexAsked = xValues.indexOf(valueAsked);
+    const answer = (isAskingImage
+        ? imageValues[indexAsked]
+        : xValues
+            .filter((el, index) => imageValues[index] === valueAsked)
+            .join("\\text{ et }")) + "";
+    return answer;
+};
 const getInverseImageFunctionTableQuestion = () => {
     const xValues = randTupleInt(5, {
         from: -10,
@@ -30,29 +40,22 @@ const getInverseImageFunctionTableQuestion = () => {
         yValues[randint(0, 5, [indexAsked])] = valueAsked;
     }
     const isAskingImage = coinFlip();
-    const answer = (isAskingImage
-        ? yValues[indexAsked]
-        : xValues
-            .filter((el, index) => yValues[index] === valueAsked)
-            .join("\\text{ et }")) + "";
     const identifiers = {
         xValues,
         imageValues: yValues,
         isAskingImage,
         value: valueAsked,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
+        answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
         keys: ["et"],
         answerFormat: "tex",
         style: { tableHasNoHeader: true },
-        identifiers: {
-            xValues,
-            imageValues: yValues,
-            isAskingImage,
-            value: valueAsked,
-        },
+        identifiers,
     };
     return question;
 };
@@ -80,14 +83,12 @@ const isAnswerValid = (ans, { answer, xValues, imageValues, isAskingImage, value
 export const inverseImageFunctionTable = {
     id: "inverseImageFunctionTable",
     label: "Déterminer une image ou un antécédent à partir d'un tableau de valeurs",
-    levels: ["3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
     isSingleStep: true,
-    sections: ["Fonctions"],
     generator: (nb) => getDistinctQuestions(getInverseImageFunctionTableQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getInstruction,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/basics/twoFunctionsEquation.d.ts

@@ -3,6 +3,7 @@ type Identifiers = {
     yValue: number;
     fSplinePoints: number[][];
     gSplinePoints: number[][];
+    xSolutions: number[];
 };
 export declare const twoFunctionsEquation: Exercise<Identifiers>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"twoFunctionsEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/twoFunctionsEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;CAC3B,CAAC;AAyIF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"twoFunctionsEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/twoFunctionsEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAiKF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}

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

@@ -9,6 +9,43 @@ import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { DiscreteSetNode } from "../../../../tree/nodes/sets/discreteSetNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { random } from "../../../../utils/alea/random.js";
+const getInstruction = (identifiers) => {
+    return `Déterminer graphiquement les solutions de l'équation $f(x) = g(x)$ où $f$ et $g$ sont les fonctions représentées ci-dessous.`;
+};
+const getAnswer = (identifiers) => {
+    const { xSolutions } = identifiers;
+    const answer = new EquationSolutionNode(new DiscreteSetNode(xSolutions.map((sol) => new NumberNode(sol)))).toTex();
+    return answer;
+};
+const getGGBOptions = (identifiers) => {
+    const { fSplinePoints, gSplinePoints, yValue } = identifiers;
+    const fColor = random(blues);
+    const gColor = random(oranges);
+    const commands = [
+        `S = Spline(${fSplinePoints
+            .map((point) => `(${point[0]},${point[1]})`)
+            .join(",")})`,
+        "SetFixed(S, true)",
+        `SetColor(S, "${fColor}")`,
+        `SetCaption(S, "$f$")`,
+        `ShowLabel(S, true)`,
+        `T = Spline(${gSplinePoints
+            .map((point) => `(${point[0]},${point[1]})`)
+            .join(",")})`,
+        "SetFixed(T, true)",
+        `SetColor(T, "${gColor}")`,
+        `SetCaption(T, "$g$")`,
+        `ShowLabel(T, true)`,
+    ];
+    const ggb = new GeogebraConstructor({ commands });
+    const xMin = Math.min(...[...fSplinePoints, ...gSplinePoints].map((point) => point[0]));
+    const yMin = Math.min(...[...fSplinePoints, ...gSplinePoints].map((point) => point[1]));
+    const xMax = Math.max(...[...fSplinePoints, ...gSplinePoints].map((point) => point[0]));
+    const yMax = Math.max(...[...fSplinePoints, ...gSplinePoints].map((point) => point[1]));
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
+    });
+};
 const getTwoFunctionsEquationQuestion = () => {
     const yValue = randint(-5, 5);
     let xSolutions = [];
@@ -17,7 +54,6 @@ const getTwoFunctionsEquationQuestion = () => {
         xSolutions.push(randint(-9, 10, xSolutions));
     }
     xSolutions.sort((a, b) => a - b);
-    const answer = new EquationSolutionNode(new DiscreteSetNode(xSolutions.map((sol) => new NumberNode(sol)))).toTex();
     const fSplinePoints = [];
     const gSplinePoints = [];
     let prevYWasAbove = coinFlip();
@@ -56,38 +92,17 @@ const getTwoFunctionsEquationQuestion = () => {
         xSolutions[xSolutions.length - 1] + (1 + Math.random() * 3),
         yValue - (prevYWasAbove ? randint(-2, 0) : randint(1, 3)),
     ]);
-    const xMin = Math.min(...[...fSplinePoints, ...gSplinePoints].map((point) => point[0]));
-    const yMin = Math.min(...[...fSplinePoints, ...gSplinePoints].map((point) => point[1]));
-    const xMax = Math.max(...[...fSplinePoints, ...gSplinePoints].map((point) => point[0]));
-    const yMax = Math.max(...[...fSplinePoints, ...gSplinePoints].map((point) => point[1]));
-    const fColor = random(blues);
-    const gColor = random(oranges);
-    const commands = [
-        `S = Spline(${fSplinePoints
-            .map((point) => `(${point[0]},${point[1]})`)
-            .join(",")})`,
-        "SetFixed(S, true)",
-        `SetColor(S, "${fColor}")`,
-        `SetCaption(S, "$f$")`,
-        `ShowLabel(S, true)`,
-        `T = Spline(${gSplinePoints
-            .map((point) => `(${point[0]},${point[1]})`)
-            .join(",")})`,
-        "SetFixed(T, true)",
-        `SetColor(T, "${gColor}")`,
-        `SetCaption(T, "$g$")`,
-        `ShowLabel(T, true)`,
-    ];
-    const ggb = new GeogebraConstructor({ commands });
+    const identifiers = { yValue, fSplinePoints, gSplinePoints, xSolutions };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Déterminer graphiquement les solutions de l'équation $f(x) = g(x)$ où $f$ et $g$ sont les fonctions représentées ci-dessous.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: discreteSetKeys,
         answerFormat: "tex",
-        identifiers: { yValue, fSplinePoints, gSplinePoints },
-        ggbOptions: ggb.getOptions({
-            coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
-        }),
+        identifiers,
+        ggbOptions: getGGBOptions(identifiers),
     };
     return question;
 };
@@ -118,9 +133,7 @@ const isAnswerValid = (ans, { answer, fSplinePoints, yValue }) => {
 export const twoFunctionsEquation = {
     id: "twoFunctionsEquation",
     label: "Résoudre graphiquement une équation du type $f(x)=g(x)$",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Fonctions"],
     generator: (nb) => getDistinctQuestions(getTwoFunctionsEquationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -128,4 +141,5 @@ export const twoFunctionsEquation = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"twoFunctionsInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/twoFunctionsInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAK9C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAU/D,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AAyPF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"twoFunctionsInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/twoFunctionsInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAK9C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAU/D,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AA+PF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAaxD,CAAC"}

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

@@ -140,6 +140,9 @@ const getTwoFunctionsInequationQuestion = () => {
         ineqSymbol: ineq.symbol,
         intervals,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -192,9 +195,7 @@ const isAnswerValid = (ans, { answer, fSplinePoints, yValue, intervals }) => {
 export const twoFunctionsInequation = {
     id: "twoFunctionsInequation",
     label: "Résoudre graphiquement une inéquation du type $f(x)<g(x)$",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Fonctions"],
     generator: (nb) => getDistinctQuestions(getTwoFunctionsInequationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -202,4 +203,5 @@ export const twoFunctionsInequation = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/cube/cubicEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cubicEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/cube/cubicEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAkB/C,CAAC"}
+{"version":3,"file":"cubicEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/cube/cubicEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAgB/C,CAAC"}

package/lib/exercises/math/functions/cube/cubicEquation.js

@@ -28,6 +28,9 @@ const getCubicEquationQuestion = () => {
     const x = randint(-10, 11);
     const k = x ** 3;
     const identifiers = { k };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -66,7 +69,5 @@ export const cubicEquation = {
     subject: "Mathématiques",
     getInstruction,
     getAnswer,
-    // getCorrection,
-    // getHint,
-    // hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"exponentialsVariations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponentials/exponentialsVariations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAM7C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}
+{"version":3,"file":"exponentialsVariations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponentials/exponentialsVariations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAM7C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}

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

@@ -91,6 +91,9 @@ const getExponentialsVariationsQuestion = (ops) => {
         a,
         q: q.toIdentifiers(),
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -118,5 +121,5 @@ export const exponentialsVariations = {
     getAnswer,
     answerType: "QCU",
     hasHintAndCorrection: true,
-    getKeys,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"integralAffines.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralAffines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA6FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"integralAffines.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralAffines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAkGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}

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

@@ -36,6 +36,9 @@ const getIntegralAffinesQuestion = () => {
         upperBound,
         trinomial: [trinomial.a, trinomial.b, trinomial.c],
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -80,6 +83,5 @@ export const integralAffines = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getAnswer,
-    getInstruction,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"integralDerivatedUCosU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralDerivatedUCosU.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAmFF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAaxD,CAAC"}
+{"version":3,"file":"integralDerivatedUCosU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralDerivatedUCosU.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuGF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAYxD,CAAC"}

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

@@ -8,19 +8,34 @@ import { SinNode } from "../../../../tree/nodes/functions/sinNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+const getInstruction = (identifiers) => {
+    const { a, b, aU, bU } = identifiers;
+    const u = new Affine(aU, bU, "x");
+    const cosU = new CosNode(u.toTree());
+    const integral = new IntegralNode(new MultiplyNode(u.derivate().toTree(), cosU), a.toTree(), b.toTree(), "x");
+    return `Calculer : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).simplify().toTex();
+};
 const getIntegralDerivatedUCosUQuestion = () => {
     const u = AffineConstructor.random();
-    const cosU = new CosNode(u.toTree());
     const b = randint(-4, 6);
     const a = randint(-5, b);
-    const integral = new IntegralNode(new MultiplyNode(u.derivate().toTree(), cosU), a.toTree(), b.toTree(), "x");
-    const correctAns = getCorrectAnswer(a, b, u);
+    const identifiers = { a, b, aU: u.a, bU: u.b };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: correctAns.simplify().toTex(),
-        instruction: `Calculer : $${integral.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["sin", "cos"],
         answerFormat: "tex",
-        identifiers: { a, b, aU: u.a, bU: u.b },
+        identifiers,
     };
     return question;
 };
@@ -38,12 +53,13 @@ const getPropositions = (n, { answer, a, b, aU, bU }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { a, b, aU, bU }) => {
-    const u = new Affine(aU, bU, "x");
-    const correctAns = getCorrectAnswer(a, b, u).simplify();
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    const correctAns = getAnswerNode(identifiers).simplify();
     return correctAns.toAllValidTexs().includes(ans);
 };
-const getCorrectAnswer = (a, b, u) => {
+const getAnswerNode = (identifiers) => {
+    const { a, b, aU, bU } = identifiers;
+    const u = new Affine(aU, bU, "x");
     const uTree = u.toTree();
     const primitiveA = new SinNode(uTree.evaluate({ x: a }).toTree());
     const primitiveB = new SinNode(uTree.evaluate({ x: b }).toTree());
@@ -66,13 +82,12 @@ const generatePropositions = (a, b, u) => {
 export const IntegralDerivatedUCosU = {
     id: "IntegralDerivatedUCosU",
     label: "Calcul d'intégrales de fonctions du type $u'\\cos(u)$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralDerivatedUCosUQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"integralDerivatedUSinU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralDerivatedUSinU.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAaxD,CAAC"}
+{"version":3,"file":"integralDerivatedUSinU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralDerivatedUSinU.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAiIF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAYxD,CAAC"}

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

@@ -8,18 +8,33 @@ import { SinNode } from "../../../../tree/nodes/functions/sinNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+const getInstruction = (identifiers) => {
+    const { a, b, aU, bU } = identifiers;
+    const u = new Affine(aU, bU, "x");
+    const integral = new IntegralNode(new MultiplyNode(u.derivate().toTree(), new SinNode(u.toTree())), a.toTree(), b.toTree(), "x");
+    return `Calculer : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).simplify().toTex();
+};
 const getIntegralDerivatedUSinUQuestion = () => {
     const u = AffineConstructor.random();
     const b = randint(-4, 6);
     const a = randint(-5, b);
-    const integral = new IntegralNode(new MultiplyNode(u.derivate().toTree(), new SinNode(u.toTree())), a.toTree(), b.toTree(), "x");
-    const correctAns = getCorrectAnswer(a, b, u);
+    const identifiers = { a, b, aU: u.a, bU: u.b };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: correctAns.simplify().toTex(),
-        instruction: `Calculer : $${integral.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["sin", "cos"],
         answerFormat: "tex",
-        identifiers: { a, b, aU: u.a, bU: u.b },
+        identifiers,
     };
     return question;
 };
@@ -38,12 +53,13 @@ const getPropositions = (n, { answer, a, b, aU, bU }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { a, b, aU, bU }) => {
-    const u = new Affine(aU, bU, "x");
-    const correctAns = getCorrectAnswer(a, b, u).simplify();
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    const correctAns = getAnswerNode(identifiers).simplify();
     return correctAns.toAllValidTexs().includes(ans);
 };
-const getCorrectAnswer = (a, b, u) => {
+const getAnswerNode = (identifiers) => {
+    const { a, b, aU, bU } = identifiers;
+    const u = new Affine(aU, bU, "x");
     const minusOne = (-1).toTree();
     const uTree = u.toTree();
     const primitiveA = new MultiplyNode(minusOne, new CosNode(uTree.evaluate({ x: a }).toTree())).simplify();
@@ -71,13 +87,12 @@ const generatePropositions = (a, b, u) => {
 export const integralDerivatedUSinU = {
     id: "integralDerivatedUSinU",
     label: "Calcul d'intégrales de fonctions du type $u'\\sin(u)$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralDerivatedUSinUQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"integralExpAxPlusB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralExpAxPlusB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA2GF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"integralExpAxPlusB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralExpAxPlusB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAwHF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAYpD,CAAC"}

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

@@ -8,19 +8,34 @@ import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+const getInstruction = (identifiers) => {
+    const { a, b, aX, bX } = identifiers;
+    const f = new Affine(aX, bX, "x");
+    const e = new ExpNode(new Affine(f.a, f.b, "x").toTree());
+    const integral = new IntegralNode(e, a.toTree(), b.toTree(), "x");
+    return `Calculer : 
+  
+$$
+${integral.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).toTex();
+};
 const getIntegralExpAxPlusBQuestion = () => {
     const f = AffineConstructor.random();
     const b = randint(-4, 6);
     const a = randint(-5, b);
-    const e = new ExpNode(new Affine(f.a, f.b, "x").toTree());
-    const integral = new IntegralNode(e, a.toTree(), b.toTree(), "x");
-    const correctAns = getCorrectAnswer(a, b, f.a, f.b);
+    const identifiers = { a, b, aX: f.a, bX: f.b };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: correctAns.toTex(),
-        instruction: `Calculer : $${integral.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["epower"],
         answerFormat: "tex",
-        identifiers: { a, b, aX: f.a, bX: f.b },
+        identifiers,
     };
     return question;
 };
@@ -38,11 +53,12 @@ const getPropositions = (n, { answer, a, b, aX, bX }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { a, b, aX, bX }) => {
-    const correctAns = getCorrectAnswer(a, b, aX, bX);
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    const correctAns = getAnswerNode(identifiers);
     return correctAns.toAllValidTexs().includes(ans);
 };
-const getCorrectAnswer = (a, b, aX, bX) => {
+const getAnswerNode = (identifiers) => {
+    const { a, b, aX, bX } = identifiers;
     const f = new Affine(aX, bX, "x").toTree();
     const oneDivAx = new FractionNode((1).toTree(), aX.toTree()).simplify();
     return new MultiplyNode(oneDivAx, new SubstractNode(new ExpNode(f.evaluate({ x: b }).toTree()).simplify(), new ExpNode(f.evaluate({ x: a }).toTree()).simplify()).simplify());
@@ -68,13 +84,12 @@ const generatePropositions = (a, b, aX, bX) => {
 export const integralExpAxPlusB = {
     id: "integralExpAxPlusB",
     label: "Calcul d'intégrales de fonctions du type $\\exp(ax+b)$",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralExpAxPlusBQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"integralExpU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralExpU.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;AAoIF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAY9C,CAAC"}
+{"version":3,"file":"integralExpU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralExpU.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;AA2JF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAW9C,CAAC"}