math-exercises 2.0.1 → 2.0.2

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

@@ -9,41 +9,47 @@ const expNode_1 = require("../../../tree/nodes/functions/expNode");
 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 simplify_1 = require("../../../tree/parsers/simplify");
 const getExpDerivativeThree = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const b = (0, randint_1.randint)(-9, 10);
-    const myfunction = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')));
-    const derivative = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b + a, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')));
+    const myfunction = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
+    const derivative = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b + a, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
     const answer = derivative.toTex();
     const question = {
         instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()}$.`,
         startStatement: "f'(x)",
         answer,
-        keys: ['x', 'epower', 'exp'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: ["x", "epower", "exp"],
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
 const getPropositions = (n, { answer, a, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b + a, -a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, a + '');
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')))).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b + a, -a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, a + "");
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x")), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))).toTex());
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const affine = new polynomial_1.Polynomial([a + b, a]).toTree();
+    const derivative = new multiplyNode_1.MultiplyNode(affine, new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
+    const texs = derivative.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.expDerivativeThree = {
-    id: 'expDerivativeThree',
-    connector: '=',
-    label: 'Dérivée de $(ax+b) \\times \\exp(x)$',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp'],
-    sections: ['Dérivation', 'Exponentielle'],
+    id: "expDerivativeThree",
+    connector: "=",
+    label: "Dérivée de $(ax+b) \\times \\exp(x)$",
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp"],
+    sections: ["Dérivation", "Exponentielle"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpDerivativeThree, nb),
     getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivative/expDerivativeTwo.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 expDerivativeTwo: MathExercise<QCMProps, VEAProps>;
+export declare const expDerivativeTwo: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=expDerivativeTwo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeTwo.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeTwo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA6CnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"expDerivativeTwo.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeTwo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}

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

@@ -9,44 +9,49 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const getExpDerivative = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const b = (0, randint_1.randint)(-9, 10);
-    const myfunction = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))), new numberNode_1.NumberNode(b));
-    const derivative = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))));
+    const myfunction = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(b));
+    const derivative = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
     const answer = derivative.toTex();
     const question = {
         instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()}$.`,
         startStatement: "f'(x)",
         answer,
-        keys: ['x', 'epower', 'exp'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: ["x", "epower", "exp"],
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
 const getPropositions = (n, { answer, a, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const myfunction = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))), new numberNode_1.NumberNode(b));
+    const myfunction = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(b));
     (0, exercise_1.tryToAddWrongProp)(propositions, myfunction.toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, a + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, a + "");
     while (propositions.length < n) {
         const randomA = (0, randint_1.randint)(-9, 10, [0]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(randomA), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')))).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(randomA), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))).toTex());
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a }) => {
+    const derivative = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
+    const texs = derivative.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.expDerivativeTwo = {
-    id: 'expDerivativeTwo',
-    connector: '=',
-    label: 'Dérivée de $a \\times \\exp(x) + b$',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp'],
-    sections: ['Dérivation', 'Exponentielle'],
+    id: "expDerivativeTwo",
+    connector: "=",
+    label: "Dérivée de $a \\times \\exp(x) + b$",
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp"],
+    sections: ["Dérivation", "Exponentielle"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpDerivative, nb),
     getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

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

@@ -1,12 +1,11 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise, QCMGenerator, QuestionGenerator, VEA } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
 };
