math-exercises 1.4.18 → 2.0.1

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

@@ -3,7 +3,8 @@
  *  type (ax+b)(cx+d) ± (ax+b)(ex+f)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFactoType1Question = exports.factoType1Exercise = void 0;
+exports.factoType1Exercise = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const affine_1 = require("../../../math/polynomials/affine");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
@@ -11,21 +12,7 @@ const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.factoType1Exercise = {
-    id: 'facto1',
-    connector: '=',
-    instruction: '',
-    isSingleStep: false,
-    label: 'Factorisation du type $(ax+b)(cx+d) \\pm (ax+b)(ex+f)$',
-    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 affines = affine_1.AffineConstructor.differentRandoms(3);
     const permut = [(0, shuffle_1.shuffle)([affines[0], affines[1]]), (0, shuffle_1.shuffle)([affines[0], affines[2]])];
     const operation = (0, random_1.random)(['add', 'substract']);
@@ -33,59 +20,39 @@ function getFactoType1Question() {
         ? new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(permut[0][0].toTree(), permut[0][1].toTree()), new multiplyNode_1.MultiplyNode(permut[1][0].toTree(), permut[1][1].toTree()))
         : new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(permut[0][0].toTree(), permut[0][1].toTree()), new multiplyNode_1.MultiplyNode(permut[1][0].toTree(), permut[1][1].toTree()));
     const answerTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(operation === 'add' ? affines[2] : affines[2].opposite()).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(affines[0].toTree(), affines[1].add(operation !== 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new multiplyNode_1.MultiplyNode(affines[1].toTree(), affines[0].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new multiplyNode_1.MultiplyNode(affines[2].toTree(), affines[0].add(operation === 'add' ? affines[2] : affines[2].opposite()).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(affines[0].toTree(), affines[1].add(affine_1.AffineConstructor.differentRandoms(1)[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, affinesCoeffs: affines.map((affine) => affine.coefficients), operation },
     };
     return question;
-}
-exports.getFactoType1Question = getFactoType1Question;
+};
+const getPropositions = (n, { answer, affinesCoeffs, operation }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const affines = affinesCoeffs.map((coeffs) => new affine_1.Affine(coeffs[1], coeffs[0]));
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(operation !== 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[1].toTree(), affines[0].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[2].toTree(), affines[0].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex());
+    while (propositions.length < n) {
+        const wrongAnswer = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(affine_1.AffineConstructor.differentRandoms(1)[0]).toTree());
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.factoType1Exercise = {
+    id: 'facto1',
+    connector: '=',
+    isSingleStep: false,
+    label: 'Factorisation du type $(ax+b)(cx+d) \\pm (ax+b)(ex+f)$',
+    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/inequations/firstDegreeInequationsType0.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,2BAA2B,EAAE,YAWzC,CAAC;AAEF,wBAAgB,iCAAiC,IAAI,QAAQ,CAyD5D"}
+{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.js

@@ -1,71 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstDegreeInequationsQuestion = exports.firstDegreeInequationsType0 = void 0;
+exports.firstDegreeInequationsType0 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const affine_1 = require("../../../math/polynomials/affine");
 const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.firstDegreeInequationsType0 = {
-    id: 'firstDegreeInequationsType0',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une inéquation du type $x+b<c$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
-    isSingleStep: true,
-    sections: ['Inéquations'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFirstDegreeInequationsQuestion() {
+const getFirstDegreeInequationsQuestion = () => {
     const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 11));
     const c = (0, randint_1.randint)(-10, 11);
     const result = c - affine.b;
     const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
-    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
     const answer = `x${ineqType}${result}`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: `x ${affine.a < 0 ? ineqType : invIneqType} ${result}`,
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `x ${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType} ${(0, randint_1.randint)(-10, 11)}`;
-                proposition = {
-                    id: (0, uuid_1.v4)() + ``,
-                    statement: wrongAnswer,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType} ${c}$ `,
         keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, ineqType, result },
     };
     return question;
-}
-exports.getFirstDegreeInequationsQuestion = getFirstDegreeInequationsQuestion;
+};
+const getPropositions = (n, { answer, a, ineqType, result }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
+    while (propositions.length < n) {
+        const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.firstDegreeInequationsType0 = {
+    id: 'firstDegreeInequationsType0',
+    connector: '\\iff',
+    label: 'Résoudre une inéquation du type $x+b<c$',
+    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    isSingleStep: true,
+    sections: ['Inéquations'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType1.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,2BAA2B,EAAE,YAWzC,CAAC;AAEF,wBAAgB,iCAAiC,IAAI,QAAQ,CAyD5D"}
+{"version":3,"file":"firstDegreeInequationsType1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType1.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,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYxE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType1.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstDegreeInequationsQuestion = exports.firstDegreeInequationsType1 = void 0;
+exports.firstDegreeInequationsType1 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
@@ -8,65 +9,42 @@ const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.firstDegreeInequationsType1 = {
-    id: 'firstDegreeInequationsType1',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une inéquation du type $ax<b$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
-    isSingleStep: true,
-    sections: ['Inéquations'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFirstDegreeInequationsQuestion() {
+const getFirstDegreeInequationsQuestion = () => {
     const affine = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, 1]), 0);
     const b = (0, randint_1.randint)(-10, 11);
     const result = new rational_1.Rational(b, affine.a).simplify().toTree().toTex();
     const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
     const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
     const answer = `x${affine.a > 0 ? ineqType : invIneqType}${result}`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: `x ${affine.a < 0 ? ineqType : invIneqType} ${result}`,
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `x ${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType} ${(0, randint_1.randint)(-10, 11)}`;
-                proposition = {
-                    id: (0, uuid_1.v4)() + ``,
-                    statement: wrongAnswer,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType} ${b}$ `,
         keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, ineqType, result },
     };
     return question;
-}
-exports.getFirstDegreeInequationsQuestion = getFirstDegreeInequationsQuestion;
+};
+const getPropositions = (n, { answer, a, ineqType, result }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
+    while (propositions.length < n) {
+        const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.firstDegreeInequationsType1 = {
+    id: 'firstDegreeInequationsType1',
+    connector: '\\iff',
+    getPropositions,
+    label: 'Résoudre une inéquation du type $ax<b$',
+    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    isSingleStep: true,
+    sections: ['Inéquations'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+};

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType2.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,2BAA2B,EAAE,YAWzC,CAAC;AAEF,wBAAgB,iCAAiC,IAAI,QAAQ,CAyD5D"}
+{"version":3,"file":"firstDegreeInequationsType2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYxE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType2.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstDegreeInequationsQuestion = exports.firstDegreeInequationsType2 = void 0;
+exports.firstDegreeInequationsType2 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
@@ -8,65 +9,42 @@ const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.firstDegreeInequationsType2 = {
-    id: 'firstDegreeInequationsType2',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une inéquation du type $ax+b<c$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
-    isSingleStep: true,
-    sections: ['Inéquations'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFirstDegreeInequationsQuestion() {
+const getFirstDegreeInequationsQuestion = () => {
     const affine = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, 1]), (0, randint_1.randint)(-10, 10, [0]));
     const c = (0, randint_1.randint)(-10, 11);
     const result = new rational_1.Rational(c - affine.b, affine.a).simplify().toTree().toTex();
     const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
     const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
     const answer = `x${affine.a > 0 ? ineqType : invIneqType}${result}`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: `x ${affine.a < 0 ? ineqType : invIneqType} ${result}`,
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `x ${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType} ${(0, randint_1.randint)(-10, 11)}`;
-                proposition = {
-                    id: (0, uuid_1.v4)() + ``,
-                    statement: wrongAnswer,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType} ${c}$ `,
         keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, result, ineqType },
     };
     return question;
-}
-exports.getFirstDegreeInequationsQuestion = getFirstDegreeInequationsQuestion;
+};
+const getPropositions = (n, { answer, a, ineqType, result }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
+    while (propositions.length < n) {
+        const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.firstDegreeInequationsType2 = {
+    id: 'firstDegreeInequationsType2',
+    connector: '\\iff',
+    getPropositions,
+    label: 'Résoudre une inéquation du type $ax+b<c$',
+    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    isSingleStep: true,
+    sections: ['Inéquations'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+};

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType3.d.ts

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const firstDegreeInequationsType3: MathExercise;
-export declare function getFirstDegreeInequationsQuestion(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    coeff: number;
+    ineqType: string;
+    result: string;
+};
+type VEAProps = {};
+export declare const firstDegreeInequationsType3: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=firstDegreeInequationsType3.d.ts.map

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,2BAA2B,EAAE,YAWzC,CAAC;AAEF,wBAAgB,iCAAiC,IAAI,QAAQ,CAyD5D"}
+{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType3.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstDegreeInequationsQuestion = exports.firstDegreeInequationsType3 = void 0;
+exports.firstDegreeInequationsType3 = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
@@ -8,20 +9,7 @@ const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-exports.firstDegreeInequationsType3 = {
-    id: 'firstDegreeInequationsType3',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une inéquation du type $ax+b<cx+d$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
-    isSingleStep: true,
-    sections: ['Inéquations'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFirstDegreeInequationsQuestion() {
+const getFirstDegreeInequationsQuestion = () => {
     const affine1 = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0]), (0, randint_1.randint)(-10, 10));
     const affine2 = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, affine1.a]), (0, randint_1.randint)(-10, 10));
     const result = new rational_1.Rational(affine2.b - affine1.b, affine1.a - affine2.a).simplify().toTree().toTex();
@@ -29,45 +17,35 @@ function getFirstDegreeInequationsQuestion() {
     const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
     const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
     const answer = `x${coeff > 0 ? ineqType : invIneqType}${result}`;
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)(),
-            statement: `x ${coeff < 0 ? ineqType : invIneqType} ${result}`,
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = `x ${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType} ${(0, randint_1.randint)(-10, 11)}`;
-                proposition = {
-                    id: (0, uuid_1.v4)() + ``,
-                    statement: wrongAnswer,
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine1.toTex()} ${ineqType} ${affine2.toTex()}$ `,
         keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, coeff, ineqType, result },
     };
     return question;
-}
-exports.getFirstDegreeInequationsQuestion = getFirstDegreeInequationsQuestion;
+};
+const getPropositions = (n, { answer, coeff, ineqType, result }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x${coeff < 0 ? ineqType : invIneqType}${result}`);
+    while (propositions.length < n) {
+        const wrongAnswer = `x ${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType} ${(0, randint_1.randint)(-10, 11)}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.firstDegreeInequationsType3 = {
+    id: 'firstDegreeInequationsType3',
+    connector: '\\iff',
+    label: 'Résoudre une inéquation du type $ax+b<cx+d$',
+    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    isSingleStep: true,
+    sections: ['Inéquations'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ/E,eAAO,MAAM,kBAAkB,EAAE,YAYhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAoDhD"}
+{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}