math-exercises 2.0.11 → 2.0.13

package/lib/exercises/primitve/usualPrimitives.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.usualPrimitives = void 0;
+exports.getUsualPrimitives = 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,68 +8,34 @@ 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/proba/conditionalProbability.d.ts

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const conditionalProbability: Exercise;
+export declare function getConditionalProbability(): Question;
+//# sourceMappingURL=conditionalProbability.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAM9D,eAAO,MAAM,sBAAsB,EAAE,QAUpC,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CA4GpD"}

package/lib/exercises/proba/conditionalProbability.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConditionalProbability = exports.conditionalProbability = void 0;
+const randint_1 = require("../../math/utils/random/randint");
+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: ['1', '0'],
+    isSingleStep: false,
+    section: 'Probabilités',
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getConditionalProbability, nb),
+    keys: ['p', 'cap', 'underscore'],
+};
+function 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));
+    const pA_B = (0, round_1.round)(pAB / pB, 2);
+    const pB_A = (0, round_1.round)(pAB / pA, 2);
+    const flip = (0, randint_1.randint)(1, 7);
+    let instruction = `On considère deux événements A et B tels que `;
+    let startStatement = '';
+    let answer = '';
+    switch (flip) {
+        case 1: {
+            instruction += `$P(A) = ${(pA / 100 + '').replace('.', ',')}\\ $ et $\\ P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}$.$\\\\$Déterminer $P_A(B)$.`;
+            startStatement = `P_A(B)`;
+            answer = `${pB_A}`;
+            break;
+        }
+        case 2: {
+            instruction += `$P(B) = ${(pB / 100 + '').replace('.', ',')}\\ $ et $\\ P(B \\cap A) = ${(pAB / 100 + '').replace('.', ',')}$.$\\\\$Déterminer $P_B(A)$.`;
+            startStatement = `P_B(A)`;
+            answer = `${pA_B}`;
+            break;
+        }
+        case 3: {
+            instruction += `$P(A) = ${(pA / 100 + '').replace('.', ',')}\\ $ et $\\ P_A(B) = ${(pB_A + '').replace('.', ',')}$.$\\\\$Déterminer $P(A \\cap B)$.`;
+            startStatement = `P(A \\cap B)`;
+            answer = `${pAB / 100}`;
+            break;
+        }
+        case 4: {
+            instruction += `$P(B) = ${(pB / 100 + '').replace('.', ',')}\\ $ et $\\ P_B(A) = ${(pA_B + '').replace('.', ',')}$.$\\\\$Déterminer $P(A \\cap B)$.`;
+            startStatement = `P(A \\cap B)`;
+            answer = `${pAB / 100}`;
+            break;
+        }
+        case 5: {
+            instruction += `$P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}\\ $ et $\\ P_B(A) = ${(pA_B + '').replace('.', ',')}$.$\\\\$Déterminer $P(B)$.`;
+            startStatement = `P(B)`;
+            answer = `${pB / 100}`;
+            break;
+        }
+        case 6: {
+            instruction += `$P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}\\ $ et $\\ P_A(B) = ${(pB_A + '').replace('.', ',')}$.$\\\\$Déterminer $P(A)$.`;
+            startStatement = `P(A)`;
+            answer = `${pA / 100}`;
+            break;
+        }
+    }
+    const getPropositions = (n) => {
+        const res = [];
+        res.push({
+            id: (0, uuid_1.v4)() + '',
+            statement: answer,
+            isRightAnswer: true,
+        });
+        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,
+                };
+                isDuplicate = res.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            res.push(proposition);
+        }
+        return (0, shuffle_1.shuffle)(res);
+    };
+    const question = {
+        instruction,
+        startStatement,
+        answer,
+        keys: ['p', 'cap', 'underscore'],
+        getPropositions,
+    };
+    return question;
+}
+exports.getConditionalProbability = getConditionalProbability;

