math-exercises 1.4.18 → 2.0.0

package/lib/exercises/powers/calculatePower.js

@@ -1,80 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCalculatePowerQuestion = exports.calculatePower = void 0;
+exports.calculatePower = 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 powerNode_1 = require("../../tree/nodes/operators/powerNode");
-const uuid_1 = require("uuid");
-exports.calculatePower = {
-    id: 'calculatePower',
-    connector: '=',
-    instruction: '',
-    label: 'Calculer une puissance',
-    levels: ['4ème', '3ème', '2ndPro', '2nde', 'CAP'],
-    isSingleStep: true,
-    sections: ['Puissances'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCalculatePowerQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getCalculatePowerQuestion() {
+const getCalculatePowerQuestion = () => {
     const int = (0, randint_1.randint)(-10, 11);
     const power = (0, randint_1.randint)(0, 6);
     const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
     const answer = int ** power + '';
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(res, int * power + '');
-        if (int < 0)
-            (0, exercise_1.tryToAddWrongProp)(res, -(int ** power) + '');
-        if (int === 0) {
-            (0, exercise_1.tryToAddWrongProp)(res, power + '');
-            (0, exercise_1.tryToAddWrongProp)(res, '1');
-            (0, exercise_1.tryToAddWrongProp)(res, -power + '');
-            (0, exercise_1.tryToAddWrongProp)(res, '-1');
-            (0, exercise_1.tryToAddWrongProp)(res, '2');
-        }
-        if (int === 1 || int === -1) {
-            (0, exercise_1.tryToAddWrongProp)(res, power + '');
-            (0, exercise_1.tryToAddWrongProp)(res, '0');
-            (0, exercise_1.tryToAddWrongProp)(res, '1');
-            (0, exercise_1.tryToAddWrongProp)(res, '-1');
-            (0, exercise_1.tryToAddWrongProp)(res, '2');
-            (0, exercise_1.tryToAddWrongProp)(res, -power + '');
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = int ** (0, randint_1.randint)(0, 6, [power]) + '';
-                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 = {
         answer,
         instruction: `Calculer : $${statement}$`,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, int, power },
     };
     return question;
-}
-exports.getCalculatePowerQuestion = getCalculatePowerQuestion;
+};
+const getPropositions = (n, { answer, int, power }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + '');
+    if (int < 0)
+        (0, exercise_1.tryToAddWrongProp)(propositions, -(int ** power) + '');
+    if (int === 0) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, power + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
+        (0, exercise_1.tryToAddWrongProp)(propositions, -power + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '-1');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '2');
+    }
+    if (int === 1 || int === -1) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, power + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '0');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '-1');
+        (0, exercise_1.tryToAddWrongProp)(propositions, '2');
+        (0, exercise_1.tryToAddWrongProp)(propositions, -power + '');
+    }
+    while (propositions.length < n) {
+        const wrongAnswer = int ** (0, randint_1.randint)(0, 6, [power]) + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.calculatePower = {
+    id: 'calculatePower',
+    connector: '=',
+    label: 'Calculer une puissance',
+    levels: ['4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    isSingleStep: true,
+    sections: ['Puissances'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCalculatePowerQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

@@ -1,4 +1,9 @@
-import { MathExercise, Question } from '../exercise';
-export declare const decimalToScientific: MathExercise;
-export declare function getDecimalToScientificQuestion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    decimal: number;
+};
+type VEAProps = {};
+export declare const decimalToScientific: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=decimalToScientific.d.ts.map

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

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

package/lib/exercises/powers/decimalToScientific.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDecimalToScientificQuestion = exports.decimalToScientific = void 0;
+exports.decimalToScientific = void 0;
 const decimal_1 = require("../../math/numbers/decimals/decimal");
 const integer_1 = require("../../math/numbers/integer/integer");
 const randint_1 = require("../../math/utils/random/randint");
@@ -10,11 +10,41 @@ const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const probaFlip_1 = require("../../utils/probaFlip");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
+const getDecimalToScientificQuestion = () => {
+    const isZero = (0, probaFlip_1.probaFlip)(0.2);
+    let intPart, dec;
+    if (isZero) {
+        dec = decimal_1.DecimalConstructor.fromParts('0', decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(2, 5), (0, randint_1.randint)(1, 4)));
+    }
+    else {
+        intPart = integer_1.IntegerConstructor.random((0, randint_1.randint)(2, 5));
+        dec = decimal_1.DecimalConstructor.fromParts(intPart.toString(), decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(1, 5)));
+    }
+    const decTex = dec.toTree().toTex();
+    const answer = dec.toScientificNotation().toTex();
+    const question = {
+        instruction: `Donner l'écriture scientifique de : $${decTex}$`,
+        startStatement: decTex,
+        answer: answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, decimal: dec.value },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, decimal }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const dec = new decimal_1.Decimal(decimal);
+    while (propositions.length < n) {
+        const wrongAnswer = new multiplyNode_1.MultiplyNode(dec.toScientificPart(), new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode((0, randint_1.randint)(-5, 5, [0, 1])))).toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
 exports.decimalToScientific = {
     id: 'decimalToScientific',
     connector: '=',
-    instruction: '',
     label: "Passer d'écriture décimale à écriture scientifique",
     levels: [
         '5ème',
@@ -32,58 +62,8 @@ exports.decimalToScientific = {
     ],
     sections: ['Puissances'],
     isSingleStep: true,
-    keys: [],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDecimalToScientificQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getDecimalToScientificQuestion() {
-    const isZero = (0, probaFlip_1.probaFlip)(0.2);
-    let intPart, dec;
-    if (isZero) {
-        dec = decimal_1.DecimalConstructor.fromParts('0', decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(2, 5), (0, randint_1.randint)(1, 4)));
-    }
-    else {
-        intPart = integer_1.IntegerConstructor.random((0, randint_1.randint)(2, 5));
-        dec = decimal_1.DecimalConstructor.fromParts(intPart.toString(), decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(1, 5)));
-    }
-    const decTex = dec.toTree().toTex();
-    const answer = dec.toScientificNotation().toTex();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new multiplyNode_1.MultiplyNode(dec.toScientificPart(), new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode((0, randint_1.randint)(-5, 5, [0, 1])))).toTex();
-                // const wrongAnswer = randint(-100, 100) + '';
-                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 scientifique de : $${decTex}$`,
-        startStatement: decTex,
-        answer: answer,
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getDecimalToScientificQuestion = getDecimalToScientificQuestion;

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

@@ -1,4 +1,10 @@
-import { MathExercise, Question } from '../../exercises/exercise';
-export declare const powerDefinition: MathExercise;
-export declare function getPowerDefinitionQuestion(): Question;
+import { MathExercise } from '../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    int: number;
+    power: number;
+};
+type VEAProps = {};
+export declare const powerDefinition: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=powerDefinition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"powerDefinition.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powerDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,0BAA0B,CAAC;AAOhH,eAAO,MAAM,eAAe,EAAE,YAW7B,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,QAAQ,CAqDrD"}
+{"version":3,"file":"powerDefinition.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powerDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}

package/lib/exercises/powers/powerDefinition.js

@@ -1,25 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPowerDefinitionQuestion = exports.powerDefinition = void 0;
+exports.powerDefinition = 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 powerNode_1 = require("../../tree/nodes/operators/powerNode");
-const uuid_1 = require("uuid");
-exports.powerDefinition = {
-    id: 'powerDefinition',
-    connector: '=',
-    instruction: '',
-    label: 'Écrire un produit sous forme de puissance',
-    levels: ['4ème', '3ème', '2ndPro', 'CAP'],
-    isSingleStep: true,
-    sections: ['Puissances'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowerDefinitionQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getPowerDefinitionQuestion() {
+const getPowerDefinitionQuestion = () => {
     const int = (0, randint_1.randint)(2, 11);
     const power = (0, randint_1.randint)(2, 6);
     let statement = '';
@@ -29,41 +16,35 @@ function getPowerDefinitionQuestion() {
             statement += '\\times';
     }
     const answer = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(res, `${power}\\times${int}`);
-        (0, exercise_1.tryToAddWrongProp)(res, `${int}\\times${power}`);
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode((0, randint_1.randint)(2, 7))).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 = {
         answer,
         instruction: `Écrire sous forme de puissance : $${statement}$`,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, int, power },
     };
     return question;
-}
-exports.getPowerDefinitionQuestion = getPowerDefinitionQuestion;
+};
+const getPropositions = (n, { answer, int, power }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${power}\\times${int}`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${int}\\times${power}`);
+    while (propositions.length < n) {
+        const wrongAnswer = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode((0, randint_1.randint)(2, 7))).toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.powerDefinition = {
+    id: 'powerDefinition',
+    connector: '=',
+    label: 'Écrire un produit sous forme de puissance',
+    levels: ['4ème', '3ème', '2ndPro', 'CAP'],
+    isSingleStep: true,
+    sections: ['Puissances'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowerDefinitionQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"powersDivision.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersDivision.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAW5B,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,YAYjC,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,kBAAkB,GAAE,OAAe,GAAG,QAAQ,CAsDvF"}
+{"version":3,"file":"powersDivision.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersDivision.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,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;AAqCnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}

package/lib/exercises/powers/powersDivision.js

@@ -3,80 +3,63 @@
  * a^b/a^c
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPowersDivisionQuestion = exports.powersOfTenDivision = exports.powersDivision = void 0;
+exports.powersOfTenDivision = exports.powersDivision = 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 fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 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 getPowersDivisionQuestion = (opts) => {
+    let 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 fractionNode_1.FractionNode(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 question = {
+        instruction: `Calculer : $${statement.toTex()}$`,
+        startStatement: statement.toTex(),
+        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 wrongPower = b - c + (0, randint_1.randint)(-5, 6, [0, c - b]);
+        const wrongAnswerTree = new power_1.Power(a === 1 || a === -1 ? (0, randint_1.randint)(-3, 4, [-1, 1]) : a, wrongPower).simplify(); // pour éviter les 1 1 -1 1 dans propositions
+        const wrongAnswer = wrongAnswerTree.toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.powersDivision = {
     id: 'powersDivision',
     connector: '=',
-    instruction: '',
     label: 'Division de puissances',
     levels: ['4ème', '3ème', '2nde', '2ndPro', '1reESM', '1rePro', '1reSpé', '1reTech', 'TermPro', 'TermTech'],
     sections: ['Puissances'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersDivisionQuestion, nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersDivisionQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
 exports.powersOfTenDivision = {
     id: 'powersOfTenDivision',
     connector: '=',
-    instruction: 'Calculer :',
     label: 'Division de puissances de 10',
     levels: ['4ème', '3ème', '2nde'],
     sections: ['Puissances'],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersDivisionQuestion(true), nb),
-    keys: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersDivisionQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getPowersDivisionQuestion(useOnlyPowersOfTen = false) {
-    let 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 fractionNode_1.FractionNode(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 wrongPower = b - c + (0, randint_1.randint)(-5, 6, [0, c - b]);
-                const wrongAnswerTree = new power_1.Power(a === 1 || a === -1 ? (0, randint_1.randint)(-3, 4, [-1, 1]) : a, wrongPower).simplify(); // pour éviter les 1 1 -1 1 dans propositions
-                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.getPowersDivisionQuestion = getPowersDivisionQuestion;

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

@@ -1,7 +1,12 @@
 /**
  * 10^(-x) into 0,0...1
  */
-import { MathExercise, Question } from '../exercise';
-export declare const powersOfTenToDecimal: MathExercise;
-export declare function getPowersOfTenToDecimalQuestion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    randPower: number;
+};
+type VEAProps = {};
+export declare const powersOfTenToDecimal: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=powersOfTenToDecimal.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"powersOfTenToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersOfTenToDecimal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,oBAAoB,EAAE,YA0BlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CAkD1D"}
+{"version":3,"file":"powersOfTenToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersOfTenToDecimal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAyBjE,CAAC"}

package/lib/exercises/powers/powersOfTenToDecimal.js

@@ -3,18 +3,44 @@
  * 10^(-x) into 0,0...1
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPowersOfTenToDecimalQuestion = exports.powersOfTenToDecimal = void 0;
+exports.powersOfTenToDecimal = 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 shuffle_1 = require("../../utils/shuffle");
+const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
+const getPowersOfTenToDecimalQuestion = () => {
+    const randPower = (0, randint_1.randint)(-9, 10);
+    const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(randPower));
+    const answerTree = new power_1.Power(10, randPower).toDecimalWriting().toTree();
+    const answer = answerTree.toTex().replace('.', ',');
+    const statementTex = statement.toTex();
+    const question = {
+        instruction: `Donner l'écriture décimale de : $${statementTex}$`,
+        startStatement: statementTex,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randPower },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, randPower }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongPower = randPower + (0, randint_1.randint)(-3, 4, [0]);
+        const wrongAnswerTree = new power_1.Power(10, wrongPower).toDecimalWriting().toTree();
+        const wrongAnswer = wrongAnswerTree.toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.powersOfTenToDecimal = {
     id: 'powersOfTenToDecimal',
     connector: '=',
-    instruction: '',
     label: "Ecriture décimale d'une puissance de 10",
     levels: [
         '5ème',
@@ -33,50 +59,8 @@ exports.powersOfTenToDecimal = {
     sections: ['Puissances'],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersOfTenToDecimalQuestion, nb, 19),
-    keys: [],
     qcmTimer: 60,
     freeTimer: 60,
     maxAllowedQuestions: 19,
+    getPropositions,
 };
-function getPowersOfTenToDecimalQuestion() {
-    const randPower = (0, randint_1.randint)(-9, 10);
-    const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(randPower));
-    const answerTree = new power_1.Power(10, randPower).toDecimalWriting().toTree();
-    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 wrongPower = randPower + (0, randint_1.randint)(-3, 4, [0]);
-                const wrongAnswerTree = new power_1.Power(10, wrongPower).toDecimalWriting().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, shuffle_1.shuffle)(res);
-    };
-    const question = {
-        instruction: `Donner l'écriture décimale de : $${statement.toTex()}$`,
-        startStatement: statement.toTex(),
-        answer: answerTree.toTex().replace('.', ','),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getPowersOfTenToDecimalQuestion = getPowersOfTenToDecimalQuestion;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"powersPower.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersPower.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAInG,eAAO,MAAM,gBAAgB,EAAE,YAW9B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,kBAAkB,GAAE,OAAe,GAAG,QAAQ,CA4DpF"}
+{"version":3,"file":"powersPower.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersPower.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,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;AA4CnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}