math-exercises 2.0.12 → 2.0.13

package/lib/exercises/primitve/exponentialPrimitive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exponentialPrimitive = exports.getExponentialPrimitivePropositions = exports.getExponentialPrimitive = void 0;
+exports.getExponentialPrimitive = exports.exponentialPrimitive = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../math/polynomials/polynomial");
@@ -14,7 +14,21 @@ const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
 const simplify_1 = require("../../tree/parsers/simplify");
 const coinFlip_1 = require("../../utils/coinFlip");
-const getExponentialPrimitive = () => {
+const uuid_1 = require("uuid");
+exports.exponentialPrimitive = {
+    id: 'exponentialPrimitive',
+    connector: '=',
+    instruction: '',
+    label: 'Primitive de la fonction exponentielle',
+    levels: ['TermSpé', 'MathComp'],
+    sections: ['Primitives', 'Exponentielle'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExponentialPrimitive, nb),
+    keys: ['x', 'C', 'epower', 'exp'],
+    qcmTimer: 60,
+    freeTimer: 60,
+};
+function getExponentialPrimitive() {
     const rand = (0, coinFlip_1.coinFlip)();
     const a = (0, randint_1.randint)(-9, 10);
     const u = polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3));
@@ -22,77 +36,71 @@ const getExponentialPrimitive = () => {
     let integratedFuction;
     if (rand) {
         // a * e^(x)
-        const node = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')));
-        selectedFunction = (0, simplify_1.simplifyNode)(node); // le simplify ici a pour but de éviter les 1*e / -1*e
-        integratedFuction = node;
+        selectedFunction = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')))); // le simplify ici a pour but de éviter les 1*e / -1*e
+        integratedFuction = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')));
     }
     else {
         // u'(x) * e^(u(x))
-        const expUTree = new expNode_1.ExpNode(u.toTree());
-        selectedFunction = new multiplyNode_1.MultiplyNode(u.derivate().toTree(), expUTree);
-        integratedFuction = expUTree;
+        const oneOrTwo = (0, coinFlip_1.coinFlip)();
+        selectedFunction = new multiplyNode_1.MultiplyNode(u.derivate().toTree(), new expNode_1.ExpNode(u.toTree()));
+        integratedFuction = new expNode_1.ExpNode(u.toTree());
     }
-    const answer = `${(0, simplify_1.simplifyNode)(integratedFuction).toTex()}+C`;
+    const getPropositions = (n) => {
+        const propositions = [];
+        propositions.push({
+            id: (0, uuid_1.v4)(),
+            statement: `${(0, simplify_1.simplifyNode)(integratedFuction).toTex()} + C`,
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        if (rand) {
+            const wrongIntegrals = [
+                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))),
+                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')))),
+                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new fractionNode_1.FractionNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(a)))),
+                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new addNode_1.AddNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(a)))),
+                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(a)))),
+                new expNode_1.ExpNode(new variableNode_1.VariableNode('x')),
+            ];
+            wrongIntegrals.forEach((node) => (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(node).toTex()));
+        }
+        else {
+            const wrongIntegrals = [
+                new multiplyNode_1.MultiplyNode(u.toTree(), new expNode_1.ExpNode(u.toTree())),
+                new multiplyNode_1.MultiplyNode(u.derivate().toTree(), new expNode_1.ExpNode(u.toTree())),
+                new multiplyNode_1.MultiplyNode(u.toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))),
+                new multiplyNode_1.MultiplyNode(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(1), u.toTree()), new expNode_1.ExpNode(new variableNode_1.VariableNode('x'))),
+                new multiplyNode_1.MultiplyNode(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(1), u.toTree()), new expNode_1.ExpNode(u.toTree())),
+                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])), new expNode_1.ExpNode(u.toTree())),
+            ];
+            wrongIntegrals.forEach((node) => (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(node).toTex()));
+        }
+        const missing = n - propositions.length;
+        for (let i = 0; i < missing; i++) {
+            let isDuplicate;
+            let proposition;
+            let wrongIntegral = (0, randint_1.randint)(-10, 10) + 'e^x';
+            do {
+                proposition = {
+                    id: (0, uuid_1.v4)(),
+                    statement: `${wrongIntegral} + C`,
+                    isRightAnswer: false,
+                    format: 'tex',
+                };
+                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            propositions.push(proposition);
+        }
+        return (0, exercise_1.shuffleProps)(propositions, n);
+    };
     const question = {
         instruction: `Déterminer la forme générale des primitives de la fonction f définie par $f(x) = ${selectedFunction.toTex()}$.`,
         startStatement: `F(x)`,
-        answer,
+        answer: `${(0, simplify_1.simplifyNode)(integratedFuction).toTex()}+C`,
         keys: ['x', 'C', 'epower', 'exp'],
+        getPropositions,
         answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, rand, coeffs: u.coefficients },
     };
     return question;
