math-exercises 1.4.18 → 2.0.1

package/lib/exercises/conversion/massConversion.js

@@ -1,61 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMassConversion = exports.massConversion = void 0;
+exports.massConversion = void 0;
 const decimal_1 = require("../../math/numbers/decimals/decimal");
 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 uuid_1 = require("uuid");
+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 question = {
+        instruction: `$${randomMass.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randomMass: randomMass.value, randomUnitIndex, randomUnitInstructionIndex },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, randomMass, randomUnitIndex, randomUnitInstructionIndex }) => {
+    const propositions = [];
+    (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 + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.massConversion = {
     id: 'massConversion',
     connector: '=',
-    instruction: '',
     label: 'Conversion de masses',
     levels: ['6ème', '5ème', 'CAP', '2ndPro'],
     sections: ['Conversions'],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMassConversion, nb),
-    keys: [],
+    getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
 };
-function 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 getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = randomMass.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
-    const question = {
-        instruction: `$${randomMass.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: (randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ','),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getMassConversion = getMassConversion;

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

@@ -1,4 +1,8 @@
-import { MathExercise, Question } from '../exercise';
-export declare const volumeCapacityConversion: MathExercise;
-export declare function getVolumeCapacityConversion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+};
+type VEAProps = {};
+export declare const volumeCapacityConversion: MathExercise<QCMProps, VEAProps>;
+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,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,wBAAwB,EAAE,YAYtC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAmEtD"}
+{"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"}

package/lib/exercises/conversion/volumeCapacityConversion.js

@@ -1,26 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVolumeCapacityConversion = exports.volumeCapacityConversion = void 0;
+exports.volumeCapacityConversion = void 0;
 const decimal_1 = require("../../math/numbers/decimals/decimal");
 const randint_1 = require("../../math/utils/random/randint");
 const coinFlip_1 = require("../../utils/coinFlip");
 const shuffle_1 = require("../../utils/shuffle");
+const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
-exports.volumeCapacityConversion = {
-    id: 'volumeCapacityConversion',
-    connector: '=',
-    instruction: '',
-    label: "Conversion d'un volume vers une contenance et vice versa",
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
-    isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeCapacityConversion, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getVolumeCapacityConversion() {
+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);
@@ -41,38 +28,35 @@ function getVolumeCapacityConversion() {
         AsnwerUnit = volumeUnits[randomUnitInstructionIndex];
         answer = random.multiplyByPowerOfTen(randomUnitIndex - 3 + 3 * (2 - randomUnitInstructionIndex));
     }
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer.value + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = answer.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [0]));
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.value + '',
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
+    const answerTex = (answer.value + '').replace('.', ',');
     const question = {
         instruction: `$${random.value}$ $${instructionUnit}$ = ... $${AsnwerUnit}$`,
-        answer: (answer.value + '').replace('.', ','),
+        answer: answerTex,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer: answerTex },
     };
     return question;
-}
-exports.getVolumeCapacityConversion = getVolumeCapacityConversion;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    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 + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.volumeCapacityConversion = {
+    id: 'volumeCapacityConversion',
+    connector: '=',
+    getPropositions,
+    label: "Conversion d'un volume vers une contenance et vice versa",
+    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
+    sections: ['Conversions'],
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeCapacityConversion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+};

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../exercise';
-export declare const volumeConversion: MathExercise;
-export declare function getVolumeConversion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    randomUnitIndex: number;
+    randomUnitInstructionIndex: number;
+    randomVolume: number;
+};
+type VEAProps = {};
+export declare const volumeConversion: MathExercise<QCMProps, VEAProps>;
+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,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAyD9C"}
+{"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"}

package/lib/exercises/conversion/volumeConversion.js

@@ -1,63 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVolumeConversion = exports.volumeConversion = void 0;
+exports.volumeConversion = void 0;
 const decimal_1 = require("../../math/numbers/decimals/decimal");
 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 uuid_1 = require("uuid");
-exports.volumeConversion = {
-    id: 'volumeConversion',
-    connector: '=',
-    instruction: '',
-    label: 'Conversion de volumes',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
-    isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeConversion, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getVolumeConversion() {
+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]);
     const randomVolume = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = randomVolume.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