-type VEAProps = {};
-export declare const getFirstDegreeDerivative: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getFirstDegreeDerivativePropositions: QCMGenerator<QCMProps>;
-export declare const firstDegreeDerivative: MathExercise<QCMProps, VEAProps>;
+export declare const getFirstDegreeDerivative: QuestionGenerator<Identifiers>;
+export declare const getFirstDegreeDerivativePropositions: QCMGenerator<Identifiers>;
+export declare const isFirstDegreeDerivativeAnswerValid: VEA<Identifiers>;
+export declare const firstDegreeDerivative: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=firstDegreeDerivative.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/firstDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAIlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AACnB,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAc1E,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,YAAY,CAAC,QAAQ,CAevE,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWlE,CAAC"}
+{"version":3,"file":"firstDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/firstDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAIJ,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAcnE,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,YAAY,CAAC,WAAW,CAkB1E,CAAC;AACF,eAAO,MAAM,kCAAkC,EAAE,GAAG,CAAC,WAAW,CAK/D,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firstDegreeDerivative = exports.getFirstDegreeDerivativePropositions = exports.getFirstDegreeDerivative = void 0;
+exports.firstDegreeDerivative = exports.isFirstDegreeDerivativeAnswerValid = exports.getFirstDegreeDerivativePropositions = exports.getFirstDegreeDerivative = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
@@ -8,14 +8,14 @@ const randint_1 = require("../../../math/utils/random/randint");
 const getFirstDegreeDerivative = () => {
     const [a, b] = [(0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10)];
     const polynomial = new polynomial_1.Polynomial([b, a]);
-    const answer = a + '';
+    const answer = a + "";
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$.`,
+        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toTex()}$.`,
         startStatement: `f'(x)`,
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
@@ -24,24 +24,29 @@ const getFirstDegreeDerivativePropositions = (n, { answer, a, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([0, a]).toTree().toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, 'x');
-    (0, exercise_1.tryToAddWrongProp)(propositions, b + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, "x");
+    (0, exercise_1.tryToAddWrongProp)(propositions, b + "");
     while (propositions.length < n) {
         const wrongAnswer = (0, randint_1.randint)(-9, 10);
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer + "");
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 exports.getFirstDegreeDerivativePropositions = getFirstDegreeDerivativePropositions;
+const isFirstDegreeDerivativeAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.isFirstDegreeDerivativeAnswerValid = isFirstDegreeDerivativeAnswerValid;
 exports.firstDegreeDerivative = {
-    id: 'firstDegreeDerivative',
-    connector: '=',
+    id: "firstDegreeDerivative",
+    connector: "=",
     label: "Dérivée d'une fonction affine",
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', '1rePro', 'TermPro'],
-    sections: ['Dérivation'],
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "1rePro", "TermPro"],
+    sections: ["Dérivation"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getFirstDegreeDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions: exports.getFirstDegreeDerivativePropositions,
+    isAnswerValid: exports.isFirstDegreeDerivativeAnswerValid,
 };

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

@@ -0,0 +1,18 @@
+export { constanteDerivative } from "./constanteDerivative";
+export * from "./expDerivativeOne";
+export * from "./expDerivativeThree";
+export * from "./expDerivativeTwo";
+export { firstDegreeDerivative } from "./firstDegreeDerivative";
+export * from "./inverseFunctionDerivative";
+export * from "./lnDerivativeOne";
+export * from "./lnDerivativeThree";
+export * from "./lnDerivativeTwo";
+export * from "./powerFunctionDerivative";
+export * from "./quotientDerivative";
+export * from "./productDerivative";
+export * from "./rootFunctionDerivative";
+export { secondDegreeDerivative } from "./secondDegreeDerivative";
+export { thirdDegreeDerivative } from "./thirdDegreeDerivative";
+export * from "./thirdDegreeFunctionVariation";
+export * from "./usualderivative";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mBAAmB,CAAC"}

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

@@ -0,0 +1,38 @@
+"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 });
+exports.thirdDegreeDerivative = exports.secondDegreeDerivative = exports.firstDegreeDerivative = exports.constanteDerivative = void 0;
+var constanteDerivative_1 = require("./constanteDerivative");
+Object.defineProperty(exports, "constanteDerivative", { enumerable: true, get: function () { return constanteDerivative_1.constanteDerivative; } });
+__exportStar(require("./expDerivativeOne"), exports);
+__exportStar(require("./expDerivativeThree"), exports);
+__exportStar(require("./expDerivativeTwo"), exports);
+var firstDegreeDerivative_1 = require("./firstDegreeDerivative");
+Object.defineProperty(exports, "firstDegreeDerivative", { enumerable: true, get: function () { return firstDegreeDerivative_1.firstDegreeDerivative; } });
+__exportStar(require("./inverseFunctionDerivative"), exports);
+__exportStar(require("./lnDerivativeOne"), exports);
+__exportStar(require("./lnDerivativeThree"), exports);
+__exportStar(require("./lnDerivativeTwo"), exports);
+__exportStar(require("./powerFunctionDerivative"), exports);
+__exportStar(require("./quotientDerivative"), exports);
+__exportStar(require("./productDerivative"), exports);
+__exportStar(require("./rootFunctionDerivative"), exports);
+var secondDegreeDerivative_1 = require("./secondDegreeDerivative");
+Object.defineProperty(exports, "secondDegreeDerivative", { enumerable: true, get: function () { return secondDegreeDerivative_1.secondDegreeDerivative; } });
+var thirdDegreeDerivative_1 = require("./thirdDegreeDerivative");
+Object.defineProperty(exports, "thirdDegreeDerivative", { enumerable: true, get: function () { return thirdDegreeDerivative_1.thirdDegreeDerivative; } });
+__exportStar(require("./thirdDegreeFunctionVariation"), exports);
+__exportStar(require("./usualderivative"), exports);

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

@@ -1,9 +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 inverseFunctionDerivative: MathExercise<QCMProps, VEAProps>;
+export declare const inverseFunctionDerivative: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=inverseFunctionDerivative.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"inverseFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/inverseFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAiCnB,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWtE,CAAC"}
+{"version":3,"file":"inverseFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/inverseFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2CF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAa/D,CAAC"}

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

@@ -4,16 +4,20 @@ exports.inverseFunctionDerivative = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 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 powerNode_1 = require("../../../tree/nodes/operators/powerNode");
+const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const getInverseFunctionDerivative = () => {
     const a = (0, randint_1.randint)(-19, 20, [0]);
-    const answer = `${a > 0 ? '-' : ''}\\frac{${Math.abs(a)}}{x^2}`;
+    const answer = `${a > 0 ? "-" : ""}\\frac{${Math.abs(a)}}{x^2}`;
     const question = {
         instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =\\frac{${a}}{x}$.`,
         startStatement: `f'(x)`,
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a },
     };
     return question;
 };
@@ -30,15 +34,22 @@ const getPropositions = (n, { answer, a }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a }) => {
+    const answerTree = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-a), new powerNode_1.SquareNode(new variableNode_1.VariableNode("x")));
+    const texs = answerTree.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.inverseFunctionDerivative = {
-    id: 'inverseFunctionDerivative',
-    connector: '=',
+    id: "inverseFunctionDerivative",
+    connector: "=",
     label: "Dérivée d'une fonction inverse",
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', 'TermTech'],
-    sections: ['Dérivation', 'Fonction inverse'],
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "TermTech"],
+    sections: ["Dérivation", "Fonction inverse"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getInverseFunctionDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivative/lnDerivativeOne.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 lnDerivativeOne: MathExercise<QCMProps, VEAProps>;
+export declare const lnDerivativeOne: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=lnDerivativeOne.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lnDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/lnDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAclC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"lnDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/lnDerivativeOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqDF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAYrD,CAAC"}

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

