math-exercises 2.0.0 → 2.0.2

package/lib/exercises/conversion/lengthConversion.js

@@ -6,18 +6,24 @@ const randint_1 = require("../../math/utils/random/randint");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const units = ["mm", "cm", "dm", "m", "dam", "hm", "km"];
 const getLengthConversion = () => {
-    const units = ['mm', 'cm', 'dm', 'm', 'dam', 'hm', 'km'];
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
     const randomLength = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
-    const answer = (randomLength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ',');
+    const answer = (randomLength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + "").replace(".", ",");
     const question = {
-        instruction: `$${randomLength.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        instruction: `Compléter : $${randomLength.value
+            .toString()
+            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}} = \\ldots  \\textrm{${units[randomUnitInstructionIndex]}}$`,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, randomLength: randomLength.value, randomUnitIndex, randomUnitInstructionIndex },
+        answerFormat: "tex",
+        identifiers: {
+            randomLength: randomLength.value,
+            randomUnitIndex,
+            randomUnitInstructionIndex,
+        },
     };
     return question;
 };
@@ -26,20 +32,27 @@ const getPropositions = (n, { answer, randomLength, randomUnitIndex, randomUnitI
     (0, exercise_1.addValidProp)(propositions, answer);
     const lengthDecimal = new decimal_1.Decimal(randomLength);
     while (propositions.length < n) {
-        const wrongAnswer = lengthDecimal.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        const wrongAnswer = lengthDecimal
+            .multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex]))
+            .value.toString()
+            .replace(".", ",");
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.lengthConversion = {
-    id: 'lengthConversion',
-    connector: '=',
-    label: 'Conversion de longueurs',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
+    id: "lengthConversion",
+    connector: "=",
+    label: "Conversion de longueurs",
+    levels: ["6ème", "5ème", "CAP", "2ndPro"],
+    sections: ["Conversions"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLengthConversion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/conversion/massConversion.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     randomUnitIndex: number;
     randomUnitInstructionIndex: number;
     randomMass: number;
 };
-type VEAProps = {};
-export declare const massConversion: MathExercise<QCMProps, VEAProps>;
+export declare const massConversion: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=massConversion.d.ts.map

package/lib/exercises/conversion/massConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"massConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/massConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY3D,CAAC"}
+{"version":3,"file":"massConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/massConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAuDF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAYpD,CAAC"}

package/lib/exercises/conversion/massConversion.js

@@ -6,18 +6,24 @@ const randint_1 = require("../../math/utils/random/randint");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const units = ["mg", "cg", "dg", "g", "dag", "hg", "kg"];
 const getMassConversion = () => {
-    const units = ['mg', 'cg', 'dg', 'g', 'dag', 'hg', 'kg'];
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
     const randomMass = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
-    const answer = (randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ',');
+    const answer = (randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + "").replace(".", ",");
     const question = {
-        instruction: `$${randomMass.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        instruction: `Compléter : $${randomMass.value
+            .toString()
+            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}} = \\ldots \\textrm{${units[randomUnitInstructionIndex]}}$`,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, randomMass: randomMass.value, randomUnitIndex, randomUnitInstructionIndex },
+        answerFormat: "tex",
+        identifiers: {
+            randomMass: randomMass.value,
+            randomUnitIndex,
+            randomUnitInstructionIndex,
+        },
     };
     return question;
 };
@@ -26,20 +32,27 @@ const getPropositions = (n, { answer, randomMass, randomUnitIndex, randomUnitIns
     (0, exercise_1.addValidProp)(propositions, answer);
     const massDecimal = new decimal_1.Decimal(randomMass);
     while (propositions.length < n) {
-        const wrongAnswer = massDecimal.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        const wrongAnswer = massDecimal
+            .multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex]))
+            .value.toString()
+            .replace(".", ",");
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.massConversion = {
-    id: 'massConversion',
-    connector: '=',
-    label: 'Conversion de masses',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
+    id: "massConversion",
+    connector: "=",
+    label: "Conversion de masses",
+    levels: ["6ème", "5ème", "CAP", "2ndPro"],
+    sections: ["Conversions"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMassConversion, nb),
     getPropositions,
+    isAnswerValid,
     qcmTimer: 60,
     freeTimer: 60,
 };

