math-exercises 2.0.0 → 2.0.2

package/lib/exercises/derivation/derivative/thirdDegreeFunctionVariation.js

@@ -5,6 +5,10 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
+const infiniteNode_1 = require("../../../tree/nodes/numbers/infiniteNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const intervalNode_1 = require("../../../tree/nodes/sets/intervalNode");
+const unionIntervalNode_1 = require("../../../tree/nodes/sets/unionIntervalNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
 const getThirdDegreeFunctionVariation = () => {
@@ -12,21 +16,28 @@ const getThirdDegreeFunctionVariation = () => {
     const c = (0, randint_1.randint)(-2, 3);
     const racine1 = (0, randint_1.randint)(-5, 4);
     const racine2 = (0, randint_1.randint)(racine1 + 1, 6);
-    const coefs = [c, a * racine1 * racine2, (-a * (racine1 + racine2)) / 2, a / 3];
+    const coefs = [
+        c,
+        a * racine1 * racine2,
+        (-a * (racine1 + racine2)) / 2,
+        a / 3,
+    ];
     const polynome = new polynomial_1.Polynomial(coefs);
     const coin = (0, coinFlip_1.coinFlip)() ? -1 : 1;
     const instruction = `Soit $f$ la fonction représentée ci-dessous. Sur quel intervalle la dérivée de $f$ est-elle ` +
-        (coin < 0 ? 'négative ?' : 'positive ?');
-    const answer = coin * a < 0 ? `[${racine1};${racine2}]` : `]-\\infty;${racine1}]\\cup[${racine2};+\\infty[`;
+        (coin < 0 ? "négative ?" : "positive ?");
+    const answer = coin * a < 0
+        ? `[${racine1};${racine2}]`
+        : `]-\\infty;${racine1}]\\cup[${racine2};+\\infty[`;
     const commands = [polynome.toString()];
     const ymax = Math.max(polynome.calculate(racine1), polynome.calculate(racine2));
     const ymin = Math.min(polynome.calculate(racine1), polynome.calculate(racine2));
     const question = {
         instruction,
-        startStatement: 'S',
+        startStatement: "S",
         answer,
-        keys: ['lbracket', 'rbracket', 'semicolon', 'infty'],
-        answerFormat: 'tex',
+        keys: ["lbracket", "rbracket", "semicolon", "infty"],
+        answerFormat: "tex",
         coords: [
             racine1 - ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1),
             racine2 + ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1),
@@ -34,7 +45,7 @@ const getThirdDegreeFunctionVariation = () => {
             ymax + ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10,
         ],
         commands,
-        qcmGeneratorProps: { answer, racine1, racine2 },
+        identifiers: { racine1, racine2, coin, a },
     };
     return question;
 };
@@ -43,7 +54,7 @@ const getPropositions = (n, { answer, racine1, racine2 }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     (0, exercise_1.tryToAddWrongProp)(propositions, `[${racine2};+\\infty[`);
     (0, exercise_1.tryToAddWrongProp)(propositions, `]-\\infty;${racine1}]`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `]-\\infty;${racine1}] \\cup [${racine2};+\\infty[`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `]-\\infty;${racine1}]\\cup[${racine2};+\\infty[`);
     while (propositions.length < n) {
         const racine1 = (0, randint_1.randint)(-5, 4);
         const racine2 = (0, randint_1.randint)(racine1 + 1, 6);
@@ -52,15 +63,37 @@ const getPropositions = (n, { answer, racine1, racine2 }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { racine1, racine2, coin, a }) => {
+    const r1 = new numberNode_1.NumberNode(racine1);
+    const r2 = new numberNode_1.NumberNode(racine2);
+    const answer = coin * a < 0
+        ? new intervalNode_1.IntervalNode(r1, r2, intervalNode_1.ClosureType.FF)
+        : new unionIntervalNode_1.UnionIntervalNode([
+            new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, r1, intervalNode_1.ClosureType.OF),
+            new intervalNode_1.IntervalNode(r2, infiniteNode_1.PlusInfinityNode, intervalNode_1.ClosureType.FO),
+        ]);
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.thirdDegreeFunctionVariation = {
-    id: 'thirdDegreeFunctionVariation',
-    connector: '=',
+    id: "thirdDegreeFunctionVariation",
+    connector: "=",
     label: "Lecture du signe de la dérivée via les variations d'une fonction",
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', '1rePro', 'TermPro', 'TermTech'],
-    sections: ['Dérivation'],
+    levels: [
+        "1reESM",
+        "1reSpé",
+        "1reTech",
+        "MathComp",
+        "1rePro",
+        "TermPro",
+        "TermTech",
+    ],
+    sections: ["Dérivation"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getThirdDegreeFunctionVariation, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivative/usualderivative.d.ts

@@ -1,13 +1,11 @@
-import { MathExercise } from '../../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercise";
+type Identifiers = {
     type: number;
     a?: number;
     b?: number;
     coefficients?: number[];
     tex?: string;
 };
-type VEAProps = {};
-export declare const usualDerivative: MathExercise<QCMProps, VEAProps>;
+export declare const usualDerivative: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=usualderivative.d.ts.map

package/lib/exercises/derivation/derivative/usualderivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usualderivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/usualderivative.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA0D,MAAM,gBAAgB,CAAC;AAOtG,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoDnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"usualderivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/usualderivative.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAMb,MAAM,gBAAgB,CAAC;AAuBxB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA0FF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAoBrD,CAAC"}

package/lib/exercises/derivation/derivative/usualderivative.js

@@ -10,28 +10,28 @@ const thirdDegreeDerivative_1 = require("./thirdDegreeDerivative");
 const getUsualDerivative = () => {
     const type = (0, randint_1.randint)(1, 5);
     let question;
-    let qcmGeneratorProps;
+    let identifiers;
     switch (type) {
         case 1:
             question = (0, firstDegreeDerivative_1.getFirstDegreeDerivative)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 1 };
+            identifiers = { ...question.identifiers, type: 1 };
             break;
         case 2:
             question = (0, secondDegreeDerivative_1.getSecondDegreeDerivative)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 2 };
+            identifiers = { ...question.identifiers, type: 2 };
             break;
         case 3:
             question = (0, thirdDegreeDerivative_1.getThirdDegreeDerivative)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 3 };
+            identifiers = { ...question.identifiers, type: 3 };
             break;
         case 4:
             question = (0, constanteDerivative_1.getConstanteDerivative)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 4 };
+            identifiers = { ...question.identifiers, type: 4 };
             break;
         default:
-            throw Error('erreur');
+            throw Error("erreur");
     }
-    return { ...question, qcmGeneratorProps };
+    return { ...question, identifiers };
 };
 const getPropositions = (n, { answer, type, a, b, coefficients, tex }) => {
     let props;
@@ -40,28 +40,69 @@ const getPropositions = (n, { answer, type, a, b, coefficients, tex }) => {
             props = (0, firstDegreeDerivative_1.getFirstDegreeDerivativePropositions)(n, { a: a, answer, b: b });
             break;
         case 2:
-            props = (0, secondDegreeDerivative_1.getSecondDegreeDerivativePropositions)(n, { answer, coefficients: coefficients });
+            props = (0, secondDegreeDerivative_1.getSecondDegreeDerivativePropositions)(n, {
+                answer,
+                coefficients: coefficients,
+            });
             break;
         case 3:
-            props = (0, thirdDegreeDerivative_1.getThirdDegreeDerivativePropositions)(n, { answer, coefficients: coefficients });
+            props = (0, thirdDegreeDerivative_1.getThirdDegreeDerivativePropositions)(n, {
+                answer,
+                coefficients: coefficients,
+            });
             break;
         case 4:
             props = (0, constanteDerivative_1.getConstanteDerivativePropositions)(n, { answer, tex: tex });
             break;
         default:
-            throw Error('erreur');
+            throw Error("erreur");
     }
     return props;
 };
+const isAnswerValid = (ans, { answer, type, coefficients, a, b, tex }) => {
+    let valid;
+    switch (type) {
+        case 1:
+            valid = (0, firstDegreeDerivative_1.isFirstDegreeDerivativeAnswerValid)(ans, { answer, a: a, b: b });
+            break;
+        case 2:
+            valid = (0, secondDegreeDerivative_1.isSecondDegreeDerivativeAnswerValid)(ans, {
+                coefficients: coefficients,
+                answer,
+            });
+            break;
+        case 3:
+            valid = (0, thirdDegreeDerivative_1.isThirdDegreeDerivativeAnswerValid)(ans, {
+                coefficients: coefficients,
+                answer,
+            });
+            break;
+        case 4:
+            valid = (0, constanteDerivative_1.isConstanteDerivativeAnswerValid)(ans, { answer, tex: tex });
+            break;
+        default:
+            throw Error("erreur");
+    }
+    return valid;
+};
 exports.usualDerivative = {
-    id: 'usualDerivative',
-    connector: '=',
-    label: 'Dérivées des fonctions de référence',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', '1rePro', 'TermPro', 'TermTech'],
-    sections: ['Dérivation'],
+    id: "usualDerivative",
+    connector: "=",
+    label: "Dérivées des fonctions de référence",
+    levels: [
+        "1reESM",
+        "1reSpé",
+        "1reTech",
+        "MathComp",
+        "1rePro",
+        "TermPro",
+        "TermTech",
+    ],
+    sections: ["Dérivation"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getUsualDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivativeNumberCalcul.d.ts

@@ -1,8 +1,8 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    coeffs: number[];
+    x: number;
 };
-type VEAProps = {};
-export declare const derivativeNumberCalcul: MathExercise<QCMProps, VEAProps>;
+export declare const derivativeNumberCalcul: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=derivativeNumberCalcul.d.ts.map

package/lib/exercises/derivation/derivativeNumberCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derivativeNumberCalcul.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}
+{"version":3,"file":"derivativeNumberCalcul.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuCF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAa5D,CAAC"}

package/lib/exercises/derivation/derivativeNumberCalcul.js

@@ -8,14 +8,16 @@ const randint_1 = require("../../math/utils/random/randint");
 const getDerivativeNumberCalculQuestion = () => {
     const x = (0, randint_1.randint)(-9, 10);
     const trinom = polynomial_1.PolynomialConstructor.randomWithOrder(2);
-    const instruction = `Soit $f(x) = ${trinom.toTree().toTex()}$. Calculer $f'(${x})$.`;
-    const answer = trinom.derivate().calculate(x) + '';
+    const instruction = `Soit $f(x) = ${trinom
+        .toTree()
+        .toTex()}$. Calculer $f'(${x})$.`;
+    const answer = trinom.derivate().calculate(x) + "";
     const question = {
         answer,
         instruction,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answerFormat: "tex",
+        identifiers: { x, coeffs: trinom.coefficients },
     };
     return question;
 };
@@ -23,20 +25,24 @@ const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
-        const wrongAnswer = (0, randint_1.randint)(-20, 20) + '';
+        const wrongAnswer = (0, randint_1.randint)(-20, 20) + "";
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.derivativeNumberCalcul = {
-    id: 'derivativeNumberCalcul',
-    connector: '=',
-    label: 'Calculer un nombre dérivé via la définition',
-    levels: ['1reSpé'],
+    id: "derivativeNumberCalcul",
+    connector: "=",
+    label: "Calculer un nombre dérivé via la définition",
+    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ['Dérivation', 'Limites'],
+    sections: ["Dérivation", "Limites"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDerivativeNumberCalculQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivativeNumberReading.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     A: number[];
     B: number[];
 };
-type VEAProps = {};
-export declare const derivativeNumberReading: MathExercise<QCMProps, VEAProps>;
+export declare const derivativeNumberReading: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=derivativeNumberReading.d.ts.map

package/lib/exercises/derivation/derivativeNumberReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgEnB,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWpE,CAAC"}
+{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AA8EF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}

package/lib/exercises/derivation/derivativeNumberReading.js

@@ -3,73 +3,83 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.derivativeNumberReading = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
-const droite_1 = require("../../math/geometry/droite");
-const point_1 = require("../../math/geometry/point");
+const integer_1 = require("../../math/numbers/integer/integer");
+const rational_1 = require("../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../math/polynomials/polynomial");
 const randint_1 = require("../../math/utils/random/randint");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
-const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
-const simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
-const mathjs_1 = require("mathjs");
 const getDerivativeNumberReading = () => {
     let xA, yA, xB, yB;
-    let pointA, pointB;
-    do {
-        [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-5, 6));
-        xB = xA > 0 ? (0, randint_1.randint)(xA - 4, 6) : (0, randint_1.randint)(-4, xA + 5); // l'écart entre les deux points ne soit pas grand
-        yB = yA > 0 ? (0, randint_1.randint)(yA - 4, 6) : (0, randint_1.randint)(-4, yA + 5);
-        pointA = new point_1.Point('A', new numberNode_1.NumberNode(xA), new numberNode_1.NumberNode(yA));
-        pointB = new point_1.Point('B', new numberNode_1.NumberNode(xB), new numberNode_1.NumberNode(yB));
-    } while (xB - xA === 0);
-    const droite = droite_1.DroiteConstructor.fromTwoPoints(pointA, pointB, 'D');
-    const [a, b] = [(3 * (0, randint_1.randint)(-100, 100, [0])) / 100, (2 * (0, randint_1.randint)(-4, 5)) / 100];
-    const c = (0, mathjs_1.evaluate)(droite.a.toMathString()) - a * Math.pow(xA, 2) - b * xA;
+    [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-5, 6));
+    xB = xA > 0 ? (0, randint_1.randint)(xA - 4, 6, [xA]) : (0, randint_1.randint)(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
+    yB = yA > 0 ? (0, randint_1.randint)(yA - 4, 6) : (0, randint_1.randint)(-4, yA + 5);
+    const pente = new rational_1.Rational(yB - yA, xB - xA).simplify();
+    const origin = pente
+        .opposite()
+        .multiply(new integer_1.Integer(xA))
+        .add(new integer_1.Integer(yA));
+    const penteTree = pente.toTree();
+    const originTree = origin.toTree();
+    const penteString = penteTree.toMathString();
+    const originString = originTree.toMathString();
+    const penteValue = pente.value;
+    const originValue = origin.value;
+    const [a, b] = [
+        (3 * (0, randint_1.randint)(-100, 100, [0])) / 100,
+        (2 * (0, randint_1.randint)(-4, 5)) / 100,
+    ];
+    const c = penteValue - a * Math.pow(xA, 2) - b * xA;
     const d = yA - (a / 3) * Math.pow(xA, 3) - (b / 2) * Math.pow(xA, 2) - xA * c;
     const polynome = new polynomial_1.Polynomial([d, c, b / 2, a / 3]);
     const instruction = `Ci-dessous sont tracées la courbe de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer $f'(${xA})$.`;
     const commands = [
         polynome.toString(),
-        `g(x) = (${droite.a.toMathString()}) * x + (${droite.b.toMathString()})`,
+        `g(x) = (${penteString}) * x + (${originString})`,
         `(${xA},${yA})`,
     ];
-    const answer = droite.getLeadingCoefficient();
+    const answer = penteTree.toTex();
     const question = {
         instruction,
-        startStatement: 'a',
+        startStatement: "a",
         answer,
         commands,
         coords: [xA - 5, xA + 5, yA - 5, yA + 5],
-        answerFormat: 'tex',
+        answerFormat: "tex",
         keys: [],
-        qcmGeneratorProps: { answer, A: [xA, yA], B: [xB, yB] },
+        identifiers: { A: [xA, yA], B: [xB, yB] },
     };
     return question;
 };
 const getPropositions = (n, { answer, A, B }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const pointA = new point_1.Point('A', new numberNode_1.NumberNode(A[0]), new numberNode_1.NumberNode(A[1]));
-    const pointB = new point_1.Point('B', new numberNode_1.NumberNode(B[0]), new numberNode_1.NumberNode(B[1]));
-    const droite = droite_1.DroiteConstructor.fromTwoPoints(pointA, pointB, 'D');
-    const leadingCoefficient = droite.getLeadingCoefficient();
+    if (B[1] - A[1] !== 0)
+        (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(B[0] - A[0], B[1] - A[1]).simplify().toTree().toTex());
     while (propositions.length < n) {
-        const wrongAnswer = leadingCoefficient !== '0'
-            ? (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(droite.a, new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0, 1]))))
-            : new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0]));
+        const wrongAnswer = new numberNode_1.NumberNode((0, randint_1.randint)(-4, 5, [0]));
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { A, B }) => {
+    const answer = new rational_1.Rational(B[1] - A[1], B[0] - A[0])
+        .simplify()
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.derivativeNumberReading = {
-    id: 'derivativeNumberReading',
-    connector: '=',
-    label: 'Lecture de nombre dérivé',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', '1rePro'],
-    sections: ['Dérivation'],
+    id: "derivativeNumberReading",
+    connector: "=",
+    label: "Lecture de nombre dérivé",
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "1rePro"],
+    sections: ["Dérivation"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDerivativeNumberReading, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./derivative";
+export * from "./derivativeNumberCalcul";
+export * from "./derivativeNumberReading";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC"}

package/lib/exercises/derivation/index.js

@@ -0,0 +1,19 @@
+"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("./derivative"), exports);
+__exportStar(require("./derivativeNumberCalcul"), exports);
+__exportStar(require("./derivativeNumberReading"), exports);

package/lib/exercises/equaDiff/equaDiffGeneralForme.d.ts

@@ -1,8 +1,7 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    a: number;
 };
-type VEAProps = {};
-export declare const exponentialDifferentialEquation: MathExercise<QCMProps, VEAProps>;
+export declare const exponentialDifferentialEquation: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=equaDiffGeneralForme.d.ts.map

package/lib/exercises/equaDiff/equaDiffGeneralForme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equaDiffGeneralForme.d.ts","sourceRoot":"","sources":["../../../src/exercises/equaDiff/equaDiffGeneralForme.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+CnB,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5E,CAAC"}
+{"version":3,"file":"equaDiffGeneralForme.d.ts","sourceRoot":"","sources":["../../../src/exercises/equaDiff/equaDiffGeneralForme.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8DF,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,WAAW,CAYrE,CAAC"}

package/lib/exercises/equaDiff/equaDiffGeneralForme.js

@@ -5,47 +5,54 @@ const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
 const expNode_1 = require("../../tree/nodes/functions/expNode");
-const constantNode_1 = require("../../tree/nodes/numbers/constantNode");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
-const equalNode_1 = require("../../tree/nodes/operators/equalNode");
+const equalNode_1 = require("../../tree/nodes/equations/equalNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
 const getExponentialEquation = () => {
     const a = (0, randint_1.randint)(-19, 20, [0]);
-    const myEquation = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('y')));
-    const myAnswer = new equalNode_1.EqualNode(new variableNode_1.VariableNode('y'), new multiplyNode_1.MultiplyNode(new constantNode_1.ConstantNode('C', 'C'), new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')))))); // y = Ce^(ax);
-    const answer = myAnswer.toTex();
+    const equation = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("y"));
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new multiplyNode_1.MultiplyNode(new variableNode_1.VariableNode("C"), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x"))))).toTex();
     const question = {
-        instruction: `Résoudre l'équation différentielle suivante : $y' = ${myEquation.toTex()}$.`,
+        instruction: `Résoudre l'équation différentielle suivante : $y' = ${equation.toTex()}$.`,
         startStatement: `y(x)`,
         answer,
-        keys: ['x', 'y', 'epower', 'exp', 'C', 'equal'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: ["x", "y", "epower", "exp", "C", "equal"],
+        answerFormat: "tex",
+        identifiers: { a },
     };
     return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    const yNode = new variableNode_1.VariableNode("y");
+    const cNode = new variableNode_1.VariableNode("C");
+    const xNode = new variableNode_1.VariableNode("x");
     while (propositions.length < n) {
         const a = (0, randint_1.randint)(1, 10);
-        const myWrongAnswer = new equalNode_1.EqualNode(new variableNode_1.VariableNode('y'), new multiplyNode_1.MultiplyNode(new constantNode_1.ConstantNode('C', 'C'), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')))));
+        const myWrongAnswer = new equalNode_1.EqualNode(yNode, new multiplyNode_1.MultiplyNode(cNode, new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), xNode))));
         (0, exercise_1.tryToAddWrongProp)(propositions, myWrongAnswer.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a }) => {
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new multiplyNode_1.MultiplyNode(new variableNode_1.VariableNode("C"), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x")))), { allowRawRightChildAsSolution: true });
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.exponentialDifferentialEquation = {
-    id: 'exponentialDifferentialEquation',
-    connector: '=',
-    label: "Équation Différentielle : $y' = ay$",
-    levels: ['1reSpé', 'MathComp', 'TermSpé'],
-    sections: ['Équations différentielles'],
+    id: "exponentialDifferentialEquation",
+    connector: "=",
+    label: "Équation différentielle $y' = ay$",
+    levels: ["1reSpé", "MathComp", "TermSpé"],
+    sections: ["Équations différentielles"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExponentialEquation, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/equaDiff/equaDiffGeneralFormeWithIC.d.ts

@@ -1,8 +1,8 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    initialY: number;
 };
-type VEAProps = {};
-export declare const exponentialDifferentialEquationWithIC: MathExercise<QCMProps, VEAProps>;
+export declare const exponentialDifferentialEquationWithIC: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=equaDiffGeneralFormeWithIC.d.ts.map

package/lib/exercises/equaDiff/equaDiffGeneralFormeWithIC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equaDiffGeneralFormeWithIC.d.ts","sourceRoot":"","sources":["../../../src/exercises/equaDiff/equaDiffGeneralFormeWithIC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA6DnB,eAAO,MAAM,qCAAqC,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWlF,CAAC"}
+{"version":3,"file":"equaDiffGeneralFormeWithIC.d.ts","sourceRoot":"","sources":["../../../src/exercises/equaDiff/equaDiffGeneralFormeWithIC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAyEF,eAAO,MAAM,qCAAqC,EAAE,YAAY,CAAC,WAAW,CAczE,CAAC"}