-};
+}
 exports.getExponentialPrimitive = getExponentialPrimitive;
-const getExponentialPrimitivePropositions = (n, { answer, a, rand, coeffs }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    if (rand) {
-        const aNode = new numberNode_1.NumberNode(a);
-        const xNode = new variableNode_1.VariableNode('x');
-        const expXTree = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
-        const wrongIntegrals = [
-            new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-a), expXTree),
-            new multiplyNode_1.MultiplyNode(aNode, new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(aNode, xNode))),
-            new multiplyNode_1.MultiplyNode(aNode, new expNode_1.ExpNode(new fractionNode_1.FractionNode(xNode, aNode))),
-            new multiplyNode_1.MultiplyNode(aNode, new expNode_1.ExpNode(new addNode_1.AddNode(xNode, aNode))),
-            new multiplyNode_1.MultiplyNode(aNode, new expNode_1.ExpNode(new powerNode_1.PowerNode(xNode, aNode))),
-            expXTree,
-        ];
-        wrongIntegrals.forEach((node) => (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(node).toTex()));
-    }
-    else {
-        const u = new polynomial_1.Polynomial(coeffs);
-        const uTree = u.toTree();
-        const expXTree = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
-        const expUTree = new expNode_1.ExpNode(uTree);
-        const invUTree = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(1), uTree);
-        const wrongIntegrals = [
-            new multiplyNode_1.MultiplyNode(uTree, expUTree),
-            new multiplyNode_1.MultiplyNode(u.derivate().toTree(), expUTree),
-            new multiplyNode_1.MultiplyNode(uTree, expXTree),
-            new multiplyNode_1.MultiplyNode(invUTree, expXTree),
-            new multiplyNode_1.MultiplyNode(invUTree, expUTree),
-            new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])), expUTree),
-        ];
-        wrongIntegrals.forEach((node) => (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(node).toTex()));
-    }
-    while (propositions.length < n) {
-        let wrongIntegral = (0, randint_1.randint)(-10, 10) + 'e^x';
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${wrongIntegral} + C`);
-    }
-    return (0, exercise_1.shuffleProps)(propositions, n);
-};
-exports.getExponentialPrimitivePropositions = getExponentialPrimitivePropositions;
-exports.exponentialPrimitive = {
-    id: 'exponentialPrimitive',
-    connector: '=',
-    label: 'Primitive de la fonction exponentielle',
-    levels: ['TermSpé', 'MathComp'],
-    sections: ['Primitives', 'Exponentielle'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getExponentialPrimitive, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions: exports.getExponentialPrimitivePropositions,
-};

package/lib/exercises/primitve/logarithmePrimitive.d.ts

@@ -1,11 +1,4 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    coeffs: number[];
-};
-type VEAProps = {};
-export declare const getLogarithmePrimitive: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getLogarithmePrimitivePropositions: QCMGenerator<QCMProps>;
-export declare const logarithmePrimitive: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../exercises/exercise';
+export declare const logarithmePrimitive: MathExercise;
+export declare function getLogarithmePrimitive(): Question;
 //# sourceMappingURL=logarithmePrimitive.d.ts.map

package/lib/exercises/primitve/logarithmePrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logarithmePrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/logarithmePrimitive.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,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AACnB,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAkBxE,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,QAAQ,CA4BrE,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}
+{"version":3,"file":"logarithmePrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/logarithmePrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAW/E,eAAO,MAAM,mBAAmB,EAAE,YAYjC,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CAiEjD"}

package/lib/exercises/primitve/logarithmePrimitive.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logarithmePrimitive = exports.getLogarithmePrimitivePropositions = exports.getLogarithmePrimitive = void 0;
-const exercise_1 = require("../../exercises/exercise");
+exports.getLogarithmePrimitive = exports.logarithmePrimitive = void 0;
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../math/polynomials/polynomial");
 const randint_1 = require("../../math/utils/random/randint");
@@ -10,53 +9,68 @@ const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
-const getLogarithmePrimitive = () => {
-    const u = polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3));
-    const selectedFunction = new fractionNode_1.FractionNode(u.derivate().toTree(), u.toTree());
-    const integratedFuction = `\\ln\\left|${u.toTex()}\\right|`;
-    const answer = `${integratedFuction}+C`;
-    const question = {
-        instruction: `Déterminer la forme générale des primitives de la fonction f définie par $f(x) = ${(0, simplify_1.simplifyNode)(selectedFunction).toTex()}$.`,
-        startStatement: `F(x)`,
-        answer,
-        keys: ['x', 'C', 'ln', 'abs'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, coeffs: u.coefficients },
-    };
-    return question;
-};
-exports.getLogarithmePrimitive = getLogarithmePrimitive;
-const getLogarithmePrimitivePropositions = (n, { answer, coeffs }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const u = new polynomial_1.Polynomial(coeffs);
-    const wrongIntegrals = [
-        new fractionNode_1.FractionNode(u.derivate().toTree(), new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2))).toTex(),
-        new fractionNode_1.FractionNode(u
-            .derivate()
-            .multiply(new polynomial_1.Polynomial([-1]))
-            .toTree(), new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2))).toTex(),
-        `ln(${new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2)).toTex()})`,
-    ];
-    while (propositions.length < n) {
-        wrongIntegrals.push(new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2)).toTex(), `ln\|${polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3)).toTex()}\|`);
-        let wrongIntegral;
-        wrongIntegral = wrongIntegrals[(0, randint_1.randint)(0, wrongIntegrals.length)];
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${wrongIntegral} + C`);
-        wrongIntegrals.pop();
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.getLogarithmePrimitivePropositions = getLogarithmePrimitivePropositions;
+const uuid_1 = require("uuid");
 exports.logarithmePrimitive = {
     id: 'logarithmePrimitive',
     connector: '=',
+    instruction: '',
     label: 'Primitive de la fonction logarithme',
     levels: ['TermSpé', 'MathComp'],
     sections: ['Primitives', 'Logarithme népérien'],
     isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getLogarithmePrimitive, nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLogarithmePrimitive, nb),
