math-exercises 1.4.18 → 2.0.1

package/lib/exercises/powers/powersPower.js

@@ -3,87 +3,69 @@
  * (a^b)^c
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPowersPowerQuestion = exports.powersPower = exports.powersOfTenPower = void 0;
+exports.powersPower = exports.powersOfTenPower = void 0;
 const power_1 = require("../../math/numbers/integer/power");
 const randint_1 = require("../../math/utils/random/randint");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
+const getPowersPowerQuestion = (opts) => {
+    const a = opts?.useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0, 1]);
+    const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
+    const statement = new powerNode_1.PowerNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c));
+    let answerTree = new power_1.Power(a, b * c).simplify();
+    const answer = answerTree.toTex();
+    const statementTex = statement.toTex();
+    const question = {
+        instruction: `Calculer : $${statementTex}$`,
+        startStatement: statementTex,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a, b, c },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b, c }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    if (a === 1 || a === 0 || a === -1) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '-1');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '0');
+        (0, exercise_1.tryToAddWrongProp)(propositions, b * c + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, b + c + '');
+    }
+    while (propositions.length < n) {
+        const wrongExponent = b * c + (0, randint_1.randint)(-11, 11, [0]);
+        const wrongAnswerTree = new power_1.Power(a, wrongExponent).simplify();
+        const wrongAnswer = wrongAnswerTree.toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
 exports.powersOfTenPower = {
     id: 'powersOfTenPower',
     connector: '=',
-    instruction: '',
     label: "Puissance d'une puissance de 10 ",
     levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1reESM', '1rePro', '1reSpé', '1reTech', 'TermPro', 'TermTech'],
     sections: ['Puissances'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersPowerQuestion(true), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersPowerQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 exports.powersPower = {
     id: 'powersPower',
     connector: '=',
-    instruction: '',
     label: "Puissance d'une puissance",
     levels: ['4ème', '3ème', '2nde'],
     sections: ['Puissances'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersPowerQuestion, nb),
-    keys: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersPowerQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getPowersPowerQuestion(useOnlyPowersOfTen = false) {
-    const a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0, 1]);
-    const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
-    const statement = new powerNode_1.PowerNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c));
-    let answerTree = new power_1.Power(a, b * c).simplify();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        if (a === 1 || a === 0 || a === -1) {
-            (0, exercise_1.tryToAddWrongProp)(res, '1');
-            (0, exercise_1.tryToAddWrongProp)(res, '-1');
-            (0, exercise_1.tryToAddWrongProp)(res, '0');
-            (0, exercise_1.tryToAddWrongProp)(res, b * c + '');
-            (0, exercise_1.tryToAddWrongProp)(res, b + c + '');
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongExponent = b * c + (0, randint_1.randint)(-11, 11, [0]);
-                const wrongAnswerTree = new power_1.Power(a, wrongExponent).simplify();
-                const wrongAnswer = wrongAnswerTree.toTex();
-                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, exercise_1.shuffleProps)(res, n);
-    };
-    const question = {
-        instruction: `Calculer : $${statement.toTex()}$`,
-        startStatement: statement.toTex(),
-        answer: answerTree.toTex(),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getPowersPowerQuestion = getPowersPowerQuestion;

package/lib/exercises/powers/powersProduct.d.ts

@@ -1,8 +1,15 @@
 /**
  * a^b*a^c
  */
-import { MathExercise, Question } from '../exercise';
-export declare const powersOfTenProduct: MathExercise;
-export declare const powersProduct: MathExercise;
-export declare function getPowersProductQuestion(useOnlyPowersOfTen?: boolean): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+    c: number;
+};
+type VEAProps = {};
+export declare const powersOfTenProduct: MathExercise<QCMProps, VEAProps>;
+export declare const powersProduct: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=powersProduct.d.ts.map