package/lib/exercises/conversion/volumeCapacityConversion.d.ts

@@ -1,8 +1,10 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
+    randomUnitIndex: number;
+    randomUnitInstructionIndex: number;
+    randomValue: number;
+    isVolumeToCapacity: boolean;
 };
-type VEAProps = {};
-export declare const volumeCapacityConversion: MathExercise<QCMProps, VEAProps>;
+export declare const volumeCapacityConversion: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=volumeCapacityConversion.d.ts.map

package/lib/exercises/conversion/volumeCapacityConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeCapacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeCapacityConversion.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAiDnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYrE,CAAC"}
+{"version":3,"file":"volumeCapacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeCapacityConversion.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAkEF,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,WAAW,CAc9D,CAAC"}

package/lib/exercises/conversion/volumeCapacityConversion.js

@@ -7,56 +7,68 @@ const coinFlip_1 = require("../../utils/coinFlip");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const volumeUnits = ["mm", "cm", "dm", "m", "dam", "hm", "km"];
+const capacityUnits = ["mL", "cL", "dL", "L", "daL", "hL", "kL"];
 const getVolumeCapacityConversion = () => {
-    const volumeUnits = ['mm^3', 'cm^3', 'dm^3', 'm^3', 'dam^3', 'hm^3', 'km^3'];
-    const capacityUnits = ['mL', 'cL', 'dL', 'L', 'daL', 'hL', 'kL'];
     const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7);
     const randomUnitIndex = (0, randint_1.randint)(
     // cette manip a pour but d'éviter des conversion avec des nombres trop grand/petit
     randomUnitInstructionIndex - 1 < 0 ? 0 : randomUnitInstructionIndex - 1, randomUnitInstructionIndex + 2 > 7 ? 7 : randomUnitInstructionIndex + 2);
     const random = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
     let instructionUnit;
-    let AsnwerUnit;
+    let answerUnit;
     let answer;
-    if ((0, coinFlip_1.coinFlip)()) {
+    const isVolumeToCapacity = (0, coinFlip_1.coinFlip)();
+    if (isVolumeToCapacity) {
         instructionUnit = volumeUnits[randomUnitIndex];
-        AsnwerUnit = capacityUnits[randomUnitInstructionIndex];
+        answerUnit = capacityUnits[randomUnitInstructionIndex];
         answer = random.multiplyByPowerOfTen(3 * (randomUnitIndex - 2) + 3 - randomUnitInstructionIndex);
     }
     else {
         instructionUnit = capacityUnits[randomUnitIndex];
-        AsnwerUnit = volumeUnits[randomUnitInstructionIndex];
+        answerUnit = volumeUnits[randomUnitInstructionIndex];
         answer = random.multiplyByPowerOfTen(randomUnitIndex - 3 + 3 * (2 - randomUnitInstructionIndex));
     }
-    const answerTex = (answer.value + '').replace('.', ',');
+    const answerTex = answer.toTree().toTex();
     const question = {
-        instruction: `$${random.value}$ $${instructionUnit}$ = ... $${AsnwerUnit}$`,
+        instruction: `Compléter : $${random.value
+            .toString()
+            .replace(".", ",")} \\textrm{${instructionUnit}}${isVolumeToCapacity ? "^3" : ""} = \\ldots \\textrm{${answerUnit}}${!isVolumeToCapacity ? "^3" : ""}$`,
         answer: answerTex,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer: answerTex },
+        answerFormat: "tex",
+        identifiers: {
+            isVolumeToCapacity,
+            randomUnitIndex,
+            randomUnitInstructionIndex,
+            randomValue: random.value,
+        },
     };
     return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const decimal = new decimal_1.Decimal(Number(answer.replace(',', '.')));