@@ -4,27 +4,28 @@ exports.lnDerivativeOne = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
+const rationalFrac_1 = require("../../../math/polynomials/rationalFrac");
 const randint_1 = require("../../../math/utils/random/randint");
 const expNode_1 = require("../../../tree/nodes/functions/expNode");
 const logNode_1 = require("../../../tree/nodes/functions/logNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const getLnDerivative = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const b = (0, randint_1.randint)(-9, 10);
     const polynom = new polynomial_1.Polynomial([b, a]);
-    const derivative = (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(a), polynom.toTree()));
     const logTree = new logNode_1.LogNode(polynom.toTree());
-    const answer = derivative.toTex();
+    const answer = new rationalFrac_1.RationalFrac(new polynomial_1.Polynomial([a]), polynom)
+        .simplify()
+        .toTree()
+        .toTex();
     const question = {
         instruction: `Déterminer la dérivée de la fonction $f(x) = ${logTree.toTex()}$.`,
         startStatement: "f'(x)",
         answer,
-        keys: ['x', 'ln', 'epower'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: ["x", "ln", "epower"],
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
@@ -33,23 +34,35 @@ const getPropositions = (n, { answer, a, b }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     const polynom = new polynomial_1.Polynomial([b, a]);
     const logTree = new logNode_1.LogNode(polynom.toTree());
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), logTree)).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, a + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), logTree).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, a + "");
     (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(polynom.toTree()).toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, polynom.toTree().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, `\\frac{${a}}{${logTree.toTex()}}`);
     (0, exercise_1.tryToAddWrongProp)(propositions, `\\frac{1}{${polynom.toTree().toTex()}}`);
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const frac = new rationalFrac_1.RationalFrac(new polynomial_1.Polynomial([a]), new polynomial_1.Polynomial([b, a]));
+    const nonSimplified = frac.toTree();
+    const simplified = frac.simplify().toTree();
+    const texs = [
+        ...simplified.toAllValidTexs(),
+        ...nonSimplified.toAllValidTexs(),
+    ];
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.lnDerivativeOne = {
-    id: 'lnDerivativeOne',
-    connector: '=',
-    label: 'Dérivée de $\\ln(ax + b)$',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', 'TermSpé'],
-    sections: ['Dérivation', 'Logarithme népérien'],
+    id: "lnDerivativeOne",
+    connector: "=",
+    label: "Dérivée de $\\ln(ax + b)$",
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "TermSpé"],
+    sections: ["Dérivation", "Logarithme népérien"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLnDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivative/lnDerivativeThree.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 lnDerivativeThree: MathExercise<QCMProps, VEAProps>;
+export declare const lnDerivativeThree: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=lnDerivativeThree.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lnDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/lnDerivativeThree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAclC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuDnB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}
+{"version":3,"file":"lnDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/lnDerivativeThree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8FF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAYvD,CAAC"}

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