package/lib/exercises/powers/powersProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersProduct.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersProduct.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,kBAAkB,EAAE,YAWhC,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,kBAAkB,GAAE,OAAe,GAAG,QAAQ,CAuDtF"}
+{"version":3,"file":"powersProduct.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersProduct.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}

package/lib/exercises/powers/powersProduct.js

@@ -3,80 +3,64 @@
  * a^b*a^c
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPowersProductQuestion = exports.powersProduct = exports.powersOfTenProduct = void 0;
+exports.powersProduct = exports.powersOfTenProduct = void 0;
 const power_1 = require("../../math/numbers/integer/power");
 const randint_1 = require("../../math/utils/random/randint");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../utils/shuffle");
+const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
+const getPowersProductQuestion = (opts) => {
+    const a = opts?.useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0]);
+    const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
+    const statement = new multiplyNode_1.MultiplyNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(c)));
+    const answerTree = new power_1.Power(a, b + c).simplify();
+    const answer = answerTree.toTex();
+    const statmentTex = statement.toTex();
+    const question = {
+        instruction: `Calculer : $${statmentTex}$`,
+        startStatement: statmentTex,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a, b, c },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b, c }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongExponent = b + c + (0, randint_1.randint)(-11, 11, [0, -b - c]);
+        const wrongAnswerTree = new power_1.Power(a === 1 || a === -1 ? (0, randint_1.randint)(-3, 4, [-1, 1]) : a, wrongExponent).simplify();
+        const wrongAnswer = wrongAnswerTree.toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.powersOfTenProduct = {
     id: 'powersOfTenProduct',
     connector: '=',
-    instruction: '',
     label: 'Multiplication de puissances de 10',
     levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1reESM', '1rePro', '1reSpé', '1reTech', 'TermPro', 'TermTech'],
     sections: ['Puissances'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersProductQuestion(true), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersProductQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 exports.powersProduct = {
     id: 'powersProduct',
     connector: '=',
-    instruction: '',
     label: 'Multiplication de puissances',
     levels: ['4ème', '3ème', '2nde'],
     sections: ['Puissances'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersProductQuestion, nb),
-    keys: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersProductQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getPowersProductQuestion(useOnlyPowersOfTen = false) {
-    const a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0]);
-    const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
-    const statement = new multiplyNode_1.MultiplyNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(c)));
-    const answerTree = new power_1.Power(a, b + c).simplify();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongExponent = b + c + (0, randint_1.randint)(-11, 11, [0, -b - c]);
-                const wrongAnswerTree = new power_1.Power(a === 1 || a === -1 ? (0, randint_1.randint)(-3, 4, [-1, 1]) : a, wrongExponent).simplify();
-                const wrongAnswer = wrongAnswerTree.toTex();
-                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: `Calculer : $${statement.toTex()}$`,
-        startStatement: statement.toTex(),
-        answer: answerTree.toTex(),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getPowersProductQuestion = getPowersProductQuestion;

package/lib/exercises/powers/scientificToDecimal.d.ts

@@ -1,7 +1,13 @@
 /**
  * a*10^x vers décimal
  *  */
-import { MathExercise, Question } from '../exercise';
-export declare const scientificToDecimal: MathExercise;
-export declare function getScientificToDecimalQuestion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    tenPower: number;
+    decimal: number;
+};
+type VEAProps = {};
+export declare const scientificToDecimal: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=scientificToDecimal.d.ts.map

package/lib/exercises/powers/scientificToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scientificToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/scientificToDecimal.ts"],"names":[],"mappings":"AAAA;;MAEM;AASN,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,mBAAmB,EAAE,YA0BjC,CAAC;AAEF,wBAAgB,8BAA8B,IAAI,QAAQ,CAqDzD"}
+{"version":3,"file":"scientificToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/scientificToDecimal.ts"],"names":[],"mappings":"AAAA;;MAEM;AASN,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAwBhE,CAAC"}

package/lib/exercises/powers/scientificToDecimal.js

@@ -3,7 +3,7 @@
  * a*10^x vers décimal
  *  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScientificToDecimalQuestion = exports.scientificToDecimal = void 0;
+exports.scientificToDecimal = void 0;
 const decimal_1 = require("../../math/numbers/decimals/decimal");
 const randint_1 = require("../../math/utils/random/randint");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