+    const decimal = new decimal_1.Decimal(Number(answer.replace(",", ".")));
     while (propositions.length < n) {
         const wrongAnswer = decimal.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [0]));
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.value + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTree().toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.volumeCapacityConversion = {
-    id: 'volumeCapacityConversion',
-    connector: '=',
+    id: "volumeCapacityConversion",
+    connector: "=",
     getPropositions,
     label: "Conversion d'un volume vers une contenance et vice versa",
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
+    levels: ["6ème", "5ème", "CAP", "2ndPro"],
+    sections: ["Conversions"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeCapacityConversion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/conversion/volumeConversion.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     randomUnitIndex: number;
     randomUnitInstructionIndex: number;
     randomVolume: number;
 };
-type VEAProps = {};
-export declare const volumeConversion: MathExercise<QCMProps, VEAProps>;
+export declare const volumeConversion: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=volumeConversion.d.ts.map

package/lib/exercises/conversion/volumeConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0CnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY7D,CAAC"}
+{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAatD,CAAC"}

package/lib/exercises/conversion/volumeConversion.js

@@ -6,20 +6,26 @@ const randint_1 = require("../../math/utils/random/randint");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const units = ["mm", "cm", "dm", "m", "dam", "hm", "km"];
 const getVolumeConversion = () => {
-    const units = ['mm^3', 'cm^3', 'dm^3', 'm^3', 'dam^3', 'hm^3', 'km^3'];
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(
     // cette manip a pour but d'éviter des conversion de type km³ --> cm³ ou le contraire (chiffre trop grand/petit)
-    randomUnitIndex - 2 < 0 ? 0 : randomUnitIndex - 2, randomUnitIndex + 2 > 7 ? 7 : randomUnitIndex + 3, [randomUnitIndex]);
+    randomUnitIndex - 2 < 0 ? 0 : randomUnitIndex - 2, randomUnitIndex + 2 > 7 ? 7 : randomUnitIndex + 2, [randomUnitIndex]);
     const randomVolume = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
-    const answer = (randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ',');
+    const answer = (randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + "").replace(".", ",");
     const question = {
-        instruction: `$${randomVolume.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        instruction: `Compléter : $${randomVolume.value
+            .toString()
+            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}}^3 = \\ldots \\textrm{${units[randomUnitInstructionIndex]}}^3$`,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, randomUnitIndex, randomUnitInstructionIndex, randomVolume: randomVolume.value },
+        answerFormat: "tex",
+        identifiers: {
+            randomUnitIndex,
+            randomUnitInstructionIndex,
+            randomVolume: randomVolume.value,
+        },
     };
     return question;
 };
@@ -28,20 +34,27 @@ const getPropositions = (n, { answer, randomUnitIndex, randomUnitInstructionInde
     (0, exercise_1.addValidProp)(propositions, answer);
     const volumeDecimal = new decimal_1.Decimal(randomVolume);
     while (propositions.length < n) {
-        const wrongAnswer = volumeDecimal.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        const wrongAnswer = volumeDecimal
+            .multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex]))
+            .value.toString()
+            .replace(".", ",");
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.volumeConversion = {
-    id: 'volumeConversion',
-    connector: '=',
-    label: 'Conversion de volumes',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
+    id: "volumeConversion",
+    connector: "=",
+    label: "Conversion de volumes",
+    levels: ["6ème", "5ème", "CAP", "2ndPro"],
+    sections: ["Conversions"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeConversion, nb),
     getPropositions,
+    isAnswerValid,
     qcmTimer: 60,
     freeTimer: 60,
 };

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

@@ -1,11 +1,10 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise, QCMGenerator, QuestionGenerator, VEA } from "../../../exercises/exercise";
+type Identifiers = {
     tex: string;
 };
-type VEAProps = {};
-export declare const getConstanteDerivative: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getConstanteDerivativePropositions: QCMGenerator<QCMProps>;
-export declare const constanteDerivative: MathExercise<QCMProps, VEAProps>;
+export declare const getConstanteDerivative: QuestionGenerator<Identifiers>;
+export declare const getConstanteDerivativePropositions: QCMGenerator<Identifiers>;
+export declare const isConstanteDerivativeAnswerValid: VEA<Identifiers>;
+export declare const constanteDerivative: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=constanteDerivative.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constanteDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/constanteDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAEnB,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAcxE,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,QAAQ,CAgBrE,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}
+{"version":3,"file":"constanteDerivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/constanteDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAIJ,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,WAAW,CAcjE,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,WAAW,CAmBxE,CAAC;AACF,eAAO,MAAM,gCAAgC,EAAE,GAAG,CAAC,WAAW,CAE7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAYzD,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.constanteDerivative = exports.getConstanteDerivativePropositions = exports.getConstanteDerivative = void 0;
+exports.constanteDerivative = exports.isConstanteDerivativeAnswerValid = exports.getConstanteDerivativePropositions = exports.getConstanteDerivative = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const nombre_1 = require("../../../math/numbers/nombre");
@@ -8,14 +8,14 @@ const randint_1 = require("../../../math/utils/random/randint");
 const getConstanteDerivative = () => {
     const c = nombre_1.NombreConstructor.random();
     const tex = c.toTree().toTex();
-    const answer = '0';
+    const answer = "0";
     const question = {
         instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${tex}$.`,
         startStatement: `f'(x)`,
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, tex },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { tex },
     };
     return question;
 };
