math-exercises 1.4.18 → 2.0.1

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEquationType3ExerciseQuestion = exports.equationType3Exercise = void 0;
+exports.equationType3Exercise = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
@@ -11,24 +12,7 @@ const randint_1 = require("../../../math/utils/random/randint");
 const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-/**
- *  type ax+b=c
- */
-exports.equationType3Exercise = {
-    id: 'equa3',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Équations $ax+b=c$',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    sections: ['Équations'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType3ExerciseQuestion, nb),
-    keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getEquationType3ExerciseQuestion() {
+const getEquationType3ExerciseQuestion = () => {
     const interval = new intervals_1.Interval('[[-10; 10]]');
     const intervalStar = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const b = intervalStar.getRandomElement();
@@ -38,39 +22,35 @@ function getEquationType3ExerciseQuestion() {
     const solution = new rational_1.Rational(c.value - b.value, a.value).simplify();
     const statementTree = new equalNode_1.EqualNode(affine, c.toTree());
     const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), solution.toTree());
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new rational_1.Rational(c.value - b.value + (0, randint_1.randint)(-7, 8, [0, -c.value + b.value]), a.value + (0, randint_1.randint)(-7, 8, [-a.value, 0])).simplify();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.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 answer = answerTree.toTex();
     const question = {
         instruction: `Résoudre : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: a.value, b: b.value, c: c.value },
     };
     return question;
-}
-exports.getEquationType3ExerciseQuestion = getEquationType3ExerciseQuestion;
+};
+const getPropositions = (n, { answer, a, b, c }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = new rational_1.Rational(c - b + (0, randint_1.randint)(-7, 8, [0, -c + b]), a + (0, randint_1.randint)(-7, 8, [-a, 0])).simplify();
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.toTree()).toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.equationType3Exercise = {
+    id: 'equa3',
+    connector: '\\iff',
+    label: 'Équations $ax+b=c$',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
+    sections: ['Équations'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType3ExerciseQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

@@ -1,7 +1,15 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
+import { MathExercise } from '../../../exercises/exercise';
 /**
  *  type ax+b=cx+d
  */
-export declare const equationType4Exercise: MathExercise;
-export declare function getEquationType4ExerciseQuestion(): Question;
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+};
+type VEAProps = {};
+export declare const equationType4Exercise: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=equationType4Exercise.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAa/E;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,YAanC,CAAC;AAEF,wBAAgB,gCAAgC,IAAI,QAAQ,CA4D3D"}
+{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC;;GAEG;AAEH,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAyCnB,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYlE,CAAC"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEquationType4ExerciseQuestion = exports.equationType4Exercise = void 0;
+exports.equationType4Exercise = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
@@ -11,24 +12,7 @@ const randint_1 = require("../../../math/utils/random/randint");
 const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-/**
- *  type ax+b=cx+d
- */
-exports.equationType4Exercise = {
-    id: 'equa4',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Équations $ax+b=cx+d$',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    sections: ['Équations'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType4ExerciseQuestion, nb),
-    keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getEquationType4ExerciseQuestion() {
+const getEquationType4ExerciseQuestion = () => {
     const interval = new intervals_1.Interval('[[-10; 10]]');
     const intervalStar = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const a = intervalStar.getRandomElement();
@@ -40,39 +24,35 @@ function getEquationType4ExerciseQuestion() {
     const solution = new rational_1.Rational(d.value - b.value, a.value - c.value).simplify();
     const statementTree = new equalNode_1.EqualNode(affines[0].toTree(), affines[1].toTree());
     const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), solution.toTree());
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answerTree.toTex(),
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 1; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = new rational_1.Rational(d.value - b.value + (0, randint_1.randint)(-7, 8, [0, -d.value + b.value]), a.value - c.value + (0, randint_1.randint)(-7, 8, [-a.value + c.value, 0])).simplify();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.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 answer = answerTree.toTex();
     const question = {
         instruction: `Résoudre : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer: answerTree.toTex(),
         keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: a.value, b: b.value, c: c.value, d: d.value },
     };
     return question;
-}
-exports.getEquationType4ExerciseQuestion = getEquationType4ExerciseQuestion;
+};
+const getPropositions = (n, { answer, a, b, c, d }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = new rational_1.Rational(d - b + (0, randint_1.randint)(-7, 8, [0, -d + b]), a - c + (0, randint_1.randint)(-7, 8, [-a + c, 0])).simplify();
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.toTree()).toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.equationType4Exercise = {
+    id: 'equa4',
+    connector: '\\iff',
+    label: 'Équations $ax+b=cx+d$',
+    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
+    sections: ['Équations'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType4ExerciseQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAa/E,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AAEF,wBAAgB,cAAc,IAAI,QAAQ,CAuDzC"}
+{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpEquation = exports.expEquation = void 0;
+exports.expEquation = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const expNode_1 = require("../../../tree/nodes/functions/expNode");
@@ -12,58 +13,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 getExpEquation = () => {
+    const a = (0, randint_1.randint)(-9, 20, [0]);
+    const k = a > 0 ? (0, randint_1.randint)(1, 20) : (0, randint_1.randint)(-20, 0);
+    const equation = new equalNode_1.EqualNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')))), new numberNode_1.NumberNode(k));
+    const answer = new logNode_1.LogNode((0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(k), new numberNode_1.NumberNode(a)))).toTex();
+    const question = {
+        instruction: `Résoudre l'équation $${equation.toTex()}$.`,
+        answer: answer,
+        keys: ['x', 'equal', 'epower', 'exp', 'ln'],
+        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 logNode_1.LogNode((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.expEquation = {
     id: 'expEquation',
     connector: '=',
-    instruction: '',
     label: 'Résoudre des équations de type $a \\times \\exp(x) = k$',
     levels: ['1reSpé', 'TermSpé', 'MathComp'],
     sections: ['Exponentielle'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpEquation, nb),
-    keys: ['x', 'equal', 'epower', 'exp', 'ln'],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getExpEquation() {
-    const a = (0, randint_1.randint)(-9, 20, [0]);
-    const k = a > 0 ? (0, randint_1.randint)(1, 20) : (0, randint_1.randint)(-20, 0);
-    const equation = new equalNode_1.EqualNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')))), new numberNode_1.NumberNode(k));
-    const answer = new logNode_1.LogNode((0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(k), new numberNode_1.NumberNode(a))));
-    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 logNode_1.LogNode((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', 'epower', 'exp', 'ln'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getExpEquation = getExpEquation;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,mBAAmB,EAAE,YAYjC,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CAoDjD"}
+{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,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;AA+BnB,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}

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

@@ -1,67 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstDegreeEquation = exports.firstDegreeEquation = void 0;
+exports.firstDegreeEquation = void 0;
+const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const getFirstDegreeEquation = () => {
+    const a = (0, randint_1.randint)(-30, 30, [0]);
+    const b = (0, randint_1.randint)(-30, 30, [0]);
+    const answer = `x=${new rational_1.Rational(a, b).simplify().toTree().toTex()}`;
+    const question = {
+        instruction: `Résoudre l'équation suivante : $\\frac{${a}}{x} = ${b}$`,
+        startStatement: `x`,
+        answer,
+        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a, b },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(b / a)).toTex()}`);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode((a + (0, randint_1.randint)(-7, 8, [-a])) / (b + (0, randint_1.randint)(-7, 8, [-b])))).toTex()}`);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.firstDegreeEquation = {
     id: 'firstDegreeEquation',
     connector: '=',
-    instruction: '',
     label: 'Résoudre une équation du premier degré du type $\\frac{a}{x} = b$',
     levels: ['2nde', '1reESM', '1reSpé'],
     sections: ['Équations'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeEquation, nb),
-    keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
+    getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
 };
-function getFirstDegreeEquation() {
-    const a = (0, randint_1.randint)(-30, 30, [0]);
-    const b = (0, randint_1.randint)(-30, 30, [0]);
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b)).toTex()}`,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(b / a)).toTex()}`,
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode((a + (0, randint_1.randint)(-7, 8, [-a])) / (b + (0, randint_1.randint)(-7, 8, [-b])))).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ésoudre l'équation suivante : $\\frac{${a}}{x} = ${b}$`,
-        startStatement: `x`,
-        answer: `x=${new rational_1.Rational(a, b).simplify().toTree().toTex()}`,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-    return question;
-}
-exports.getFirstDegreeEquation = getFirstDegreeEquation;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"fractionEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/fractionEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAiE9C"}
+{"version":3,"file":"fractionEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/fractionEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionEquation = exports.fractionEquation = void 0;
+exports.fractionEquation = 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.fractionEquation = {
-    id: 'fractionEquation',
-    connector: '\\iff',
-    instruction: '',
-    label: 'Résoudre une équation quotient nul',
-    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
-    sections: ['Équations'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionEquation, nb),
-    keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'ou', 'emptyset'],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionEquation() {
+const getFractionEquation = () => {
     // (ax + b)/(cx + d) = 0
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const b = (0, randint_1.randint)(-9, 10, [0]);
@@ -32,45 +19,40 @@ function getFractionEquation() {
     const polynome1 = new polynomial_1.Polynomial([b, a]);
     const polynome2 = new polynomial_1.Polynomial([d, c]);
     const answer = -d / c === -b / a ? `S=\\emptyset` : `S=\\left\\{${new rational_1.Rational(-b, a).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 {
-                const a = (0, randint_1.randint)(-9, 10, [0]);
-                const b = (0, randint_1.randint)(-9, 10, [0]);
-                const c = (0, randint_1.randint)(-9, 10, [0]);
-                const d = (0, randint_1.randint)(-9, 10, [0]);
-                const wrongAnswer = -d / c === -b / a
-                    ? `S=\\emptyset`
-                    : `S=\\left\\{${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-b), new numberNode_1.NumberNode(a))).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 : $\\frac{${polynome1.toTex()}}{${polynome2.toTex()}} = 0$`,
         startStatement: `\\frac{${polynome1.toTex()}}{${polynome2.toTex()}} = 0`,
         answer,
         keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'ou', 'emptyset'],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer },
     };
     return question;
-}
-exports.getFractionEquation = getFractionEquation;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const a = (0, randint_1.randint)(-9, 10, [0]);
+        const b = (0, randint_1.randint)(-9, 10, [0]);
+        const c = (0, randint_1.randint)(-9, 10, [0]);
+        const d = (0, randint_1.randint)(-9, 10, [0]);
+        const wrongAnswer = -d / c === -b / a
+            ? `S=\\emptyset`
+            : `S=\\left\\{${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-b), new numberNode_1.NumberNode(a))).toTex()}\\right\\}`;
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.fractionEquation = {
+    id: 'fractionEquation',
+    connector: '\\iff',
+    label: 'Résoudre une équation quotient nul',
+    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
+    sections: ['Équations'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionEquation, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAe/E,eAAO,MAAM,WAAW,EAAE,YAYzB,CAAC;AAEF,wBAAgB,aAAa,IAAI,QAAQ,CAuDxC"}
+{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAelC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}