math-exercises 1.4.18 → 2.0.1

package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDoubleDistributivityQuestion = exports.doubleDistributivity = void 0;
+exports.doubleDistributivity = 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");
@@ -9,77 +10,49 @@ 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");
+const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const getDoubleDistributivityQuestion = () => {
+    const affines = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
+    const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].toTree());
+    const answer = affines[0].multiply(affines[1]).toTree().toTex();
+    const question = {
+        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer,
+        keys: ['x'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, affine1Coeffs: affines[0].coefficients, affine2Coeffs: affines[1].coefficients },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const affines = [new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]), new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0])];
+    (0, exercise_1.tryToAddWrongProp)(propositions, affines[0]
+        .multiply(new affine_1.Affine(-affines[1].a, (0, randint_1.randint)(-9, 10, [affines[1].b])))
+        .toTree()
+        .toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, affines[1]
+        .multiply(new affine_1.Affine((0, randint_1.randint)(-9, 10, [affines[0].a, 0]), affines[0].b))
+        .toTree()
+        .toTex());
+    while (propositions.length < n) {
+        const affinesTemps = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
+        const wrongAnswer = affinesTemps[0].multiply(affinesTemps[1]).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.doubleDistributivity = {
     id: 'doubleDistri',
     connector: '=',
-    instruction: '',
     label: 'Distributivité double',
     levels: ['3ème', '2nde', '1reTech'],
     sections: ['Calcul littéral'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDoubleDistributivityQuestion, nb),
-    keys: ['x'],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getDoubleDistributivityQuestion() {
-    const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const affines = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
-    const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].toTree());
-    const answerTree = affines[0].multiply(affines[1]).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: affines[0]
-                .multiply(new affine_1.Affine(-affines[1].a, (0, randint_1.randint)(-9, 10, [affines[1].b])))
-                .toTree()
-                .toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: affines[1]
-                    .multiply(new affine_1.Affine((0, randint_1.randint)(-9, 10, [affines[0].a, 0]), affines[0].b))
-                    .toTree()
-                    .toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; i < n - 3; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const affinesTemps = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
-                const wrongAnswer = affinesTemps[0].multiply(affinesTemps[1]).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);
-    };
-    return {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
-        keys: ['x'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-}
-exports.getDoubleDistributivityQuestion = getDoubleDistributivityQuestion;

package/lib/exercises/calculLitteral/distributivity/firstIdentity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/firstIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CAuEnD"}
+{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAYlC,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;AAGnB,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAe1E,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,CAe/D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}

package/lib/exercises/calculLitteral/distributivity/firstIdentity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstIdentityQuestion = exports.firstIdentity = void 0;
+exports.firstIdentity = exports.getFirstIdentityPropositions = exports.getFirstIdentityQuestion = 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,78 +11,46 @@ const intervals_1 = require("../../../math/sets/intervals/intervals");
 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");
+const interval = new intervals_1.Interval('[[1; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const getFirstIdentityQuestion = () => {
+    const affine = affine_1.AffineConstructor.random(interval, interval);
+    const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
+    const answer = affine.multiply(affine).toTree().toTex();
+    const question = {
+        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer,
+        keys: ['x'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
+    };
+    return question;
+};
+exports.getFirstIdentityQuestion = getFirstIdentityQuestion;
+const getFirstIdentityPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([b ** 2, 0, a ** 2]).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([b ** 2, a * b, a ** 2]).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([b ** 2, a ** 2 + b ** 2, a ** 2]).toTree().toTex());
+    const affine = new affine_1.Affine(a, b);
+    while (propositions.length < n) {
+        const affineTemp = affine_1.AffineConstructor.random(interval, interval);
+        const wrongAnswer = affine.multiply(affineTemp).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.getFirstIdentityPropositions = getFirstIdentityPropositions;
 exports.firstIdentity = {
     id: 'idRmq1',
     connector: '=',
-    instruction: '',
     label: 'Identité remarquable $(a+b)^2$',
     levels: ['3ème', '2nde'],
     sections: ['Calcul littéral'],
     isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstIdentityQuestion, nb),
-    keys: ['x'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getFirstIdentityQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions: exports.getFirstIdentityPropositions,
 };
-function getFirstIdentityQuestion() {
-    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 = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const answerTree = affine.multiply(affine).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 polynomial_1.Polynomial([affine.b ** 2, 0, affine.a ** 2]).toTree().toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new polynomial_1.Polynomial([affine.b ** 2, affine.a * affine.b, affine.a ** 2]).toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new polynomial_1.Polynomial([affine.b ** 2, affine.a ** 2 + affine.b ** 2, affine.a ** 2]).toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; i < n - 4; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const affineTemp = affine_1.AffineConstructor.random(interval, interval);
-                const wrongAnswer = affine.multiply(affineTemp).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);
-    };
-    return {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
-        keys: ['x'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-}
-exports.getFirstIdentityQuestion = getFirstIdentityQuestion;

package/lib/exercises/calculLitteral/distributivity/secondIdentity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/secondIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CAwEpD"}
+{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAYlC,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;AAKnB,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAe3E,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,QAAQ,CAgBhE,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY3D,CAAC"}

package/lib/exercises/calculLitteral/distributivity/secondIdentity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSecondIdentityQuestion = exports.secondIdentity = void 0;
+exports.secondIdentity = exports.getSecondIdentityPropositions = exports.getSecondIdentityQuestion = 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,79 +11,47 @@ const intervals_1 = require("../../../math/sets/intervals/intervals");
 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");
+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 getSecondIdentityQuestion = () => {
+    const affine = affine_1.AffineConstructor.random(intervalA, intervalB);
+    const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
+    const answer = affine.multiply(affine).toTree().toTex();
+    const question = {
+        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer,
+        keys: ['x'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
+    };
+    return question;
+};
+exports.getSecondIdentityQuestion = getSecondIdentityQuestion;
+const getSecondIdentityPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([-(b ** 2), 0, a ** 2]).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([b ** 2, a * b, a ** 2]).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([-(b ** 2), -(a ** 2 + b ** 2), a ** 2]).toTree().toTex());
+    const affine = new affine_1.Affine(a, b);
+    while (propositions.length < n) {
+        const affineTemp = affine_1.AffineConstructor.random(intervalA, intervalB);
+        const wrongAnswer = affine.multiply(affineTemp).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.getSecondIdentityPropositions = getSecondIdentityPropositions;
 exports.secondIdentity = {
     id: 'idRmq2',
     connector: '=',
-    instruction: '',
     label: 'Identité remarquable $(a-b)^2$',
     levels: ['3ème', '2nde'],
     sections: ['Calcul littéral'],
     isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSecondIdentityQuestion, nb),
-    keys: ['x'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getSecondIdentityQuestion, nb),
+    getPropositions: exports.getSecondIdentityPropositions,
     qcmTimer: 60,
     freeTimer: 60,
 };
-function getSecondIdentityQuestion() {
-    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 = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const answerTree = affine.multiply(affine).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 polynomial_1.Polynomial([-(affine.b ** 2), 0, affine.a ** 2]).toTree().toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new polynomial_1.Polynomial([affine.b ** 2, affine.a * affine.b, affine.a ** 2]).toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new polynomial_1.Polynomial([-(affine.b ** 2), -(affine.a ** 2 + affine.b ** 2), affine.a ** 2]).toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; i < n - 4; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const affineTemp = affine_1.AffineConstructor.random(intervalA, intervalB);
-                const wrongAnswer = affine.multiply(affineTemp).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);
-    };
-    return {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
-        keys: ['x'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-}
-exports.getSecondIdentityQuestion = getSecondIdentityQuestion;

package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,oBAAoB,EAAE,YAYlC,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,QAAQ,CAyE1D"}
+{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/simpleDistributivity.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;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}

package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSimpleDistributivityQuestion = exports.simpleDistributivity = void 0;
+exports.simpleDistributivity = 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");
@@ -9,79 +10,45 @@ const intervals_1 = require("../../../math/sets/intervals/intervals");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
+const excludeNbrs = [new integer_1.Integer(-1), new integer_1.Integer(0), new integer_1.Integer(1)];
+const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet(excludeNbrs));
+const getSimpleDistributivityQuestion = () => {
+    const affine = affine_1.AffineConstructor.random(interval, interval);
+    const coeff = interval.getRandomElement();
+    const statementTree = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff.value), affine.toTree());
+    const answer = affine.times(coeff.value).toTree().toTex();
+    const question = {
+        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer,
+        keys: ['x'],
+        answerFormat: 'tex',
+        qcmGeneratorProps: { answer, a: affine.a, b: affine.b, coeff: coeff.value },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b, coeff }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const affine = new affine_1.Affine(a, b);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new affine_1.Affine(coeff * a, b).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new affine_1.Affine(a, coeff * b).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, affine.times(-coeff).toTree().toTex());
+    while (propositions.length < n) {
+        const wrongAnswer = affine_1.AffineConstructor.random(interval, interval).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
 exports.simpleDistributivity = {
     id: 'simpleDistri',
     connector: '=',
-    instruction: '',
     label: 'Distributivité simple',
     levels: ['3ème', '2nde', 'CAP', '2ndPro', '1reTech'],
     sections: ['Calcul littéral'],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimpleDistributivityQuestion, nb),
-    keys: ['x'],
     qcmTimer: 60,
     freeTimer: 60,
+    getPropositions,
 };
-function getSimpleDistributivityQuestion() {
-    const excludeNbrs = [new integer_1.Integer(-1), new integer_1.Integer(0), new integer_1.Integer(1)];
-    const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet(excludeNbrs));
-    const affine = affine_1.AffineConstructor.random(interval, interval);
-    const coeff = interval.getRandomElement();
-    const statementTree = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff.value), affine.toTree());
-    const answerTree = affine.times(coeff.value).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 affine_1.Affine(coeff.value * affine.a, affine.b).toTree().toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (n > 2)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new affine_1.Affine(affine.a, coeff.value * affine.b).toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        if (n > 3)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: affine.times(-coeff.value).toTree().toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        for (let i = 0; i < n - 4; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongAnswer = affine_1.AffineConstructor.random(interval, interval).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);
-    };
-    return {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
-        keys: ['x'],
-        getPropositions,
-        answerFormat: 'tex',
-    };
-}
-exports.getSimpleDistributivityQuestion = getSimpleDistributivityQuestion;

package/lib/exercises/calculLitteral/distributivity/thirdIdentity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/thirdIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CAyEnD"}
+{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAUlC,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;AAInB,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAe1E,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,CAgB/D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY1D,CAAC"}