math-exercises 1.4.18 → 2.0.0

package/lib/exercises/calculLitteral/equation/logEquation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLnEquation = exports.logEquation = void 0;
+exports.logEquation = 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");
@@ -13,58 +14,39 @@ 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");
+const getLnEquation = () => {
+    const a = (0, randint_1.randint)(-9, 20, [0]);
+    const k = (0, randint_1.randint)(-9, 20, [0]);
+    const equation = new equalNode_1.EqualNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode('x')))), new numberNode_1.NumberNode(k));
+    const answer = new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree()).toTex();
+    const question = {
+        instruction: `Résoudre l'équation $${equation.toTex()}$.`,
+        answer,
+        keys: ['x', 'equal', 'ln', 'epower', 'exp'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const randomA = (0, randint_1.randint)(1, 10);
+        const randomK = (0, randint_1.randint)(1, 20);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(randomK), new numberNode_1.NumberNode(randomA)))).toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.logEquation = {
     id: 'logEquation',
     connector: '=',
-    instruction: '',
     label: 'Résoudre des équations de type $a \\times \\ln(x) = k$',
     levels: ['1reSpé', 'TermSpé', 'MathComp'],
     sections: ['Logarithme népérien'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLnEquation, nb),
-    keys: ['x', 'equal', 'ln', 'epower', 'exp'],
+    getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
 };