package/lib/exercises/proba/marginalAndConditionalFrequency.d.ts

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const marginalAndConditionalFrequency: Exercise;
+export declare function getMarginalAndConditionalFrequency(): Question;
+//# sourceMappingURL=marginalAndConditionalFrequency.d.ts.map

package/lib/exercises/proba/marginalAndConditionalFrequency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI9D,eAAO,MAAM,+BAA+B,EAAE,QAU7C,CAAC;AAEF,wBAAgB,kCAAkC,IAAI,QAAQ,CAiG7D"}

package/lib/exercises/proba/marginalAndConditionalFrequency.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMarginalAndConditionalFrequency = exports.marginalAndConditionalFrequency = void 0;
+const randint_1 = require("../../math/utils/random/randint");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const simplify_1 = require("../../tree/parsers/simplify");
+const shuffle_1 = require("../../utils/shuffle");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const uuid_1 = require("uuid");
+exports.marginalAndConditionalFrequency = {
+    id: 'marginalAndConditionalFrequency',
+    connector: '=',
+    instruction: '',
+    label: 'Calculs de fréquences marginales et conditionnelles',
+    levels: ['1', '0'],
+    isSingleStep: false,
+    section: 'Probabilités',
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMarginalAndConditionalFrequency, nb),
+    keys: ['f', 'cap', 'underscore'],
+};
+function getMarginalAndConditionalFrequency() {
+    const [x1, x2, x3, x4] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(1, 100));
+    const x = x1 + x2 + x3 + x4;
+    const rand = (0, randint_1.randint)(0, 12);
+    const freqString = [
+        'marginale de A',
+        'marginale de B',
+        'marginale de C',
+        'marginale de D',
+        'conditionnelle de A parmi C',
+        'conditionnelle de A parmi D',
+        'conditionnelle de B parmi C',
+        'conditionnelle de B parmi D',
+        'conditionnelle de C parmi A',
+        'conditionnelle de C parmi B',
+        'conditionnelle de D parmi A',
+        'conditionnelle de D parmi B',
+    ];
+    const frequences = [
+        'f(A)',
+        'f(B)',
+        'f(C)',
+        'f(D)',
+        'f_C(A)',
+        'f_D(A)',
+        'f_C(B)',
+        'f_D(B)',
+        'f_A(C)',
+        'f_B(C)',
+        'f_A(D)',
+        'f_B(D)',
+    ];
+    const Calculs = [
+        (x1 + x3) / x,
+        (x2 + x4) / x,
+        (x1 + x2) / x,
+        (x3 + x4) / x,
+        x1 / (x1 + x2),
+        x3 / (x3 + x4),
+        x2 / (x1 + x2),
+        x4 / (x3 + x4),
+        x1 / (x1 + x3),
+        x3 / (x1 + x3),
+        x2 / (x2 + x4),
+        x4 / (x2 + x4),
+    ];
+    const calculsNodes = Calculs.map((el) => (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(el)));
+    const getPropositions = (n) => {
+        const res = [];
+        res.push({
+            id: (0, uuid_1.v4)() + '',
+            statement: calculsNodes[rand].toTex(),
+            isRightAnswer: true,
+        });
+        for (let i = 0; i < n - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                proposition = {
+                    id: (0, uuid_1.v4)() + '',
+                    statement: calculsNodes[(0, randint_1.randint)(0, 12, [rand])].toTex(),
+                    isRightAnswer: false,
+                };
+                isDuplicate = res.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            res.push(proposition);
+        }
+        return (0, shuffle_1.shuffle)(res);
+    };
+    const question = {
+        instruction: `On considère le tableau d'effectifs suivant : 
+
+| |A|B|
+|-|-|-|
+|C|${x1}|${x2}|
+|D|${x3}|${x4}|
+
+Calculer la fréquence ${freqString[rand]}.`,
+        startStatement: `${frequences[rand]}`,
+        answer: calculsNodes[rand].toTex(),
+        keys: ['f', 'cap', 'underscore'],
+        getPropositions,
+    };
+    return question;
+}
+exports.getMarginalAndConditionalFrequency = getMarginalAndConditionalFrequency;