+    keys: ['x', 'C', 'ln', 'abs'],
     qcmTimer: 60,
     freeTimer: 60,
-    getPropositions: exports.getLogarithmePrimitivePropositions,
 };
+function getLogarithmePrimitive() {
+    const u = polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3));
+    const selectedFunction = new fractionNode_1.FractionNode(u.derivate().toTree(), u.toTree());
+    const integratedFuction = `ln\|${u.toTex()}\|`;
+    const getPropositions = (n) => {
+        const propositions = [];
+        propositions.push({
+            id: (0, uuid_1.v4)(),
+            statement: `${integratedFuction} + C`,
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        for (let i = 0; i < n - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            let wrongIntegral;
+            do {
+                const wrongIntegrals = [
+                    new fractionNode_1.FractionNode(u.derivate().toTree(), new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2))).toTex(),
+                    new fractionNode_1.FractionNode(u
+                        .derivate()
+                        .multiply(new polynomial_1.Polynomial([-1]))
+                        .toTree(), new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2))).toTex(),
+                    `ln(${new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2)).toTex()})`,
+                    new powerNode_1.PowerNode(u.toTree(), new numberNode_1.NumberNode(2)).toTex(),
+                    `ln\|${polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3)).toTex()}\|`,
+                ];
+                wrongIntegral = wrongIntegrals[(0, randint_1.randint)(0, wrongIntegrals.length)];
+                proposition = {
+                    id: (0, uuid_1.v4)(),
+                    statement: `${wrongIntegral} + C`,
+                    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: `Déterminer la forme générale des primitives de la fonction f définie par $f(x) = ${(0, simplify_1.simplifyNode)(selectedFunction).toTex()}$.`,
+        startStatement: `F(x)`,
+        answer: `${integratedFuction}+C`,
+        keys: ['x', 'C', 'ln', 'abs'],
+        getPropositions,
+        answerFormat: 'tex',
+    };
+    return question;
+}
+exports.getLogarithmePrimitive = getLogarithmePrimitive;

package/lib/exercises/primitve/polynomialPrimitive.d.ts

