math-exercises 1.4.18 → 2.0.0

package/lib/exercises/complex/mutiplyComplex.js

@@ -1,69 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMutiplyComplexQuestion = exports.mutiplyComplex = void 0;
+exports.mutiplyComplex = void 0;
+const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const complex_1 = require("../../math/complex/complex");
 const shuffle_1 = require("../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.mutiplyComplex = {
-    id: 'mutiplyComplex',
-    connector: '=',
-    instruction: '',
-    label: 'Multiplier deux nombres complexes',
-    levels: ['MathExp'],
-    isSingleStep: true,
-    sections: ['Nombres complexes'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMutiplyComplexQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getMutiplyComplexQuestion() {
+const getMutiplyComplexQuestion = () => {
     const z1 = complex_1.ComplexConstructor.random();
     let z2;
     do {
         z2 = complex_1.ComplexConstructor.random();
     } while (z1.im === 0 && z2.im === 0);
-    const answer = z1.multiply(z2).toTree();
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer.toComplex().conjugate().toTree().toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = complex_1.ComplexConstructor.random();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.toTree().toTex(),
-                    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 = z1.multiply(z2).toTree().toTex();
     const question = {
-        answer: answer.toTex(),
+        answer,
         instruction: `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2.toTree().toTex()}$. Calculer $z\\times z'$.`,
         keys: ['i', 'z', 'quote'],
-        getPropositions,
         answerFormat: 'tex',
         startStatement: "z\\times z'",
+        qcmGeneratorProps: { answer, z1: [z1.re, z1.im], z2: [z2.re, z2.im] },
     };
     return question;
-}
-exports.getMutiplyComplexQuestion = getMutiplyComplexQuestion;
+};
+const getPropositions = (n, { answer, z1, z2 }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const prod = new complex_1.Complex(z1[0], z1[1]).multiply(new complex_1.Complex(z2[0], z2[1]));
+    (0, exercise_1.tryToAddWrongProp)(propositions, prod.conjugate().toTree().toTex());
+    while (propositions.length < n) {
+        const wrongAnswer = complex_1.ComplexConstructor.random();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTree().toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.mutiplyComplex = {
+    id: 'mutiplyComplex',
+    connector: '=',
+    label: 'Multiplier deux nombres complexes',
+    levels: ['MathExp'],
+    isSingleStep: true,
+    sections: ['Nombres complexes'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMutiplyComplexQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/complex/reAndIm.d.ts

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../../exercises/exercise';
-export declare const reAndIm: MathExercise;
-export declare function getReAndImQuestion(): Question;
+import { MathExercise } from '../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    re: number;
+    im: number;
+    isRe: boolean;
+};
+type VEAProps = {};
+export declare const reAndIm: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=reAndIm.d.ts.map

package/lib/exercises/complex/reAndIm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reAndIm.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/reAndIm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,OAAO,EAAE,YAWrB,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAmE7C"}
+{"version":3,"file":"reAndIm.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/reAndIm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYpD,CAAC"}

package/lib/exercises/complex/reAndIm.js

@@ -1,16 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReAndImQuestion = exports.reAndIm = void 0;
+exports.reAndIm = void 0;
+const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const complex_1 = require("../../math/complex/complex");
 const randint_1 = require("../../math/utils/random/randint");
 const coinFlip_1 = require("../../utils/coinFlip");
 const shuffle_1 = require("../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getReAndImQuestion = () => {
+    const z1 = complex_1.ComplexConstructor.random();
+    const isRe = (0, coinFlip_1.coinFlip)();
+    const answer = (isRe ? z1.re : z1.im) + '';
+    const question = {
+        answer,
+        instruction: `Soit $z=${z1.toTree().toTex()}$. Quelle est la partie ${isRe ? 'réelle' : 'imaginaire'} de $z$ ?`,
+        keys: ['i', 'z'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, re: z1.re, im: z1.im, isRe },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, re, im, isRe }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, im + 'i');
+    (0, exercise_1.tryToAddWrongProp)(propositions, isRe ? im.toString() : re.toString());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (-im).toString());
+    while (propositions.length < n) {
+        const wrongAnswer = (0, randint_1.randint)(-10, 11) + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.reAndIm = {
     id: 'getReAndImQuestion',
     connector: '=',
-    instruction: '',
+    getPropositions,
     label: 'Identifier partie réelle et partie imaginaire',
     levels: ['MathExp'],
     isSingleStep: true,
@@ -19,63 +44,3 @@ exports.reAndIm = {
     qcmTimer: 60,
     freeTimer: 60,
 };
-function getReAndImQuestion() {
-    const z1 = complex_1.ComplexConstructor.random();
-    const isRe = (0, coinFlip_1.coinFlip)();
-    const answer = isRe ? z1.re : z1.im;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer.toString(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: z1.im + 'i',
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (!res.some((prop) => prop.statement === (isRe ? z1.im.toString() : z1.re.toString())))
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: isRe ? z1.im.toString() : z1.re.toString(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (!res.some((prop) => prop.statement === (-z1.im).toString()))
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: (-z1.im).toString(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, randint_1.randint)(-10, 11) + '';
-                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 = {
-        answer: answer.toString(),
-        instruction: `Soit $z=${z1.toTree().toTex()}$. Quelle est la partie ${isRe ? 'réelle' : 'imaginaire'} de $z$ ?`,
-        keys: ['i', 'z'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getReAndImQuestion = getReAndImQuestion;

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../exercise';
-export declare const aeraConversion: MathExercise;
-export declare function getAeraConversion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    randomUnitIndex: number;
+    randomUnitInstructionIndex: number;
+    randomAera: number;
+};
+type VEAProps = {};
+export declare const aeraConversion: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=aeraConversion.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CA0D5C"}
+{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.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,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0CnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY3D,CAAC"}

package/lib/exercises/conversion/aeraConversion.js

@@ -1,64 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAeraConversion = exports.aeraConversion = void 0;
+exports.aeraConversion = 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.aeraConversion = {
-    id: 'aeraConversion',
-    connector: '=',
-    instruction: '',
-    label: 'Conversion des aires',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
-    isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAeraConversion, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getAeraConversion() {
+const getAeraConversion = () => {
     const units = ['mm^2', 'cm^2', 'dm^2', 'm^2', 'dam^2', 'hm^2', 'km^2'];
     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 randomAera = 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: randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = randomAera.multiplyByPowerOfTen(2 * (0, randint_1.randint)(-2, 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 = (randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ',');
     const question = {
         instruction: `$${randomAera.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: (randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ','),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randomAera: randomAera.value, randomUnitIndex, randomUnitInstructionIndex },
     };
     return question;
-}
-exports.getAeraConversion = getAeraConversion;
+};
+const getPropositions = (n, { answer, randomAera, randomUnitIndex, randomUnitInstructionIndex }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const aeraDecimal = new decimal_1.Decimal(randomAera);
+    while (propositions.length < n) {
+        const wrongAnswer = aeraDecimal.multiplyByPowerOfTen(2 * (0, randint_1.randint)(-2, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.aeraConversion = {
+    id: 'aeraConversion',
+    connector: '=',
+    getPropositions,
+    label: 'Conversion des aires',
+    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
+    sections: ['Conversions'],
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAeraConversion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+};

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../exercise';
-export declare const capacityConversion: MathExercise;
-export declare function getCapacityConversion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    randomUnitIndex: number;
+    randomUnitInstructionIndex: number;
+    randomCapacity: number;
+};
+type VEAProps = {};
+export declare const capacityConversion: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=capacityConversion.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,kBAAkB,EAAE,YAYhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAqDhD"}
+{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.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,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY/D,CAAC"}

package/lib/exercises/conversion/capacityConversion.js

@@ -1,62 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCapacityConversion = exports.capacityConversion = void 0;
+exports.capacityConversion = 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 getCapacityConversion = () => {
+    const units = ['mL', 'cL', 'dL', 'L', 'daL', 'hL', 'kL'];
+    const randomUnitIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
+    const randomCapacity = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const answer = (randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ',');
+    const question = {
+        instruction: `$${randomCapacity.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randomCapacity: randomCapacity.value, randomUnitIndex, randomUnitInstructionIndex },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, randomCapacity, randomUnitIndex, randomUnitInstructionIndex }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const capacityDecimal = new decimal_1.Decimal(randomCapacity);
+    while (propositions.length < n) {
+        const wrongAnswer = capacityDecimal.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.capacityConversion = {
     id: 'capacityConversion',
     connector: '=',
-    instruction: '',
+    getPropositions,
     label: 'Conversion de capacités',
     levels: ['6ème', '5ème', 'CAP', '2ndPro'],
     sections: ['Conversions'],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCapacityConversion, nb),
-    keys: [],
     qcmTimer: 60,
     freeTimer: 60,
 };
-function getCapacityConversion() {
-    const units = ['mL', 'cL', 'dL', 'L', 'daL', 'hL', 'kL'];
-    const randomUnitIndex = (0, randint_1.randint)(0, 7);
-    const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
-    const randomCapacity = 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: randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = randomCapacity.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: `$${randomCapacity.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: (randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ','),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getCapacityConversion = getCapacityConversion;

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../exercise';
-export declare const lengthConversion: MathExercise;
-export declare function getLengthConversion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    randomUnitIndex: number;
+    randomUnitInstructionIndex: number;
+    randomLength: number;
+};
+type VEAProps = {};
+export declare const lengthConversion: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=lengthConversion.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.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,CAoD9C"}
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.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,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

package/lib/exercises/conversion/lengthConversion.js

@@ -1,61 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLengthConversion = exports.lengthConversion = void 0;
+exports.lengthConversion = 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 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 question = {
+        instruction: `$${randomLength.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer,
+        keys: [],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, randomLength: randomLength.value, randomUnitIndex, randomUnitInstructionIndex },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, randomLength, randomUnitIndex, randomUnitInstructionIndex }) => {
+    const propositions = [];
+    (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 + '';
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.lengthConversion = {
     id: 'lengthConversion',
     connector: '=',
-    instruction: '',
     label: 'Conversion de longueurs',
     levels: ['6ème', '5ème', 'CAP', '2ndPro'],
     sections: ['Conversions'],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLengthConversion, nb),
-    keys: [],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function 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 getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: randomlength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = randomlength.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: `$${randomlength.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: (randomlength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ','),
-        keys: [],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getLengthConversion = getLengthConversion;

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../exercise';
-export declare const massConversion: MathExercise;
-export declare function getMassConversion(): Question;
+import { MathExercise } from '../exercise';
+type QCMProps = {
+    answer: string;
+    randomUnitIndex: number;
+    randomUnitInstructionIndex: number;
+    randomMass: number;
+};
+type VEAProps = {};
+export declare const massConversion: MathExercise<QCMProps, VEAProps>;
+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,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAoD5C"}
+{"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"}