math-exercises 1.4.18 → 2.0.0

package/lib/exercises/primitve/usualPrimitives.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsualPrimitives = exports.usualPrimitives = void 0;
+exports.usualPrimitives = void 0;
 const constantPrimitive_1 = require("../../exercises/primitve/constantPrimitive");
 const exponentialPrimitive_1 = require("../../exercises/primitve/exponentialPrimitive");
 const logarithmePrimitive_1 = require("../../exercises/primitve/logarithmePrimitive");
@@ -8,34 +8,68 @@ const polynomialPrimitive_1 = require("../../exercises/primitve/polynomialPrimit
 const sinCosPrimitive_1 = require("../../exercises/primitve/sinCosPrimitive");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
+const getUsualPrimitives = () => {
+    const rand = (0, randint_1.randint)(1, 6);
+    let question;
+    let qcmGeneratorProps;
+    switch (rand) {
+        case 1:
+            question = (0, constantPrimitive_1.getConstantPrimitive)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 1 };
+            break;
+        case 2:
+            question = (0, polynomialPrimitive_1.getPolynomialPrimitive)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 2 };
+            break;
+        case 3:
+            question = (0, logarithmePrimitive_1.getLogarithmePrimitive)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 3 };
+            break;
+        case 4:
+            question = (0, sinCosPrimitive_1.getSinCosPrimitive)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 4 };
+            break;
+        case 5:
+            question = (0, exponentialPrimitive_1.getExponentialPrimitive)();
+            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 5 };
+            break;
+        default:
+            throw Error('erreur');
+    }
+    return { ...question, qcmGeneratorProps };
+};
+const getPropositions = (n, { answer, type, a, degree, coeffs, rand }) => {
+    let props;
+    switch (type) {
+        case 1:
+            props = (0, constantPrimitive_1.getConstantPrimitivePropositions)(n, { answer });
+            break;
+        case 2:
+            props = (0, polynomialPrimitive_1.getPolynomialPrimitivePropositions)(n, { answer, degree: degree });
+            break;
+        case 3:
+            props = (0, logarithmePrimitive_1.getLogarithmePrimitivePropositions)(n, { answer, coeffs: coeffs });
+            break;
+        case 4:
+            props = (0, sinCosPrimitive_1.getSinCosPrimitivePropositions)(n, { a: a, answer, coeffs: coeffs, rand: rand });
+            break;
+        case 5:
+            props = (0, exponentialPrimitive_1.getExponentialPrimitivePropositions)(n, { a: a, answer, coeffs: coeffs, rand: rand });
+            break;
+        default:
+            throw Error('erreur');
+    }
+    return props;
+};
 exports.usualPrimitives = {
     id: 'usualPrimitives',
     connector: '=',
-    instruction: '',
     label: 'Primitives des fonctions de référence',
     levels: ['TermSpé', 'MathComp'],
     sections: ['Primitives'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getUsualPrimitives, nb),
-    keys: ['x'],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getUsualPrimitives() {
-    const rand = (0, randint_1.randint)(1, 6);
-    switch (rand) {
-        case 1:
-            return (0, constantPrimitive_1.getConstantPrimitive)();
-        case 2:
-            return (0, polynomialPrimitive_1.getPolynomialPrimitive)();
-        case 3:
-            return (0, logarithmePrimitive_1.getLogarithmePrimitive)();
-        case 4:
-            return (0, sinCosPrimitive_1.getSinCosPrimitive)();
-        case 5:
-            return (0, exponentialPrimitive_1.getExponentialPrimitive)();
-        default:
-            throw Error('erreur');
-    }
-}
-exports.getUsualPrimitives = getUsualPrimitives;

package/lib/exercises/probaStat/averageWithTable.d.ts

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

package/lib/exercises/probaStat/averageWithTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"averageWithTable.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/averageWithTable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAsEtD"}
+{"version":3,"file":"averageWithTable.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/averageWithTable.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0DnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

package/lib/exercises/probaStat/averageWithTable.js

@@ -1,25 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAverageWithTableQuestion = exports.averageWithTable = void 0;
+exports.averageWithTable = void 0;
 const randint_1 = require("../../math/utils/random/randint");
 const round_1 = require("../../math/utils/round");
 const shuffle_1 = require("../../utils/shuffle");
+const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-const uuid_1 = require("uuid");
-exports.averageWithTable = {
-    id: 'averageWithTable',
-    connector: '=',
-    instruction: '',
-    label: "Calcul de la moyenne d'un tableau d'effectifs",
-    levels: ['3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    isSingleStep: false,
-    sections: ['Statistiques'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAverageWithTableQuestion, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getAverageWithTableQuestion() {
+const getAverageWithTableQuestion = () => {
     const getRandomUniqueValues = (count, min, max) => {
         const uniqueValues = new Set();
         while (uniqueValues.size < count) {
@@ -35,30 +22,7 @@ function getAverageWithTableQuestion() {
         average += randomValeurs[i] * randomEffectives[i];
     average /= sumEffectives;
     average = (0, round_1.round)(average, 2);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: average + '',
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: (0, round_1.round)(average + (0, randint_1.randint)(-average, 20 - average, [0]) + (0, randint_1.randint)(1, 100) / 100, 2) + '',
-                    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 = (average + '').replace('.', ',');
     const question = {
         instruction: `On considère le tableau d'effectifs suivant : 
 
@@ -68,11 +32,31 @@ function getAverageWithTableQuestion() {
 |Effectif|${randomEffectives[0]}|${randomEffectives[1]}|${randomEffectives[2]}|${randomEffectives[3]}|${randomEffectives[4]}|
 
 Calculer la moyenne de cette série de valeurs.`,
-        answer: (average + '').replace('.', ','),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getAverageWithTableQuestion = getAverageWithTableQuestion;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const average = Number(answer.replace(',', '.'));
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(average + (0, randint_1.randint)(-average, 20 - average, [0]) + (0, randint_1.randint)(1, 100) / 100, 2) + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.averageWithTable = {
+    id: 'averageWithTable',
+    connector: '=',
+    label: "Calcul de la moyenne d'un tableau d'effectifs",
+    levels: ['3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
+    isSingleStep: false,
+    sections: ['Statistiques'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAverageWithTableQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/probaStat/ballsBasicProbas.d.ts

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

package/lib/exercises/probaStat/ballsBasicProbas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ballsBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/ballsBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAOhH,eAAO,MAAM,gBAAgB,EAAE,YAW9B,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CA0DtD"}
+{"version":3,"file":"ballsBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/ballsBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAyCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

package/lib/exercises/probaStat/ballsBasicProbas.js

@@ -1,24 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBallsBasicProbasQuestion = exports.ballsBasicProbas = void 0;
+exports.ballsBasicProbas = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../math/numbers/rationals/rational");
 const randint_1 = require("../../math/utils/random/randint");
-const uuid_1 = require("uuid");
-exports.ballsBasicProbas = {
-    id: 'ballsBasicProbas',
-    connector: '=',
-    instruction: '',
-    label: 'Calcul de probabilité simple avec des boules colorés',
-    levels: ['5ème', '4ème', '3ème', '2ndPro', '2nde', 'CAP'],
-    isSingleStep: true,
-    sections: ['Probabilités'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getBallsBasicProbasQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getBallsBasicProbasQuestion() {
+const getBallsBasicProbasQuestion = () => {
     const colors = ['rouge', 'jaune', 'verte'];
     const repartitions = [(0, randint_1.randint)(1, 4), (0, randint_1.randint)(1, 4), (0, randint_1.randint)(1, 4)];
     const total = repartitions.reduce((acc, curr) => (acc += curr), 0);
@@ -26,45 +13,39 @@ function getBallsBasicProbasQuestion() {
     const colorAsked = colors[colorAskedIndex];
     const nbColorAsked = repartitions[colorAskedIndex];
     const answer = new rational_1.Rational(nbColorAsked, total).simplify().tex;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(res, nbColorAsked + '');
-        (0, exercise_1.tryToAddWrongProp)(res, `\\frac{1}{3}`);
-        if (total === 3) {
-            (0, exercise_1.tryToAddWrongProp)(res, `3`);
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new rational_1.Rational((0, randint_1.randint)(1, total), total).simplify().tex;
-                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: `Dans un sac, il y a ${repartitions[0]} boules ${colors[0]}${repartitions[0] > 1 ? 's' : ''}, 
     ${repartitions[1]} boules ${colors[1]}${repartitions[1] > 1 ? 's' : ''} et ${repartitions[2]} boules ${colors[2]}${repartitions[2] > 1 ? 's' : ''}. Quelle est la probabilité de tirer une boule ${colorAsked} ?`,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, total, nbColorAsked },
     };
     return question;
-}
-exports.getBallsBasicProbasQuestion = getBallsBasicProbasQuestion;
+};
+const getPropositions = (n, { answer, total, nbColorAsked }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, nbColorAsked + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, `\\frac{1}{3}`);
+    if (total === 3) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `3`);
+    }
+    while (propositions.length < n) {
+        const wrongAnswer = new rational_1.Rational((0, randint_1.randint)(1, total), total).simplify().tex;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.ballsBasicProbas = {
+    id: 'ballsBasicProbas',
+    connector: '=',
+    label: 'Calcul de probabilité simple avec des boules colorés',
+    levels: ['5ème', '4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    isSingleStep: true,
+    sections: ['Probabilités'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getBallsBasicProbasQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/probaStat/cardBasicProbas.d.ts

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

package/lib/exercises/probaStat/cardBasicProbas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cardBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/cardBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAYhH,eAAO,MAAM,eAAe,EAAE,YAW7B,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,QAAQ,CA0FrD"}
+{"version":3,"file":"cardBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/cardBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0EnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}

package/lib/exercises/probaStat/cardBasicProbas.js

@@ -1,27 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCardBasicProbasQuestion = exports.cardBasicProbas = void 0;
+exports.cardBasicProbas = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../math/numbers/rationals/rational");
 const randint_1 = require("../../math/utils/random/randint");
 const probaLawFlip_1 = require("../../utils/probaLawFlip");
-const uuid_1 = require("uuid");
 const cardsData_1 = require("../utils/cardsData");
 const randomEnumValue_1 = require("../../utils/randomEnumValue");
-exports.cardBasicProbas = {
-    id: 'cardBasicProbas',
-    connector: '=',
-    instruction: '',
-    label: 'Calcul de probabilité simple avec un jeu de cartes',
-    levels: ['5ème', '4ème', '3ème', '2ndPro', '2nde', 'CAP'],
-    isSingleStep: true,
-    sections: ['Probabilités'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCardBasicProbasQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getCardBasicProbasQuestion() {
+const getCardBasicProbasQuestion = () => {
     //carte précise (as de coeur)
     //carte valeur (as)
     //car couleur (pique)
@@ -53,50 +40,44 @@ function getCardBasicProbasQuestion() {
             answer = `\\frac{1}{4}`;
             break;
     }
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        switch (questionType) {
-            case 'colorCard':
-                (0, exercise_1.tryToAddWrongProp)(res, '13');
-                break;
-            case 'oneCard':
-                (0, exercise_1.tryToAddWrongProp)(res, '1');
-                break;
-            case 'valueCard':
-                (0, exercise_1.tryToAddWrongProp)(res, '4');
-                break;
-        }
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new rational_1.Rational((0, randint_1.randint)(1, 52), 52).simplify().tex;
-                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: `On tire une carte dans un jeu de 52 cartes. Quelle est la probabilité d'obtenir ${target} ?`,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, questionType },
     };
     return question;
-}
-exports.getCardBasicProbasQuestion = getCardBasicProbasQuestion;
+};
+const getPropositions = (n, { answer, questionType }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    switch (questionType) {
+        case 'colorCard':
+            (0, exercise_1.tryToAddWrongProp)(propositions, '13');
+            break;
+        case 'oneCard':
+            (0, exercise_1.tryToAddWrongProp)(propositions, '1');
+            break;
+        case 'valueCard':
+            (0, exercise_1.tryToAddWrongProp)(propositions, '4');
+            break;
+    }
+    while (propositions.length < n) {
+        const wrongAnswer = new rational_1.Rational((0, randint_1.randint)(1, 52), 52).simplify().tex;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.cardBasicProbas = {
+    id: 'cardBasicProbas',
+    connector: '=',
+    label: 'Calcul de probabilité simple avec un jeu de cartes',
+    levels: ['5ème', '4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    isSingleStep: true,
+    sections: ['Probabilités'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCardBasicProbasQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/probaStat/conditionalProbability.d.ts

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

package/lib/exercises/probaStat/conditionalProbability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMlE,eAAO,MAAM,sBAAsB,EAAE,YAYpC,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CA+GpD"}
+{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8FnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}

package/lib/exercises/probaStat/conditionalProbability.js

@@ -1,25 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConditionalProbability = exports.conditionalProbability = void 0;
+exports.conditionalProbability = void 0;
 const randint_1 = require("../../math/utils/random/randint");
+const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const round_1 = require("../../math/utils/round");
 const shuffle_1 = require("../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.conditionalProbability = {
-    id: 'conditionalProbability',
-    connector: '=',
-    instruction: '',
-    label: 'Calcul de probabilité conditionnelle avec la formule de Bayes',
-    levels: ['1reESM', '1reSpé', '1reTech', 'TermTech', '1rePro', 'TermPro'],
-    isSingleStep: false,
-    sections: ['Probabilités'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getConditionalProbability, nb),
-    keys: ['p', 'cap', 'underscore'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getConditionalProbability() {
+const getConditionalProbability = () => {
     const pA = (0, randint_1.randint)(2, 100);
     const pB = (0, randint_1.randint)(2, 100);
     const pAB = (0, randint_1.randint)(1, Math.min(pA, pB));
@@ -67,38 +54,33 @@ function getConditionalProbability() {
             break;
         }
     }
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: Math.floor(Math.random() * 100) / 100 + '',
-                    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,
         startStatement,
         answer: answer.replace('.', ','),
         keys: ['p', 'cap', 'underscore'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getConditionalProbability = getConditionalProbability;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, Math.floor(Math.random() * 100) / 100 + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.conditionalProbability = {
+    id: 'conditionalProbability',
+    connector: '=',
+    label: 'Calcul de probabilité conditionnelle avec la formule de Bayes',
+    levels: ['1reESM', '1reSpé', '1reTech', 'TermTech', '1rePro', 'TermPro'],
+    isSingleStep: false,
+    sections: ['Probabilités'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getConditionalProbability, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/probaStat/diceBasicProbas.d.ts

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

package/lib/exercises/probaStat/diceBasicProbas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diceBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/diceBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAQhH,eAAO,MAAM,eAAe,EAAE,YAW7B,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,QAAQ,CA8DrD"}
+{"version":3,"file":"diceBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/diceBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}