@@ -1,11 +1,4 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    degree: number;
-};
-type VEAProps = {};
-export declare const getPolynomialPrimitive: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getPolynomialPrimitivePropositions: QCMGenerator<QCMProps>;
-export declare const polynomialPrimitive: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../exercises/exercise';
+export declare const polynomialPrimitive: MathExercise;
+export declare function getPolynomialPrimitive(): Question;
 //# sourceMappingURL=polynomialPrimitive.d.ts.map

package/lib/exercises/primitve/polynomialPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polynomialPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/polynomialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0BnB,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAiBxE,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,QAAQ,CAUrE,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}
+{"version":3,"file":"polynomialPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/polynomialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAgB/E,eAAO,MAAM,mBAAmB,EAAE,YAYjC,CAAC;AAkBF,wBAAgB,sBAAsB,IAAI,QAAQ,CAiDjD"}

package/lib/exercises/primitve/polynomialPrimitive.js

@@ -1,75 +1,82 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.polynomialPrimitive = exports.getPolynomialPrimitivePropositions = exports.getPolynomialPrimitive = void 0;
-const exercise_1 = require("../../exercises/exercise");
+exports.getPolynomialPrimitive = exports.polynomialPrimitive = void 0;
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
-const rational_1 = require("../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../math/polynomials/polynomial");
 const randint_1 = require("../../math/utils/random/randint");
-const oppositeNode_1 = require("../../tree/nodes/functions/oppositeNode");
 const constantNode_1 = require("../../tree/nodes/numbers/constantNode");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../tree/nodes/operators/addNode");
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
+const simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
+const uuid_1 = require("uuid");
+exports.polynomialPrimitive = {
+    id: 'polynomialPrimitive',
+    connector: '=',
+    instruction: '',
+    label: "Primitive d'une fonction polynomiale",
+    levels: ['TermSpé', 'MathComp'],
+    sections: ['Primitives'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPolynomialPrimitive, nb),
+    keys: ['x', 'C'],
+    qcmTimer: 60,
+    freeTimer: 60,
+};
 function getIntegratedPolynomialNode(polynomial) {
     let integralPolynomial = new constantNode_1.ConstantNode('C', 'C');
     for (let i = 0; i < polynomial.degree + 1; i++) {
         const coeff = polynomial.coefficients[i];
         if (coeff === 0)
             continue;
-        const nodeCoeff = new rational_1.Rational(coeff, i + 1).simplify().toTree();
-        const powerNode = i + 1 === 1 ? new variableNode_1.VariableNode('x') : new powerNode_1.PowerNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(i + 1));
-        let terme;
-        if (nodeCoeff.toTex() === '1')
-            terme = powerNode;
-        else if (nodeCoeff.toTex() === '-1')
-            terme = new oppositeNode_1.OppositeNode(powerNode);
-        else {
-            terme = new multiplyNode_1.MultiplyNode(nodeCoeff, i + 1 === 1 ? new variableNode_1.VariableNode('x') : new powerNode_1.PowerNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(i + 1)));
-        }
+        const nodeCoeff = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(coeff), new numberNode_1.NumberNode(i + 1));
+        const terme = new multiplyNode_1.MultiplyNode((0, simplify_1.simplifyNode)(nodeCoeff), i + 1 === 1 ? new variableNode_1.VariableNode('x') : new powerNode_1.PowerNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(i + 1)));
         integralPolynomial = new addNode_1.AddNode(terme, integralPolynomial);
     }
     return integralPolynomial;
 }
