math-exercises 2.0.1 → 2.0.3

package/lib/exercises/calcul/fractions/fractionAndIntegerDivision.js

@@ -1,73 +1,77 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fractionAndIntegerDivision = 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");
-const randint_1 = require("../../../math/utils/random/randint");
-const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
-const coinFlip_1 = require("../../../utils/coinFlip");
-const getFractionAndIntegerDivision = () => {
-    const rational = rational_1.RationalConstructor.randomIrreductible();
-    const integerFirst = (0, coinFlip_1.coinFlip)();
-    const integer = integerFirst ? new integer_1.Integer((0, randint_1.randint)(-10, 11, [0])) : new integer_1.Integer((0, randint_1.randint)(-10, 11, [0, 1]));
-    const statementTree = integerFirst
-        ? new divideNode_1.DivideNode(integer.toTree(), rational.toTree())
-        : new divideNode_1.DivideNode(rational.toTree(), integer.toTree());
-    const answerTree = integerFirst ? integer.divide(rational).toTree() : rational.divide(integer).toTree();
-    const answerTex = answerTree.toTex();
-    const question = {
-        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer: answerTex,
-        keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer: answerTex,
-            integerFirst,
-            integer: integer.value,
-            rational: [rational.num, rational.denum],
-        },
-        veaProps: { integerFirst, integer: integer.value, rational: [rational.num, rational.denum] },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, integerFirst, integer, rational }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    (0, exercise_1.tryToAddWrongProp)(propositions, !integerFirst ? integerObj.divide(rationalObj).toTree().toTex() : rationalObj.divide(integerObj).toTree().toTex());
-    while (propositions.length < n) {
-        const wrongRational = rational_1.RationalConstructor.randomIrreductible();
-        const wrongAnswerTree = integerFirst
-            ? integerObj.divide(wrongRational).toTree()
-            : wrongRational.divide(integerObj).toTree();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
-    }
-    return (0, exercise_1.shuffleProps)(propositions, n);
-};
-const isAnswerValid = (ans, { integer, integerFirst, rational }) => {
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = integerFirst
-        ? integerObj.divide(rationalObj).toTree({ FractionNodeOpts: { allowDecimalSyntax: true } })
-        : rationalObj.divide(integerObj).toTree({ FractionNodeOpts: { allowDecimalSyntax: true } });
-    const texs = answerTree.toAllValidTexs();
-    console.log(texs);
-    return texs.includes(ans);
-};
-exports.fractionAndIntegerDivision = {
-    id: 'fractionAndIntegerDivision',
-    connector: '=',
-    label: "Division d'un entier et d'une fraction",
-    levels: ['4ème', '3ème', '2nde', '2ndPro', '1rePro', 'CAP'],
-    isSingleStep: false,
-    sections: ['Fractions'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerDivision, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-    isAnswerValid,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionAndIntegerDivision = 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");
+const randint_1 = require("../../../math/utils/random/randint");
+const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
+const coinFlip_1 = require("../../../utils/coinFlip");
+const getFractionAndIntegerDivision = () => {
+    const rational = rational_1.RationalConstructor.randomIrreductible();
+    const integerFirst = (0, coinFlip_1.coinFlip)();
+    const integer = integerFirst
+        ? new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]))
+        : new integer_1.Integer((0, randint_1.randint)(-10, 11, [0, 1]));
+    const statementTree = integerFirst
+        ? new divideNode_1.DivideNode(integer.toTree(), rational.toTree())
+        : new divideNode_1.DivideNode(rational.toTree(), integer.toTree());
+    const answerTree = integerFirst
+        ? integer.divide(rational).toTree()
+        : rational.divide(integer).toTree();
+    const answerTex = answerTree.toTex();
+    const question = {
+        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer: answerTex,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: {
+            integerFirst,
+            integer: integer.value,
+            rational: [rational.num, rational.denum],
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, integerFirst, integer, rational }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const integerObj = new integer_1.Integer(integer);
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    (0, exercise_1.tryToAddWrongProp)(propositions, !integerFirst
+        ? integerObj.divide(rationalObj).toTree().toTex()
+        : rationalObj.divide(integerObj).toTree().toTex());
+    while (propositions.length < n) {
+        const wrongRational = rational_1.RationalConstructor.randomIrreductible();
+        const wrongAnswerTree = integerFirst
+            ? integerObj.divide(wrongRational).toTree()
+            : wrongRational.divide(integerObj).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { integer, integerFirst, rational }) => {
+    const integerObj = new integer_1.Integer(integer);
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    const answerTree = integerFirst
+        ? integerObj.divide(rationalObj).toTree({ allowFractionToDecimal: true })
+        : rationalObj.divide(integerObj).toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
+exports.fractionAndIntegerDivision = {
+    id: "fractionAndIntegerDivision",
+    connector: "=",
+    label: "Division d'un entier et d'une fraction",
+    levels: ["4ème", "3ème", "2nde", "2ndPro", "1rePro", "CAP"],
+    isSingleStep: false,
+    sections: ["Fractions"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerDivision, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/calcul/fractions/fractionAndIntegerProduct.d.ts

@@ -1,13 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    integer: number;
-    rational: [number, number];
-};
-type VEAProps = {
-    integer: number;
-    rational: [number, number];
-};
-export declare const fractionAndIntegerProduct: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    integer: number;
+    rational: [number, number];
+};
+export declare const fractionAndIntegerProduct: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=fractionAndIntegerProduct.d.ts.map

package/lib/exercises/calcul/fractions/fractionAndIntegerProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA4BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAmBF,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAUF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYtE,CAAC"}
+{"version":3,"file":"fractionAndIntegerProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAiClC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAsCF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAa/D,CAAC"}

package/lib/exercises/calcul/fractions/fractionAndIntegerProduct.js

@@ -1,61 +1,68 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fractionAndIntegerProduct = 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");
-const randint_1 = require("../../../math/utils/random/randint");
-const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
-const shuffle_1 = require("../../../utils/shuffle");
-const getFractionAndIntegerProduct = () => {
-    const rational = rational_1.RationalConstructor.randomIrreductible();
-    const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0, 1]));
-    const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), integer.toTree());
-    statementTree.shuffle();
-    const answerTree = rational.multiply(integer).toTree();
-    const answer = answerTree.toTex();
-    const question = {
-        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer,
-        keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, integer: integer.value, rational: [rational.num, rational.denum] },
-        veaProps: { integer: integer.value, rational: [rational.num, rational.denum] },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, integer, rational }) => {
-    const propositions = [];
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value * rationalObj.num, integerObj.value * rationalObj.denum).toTex());
-    while (propositions.length < n) {
-        const randomMultiplier = (0, randint_1.randint)(-10, 10);
-        const wrongAnswerTree = rationalObj.multiply(new integer_1.Integer(randomMultiplier)).toTree();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-const isAnswerValid = (ans, { integer, rational }) => {
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = rationalObj.multiply(integerObj).toTree({ FractionNodeOpts: { allowDecimalSyntax: true } });
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(ans);
-};
-exports.fractionAndIntegerProduct = {
-    id: 'fractionAndIntegerProduct',
-    connector: '=',
-    label: "Produit d'un entier et d'une fraction",
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    isSingleStep: false,
-    sections: ['Fractions'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerProduct, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-    isAnswerValid,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionAndIntegerProduct = 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");
+const randint_1 = require("../../../math/utils/random/randint");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getFractionAndIntegerProduct = () => {
+    const rational = rational_1.RationalConstructor.randomIrreductible();
+    const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0, 1]));
+    const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), integer.toTree());
+    statementTree.shuffle();
+    const answerTree = rational.multiply(integer).toTree();
+    const answer = answerTree.toTex();
+    const question = {
+        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: {
+            integer: integer.value,
+            rational: [rational.num, rational.denum],
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, integer, rational }) => {
+    const propositions = [];
+    const integerObj = new integer_1.Integer(integer);
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value * rationalObj.num, integerObj.value * rationalObj.denum).toTex());
+    while (propositions.length < n) {
+        const randomMultiplier = (0, randint_1.randint)(-10, 10);
+        const wrongAnswerTree = rationalObj
+            .multiply(new integer_1.Integer(randomMultiplier))
+            .toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { integer, rational }) => {
+    const integerObj = new integer_1.Integer(integer);
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    const answerTree = rationalObj
+        .multiply(integerObj)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
+exports.fractionAndIntegerProduct = {
+    id: "fractionAndIntegerProduct",
+    connector: "=",
+    label: "Produit d'un entier et d'une fraction",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    isSingleStep: false,
+    sections: ["Fractions"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerProduct, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/calcul/fractions/fractionAndIntegerSum.d.ts

@@ -1,13 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    integer: number;
-    rational: [number, number];
-};
-type VEAProps = {
-    integer: number;
-    rational: [number, number];
-};
-export declare const fractionAndIntegerSum: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    integer: number;
+    rational: [number, number];
+};
+export declare const fractionAndIntegerSum: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=fractionAndIntegerSum.d.ts.map

package/lib/exercises/calcul/fractions/fractionAndIntegerSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA0BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAuBF,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAUF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYlE,CAAC"}
+{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgClC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AA0CF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}

package/lib/exercises/calcul/fractions/fractionAndIntegerSum.js

@@ -1,62 +1,67 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fractionAndIntegerSum = 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");
-const randint_1 = require("../../../math/utils/random/randint");
-const addNode_1 = require("../../../tree/nodes/operators/addNode");
-const shuffle_1 = require("../../../utils/shuffle");
-const getFractionAndIntegerSum = () => {
-    const rational = rational_1.RationalConstructor.randomIrreductible();
-    const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]));
-    const statementTree = new addNode_1.AddNode(rational.toTree(), integer.toTree());
-    statementTree.shuffle();
-    const answerTree = rational.add(integer).toTree();
-    const answer = answerTree.toTex();
-    const question = {
-        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer,
-        keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, integer: integer.value, rational: [rational.num, rational.denum] },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, integer, rational }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value + rationalObj.num, rationalObj.denum).toTex());
-    if (integerObj.value + rationalObj.denum !== 0)
-        (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value + rationalObj.num, integerObj.value + rationalObj.denum).toTex());
-    while (propositions.length < n) {
-        const rational = rational_1.RationalConstructor.randomIrreductible();
-        const wrongAnswerTree = rational.add(integerObj).toTree();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-const isAnswerValid = (ans, { integer, rational }) => {
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = rationalObj.add(integerObj).toTree();
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(ans);
-};
-exports.fractionAndIntegerSum = {
-    id: 'fractionAndIntegerSum',
-    connector: '=',
-    label: "Somme d'un entier et d'une fraction",
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    isSingleStep: false,
-    sections: ['Fractions'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerSum, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-    isAnswerValid,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionAndIntegerSum = 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");
+const randint_1 = require("../../../math/utils/random/randint");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getFractionAndIntegerSum = () => {
+    const rational = rational_1.RationalConstructor.randomIrreductible();
+    const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]));
+    const statementTree = new addNode_1.AddNode(rational.toTree(), integer.toTree());
+    statementTree.shuffle();
+    const answerTree = rational.add(integer).toTree();
+    const answer = answerTree.toTex();
+    const question = {
+        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        answer,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: {
+            integer: integer.value,
+            rational: [rational.num, rational.denum],
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, integer, rational }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const integerObj = new integer_1.Integer(integer);
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value + rationalObj.num, rationalObj.denum).toTex());
+    if (integerObj.value + rationalObj.denum !== 0)
+        (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value + rationalObj.num, integerObj.value + rationalObj.denum).toTex());
+    while (propositions.length < n) {
+        const rational = rational_1.RationalConstructor.randomIrreductible();
+        const wrongAnswerTree = rational.add(integerObj).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { integer, rational }) => {
+    const integerObj = new integer_1.Integer(integer);
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    const answerTree = rationalObj
+        .add(integerObj)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.fractionAndIntegerSum = {
+    id: "fractionAndIntegerSum",
+    connector: "=",
+    label: "Somme d'un entier et d'une fraction",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    isSingleStep: false,
+    sections: ["Fractions"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerSum, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/calcul/fractions/fractionToPercentToDecimal.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type VEAProps = {};
-type QCMProps = {
-    answer: string;
-    rand: number;
-    numerator: number;
-    denominator: number;
-};
-export declare const fractionToPercentToDecimal: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    rand: number;
+    numerator: number;
+    denominator: number;
+};
+export declare const fractionToPercentToDecimal: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=fractionToPercentToDecimal.d.ts.map

package/lib/exercises/calcul/fractions/fractionToPercentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionToPercentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionToPercentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+DnB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA+CF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWvE,CAAC"}
+{"version":3,"file":"fractionToPercentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionToPercentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA+FlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAuFF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,WAAW,CAahE,CAAC"}