math-exercises 2.2.94 → 2.2.96

package/lib/exercises/math/calculLitteral/simplifying/reduceExpression.js

@@ -3,100 +3,193 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduceExpression = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const polynomial_1 = require("../../../../math/polynomials/polynomial");
+const affine_1 = require("../../../../math/polynomials/affine");
+const trinom_1 = require("../../../../math/polynomials/trinom");
 const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const polynomialParser_1 = require("../../../../tree/parsers/polynomialParser");
+const operatorComposition_1 = require("../../../../tree/utilities/operatorComposition");
+const random_1 = require("../../../../utils/alea/random");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const rebuildIdentifiers = (oldids) => {
+    if (oldids.variable)
+        return oldids;
+    const { polynome1Coeffs, polynome2Coeffs } = oldids;
+    const nbTerms = polynome1Coeffs.filter((e) => e === 0 || !!e).length +
+        polynome2Coeffs.filter((e) => e === 0 || !!e).length;
+    return {
+        variable: "x",
+        coeffs: [
+            [polynome1Coeffs[0], polynome2Coeffs[0]].filter((e) => e === 0 || !!e),
+            [polynome1Coeffs[1], polynome2Coeffs[1]].filter((e) => e === 0 || !!e),
+            [polynome1Coeffs[2], polynome2Coeffs[2]].filter((e) => e === 0 || !!e),
+        ],
+        order: (0, shuffle_1.shuffle)(Array.from({ length: nbTerms }, (_, i) => i)),
+    };
+};
+const getStatementNode = (identifiers) => {
+    const { variable, coeffs, order } = identifiers;
+    const nodes = coeffs.flatMap((coeff, i) => coeff.map((c) => {
+        if (i === 0)
+            return c.toTree();
+        if (i === 1)
+            return (0, multiplyNode_1.multiply)(c, variable);
+        else
+            return (0, multiplyNode_1.multiply)(c, (0, powerNode_1.square)(variable));
+    }));
+    const shuffled = order.map((i) => nodes[i]);
+    // const polynome1 = new Polynomial(polynome1Coeffs, variable);
+    // const polynome2 = new Polynomial(polynome2Coeffs, variable);
+    return (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, shuffled);
+    // const statement = new AddNode(polynome1.toTree(), polynome2.toTree());
+    // return statement.deepShuffle({ nodeIdsToShuffle: [OperatorIds.add] });
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getAnswer = (identifiers) => {
+    const answer = getStatementNode(identifiers)
+        .simplify({
+        forbidFactorize: true,
+        towardsDistribute: true,
+    })
+        .toTex();
+    return answer;
+};
+const getInstruction = (identifiers) => {
+    return `Réduire l'expression suivante : 
+
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
 const getReduceExpression = () => {
     const rand = (0, randint_1.randint)(0, 7);
     let polynome1;
     let polynome2;
-    switch (rand) {
-        case 0: // ax + b + cx + d
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 1:
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 2:
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 3:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 4:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, 0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 5:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 6:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        default:
-            throw Error("something went wrong");
+    //coeffs[0] est degré 0, coeffs[1] est degré 1, coeffs[2] degré 2
+    const coeffs = [[], [], []];
+    const nbTerms = (0, randint_1.randint)(4, 6);
+    for (let i = 0; i < nbTerms; i++) {
+        if (i === nbTerms - 1) {
+            let availableDegree = coeffs.findIndex((coeff) => coeff.length === 0);
+            if (availableDegree === -1)
+                availableDegree = (0, randint_1.randint)(0, 3);
+            coeffs[availableDegree].push((0, randint_1.randint)(-9, 10, [0]));
+        }
+        else {
+            const degree = (0, randint_1.randint)(0, 3);
+            coeffs[degree].push((0, randint_1.randint)(-9, 10, [0]));
+        }
     }
-    const statement = new addNode_1.AddNode(polynome1.toTree(), polynome2.toTree());
-    statement.shuffle();
-    const statementTex = statement.toTex();
-    const answer = polynome1.add(polynome2).toTree().toTex();
+    const order = (0, shuffle_1.shuffle)(Array.from({ length: nbTerms }, (_, i) => i));
+    // switch (rand) {
+    //   case 0: // ax + b + cx + d
+    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
+    //     polynome2 = new Polynomial([randint(-5, 6, [0]), randint(-5, 6, [0])]);
+    //     break;
+    //   case 1: //ax+b + cx
+    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
+    //     polynome2 = new Polynomial([0, randint(-5, 6, [0])]);
+    //     break;
+    //   case 2: //ax+b+c
+    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
+    //     polynome2 = new Polynomial([randint(-5, 6, [0])]);
+    //     break;
+    //   case 3: //ax^2+bx+c + ax^2+bx
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([0, randint(-5, 6), randint(-5, 6, [0])]);
+    //     break;
+    //   case 4: //ax^2+bx+c + ax^2
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([0, 0, randint(-5, 6, [0])]);
+    //     break;
+    //   case 5: //ax^2+bx+c + ax
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([0, randint(-5, 6, [0])]);
+    //     break;
+    //   case 6: //ax^2 +bx+c + c
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([randint(-5, 6, [0])]);
+    //     break;
+    //   default:
+    //     throw Error("something went wrong");
+    // }
+    const variable = (0, random_1.random)(["x", "n", "a", "y", "t"]);
+    const identifiers = {
+        // rand,
+        // polynome1Coeffs: polynome1.coefficients,
+        // polynome2Coeffs: polynome2.coefficients,
+        coeffs,
+        variable,
+        order,
+    };
     const question = {
-        instruction: `Réduire l'expression suivante : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [variable],
         answerFormat: "tex",
-        identifiers: {
-            rand,
-            polynome1Coeffs: polynome1.coefficients,
-            polynome2Coeffs: polynome2.coefficients,
-        },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, rand, polynome1Coeffs }) => {
+const getPropositions = (n, { answer, coeffs, variable }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
+    (0, exercise_1.tryToAddWrongProp)(propositions, coeffs
+        .flatMap((e) => e)
+        .reduce((acc, curr) => acc + curr, 0)
+        .frenchify());
     while (propositions.length < n) {
-        const polynome2 = new polynomial_1.Polynomial(rand < 3
-            ? [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]
-            : [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, polynome1.add(polynome2).toTree().toTex());
+        if (coeffs[2].length) {
+            (0, exercise_1.tryToAddWrongProp)(propositions, new trinom_1.Trinom((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10), {
+                variable,
+            })
+                .toTree()
+                .toTex());
+        }
+        else {
+            (0, exercise_1.tryToAddWrongProp)(propositions, new affine_1.Affine((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10)).toTree().toTex());
+        }
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { polynome1Coeffs, polynome2Coeffs, rand }) => {
-    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
-    const polynome2 = new polynomial_1.Polynomial(polynome2Coeffs);
-    const answer = polynome1
-        .add(polynome2)
-        .toTree({ forbidPowerToProduct: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { variable, answer }) => {
+    try {
+        const parsed = (0, polynomialParser_1.polynomialParser)(ans, { variable });
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({
+            forbidFactorize: true,
+            towardsDistribute: true,
+            forbidAdditions: true,
+        })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
 };
 exports.reduceExpression = {
     id: "reduceExpression",
@@ -111,4 +204,7 @@ exports.reduceExpression = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    rebuildIdentifiers,
+    getAnswer,
+    getInstruction,
 };

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

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

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

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

package/lib/exercises/math/dataReading/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("./tableReading"), exports);

package/lib/exercises/math/dataReading/tableReading.d.ts

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

package/lib/exercises/math/dataReading/tableReading.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataReading/tableReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IAIjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4FF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAgB9C,CAAC"}

package/lib/exercises/math/dataReading/tableReading.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableReading = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const numberVEA_1 = require("../../../exercises/vea/numberVEA");
+const randint_1 = require("../../../math/utils/random/randint");
+const random_1 = require("../../../utils/alea/random");
+const handleVEAError_1 = require("../../../utils/errors/handleVEAError");
+const dollarize_1 = require("../../../utils/latex/dollarize");
+const mdTable_1 = require("../../../utils/markdown/mdTable");
+const getPropositions = (n, { answer, values, caseAsked }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, random_1.random)(values.flat()).frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { values, caseAsked } = identifiers;
+    const flatValues = values.flat();
+    return flatValues[caseAsked].frenchify();
+};
+const getInstruction = (identifiers) => {
+    const { values, caseAsked } = identifiers;
+    let population = caseAsked % 3 === 0
+        ? "de la $6^e$ A"
+        : caseAsked % 3 === 1
+            ? "de la $6^e$ B"
+            : "";
+    let caractere = caseAsked < 3
+        ? "préfèrent le jeu Minecraft"
+        : caseAsked < 6
+            ? "préfèrent le jeu The Legend of Zelda"
+            : "ont répondu au sondage";
+    return `Un sondage a été réalisé auprès des élèves de deux classes de $6^e$ pour connaître leur jeu vidéo préféré. Voici leurs réponses : 
+  
+${(0, mdTable_1.mdTable)([
+        ["", "$6^e$ A", "$6^e$ B", "Total"],
+        ["Minecraft", ...values[0].map(dollarize_1.dollarize)],
+        ["The Legend of Zelda", ...values[1].map(dollarize_1.dollarize)],
+        ["Total", ...values[2].map(dollarize_1.dollarize)],
+    ])}
+
+Combien d'élèves ${population} ${caractere} ?
+`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return (0, numberVEA_1.numberVEA)(ans, answer);
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
+};
+const getTableReadingQuestion = (ops) => {
+    const caseAsked = (0, randint_1.randint)(0, 9);
+    const totalA = (0, randint_1.randint)(20, 30);
+    const totalB = (0, randint_1.randint)(20, 30, [totalA]);
+    const case0 = (0, randint_1.randint)(3, totalA - 5);
+    const case1 = (0, randint_1.randint)(3, totalB - 5, [case0]);
+    const case3 = totalA - case0;
+    const case4 = totalB - case1;
+    const values = [
+        [case0, case1, case0 + case1],
+        [case3, case4, case3 + case4],
+        [totalA, totalB, totalA + totalB],
+    ];
+    const identifiers = {
+        caseAsked,
+        values,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.tableReading = {
+    id: "tableReading",
+    connector: "=",
+    label: "Lire un tableau à double entrée",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getTableReadingQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    // getHint,
+    // getCorrection,
+    getAnswer,
+};

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

@@ -1 +1 @@
-{"version":3,"file":"convexityQuadrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/convexityQuadrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAqHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"convexityQuadrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/convexityQuadrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAoBlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAqHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}

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

@@ -13,6 +13,7 @@ const closure_1 = require("../../../../tree/nodes/sets/closure");
 const intervalNode_1 = require("../../../../tree/nodes/sets/intervalNode");
 const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getConvexityQuadrinomialsQuestion = () => {
     const quadrinomial = polynomial_1.PolynomialConstructor.randomWithOrder(3);
     const quadcoeffs = quadrinomial.coefficients;
@@ -68,7 +69,7 @@ const isAnswerValid = (ans, { answer, askConvex, quadcoeffs }) => {
         return parsed.simplify().toTex() === answer;
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 exports.convexityQuadrinomials = {

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

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA4EF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}
+{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA4EF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}

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

@@ -7,6 +7,7 @@ const affine_1 = require("../../../../math/polynomials/affine");
 const expNode_1 = require("../../../../tree/nodes/functions/expNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getInstruction = (identifiers) => {
     const { affine1Coeffs, affine2Coeffs } = identifiers;
     const affine1 = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
@@ -56,7 +57,7 @@ const isAnswerValid = (ans, { answer, affine1Coeffs, affine2Coeffs }) => {
         return parsed.simplify().toTex() === answer;
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 exports.expDerivativeFour = {

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

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

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

@@ -10,6 +10,7 @@ const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getInstruction = (identifiers) => {
     const { a, b } = identifiers;
     const myfunction = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
@@ -56,7 +57,7 @@ const isAnswerValid = (ans, { a, b, answer }) => {
         return parsed.simplify().toTex() === answer;
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 exports.expDerivativeThree = {

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

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

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

@@ -13,6 +13,7 @@ const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getInstruction = (identifiers) => {
     const { a, b } = identifiers;
     const affine = new polynomial_1.Polynomial([b, a]).toTree();
@@ -83,7 +84,7 @@ const isAnswerValid = (ans, { a, b, answer }) => {
             .toTex() === answer);
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 exports.lnDerivativeThree = {

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

@@ -1 +1 @@
-{"version":3,"file":"powerCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/powerCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA0EF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"powerCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/powerCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoIF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAmB5D,CAAC"}

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

@@ -7,19 +7,73 @@ const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
-const getPowerCompositionDerivationQuestion = () => {
-    const affine = affine_1.AffineConstructor.random(undefined, { excludes: [0] });
-    const affineTree = affine.toTree();
-    const power = (0, randint_1.randint)(3, 10);
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const alignTex_1 = require("../../../../utils/latex/alignTex");
+const getInstruction = (identifiers) => {
+    const { affineA, affineB, power } = identifiers;
+    const affine = new affine_1.Affine(affineA, affineB);
     const powerTree = power.toTree();
+    const affineTree = affine.toTree();
     const fct = new powerNode_1.PowerNode(affineTree, powerTree);
+    return `Déterminer la fonction dérivée de la fonction $f$ définie par : 
+$$
+f(x) = ${fct.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { affineA, affineB, power } = identifiers;
+    const affine = new affine_1.Affine(affineA, affineB);
+    const affineTree = affine.toTree();
     const deriv = new multiplyNode_1.MultiplyNode((power * affine.a).toTree(), new powerNode_1.PowerNode(affineTree, (power - 1).toTree()));
+    return deriv.toTex();
+};
+const getHint = (identifiers) => {
+    return `On rappelle la règle de dérivation suivante : 
+  
+$$
+\\left(u^n \\right)' = n \\times u' \\times u^{n-1} 
+$$
+`;
+};
+const getCorrection = (identifiers) => {
+    const { affineA, affineB, power: pow } = identifiers;
+    const affine = new affine_1.Affine(affineA, affineB).toTree();
+    const affineTex = affine.toTex();
+    const answer = getAnswer(identifiers);
+    return `On sait que : 
+  
+$$
+\\left(u^n \\right)' = n \\times u' \\times u^{n-1} 
+$$
+
+Ici, on a $n = ${pow}$, et $u(x) = ${affineTex}$, donc $u'(x) = ${affineA}$.
+
+Ainsi, 
+
+${(0, alignTex_1.alignTex)([
+        [
+            "f'(x)",
+            "=",
+            (0, multiplyNode_1.multiply)(pow, (0, multiplyNode_1.multiply)(affineA, (0, powerNode_1.power)(affine, (0, substractNode_1.substract)(pow, 1)))).toTex(),
+        ],
+        ["", "=", answer],
+    ])}
+`;
+};
+const getPowerCompositionDerivationQuestion = () => {
+    const affine = affine_1.AffineConstructor.random(undefined, { excludes: [0] });
+    const power = (0, randint_1.randint)(3, 10);
+    const identifiers = { affineA: affine.a, affineB: affine.b, power };
     const question = {
-        answer: deriv.toTex(),
-        instruction: `Déterminer la dérivée de $f(x) = ${fct.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: { affineA: affine.a, affineB: affine.b, power },
+        identifiers,
     };
     return question;
 };
@@ -39,10 +93,15 @@ const getPropositions = (n, { answer, affineA, affineB, power }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, power, affineA, affineB }) => {
-    const affineTree = new affine_1.Affine(affineA, affineB).toTree();
-    const deriv = new multiplyNode_1.MultiplyNode((power * affineA).toTree(), new powerNode_1.PowerNode(affineTree, (power - 1).toTree()));
-    const texs = deriv.toAllValidTexs({ forbidPowerToProduct: true });
-    return texs.includes(ans);
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify({ forbidFactorize: true }).toTex() === answer;
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
 };
 exports.powerCompositionDerivation = {
     id: "powerCompositionDerivation",
@@ -57,4 +116,9 @@ exports.powerCompositionDerivation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"quotientDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/quotientDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAuGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAcpD,CAAC"}
+{"version":3,"file":"quotientDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/quotientDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAuGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAcpD,CAAC"}