math-exercises 1.4.18 → 2.0.1

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.js

@@ -1,26 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEvaluateExpression = exports.evaluateExpression = void 0;
+exports.evaluateExpression = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 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");
-exports.evaluateExpression = {
-    id: 'evaluateExpression',
-    connector: '=',
-    instruction: '',
-    label: 'Evaluer une expression',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro'],
-    sections: ['Calcul littéral'],
-    isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEvaluateExpression, nb),
-    keys: ['x'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getEvaluateExpression() {
+const getEvaluateExpression = () => {
     const rand = (0, coinFlip_1.coinFlip)();
     const polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-5, 6, [0])]);
     const polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-4, 5, [0])]);
@@ -28,39 +15,34 @@ function getEvaluateExpression() {
     const statement = rand
         ? `Calculer $${polynome1.toTree().toTex()}$ pour $x = ${xValue}$`
         : `Calculer $${polynome2.toTree().toTex()}$ pour $x = ${xValue}$`;
-    const answer = rand ? polynome1.calculate(xValue) : polynome2.calculate(xValue);
-    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 {
-                const wrongAnswer = answer + (0, randint_1.randint)(-10, 11, [0]);
-                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 = rand ? polynome1.calculate(xValue) + '' : polynome2.calculate(xValue) + '';
     const question = {
         instruction: statement,
-        answer: answer + '',
+        answer,
         keys: ['x'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getEvaluateExpression = getEvaluateExpression;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = Number(answer) + (0, randint_1.randint)(-10, 11, [0]);
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer + '');
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.evaluateExpression = {
+    id: 'evaluateExpression',
+    connector: '=',
+    label: 'Evaluer une expression',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro'],
+    sections: ['Calcul littéral'],
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEvaluateExpression, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/simplifying/expSimplifiying.d.ts

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

package/lib/exercises/calculLitteral/simplifying/expSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/expSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAc/E,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAyG7C"}
+{"version":3,"file":"expSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/expSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwFnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}

package/lib/exercises/calculLitteral/simplifying/expSimplifiying.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpSimplifiying = exports.expSimplifiying = void 0;
+exports.expSimplifiying = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -11,21 +12,7 @@ const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.expSimplifiying = {
-    id: 'expSimplifiying',
-    connector: '\\iff',
-    instruction: '',
-    label: "Simplifier des expressions avec l'exponentielle",
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
-    sections: ['Exponentielle'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
-    keys: ['x', 'epower', 'exp'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getExpSimplifiying() {
+const getExpSimplifiying = () => {
     const random = (0, randint_1.randint)(1, 4);
     let expression;
     switch (random) {
@@ -45,54 +32,50 @@ function getExpSimplifiying() {
             expression = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
     }
     const simplifiedExpression = (0, simplify_1.simplifyNode)(expression);
-    const getPropositions = (numOptions) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: simplifiedExpression.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < numOptions - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                let wrongExpression;
-                switch (random) {
-                    case 1:
-                        wrongExpression = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([0, (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])))), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-                        wrongExpression.shuffle();
-                        break;
-                    case 2:
-                        wrongExpression = new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-                        wrongExpression.shuffle();
-                        break;
-                    case 3:
-                        wrongExpression = new fractionNode_1.FractionNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-                        wrongExpression.shuffle();
-                        break;
-                    default:
-                        wrongExpression = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
-                }
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: (0, simplify_1.simplifyNode)(wrongExpression).toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            propositions.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(propositions);
-    };
+    const answer = simplifiedExpression.toTex();
     const question = {
         instruction: `Simplifier l'expression $${expression.toTex()}$.`,
-        answer: simplifiedExpression.toTex(),
+        answer,
         keys: ['x', 'epower', 'exp'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, random },
     };
     return question;
-}
-exports.getExpSimplifiying = getExpSimplifiying;
+};
+const getPropositions = (n, { answer, random }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        let wrongExpression;
+        switch (random) {
+            case 1:
+                wrongExpression = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([0, (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])))), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
+                wrongExpression.shuffle();
+                break;
+            case 2:
+                wrongExpression = new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
+                wrongExpression.shuffle();
+                break;
+            case 3:
+                wrongExpression = new fractionNode_1.FractionNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
+                wrongExpression.shuffle();
+                break;
+            default:
+                wrongExpression = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
+        }
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(wrongExpression).toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.expSimplifiying = {
+    id: 'expSimplifiying',
+    connector: '\\iff',
+    label: "Simplifier des expressions avec l'exponentielle",
+    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    sections: ['Exponentielle'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.d.ts

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

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CA+D7C"}
+{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+CnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpSimplifiying = exports.logSimplifiying = void 0;
+exports.logSimplifiying = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const logNode_1 = require("../../../tree/nodes/functions/logNode");
@@ -10,21 +11,7 @@ const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.logSimplifiying = {
-    id: 'logSimplifiying',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Simplifier des expressions avec $\\ln$',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
-    sections: ['Logarithme népérien'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
-    keys: ['ln'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getExpSimplifiying() {
+const getExpSimplifiying = () => {
     const a = (0, randint_1.randint)(1, 10);
     const b = (0, randint_1.randint)(1, 10);
     let expression;
@@ -40,41 +27,35 @@ function getExpSimplifiying() {
         simplifiedExpression = new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b)));
         pm = -1;
     }
-    const getPropositions = (numOptions) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: simplifiedExpression.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < numOptions - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const a = (0, randint_1.randint)(1, 10);
-                const b = (0, randint_1.randint)(1, 10);
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: pm > 0
-                        ? new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex()
-                        : new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b))).toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            propositions.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(propositions);
-    };
+    const answer = simplifiedExpression.toTex();
     const question = {
         instruction: `Simplifier l'expression $${expression.toTex()}$.`,
-        answer: simplifiedExpression.toTex(),
+        answer,
         keys: ['ln'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, pm },
     };
     return question;
-}
-exports.getExpSimplifiying = getExpSimplifiying;
+};
+const getPropositions = (n, { answer, pm }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const a = (0, randint_1.randint)(1, 10);
+        const b = (0, randint_1.randint)(1, 10);
+        (0, exercise_1.tryToAddWrongProp)(propositions, pm > 0 ? new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex() : new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b))).toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.logSimplifiying = {
+    id: 'logSimplifiying',
+    connector: '\\iff',
+    label: 'Simplifier des expressions avec $\\ln$',
+    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    sections: ['Logarithme népérien'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/simplifying/reduceExpression.d.ts

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

package/lib/exercises/calculLitteral/simplifying/reduceExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAoI9C"}
+{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmHnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

package/lib/exercises/calculLitteral/simplifying/reduceExpression.js

@@ -1,26 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReduceExpression = exports.reduceExpression = void 0;
+exports.reduceExpression = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.reduceExpression = {
-    id: 'reduceExpression',
-    connector: '=',
-    instruction: '',
-    isSingleStep: false,
-    label: 'Réduire une expression',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro'],
-    sections: ['Calcul littéral'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getReduceExpression, nb),
-    keys: ['x'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getReduceExpression() {
+const getReduceExpression = () => {
     const rand = (0, randint_1.randint)(0, 7);
     let statement;
     let polynome1;
@@ -84,41 +71,37 @@ function getReduceExpression() {
             answer = polynome1.add(polynome2).toTree().toTex();
             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 {
-                polynome2 = new polynomial_1.Polynomial(rand < 3
-                    ? [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]
-                    : [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]);
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: polynome1.add(polynome2).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 question = {
         instruction: `Réduire l'expression suivante : $${statement.toTex()}$`,
         startStatement: statement.toTex(),
         answer,
         keys: ['x'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, rand, polynome1Coeffs: polynome1.coefficients },
     };
     return question;
-}
-exports.getReduceExpression = getReduceExpression;
+};
+const getPropositions = (n, { answer, rand, polynome1Coeffs }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
+    while (propositions.length < n) {
+        const polynome2 = new polynomial_1.Polynomial(rand < 3
+            ? [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]
+            : [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]);
+        (0, exercise_1.tryToAddWrongProp)(propositions, polynome1.add(polynome2).toTree().toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.reduceExpression = {
+    id: 'reduceExpression',
+    connector: '=',
+    isSingleStep: false,
+    label: 'Réduire une expression',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro'],
+    sections: ['Calcul littéral'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getReduceExpression, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/combinatory/anagrams.d.ts

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

package/lib/exercises/combinatory/anagrams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAqEhH,eAAO,MAAM,QAAQ,EAAE,YAWtB,CAAC;AAkCF,wBAAgB,mBAAmB,IAAI,QAAQ,CAqE9C"}
+{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAsGlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmDnB,eAAO,MAAM,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrD,CAAC"}

package/lib/exercises/combinatory/anagrams.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAnagramsQuestion = exports.anagrams = void 0;
+exports.anagrams = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
 const random_1 = require("../../utils/random");
-const uuid_1 = require("uuid");
 const words = [
     'angle',
     'armoire',
@@ -69,18 +68,6 @@ const words = [
     'toilette',
     'vitre',
 ];
-exports.anagrams = {
-    id: 'anagrams',
-    connector: '=',
-    instruction: '',
-    label: "Compter le nombre d'anagrammes d'un mot",
-    levels: ['TermSpé'],
-    isSingleStep: true,
-    sections: ['Combinatoire et dénombrement'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAnagramsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
 const letters = [
     'a',
     'b',
@@ -113,7 +100,7 @@ const letters = [
     'à',
     'ç',
 ];
-function getAnagramsQuestion() {
+const getAnagramsQuestion = () => {
     const word = (0, random_1.random)(words);
     const repeats = [];
     const wordLetters = word.split('');
@@ -135,43 +122,36 @@ function getAnagramsQuestion() {
     repeats.forEach((nbOfRepeats) => {
         arrangements *= getFacto(nbOfRepeats);
     });
-    const answer = facto / arrangements;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer + ``,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        (0, exercise_1.tryToAddWrongProp)(res, Math.pow(word.length, word.length) + '');
-        (0, exercise_1.tryToAddWrongProp)(res, (word.length * (word.length + 1)) / 2 + '');
-        (0, exercise_1.tryToAddWrongProp)(res, word.length * word.length + '');
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = (0, randint_1.randint)(1000, 10000);
-                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 answer = facto / arrangements + '';
     const question = {
-        answer: answer + '',
+        answer,
         instruction: `Combien d'anagrammes mathématiques du mot ${word} sont possibles ? `,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, word },
     };
     return question;
-}
-exports.getAnagramsQuestion = getAnagramsQuestion;
+};
+const getPropositions = (n, { answer, word }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, Math.pow(word.length, word.length) + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, (word.length * (word.length + 1)) / 2 + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, word.length * word.length + '');
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(1000, 10000) + '');
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.anagrams = {
+    id: 'anagrams',
+    connector: '=',
+    label: "Compter le nombre d'anagrammes d'un mot",
+    levels: ['TermSpé'],
+    isSingleStep: true,
+    sections: ['Combinatoire et dénombrement'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAnagramsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/combinatory/ballsCounting.d.ts

@@ -1,4 +1,12 @@
-import { MathExercise, Question } from '../../exercises/exercise';
-export declare const ballsCounting: MathExercise;
-export declare function getBallsCountingQuestion(): Question;
+import { MathExercise } from '../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    type: number;
+    reds: number;
+    greens: number;
+    blacks: number;
+};
+type VEAProps = {};
+export declare const ballsCounting: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=ballsCounting.d.ts.map

package/lib/exercises/combinatory/ballsCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAe,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAKhH,eAAO,MAAM,aAAa,EAAE,YAW3B,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CA8GnD"}
+{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAIlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA6FnB,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}