-function getLnEquation() {
-    const a = (0, randint_1.randint)(-9, 20, [0]);
-    const k = (0, randint_1.randint)(-9, 20, [0]);
-    const equation = new equalNode_1.EqualNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode('x')))), new numberNode_1.NumberNode(k));
-    const answer = new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree());
-    const getPropositions = (numOptions) => {
-        const propositions = [];
-        propositions.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < numOptions - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const randomA = (0, randint_1.randint)(1, 10);
-                const randomK = (0, randint_1.randint)(1, 20);
-                proposition = {
-                    id: (0, uuid_1.v4)(),
-                    statement: new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(randomK), new numberNode_1.NumberNode(randomA)))).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 question = {
-        instruction: `Résoudre l'équation $${equation.toTex()}$.`,
-        answer: answer.toTex(),
-        keys: ['x', 'equal', 'ln', 'epower', 'exp'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getLnEquation = getLnEquation;

package/lib/exercises/calculLitteral/equation/multiplicationEquation.d.ts

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

package/lib/exercises/calculLitteral/equation/multiplicationEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,sBAAsB,EAAE,YAYpC,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CAyEpD"}
+{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqDnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}

package/lib/exercises/calculLitteral/equation/multiplicationEquation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMultiplicationEquation = exports.multiplicationEquation = void 0;
+exports.multiplicationEquation = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
@@ -9,21 +10,7 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.multiplicationEquation = {
-    id: 'multiplicationEquation',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une équation produit nul',
-    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
-    sections: ['Équations'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMultiplicationEquation, nb),
-    keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'ou'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getMultiplicationEquation() {
+const getMultiplicationEquation = () => {
     // (ax + b)(cx + d) = 0
     let a, b, c, d;
     do {
@@ -38,47 +25,41 @@ function getMultiplicationEquation() {
         .simplify()
         .toTree()
         .toTex()}\\right\\}`;
-    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 {
-                do {
-                    a = (0, randint_1.randint)(-9, 10, [0]);
-                    b = (0, randint_1.randint)(-9, 10, [0]);
-                    c = (0, randint_1.randint)(-9, 10, [0]);
-                    d = (0, randint_1.randint)(-9, 10, [0]);
-                } while (a / c === b / d);
-                const polynome1 = new polynomial_1.Polynomial([b, a]);
-                const polynome2 = new polynomial_1.Polynomial([d, c]);
-                const wrongAnswer = `S=\\left\\{${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-b), new numberNode_1.NumberNode(a))).toTex()};${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-d), new numberNode_1.NumberNode(c))).toTex()}\\right\\}`;
-                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: `Résoudre : $(${polynome1.toTex()})(${polynome2.toTex()}) = 0$`,
         startStatement: `(${polynome1.toTex()})(${polynome2.toTex()}) = 0`,
         answer,
         keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'ou'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getMultiplicationEquation = getMultiplicationEquation;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        let a, b, c, d;
+        do {
+            a = (0, randint_1.randint)(-9, 10, [0]);
+            b = (0, randint_1.randint)(-9, 10, [0]);
+            c = (0, randint_1.randint)(-9, 10, [0]);
+            d = (0, randint_1.randint)(-9, 10, [0]);
+        } while (a / c === b / d);
+        const wrongAnswer = `S=\\left\\{${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-b), new numberNode_1.NumberNode(a))).toTex()};${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-d), new numberNode_1.NumberNode(c))).toTex()}\\right\\}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.multiplicationEquation = {
+    id: 'multiplicationEquation',
+    connector: '\\iff',
+    label: 'Résoudre une équation produit nul',
+    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
+    sections: ['Équations'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMultiplicationEquation, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.d.ts

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

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAgB/E,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CA4DhD"}
+{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFactoType1Question = exports.factoIdRmq1 = void 0;
+exports.factoIdRmq1 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
@@ -10,64 +11,41 @@ const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.factoIdRmq1 = {
-    id: 'factoIdRmq1',
-    connector: '=',
-    instruction: '',
-    isSingleStep: false,
-    label: 'Factorisation du type $a^2 + 2ab + b^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
-    keys: ['x'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFactoType1Question() {
+const getFactoType1Question = () => {
     const interval = new intervals_1.Interval('[[1; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const affine = affine_1.AffineConstructor.random(interval, interval);
     const statementTree = affine.multiply(affine).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: new powerNode_1.PowerNode(new affine_1.Affine(affine.b, affine.a).toTree(), new numberNode_1.NumberNode(2)).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new powerNode_1.PowerNode(new affine_1.Affine(affine.a + (0, randint_1.randint)(-affine.a + 1, 10 - affine.a), affine.b + (0, randint_1.randint)(-affine.b + 1, 10 - affine.b)).toTree(), new numberNode_1.NumberNode(2));
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.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 = answerTree.toTex();
     const question = {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: ['x'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
     };
     return question;
-}
-exports.getFactoType1Question = getFactoType1Question;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new powerNode_1.PowerNode(new affine_1.Affine(b, a).toTree(), new numberNode_1.NumberNode(2)).toTex());
+    while (propositions.length < n) {
+        const wrongAnswer = new powerNode_1.PowerNode(new affine_1.Affine(a + (0, randint_1.randint)(-a + 1, 10 - a), b + (0, randint_1.randint)(-b + 1, 10 - b)).toTree(), new numberNode_1.NumberNode(2));
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.factoIdRmq1 = {
+    id: 'factoIdRmq1',
+    connector: '=',
+    isSingleStep: false,
+    label: 'Factorisation du type $a^2 + 2ab + b^2$',
+    levels: ['3ème', '2nde'],
+    sections: ['Calcul littéral'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.d.ts

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

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAuEhD"}
+{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFactoType1Question = exports.factoIdRmq2 = void 0;
+exports.factoIdRmq2 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
@@ -10,72 +11,43 @@ const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.factoIdRmq2 = {
-    id: 'factoIdRmq2',
-    connector: '=',
-    instruction: '',
-    isSingleStep: false,
-    label: 'Factorisation du type $a^2 - 2ab + b^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
-    keys: ['x'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFactoType1Question() {
+const getFactoType1Question = () => {
     const intervalA = new intervals_1.Interval('[[0; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const intervalB = new intervals_1.Interval('[[-10; 0]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const affine = affine_1.AffineConstructor.random(intervalA, intervalB);
     const statementTree = affine.multiply(affine).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: new powerNode_1.PowerNode(new affine_1.Affine(-affine.b, -affine.a).toTree(), new numberNode_1.NumberNode(2)).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new powerNode_1.PowerNode(new affine_1.Affine(-affine.a, affine.b).toTree(), new numberNode_1.NumberNode(2)).toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; i < n - 3; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new powerNode_1.PowerNode(new affine_1.Affine(affine.a + (0, randint_1.randint)(-affine.a + 1, 10 - affine.a), affine.b + (0, randint_1.randint)(-9 - affine.b, -affine.b)).toTree(), new numberNode_1.NumberNode(2));
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.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 = answerTree.toTex();
     const question = {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: ['x'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
     };
     return question;
-}
-exports.getFactoType1Question = getFactoType1Question;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new powerNode_1.PowerNode(new affine_1.Affine(-b, -a).toTree(), new numberNode_1.NumberNode(2)).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new powerNode_1.PowerNode(new affine_1.Affine(-a, b).toTree(), new numberNode_1.NumberNode(2)).toTex());
+    while (propositions.length < n) {
+        const wrongAnswer = new powerNode_1.PowerNode(new affine_1.Affine(a + (0, randint_1.randint)(-a + 1, 10 - a), b + (0, randint_1.randint)(-9 - b, -b)).toTree(), new numberNode_1.NumberNode(2));
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.factoIdRmq2 = {
+    id: 'factoIdRmq2',
+    connector: '=',
+    isSingleStep: false,
+    label: 'Factorisation du type $a^2 - 2ab + b^2$',
+    levels: ['3ème', '2nde'],
+    sections: ['Calcul littéral'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.d.ts

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

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAa/E,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CA6EhD"}
+{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA4CnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFactoType1Question = exports.factoIdRmq3 = void 0;
+exports.factoIdRmq3 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
@@ -8,80 +9,47 @@ const discreteSet_1 = require("../../../math/sets/discreteSet");
 const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
-const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.factoIdRmq3 = {
-    id: 'factoIdRmq3',
-    connector: '=',
-    instruction: '',
-    isSingleStep: false,
-    label: 'Factorisation du type $a^2 - b^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
-    keys: ['x'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFactoType1Question() {
+const getFactoType1Question = () => {
     const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const affine = affine_1.AffineConstructor.random(interval, interval);
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = affine.multiply(affine2).toTree();
     const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: new multiplyNode_1.MultiplyNode(affine.toTree(), affine.toTree()).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new multiplyNode_1.MultiplyNode(affine2.toTree(), affine2.toTree()).toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new multiplyNode_1.MultiplyNode(affine2.toTree(), new affine_1.Affine(-affine.b, affine.a).toTree()).toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; i < n - 4; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new multiplyNode_1.MultiplyNode(new affine_1.Affine((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10, [0])).toTree(), new affine_1.Affine((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10, [0])).toTree());
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswer.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 = answerTree.toTex();
     const question = {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: ['x'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, affine1Coeffs: affine.coefficients, affine2Coeffs: affine2.coefficients },
     };
     return question;
-}
-exports.getFactoType1Question = getFactoType1Question;
+};
+const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.toTree(), affine.toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.toTree(), affine.toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine2.toTree(), affine2.toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine2.toTree(), new affine_1.Affine(-affine.b, affine.a).toTree()).toTex());
+    while (propositions.length < n) {
+        const wrongAnswer = new multiplyNode_1.MultiplyNode(new affine_1.Affine((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10, [0])).toTree(), new affine_1.Affine((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10, [0])).toTree());
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.factoIdRmq3 = {
+    id: 'factoIdRmq3',
+    connector: '=',
+    isSingleStep: false,
+    label: 'Factorisation du type $a^2 - b^2$',
+    levels: ['3ème', '2nde'],
+    sections: ['Calcul littéral'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/factorisation/factoType1Exercise.d.ts

@@ -1,7 +1,13 @@
 /**
  *  type (ax+b)(cx+d) ± (ax+b)(ex+f)
  */
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const factoType1Exercise: MathExercise;
-export declare function getFactoType1Question(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    affinesCoeffs: number[][];
+    operation: string;
+};
+type VEAProps = {};
+export declare const factoType1Exercise: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=factoType1Exercise.d.ts.map

package/lib/exercises/calculLitteral/factorisation/factoType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,kBAAkB,EAAE,YAYhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAqGhD"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2EnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}