-const getPolynomialPrimitive = () => {
+function getPolynomialPrimitive() {
     const degree = (0, randint_1.randint)(1, 4);
     const polynomial = polynomial_1.PolynomialConstructor.randomWithOrder(degree);
     const integralPolynomial = getIntegratedPolynomialNode(polynomial);
-    const answer = `${integralPolynomial.toTex()}`;
+    const getPropositions = (n) => {
+        const propositions = [];
+        propositions.push({
+            id: (0, uuid_1.v4)(),
+            statement: `${integralPolynomial.toTex()}`,
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        for (let i = 0; i < n - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                const wrongPolynomial = polynomial_1.PolynomialConstructor.randomWithOrder(degree);
+                const wrongIntegral = getIntegratedPolynomialNode(wrongPolynomial);
+                proposition = {
+                    id: (0, uuid_1.v4)(),
+                    statement: wrongIntegral.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: `Déterminer la forme générale des primitives de la fonction polynomiale $f$ définie par $f(x) = ${polynomial.toTex()}$.`,
         startStatement: `F(x)`,
-        answer,
+        answer: `${integralPolynomial.toTex()}`,
         keys: ['x', 'C'],
+        getPropositions,
         answerFormat: 'tex',
-        qcmGeneratorProps: { answer, degree },
     };
     return question;
-};
+}
 exports.getPolynomialPrimitive = getPolynomialPrimitive;
-const getPolynomialPrimitivePropositions = (n, { answer, degree }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    while (propositions.length < n) {
-        const wrongPolynomial = polynomial_1.PolynomialConstructor.randomWithOrder(degree);
-        const wrongIntegral = getIntegratedPolynomialNode(wrongPolynomial);
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongIntegral.toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.getPolynomialPrimitivePropositions = getPolynomialPrimitivePropositions;
-exports.polynomialPrimitive = {
-    id: 'polynomialPrimitive',
-    connector: '=',
-    label: "Primitive d'une fonction polynomiale",
-    levels: ['TermSpé', 'MathComp'],
-    sections: ['Primitives'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getPolynomialPrimitive, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions: exports.getPolynomialPrimitivePropositions,
-};

package/lib/exercises/primitve/sinCosPrimitive.d.ts

@@ -1,13 +1,4 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    rand: boolean;
-    a: number;
-    coeffs: number[];
-};
-type VEAProps = {};
-export declare const getSinCosPrimitive: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getSinCosPrimitivePropositions: QCMGenerator<QCMProps>;
-export declare const sinCosPrimitive: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../exercises/exercise';
+export declare const sinCosPrimitive: MathExercise;
+export declare function getSinCosPrimitive(): Question;
 //# sourceMappingURL=sinCosPrimitive.d.ts.map

package/lib/exercises/primitve/sinCosPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sinCosPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/sinCosPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAelC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAEnB,eAAO,MAAM,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CA6CpE,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,QAAQ,CAkCjE,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"sinCosPrimitive.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/sinCosPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAe/E,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAkG7C"}

package/lib/exercises/primitve/sinCosPrimitive.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sinCosPrimitive = exports.getSinCosPrimitivePropositions = exports.getSinCosPrimitive = void 0;
-const exercise_1 = require("../../exercises/exercise");
+exports.getSinCosPrimitive = exports.sinCosPrimitive = void 0;
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../math/polynomials/polynomial");
 const randint_1 = require("../../math/utils/random/randint");
@@ -13,7 +12,21 @@ const variableNode_1 = require("../../tree/nodes/variables/variableNode");
 const simplify_1 = require("../../tree/parsers/simplify");
 const coinFlip_1 = require("../../utils/coinFlip");
 const shuffle_1 = require("../../utils/shuffle");
-const getSinCosPrimitive = () => {
+const uuid_1 = require("uuid");
+exports.sinCosPrimitive = {
+    id: 'sinCosPrimitive',
+    connector: '=',
+    instruction: '',
+    label: 'Primitive de sin et cos',
+    levels: ['TermSpé', 'MathComp'],
+    sections: ['Primitives', 'Trigonométrie'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSinCosPrimitive, nb),
+    keys: ['x', 'C', 'sin', 'cos'],
+    qcmTimer: 60,
+    freeTimer: 60,
+};
+function getSinCosPrimitive() {
     const rand = (0, coinFlip_1.coinFlip)();
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const u = polynomial_1.PolynomialConstructor.randomWithOrder((0, randint_1.randint)(1, 3));
@@ -39,62 +52,63 @@ const getSinCosPrimitive = () => {
             ? new sinNode_1.SinNode(u.toTree())
             : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), new cosNode_1.CosNode(u.toTree()));
     }
-    const answer = `${(0, simplify_1.simplifyNode)(integratedFuction).toTex()}+C`;
+    const getPropositions = (n) => {
+        const propositions = [];
+        propositions.push({
+            id: (0, uuid_1.v4)(),
+            statement: `${(0, simplify_1.simplifyNode)(integratedFuction).toTex()} + C`,
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        for (let i = 0; i < n - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            let wrongIntegral;
+            do {
+                if (rand) {
+                    const wrongIntegrals = [
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-a), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-a), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [a, 0])), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [a, 0])), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
+                    ];
+                    wrongIntegral = wrongIntegrals[(0, randint_1.randint)(0, wrongIntegrals.length)];
+                }
+                else {
+                    const wrongIntegrals = [
+                        new multiplyNode_1.MultiplyNode(u.toTree(), new cosNode_1.CosNode(u.toTree())),
+                        new multiplyNode_1.MultiplyNode(u.toTree(), new sinNode_1.SinNode(u.toTree())),
+                        new sinNode_1.SinNode(u.toTree()),
+                        new cosNode_1.CosNode(u.toTree()),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), new cosNode_1.CosNode(u.toTree())),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), new sinNode_1.SinNode(u.toTree())),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
+                        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
+                    ];
+                    wrongIntegral = wrongIntegrals[(0, randint_1.randint)(0, wrongIntegrals.length)];
+                }
+                proposition = {
+                    id: (0, uuid_1.v4)(),
+                    statement: `${(0, simplify_1.simplifyNode)(wrongIntegral).toTex()} + C`,
+                    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: `Déterminer la forme générale des primitives de la fonction f définie par $f(x) = ${(0, simplify_1.simplifyNode)(selectedFunction).toTex()}$.`,
         startStatement: `F(x)`,
-        answer,
+        answer: `${(0, simplify_1.simplifyNode)(integratedFuction).toTex()}+C`,
         keys: ['x', 'C', 'sin', 'cos'],
+        getPropositions,
         answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, rand, coeffs: u.coefficients },
     };
     return question;