package/lib/exercises/proba/probabilityTree.d.ts

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const probabilityTree: Exercise;
+export declare function getProbabilityTree(): Question;
+//# sourceMappingURL=probabilityTree.d.ts.map

package/lib/exercises/proba/probabilityTree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/probabilityTree.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI9D,eAAO,MAAM,eAAe,EAAE,QAS7B,CAAC;AAOF,wBAAgB,kBAAkB,IAAI,QAAQ,CAwH7C"}

package/lib/exercises/proba/probabilityTree.js

@@ -0,0 +1,132 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProbabilityTree = exports.probabilityTree = void 0;
+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 simplify_1 = require("../../tree/parsers/simplify");
+const shuffle_1 = require("../../utils/shuffle");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const uuid_1 = require("uuid");
+exports.probabilityTree = {
+    id: 'probabilityTree',
+    connector: '=',
+    instruction: '',
+    label: "Calculs de probabilités à l'aide d'un arbre pondéré",
+    levels: ['1', '0'],
+    isSingleStep: false,
+    section: 'Probabilités',
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProbabilityTree, nb),
+};
+function pgcd(a, b) {
+    while (b)
+        [a, b] = [b, a % b];
+    return a;
+}
+function getProbabilityTree() {
+    const A = (0, randint_1.randint)(2, 9);
+    const B = (0, randint_1.randint)(2, 10 - A);
+    const AC = (0, randint_1.randint)(2, 9);
+    const AD = (0, randint_1.randint)(2, 10 - AC);
+    const BC = (0, randint_1.randint)(2, 9);
+    const BD = (0, randint_1.randint)(2, 10 - BC);
+    const pA = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(A / (A + B)));
+    const pB = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(B / (A + B)));
+    const pA_C = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(AC / (AC + AD)));
+    const pA_D = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(AD / (AC + AD)));
+    const pB_C = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(BC / (BC + BD)));
+    const pB_D = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(BD / (BC + BD)));
+    let instruction = `En utilisant l'arbre de probabilité suivant, `;
+    let startStatement = '';
+    let answer;
+    const rand = (0, randint_1.randint)(1, 5);
+    switch (rand) {
+        case 1: {
+            instruction += `$\\\\$ Calculer $P(A \\cap C)$`;
+            startStatement = `P(A \\cap C)`;
+            answer = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pA, pA_C));
+            break;
+        }
+        case 2: {
+            instruction += `$\\\\$ Calculer $P(A \\cap D)$`;
+            startStatement = `P(A \\cap D)`;
+            answer = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pA, pA_D));
+            break;
+        }
+        case 3: {
+            instruction += `$\\\\$ Calculer $P(B \\cap C)$`;
+            startStatement = `P(B \\cap C)`;
+            answer = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pB, pB_C));
+            break;
+        }
+        case 4: {
+            instruction += `$\\\\$ Calculer $P(B \\cap D)$`;
+            startStatement = `P(B \\cap D)`;
+            answer = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pB, pB_D));
+            break;
+        }
+        default:
+            answer = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pB, pB_D)); // juste pour éviter l'erreur
+    }
+    let commands = [
+        'A = Point({2,2})',
+        'B = Point({2,-2})',
+        'AC = Point({5,3})',
+        'AD = Point({5,1})',
+        'BC = Point({5,-1})',
+        'BD = Point({5,-3})',
+        'Segment(Point({0,0}),A)',
+        'Segment(A,AC)',
+        'Segment(A,AD)',
+        'Segment(Point({0,0}),B)',
+        'Segment(B,BC)',
+        'Segment(B,BD)',
+        'ShowAxes(false)',
+        'ShowGrid(false)',
+        `Text("\\scriptsize${A / pgcd(A, A + B)}/${(A + B) / pgcd(A, A + B)}", (0.3, 2.1), true, true)`,
+        `Text("\\scriptsize${AC / pgcd(AC, AC + AD)}/${(AC + AD) / pgcd(AC, AC + AD)}", (2.8, 3.5), true, true)`,
+        `Text("\\scriptsize${AD / pgcd(AD, AC + AD)}/${(AC + AD) / pgcd(AD, AC + AD)}", (2.8, 1.4), true, true)`,
+        `Text("\\scriptsize${B / pgcd(B, A + B)}/${(A + B) / pgcd(B, A + B)}", (0.3, -1.2), true, true)`,
+        `Text("\\scriptsize${BC / pgcd(BC, BC + BD)}/${(BC + BD) / pgcd(BC, BC + BD)}", (2.8, -0.6), true, true)`,
+        `Text("\\scriptsize${BD / pgcd(BD, BC + BD)}/${(BC + BD) / pgcd(BD, BC + BD)}", (2.8, -2.5), true, true)`,
+        'Text("A", (1.85 , 2.5))',
+        'Text("B", (1.85 , -2.8))',
+        'Text("C", (5.5 , 2.85))',
+        'Text("D", (5.5 , 0.85))',
+        'Text("C", (5.5 , -1.1))',
+        'Text("D", (5.5 , -3.1))',
+    ];
+    const getPropositions = (n) => {
+        const res = [];
+        res.push({
+            id: (0, uuid_1.v4)() + '',
+            statement: answer.toTex(),
+            isRightAnswer: true,
+        });
+        for (let i = 0; i < n - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                proposition = {
+                    id: (0, uuid_1.v4)() + '',
+                    statement: (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(answer, new numberNode_1.NumberNode((0, randint_1.randint)(2, 11)))).toTex(),
+                    isRightAnswer: false,
+                };
+                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.toTex(),
+        keys: [],
+        commands,
+        coords: [-2, 8, -5, 5],
+        getPropositions,
+    };
+    return question;
+}
+exports.getProbabilityTree = getProbabilityTree;

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