+    const answer = (randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ',');
     const question = {
         instruction: `$${randomVolume.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: (randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ','),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randomUnitIndex, randomUnitInstructionIndex, randomVolume: randomVolume.value },
     };
     return question;
-}
-exports.getVolumeConversion = getVolumeConversion;
+};
+const getPropositions = (n, { answer, randomUnitIndex, randomUnitInstructionIndex, randomVolume }) => {
+    const propositions = [];
+    (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 + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.volumeConversion = {
+    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,
+    qcmTimer: 60,
+    freeTimer: 60,
+};

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const constanteDerivative: MathExercise;
-export declare function getConstanteDerivative(): Question;
+import { MathExercise, QCMGenerator, QuestionGenerator } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    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 {};
 //# 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,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAQhH,eAAO,MAAM,mBAAmB,EAAE,YAYjC,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CAoDjD"}
+{"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"}

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

@@ -1,66 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConstanteDerivative = exports.constanteDerivative = void 0;
+exports.constanteDerivative = 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");
 const randint_1 = require("../../../math/utils/random/randint");
-const oppositeNode_1 = require("../../../tree/nodes/functions/oppositeNode");
-const uuid_1 = require("uuid");
-exports.constanteDerivative = {
-    id: 'constanteDerivative',
-    connector: '=',
-    instruction: '',
-    label: "Dérivée d'une constante",
-    levels: ['1reESM', '1reSpé', '1reTech', 'MathComp', '1rePro'],
-    sections: ['Dérivation'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getConstanteDerivative, nb),
-    keys: ['x'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getConstanteDerivative() {
+const getConstanteDerivative = () => {
     const c = nombre_1.NombreConstructor.random();
     const tex = c.toTree().toTex();
-    const getPropositions = (n) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: 0 + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(propositions, tex + '');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, new oppositeNode_1.OppositeNode(c.toTree()).toTex());
-        (0, exercise_1.tryToAddWrongProp)(propositions, 'x');
-        const missing = n - propositions.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, randint_1.randint)(-9, 10);
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: wrongAnswer + '',
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            propositions.push(proposition);
-        }
-        return (0, exercise_1.shuffleProps)(propositions, n);
-    };
+    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: '0',
+        answer,
         keys: ['x'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, tex },
     };
     return question;
-}
+};
 exports.getConstanteDerivative = getConstanteDerivative;
+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, `${opposite}`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, 'x');
+    while (propositions.length < n) {
+        const wrongAnswer = (0, randint_1.randint)(-9, 10);
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer + '');
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.getConstanteDerivativePropositions = getConstanteDerivativePropositions;
+exports.constanteDerivative = {
+    id: 'constanteDerivative',
+    connector: '=',
+    label: "Dérivée d'une constante",
+    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,
+};

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

@@ -1,4 +1,10 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const expDerivativeOne: MathExercise;
-export declare function getExpDerivative(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+};
+type VEAProps = {};
+export declare const expDerivativeOne: MathExercise<QCMProps, VEAProps>;
+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,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAWhH,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,gBAAgB,IAAI,QAAQ,CAwC3C"}
+{"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"}

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

@@ -1,58 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpDerivative = exports.expDerivativeOne = void 0;
+exports.expDerivativeOne = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../math/polynomials/affine");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 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 uuid_1 = require("uuid");
-exports.expDerivativeOne = {
-    id: 'expDerivativeOne',
-    connector: '=',
-    instruction: '',
-    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),
-    keys: ['x', 'epower', 'exp'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getExpDerivative() {
+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 getPropositions = (numOptions) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: derivative.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (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 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());
-        while (propositions.length < numOptions)
-            (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());
-        return (0, exercise_1.shuffleProps)(propositions, numOptions);
-    };
+    const answer = derivative.toTex();
     const question = {
         instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()}$.`,
         startStatement: "f'(x)",
-        answer: derivative.toTex(),
+        answer,
         keys: ['x', 'epower', 'exp'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a, b },
     };
     return question;
-}
-exports.getExpDerivative = getExpDerivative;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    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 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());
+    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());
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.expDerivativeOne = {
+    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,
+};

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

@@ -1,4 +1,10 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const expDerivativeThree: MathExercise;
-export declare function getExpDerivativeThree(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+};
+type VEAProps = {};
+export declare const expDerivativeThree: MathExercise<QCMProps, VEAProps>;
+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,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAYhH,eAAO,MAAM,kBAAkB,EAAE,YAYhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CA8ChD"}
+{"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"}