-};
+}
 exports.getSinCosPrimitive = getSinCosPrimitive;
-const getSinCosPrimitivePropositions = (n, { answer, rand, a, coeffs }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const u = new polynomial_1.Polynomial(coeffs);
-    while (propositions.length < n) {
-        let wrongIntegral;
-        if (rand) {
-            const wrongIntegrals = [
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-a), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-a), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [a, 0])), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [a, 0])), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
-            ];
-            wrongIntegral = wrongIntegrals[(0, randint_1.randint)(0, wrongIntegrals.length)];
-        }
-        else {
-            const wrongIntegrals = [
-                new multiplyNode_1.MultiplyNode(u.toTree(), new cosNode_1.CosNode(u.toTree())),
-                new multiplyNode_1.MultiplyNode(u.toTree(), new sinNode_1.SinNode(u.toTree())),
-                new sinNode_1.SinNode(u.toTree()),
-                new cosNode_1.CosNode(u.toTree()),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), new cosNode_1.CosNode(u.toTree())),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), new sinNode_1.SinNode(u.toTree())),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])), new cosNode_1.CosNode(new variableNode_1.VariableNode('x'))),
-                new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])), new sinNode_1.SinNode(new variableNode_1.VariableNode('x'))),
-            ];
-            wrongIntegral = wrongIntegrals[(0, randint_1.randint)(0, wrongIntegrals.length)];
-        }
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${(0, simplify_1.simplifyNode)(wrongIntegral).toTex()} + C`);
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.getSinCosPrimitivePropositions = getSinCosPrimitivePropositions;
-exports.sinCosPrimitive = {
-    id: 'sinCosPrimitive',
-    connector: '=',
-    label: 'Primitive de sin et cos',
-    levels: ['TermSpé', 'MathComp'],
-    sections: ['Primitives', 'Trigonométrie'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getSinCosPrimitive, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions: exports.getSinCosPrimitivePropositions,
-};

package/lib/exercises/primitve/usualPrimitives.d.ts

@@ -1,13 +1,4 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    type: number;
-    a?: number;
-    rand?: boolean;
-    coeffs?: number[];
-    degree?: number;
-};
-type VEAProps = {};
-export declare const usualPrimitives: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise, Question } from '../../exercises/exercise';
+export declare const usualPrimitives: MathExercise;
+export declare function getUsualPrimitives(): Question;
 //# sourceMappingURL=usualPrimitives.d.ts.map

package/lib/exercises/primitve/usualPrimitives.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usualPrimitives.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/usualPrimitives.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0D,MAAM,0BAA0B,CAAC;AAiBhH,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAyDnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"usualPrimitives.d.ts","sourceRoot":"","sources":["../../../src/exercises/primitve/usualPrimitives.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AASlE,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAiB7C"}