@@ -11,11 +11,37 @@ const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
+const getScientificToDecimalQuestion = () => {
+    const decScientific = decimal_1.DecimalConstructor.randomScientific((0, randint_1.randint)(1, 4));
+    const tenPower = (0, randint_1.randint)(-5, 6, [0, 1]);
+    const answer = decScientific.multiplyByPowerOfTen(tenPower).toTree().toTex();
+    const statement = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(decScientific.value), new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(tenPower)));
+    const statementTex = statement.toTex();
+    const question = {
+        instruction: `Donner l'écriture décimale de : $${statementTex}$`,
+        startStatement: statementTex,
+        answer: answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, decimal: decScientific.value, tenPower },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, tenPower, decimal }) => {
+    const propositions = [];
+    const decScientific = new decimal_1.Decimal(decimal);
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, decScientific.multiplyByPowerOfTen(-tenPower).toTree().toTex());
+    while (propositions.length < n) {
+        const wrongAnswerTree = decScientific.multiplyByPowerOfTen((0, randint_1.randint)(-6, 6, [tenPower])).toTree();
+        const wrongAnswer = wrongAnswerTree.toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
 exports.scientificToDecimal = {
     id: 'scientificToDecimal',
     connector: '=',
-    instruction: '',
     label: "Passer d'écriture scientifique à écriture décimale",
     levels: [
         '5ème',
@@ -33,52 +59,8 @@ exports.scientificToDecimal = {
     ],
     sections: ['Puissances'],
     isSingleStep: true,
-    keys: [],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getScientificToDecimalQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getScientificToDecimalQuestion() {
-    const decScientific = decimal_1.DecimalConstructor.randomScientific((0, randint_1.randint)(1, 4));
-    const tenPower = (0, randint_1.randint)(-5, 6, [0, 1]);
-    const answer = decScientific.multiplyByPowerOfTen(tenPower).toTree().toTex();
-    const statement = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(decScientific.value), new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(tenPower)));
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(res, decScientific.multiplyByPowerOfTen(-tenPower).toTree().toTex());
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswerTree = decScientific.multiplyByPowerOfTen((0, randint_1.randint)(-6, 6, [tenPower])).toTree();
-                const wrongAnswer = wrongAnswerTree.toTex();
-                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, exercise_1.shuffleProps)(res, n);
-    };
-    const question = {
-        instruction: `Donner l'écriture décimale de : $${statement.toTex()}$`,
-        startStatement: statement.toTex(),
-        answer: answer,
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getScientificToDecimalQuestion = getScientificToDecimalQuestion;

package/lib/exercises/primitve/constantPrimitive.d.ts

@@ -1,4 +1,10 @@
-import { MathExercise, Question } from '../../exercises/exercise';
-export declare const constantPrimitive: MathExercise;
-export declare function getConstantPrimitive(): Question;
+import { MathExercise, QCMGenerator, QuestionGenerator } from '../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+};
+type VEAProps = {};
+export declare const getConstantPrimitive: QuestionGenerator<QCMProps, VEAProps>;
+export declare const getConstantPrimitivePropositions: QCMGenerator<QCMProps>;
+export declare const constantPrimitive: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=constantPrimitive.d.ts.map

package/lib/exercises/primitve/constantPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constantPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/constantPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,iBAAiB,EAAE,YAY/B,CAAC;AAEF,wBAAgB,oBAAoB,IAAI,QAAQ,CA6C/C"}
+{"version":3,"file":"constantPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/constantPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAEnB,eAAO,MAAM,oBAAoB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CActE,CAAC;AACF,eAAO,MAAM,gCAAgC,EAAE,YAAY,CAAC,QAAQ,CAWnE,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}

package/lib/exercises/primitve/constantPrimitive.js

@@ -1,60 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConstantPrimitive = exports.constantPrimitive = void 0;
+exports.constantPrimitive = exports.getConstantPrimitivePropositions = exports.getConstantPrimitive = void 0;
+const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const monom_1 = require("../../math/polynomials/monom");
 const randint_1 = require("../../math/utils/random/randint");
 const shuffle_1 = require("../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.constantPrimitive = {
-    id: 'constantPrimitive',
-    connector: '=',
-    instruction: '',
-    label: "Primitive d'une constante",
-    levels: ['TermSpé', 'MathComp'],
-    sections: ['Primitives'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getConstantPrimitive, nb),
-    keys: ['x', 'C'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getConstantPrimitive() {
+const getConstantPrimitive = () => {
     const c = (0, randint_1.randint)(-19, 20, [0]);
     const monom = new monom_1.Monom(1, c);
-    const getPropositions = (n) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: `${monom.toTex()} + C`,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `${(0, randint_1.randint)(-9, 10, [-1, 0, 1])}x + C`;
-                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, shuffle_1.shuffle)(propositions);
-    };
+    const answer = `${monom.toTex()}+C`;
     const question = {
         instruction: `Déterminer la forme générale des primitives de la fonction constante $f$ définie par $f(x) = ${c}$.`,
         startStatement: `F(x)`,
-        answer: `${monom.toTex()}+C`,
+        answer,
         keys: ['x', 'C'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
+};
 exports.getConstantPrimitive = getConstantPrimitive;
+const getConstantPrimitivePropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = `${(0, randint_1.randint)(-9, 10, [-1, 0, 1])}x + C`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.getConstantPrimitivePropositions = getConstantPrimitivePropositions;
+exports.constantPrimitive = {
+    id: 'constantPrimitive',
+    connector: '=',
+    label: "Primitive d'une constante",
+    levels: ['TermSpé', 'MathComp'],
+    sections: ['Primitives'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getConstantPrimitive, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions: exports.getConstantPrimitivePropositions,
+};

package/lib/exercises/primitve/exponentialPrimitive.d.ts

@@ -1,4 +1,13 @@
-import { MathExercise, Question } from '../../exercises/exercise';
-export declare const exponentialPrimitive: MathExercise;
-export declare function getExponentialPrimitive(): Question;
+import { MathExercise, QCMGenerator, QuestionGenerator } from '../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    rand: boolean;
+    a: number;
+    coeffs: number[];
+};
+type VEAProps = {};
+export declare const getExponentialPrimitive: QuestionGenerator<QCMProps, VEAProps>;
+export declare const getExponentialPrimitivePropositions: QCMGenerator<QCMProps>;
+export declare const exponentialPrimitive: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=exponentialPrimitive.d.ts.map

package/lib/exercises/primitve/exponentialPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exponentialPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/exponentialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAiBhH,eAAO,MAAM,oBAAoB,EAAE,YAYlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAqFlD"}
+{"version":3,"file":"exponentialPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/exponentialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAIlB,MAAM,0BAA0B,CAAC;AAelC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AACnB,eAAO,MAAM,uBAAuB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CA+BzE,CAAC;AAEF,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAAC,QAAQ,CAwCtE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}