@@ -1,8 +1,4 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
-};
-type VEAProps = {};
-export declare const averageWithTable: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../exercise';
+export declare const averageWithTable: MathExercise;
+export declare function getAverageWithTableQuestion(): Question;
 //# 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,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"}
+{"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"}

package/lib/exercises/probaStat/averageWithTable.js

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.averageWithTable = void 0;
+exports.getAverageWithTableQuestion = 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 getAverageWithTableQuestion = () => {
+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 getRandomUniqueValues = (count, min, max) => {
         const uniqueValues = new Set();
         while (uniqueValues.size < count) {
@@ -22,7 +35,30 @@ const getAverageWithTableQuestion = () => {
         average += randomValeurs[i] * randomEffectives[i];
     average /= sumEffectives;
     average = (0, round_1.round)(average, 2);
-    const answer = (average + '').replace('.', ',');
+    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 question = {
         instruction: `On considère le tableau d'effectifs suivant : 
 
@@ -32,31 +68,11 @@ const getAverageWithTableQuestion = () => {
 |Effectif|${randomEffectives[0]}|${randomEffectives[1]}|${randomEffectives[2]}|${randomEffectives[3]}|${randomEffectives[4]}|
 
 Calculer la moyenne de cette série de valeurs.`,
-        answer,
+        answer: average + '',
         keys: [],
+        getPropositions,
         answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
     };
     return question;
-};
-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,
-};
+}
+exports.getAverageWithTableQuestion = getAverageWithTableQuestion;

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

@@ -1,8 +1,8 @@
-import { MathExercise } from "../../exercises/exercise";
-type Identifiers = {
-    repartitions: number[];
-    colorAskedIndex: number;
-};
-export declare const ballsBasicProbas: MathExercise<Identifiers>;
-export {};
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    repartitions: number[];
+    colorAskedIndex: number;
+};
+export declare const ballsBasicProbas: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=ballsBasicProbas.d.ts.map