@@ -24,26 +24,31 @@ const getConstanteDerivativePropositions = (n, { answer, tex }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     (0, exercise_1.tryToAddWrongProp)(propositions, tex);
-    (0, exercise_1.tryToAddWrongProp)(propositions, '1');
-    const opposite = tex[0] === '-' ? tex.slice(1) : '-' + tex;
+    (0, exercise_1.tryToAddWrongProp)(propositions, "1");
+    const opposite = tex[0] === "-" ? tex.slice(1) : "-" + tex;
     (0, exercise_1.tryToAddWrongProp)(propositions, `${opposite}`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, 'x');
+    (0, exercise_1.tryToAddWrongProp)(propositions, "x");
     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.getConstanteDerivativePropositions = getConstanteDerivativePropositions;
+const isConstanteDerivativeAnswerValid = (ans, {}) => {
+    return ans === "0";
+};
+exports.isConstanteDerivativeAnswerValid = isConstanteDerivativeAnswerValid;
 exports.constanteDerivative = {
-    id: 'constanteDerivative',
-    connector: '=',
+    id: "constanteDerivative",
+    connector: "=",
     label: "Dérivée d'une constante",
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', '1rePro'],
-    sections: ['Dérivation'],
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "1rePro"],
+    sections: ["Dérivation"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getConstanteDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions: exports.getConstanteDerivativePropositions,
+    isAnswerValid: exports.isConstanteDerivativeAnswerValid,
 };

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

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

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeOne.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;AAyCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"expDerivativeOne.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeOne.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;AAqDF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}

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

@@ -9,21 +9,20 @@ const randint_1 = require("../../../math/utils/random/randint");
 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 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 affine = new polynomial_1.Polynomial([b, a]);
     const myfunction = new expNode_1.ExpNode(affine.toTree());
-    const derivative = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), myfunction));
+    const derivative = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), myfunction);
     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;
 };
@@ -33,22 +32,30 @@ const getPropositions = (n, { answer, a, b }) => {
     const affine = new affine_1.Affine(a, b);
     const myfunction = new expNode_1.ExpNode(affine.toTree());
     (0, exercise_1.tryToAddWrongProp)(propositions, myfunction.toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(affine.toTree(), myfunction)).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.toTree(), myfunction).toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(new numberNode_1.NumberNode(a)).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(b), myfunction)).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(b), myfunction).toTex());
     while (propositions.length < n)
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10)), myfunction)).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10)), myfunction).toTex());
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const affine = new polynomial_1.Polynomial([b, a]);
+    const myfunction = new expNode_1.ExpNode(affine.toTree());
+    const derivative = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), myfunction);
+    const texs = derivative.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.expDerivativeOne = {
-    id: 'expDerivativeOne',
-    connector: '=',
-    label: 'Dérivée de $\\exp(ax + b)$',
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', 'TermSpé'],
-    sections: ['Dérivation', 'Exponentielle'],
+    id: "expDerivativeOne",
+    connector: "=",
+    label: "Dérivée de $\\exp(ax + b)$",
+    levels: ["1reESM", "1reSpé", "1reTech", "MathComp", "TermSpé"],
+    sections: ["Dérivation", "Exponentielle"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpDerivative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

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

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeThree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,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;AAyCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}
+{"version":3,"file":"expDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/expDerivativeThree.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;AAmEF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAYxD,CAAC"}

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,
 };