@@ -12,21 +12,20 @@ const addNode_1 = require("../../../tree/nodes/operators/addNode");
 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 simplify_1 = require("../../../tree/parsers/simplify");
 const getLnDerivative = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const b = (0, randint_1.randint)(-9, 10);
     const affine = new polynomial_1.Polynomial([b, a]).toTree();
-    const myfunction = new multiplyNode_1.MultiplyNode(affine, new logNode_1.LogNode(new variableNode_1.VariableNode('x')));
-    const derivative = (0, simplify_1.simplifyNode)(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode('x'))), new fractionNode_1.FractionNode(affine, new variableNode_1.VariableNode('x'))));
+    const myfunction = new multiplyNode_1.MultiplyNode(affine, new logNode_1.LogNode(new variableNode_1.VariableNode("x")));
+    const derivative = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode("x"))), new fractionNode_1.FractionNode(affine, new variableNode_1.VariableNode("x")));
     const answer = derivative.toTex();
     const question = {
         instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()} $.`,
         startStatement: "f'(x)",
         answer,
-        keys: ['x', 'ln', 'epower'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: ["x", "ln", "epower"],
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
@@ -34,28 +33,51 @@ const getPropositions = (n, { answer, a, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const affine = new affine_1.Affine(a, b).toTree();
-    (0, exercise_1.tryToAddWrongProp)(propositions, new fractionNode_1.FractionNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, new fractionNode_1.FractionNode(affine, new variableNode_1.VariableNode('x')).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new fractionNode_1.FractionNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x")).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new fractionNode_1.FractionNode(affine, new variableNode_1.VariableNode("x")).toTex());
     if (a === 1)
-        (0, exercise_1.tryToAddWrongProp)(propositions, '\\ln\\left(x\\right)');
+        (0, exercise_1.tryToAddWrongProp)(propositions, "\\ln\\left(x\\right)");
     else
         (0, exercise_1.tryToAddWrongProp)(propositions, `${a}\\ln\\left(x\\right)`);
     while (propositions.length < n) {
         const randomA = (0, randint_1.randint)(-9, 10, [0]);
         const randomB = (0, randint_1.randint)(-9, 10);
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(randomA), new logNode_1.LogNode(new variableNode_1.VariableNode('x'))), new fractionNode_1.FractionNode(new polynomial_1.Polynomial([randomB, randomA]).toTree(), new variableNode_1.VariableNode('x')))).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(randomA), new logNode_1.LogNode(new variableNode_1.VariableNode("x"))), new fractionNode_1.FractionNode(new polynomial_1.Polynomial([randomB, randomA]).toTree(), new variableNode_1.VariableNode("x"))).toTex());
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const affine = new affine_1.Affine(a, b);
+    const xNode = new variableNode_1.VariableNode("x");
+    const aNode = new numberNode_1.NumberNode(a);
+    const bNode = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(b), xNode);
+    const fracNode = new fractionNode_1.FractionNode(affine.toTree(), xNode);
+    const logNode = new logNode_1.LogNode(xNode);
+    const raw = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(aNode, logNode), fracNode);
+    let developped = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(aNode, logNode), fracNode);
+    let simplified = new multiplyNode_1.MultiplyNode(aNode, new addNode_1.AddNode(logNode, new numberNode_1.NumberNode(1)));
+    if (b !== 0) {
+        developped = new addNode_1.AddNode(developped, bNode);
+        simplified = new addNode_1.AddNode(simplified, bNode);
+    }
+    const texs = [
+        ...raw.toAllValidTexs(),
+        ...developped.toAllValidTexs(),
+        ...simplified.toAllValidTexs(),
+    ];
+    console.log(ans, texs);
+    return texs.includes(ans);
+};
 exports.lnDerivativeThree = {
-    id: 'lnDerivativeThree',
-    connector: '=',
-    label: 'Dérivée de $\\ln(x) \\times (ax+b)$',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', 'TermSpé'],
-    sections: ['Dérivation', 'Logarithme népérien'],
+    id: "lnDerivativeThree",
+    connector: "=",
+    label: "Dérivée de $\\ln(x) \\times (ax+b)$",
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "TermSpé"],
+    sections: ["Dérivation", "Logarithme népérien"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLnDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/derivation/derivative/lnDerivativeTwo.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 lnDerivativeTwo: MathExercise<QCMProps, VEAProps>;
+export declare const lnDerivativeTwo: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=lnDerivativeTwo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lnDerivativeTwo.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/lnDerivativeTwo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAclC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY5D,CAAC"}
+{"version":3,"file":"lnDerivativeTwo.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/lnDerivativeTwo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6DF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAYrD,CAAC"}