math-exercises 2.0.1 → 2.0.3

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

@@ -1,111 +1,157 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fractionToPercentToDecimal = void 0;
-const exercise_1 = require("../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const randint_1 = require("../../../math/utils/random/randint");
-const round_1 = require("../../../math/utils/round");
-const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
-const shuffle_1 = require("../../../utils/shuffle");
-const getFractionToPercentToDecimal = () => {
-    const denominator = 2 ** (0, randint_1.randint)(0, 5) * 5 ** (0, randint_1.randint)(0, 5);
-    const numerator = denominator !== 1 ? (0, randint_1.randint)(1, denominator) : (0, randint_1.randint)(1, 100);
-    const fraction = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator), new numberNode_1.NumberNode(denominator));
-    const decimal = numerator / denominator;
-    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
-    const rand = (0, randint_1.randint)(1, 7);
-    let instruction = '';
-    let answer = '';
-    switch (rand) {
-        case 1: {
-            instruction = `Écrire le nombre $${String(decimal).replace('.', ',')}$ sous forme de pourcentage.`;
-            answer = `${percent}\\%`;
-            break;
-        }
-        case 2: {
-            instruction = `Écrire le nombre $${String(decimal).replace('.', ',')}$ sous forme de fraction.`;
-            answer = `${(0, simplify_1.simplifyNode)(fraction).toTex()}`;
-            break;
-        }
-        case 3: {
-            instruction = `Écrire le nombre $${String(percent).replace('.', ',')}\\%$ sous forme décimale.`;
-            answer = `${decimal}`;
-            break;
-        }
-        case 4: {
-            instruction = `Écrire le nombre $${String(percent).replace('.', ',')}\\%$ sous forme de fraction.`;
-            answer = `${(0, simplify_1.simplifyNode)(fraction).toTex()}`;
-            break;
-        }
-        case 5: {
-            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme décimale.`;
-            answer = `${decimal}`;
-            break;
-        }
-        case 6: {
-            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme de pourcentage.`;
-            answer = `${percent}\\%`;
-            break;
-        }
-    }
-    const question = {
-        instruction,
-        answer: answer.replace('.', ','),
-        keys: ['percent'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer,
-            rand,
-            numerator,
-            denominator,
-        },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, rand, numerator, denominator }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const decimal = numerator / denominator;
-    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
-    while (propositions.length < n) {
-        let statement = '';
-        switch (rand) {
-            case 1:
-                const temp1 = (0, randint_1.randint)(-5, 3, [0]);
-                statement = `${(0, round_1.round)(percent * 10 ** temp1, -temp1 + 2)}\\%`;
-                break;
-            case 2:
-                statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
-                break;
-            case 3:
-                const temp3 = (0, randint_1.randint)(-5, 3, [0]);
-                statement = `${(0, round_1.round)(percent * 10 ** temp3, -temp3 + 2)}`;
-                break;
-            case 4:
-                statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
-                break;
-            case 5:
-                statement = `${(0, round_1.round)(decimal + Math.random() * 10, 2)}`;
-                break;
-            case 6:
-                statement = `${(0, round_1.round)(percent + Math.random() * 10, 2)}\\%`;
-                break;
-        }
-        (0, exercise_1.tryToAddWrongProp)(propositions, statement);
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.fractionToPercentToDecimal = {
-    id: 'fractionToPercentToDecimal',
-    connector: '\\iff',
-    label: "Passer d'une écriture d'un nombre à une autre",
-    levels: ['3ème', '2nde', '1reESM', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionToPercentToDecimal, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionToPercentToDecimal = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const decimal_1 = require("../../../math/numbers/decimals/decimal");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const frenchify_1 = require("../../../math/utils/latex/frenchify");
+const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const percentNode_1 = require("../../../tree/nodes/numbers/percentNode");
+const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getFractionToPercentToDecimal = () => {
+    const denominator = 2 ** (0, randint_1.randint)(0, 5) * 5 ** (0, randint_1.randint)(0, 5);
+    const numerator = denominator !== 1 ? (0, randint_1.randint)(1, denominator) : (0, randint_1.randint)(1, 100);
+    const fraction = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator), new numberNode_1.NumberNode(denominator));
+    const decimal = numerator / denominator;
+    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
+    const rand = (0, randint_1.randint)(1, 7);
+    let instruction = "";
+    let answer = "";
+    const percentTex = `${percent}\\%`;
+    const fracTex = new rational_1.Rational(numerator, denominator)
+        .simplify()
+        .toTree()
+        .toTex();
+    const decimalTex = `${decimal}`;
+    switch (rand) {
+        case 1: {
+            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de pourcentage.`;
+            answer = percentTex;
+            break;
+        }
+        case 2: {
+            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de fraction.`;
+            answer = fracTex;
+            break;
+        }
+        case 3: {
+            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme décimale.`;
+            answer = decimalTex;
+            break;
+        }
+        case 4: {
+            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme de fraction.`;
+            answer = fracTex;
+            break;
+        }
+        case 5: {
+            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme décimale.`;
+            answer = decimalTex;
+            break;
+        }
+        case 6: {
+            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme de pourcentage.`;
+            answer = percentTex;
+            break;
+        }
+    }
+    answer = (0, frenchify_1.frenchify)(answer);
+    const question = {
+        instruction,
+        answer,
+        keys: ["percent"],
+        answerFormat: "tex",
+        identifiers: {
+            rand,
+            numerator,
+            denominator,
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, rand, numerator, denominator }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const decimal = numerator / denominator;
+    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
+    while (propositions.length < n) {
+        let statement = "";
+        switch (rand) {
+            case 1:
+                const temp1 = (0, randint_1.randint)(-5, 3, [0]);
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(percent * 10 ** temp1, -temp1 + 2))}\\%`;
+                break;
+            case 2:
+                statement = `${new rational_1.Rational(numerator * (0, randint_1.randint)(1, 20, [0, 1]), denominator * (0, randint_1.randint)(1, 20, [0, 1]))
+                    .simplify()
+                    .toTree()
+                    .toTex()}`;
+                break;
+            case 3:
+                const temp3 = (0, randint_1.randint)(-5, 3, [0]);
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(percent * 10 ** temp3, -temp3 + 2))}`;
+                break;
+            case 4:
+                statement = `${new rational_1.Rational(numerator * (0, randint_1.randint)(1, 20, [0, 1]), denominator * (0, randint_1.randint)(1, 20, [0, 1]))
+                    .simplify()
+                    .toTree()
+                    .toTex()}`;
+                break;
+            case 5:
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(decimal + Math.random() * 10, 2))}`;
+                break;
+            case 6:
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(percent + Math.random() * 10, 2))}\\%`;
+                break;
+        }
+        (0, exercise_1.tryToAddWrongProp)(propositions, statement);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { rand, numerator, denominator }) => {
+    const decimal = numerator / denominator;
+    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
+    const percentNode = new percentNode_1.PercentNode(percent);
+    const fracNode = new rational_1.Rational(numerator, denominator).simplify().toTree();
+    const decimalNode = new decimal_1.Decimal(decimal).toTree();
+    let answer;
+    switch (rand) {
+        case 1:
+        case 6: {
+            answer = percentNode;
+            break;
+        }
+        case 2:
+        case 4: {
+            answer = fracNode;
+            break;
+        }
+        case 3:
+        case 5: {
+            answer = decimalNode;
+            break;
+        }
+        default:
+            throw Error("wrong type in fractiontopercenttodecimal");
+    }
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
+exports.fractionToPercentToDecimal = {
+    id: "fractionToPercentToDecimal",
+    connector: "\\iff",
+    label: "Passer d'une écriture d'un nombre à une autre",
+    levels: ["3ème", "2nde", "1reESM", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionToPercentToDecimal, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AA2BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmBnB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}
+{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA6BlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAwCF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAYvD,CAAC"}

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

@@ -1,53 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fractionsDivision = void 0;
-const exercise_1 = require("../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const rational_1 = require("../../../math/numbers/rationals/rational");
-const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
-const shuffle_1 = require("../../../utils/shuffle");
-const getFractionsDivision = () => {
-    const rational = rational_1.RationalConstructor.randomIrreductible();
-    const rational2 = rational_1.RationalConstructor.randomIrreductible();
-    const statementTree = new divideNode_1.DivideNode(rational.toTree(), rational2.toTree());
-    const answerTree = rational.divide(rational2).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,
-            rationalNum: [rational.num, rational.denum],
-            rationalDenum: [rational2.num, rational2.denum],
-        },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
-    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
-    (0, exercise_1.tryToAddWrongProp)(propositions, rational.multiply(rational2).toTree().toTex());
-    while (propositions.length < n) {
-        const randomRational = rational_1.RationalConstructor.randomIrreductible();
-        const wrongAnswerTree = randomRational.divide(rational2).toTree();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.fractionsDivision = {
-    id: 'fractionsDivision',
-    connector: '=',
-    label: 'Divisions de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsDivision, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionsDivision = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getFractionsDivision = () => {
+    const rational = rational_1.RationalConstructor.randomIrreductible();
+    const rational2 = rational_1.RationalConstructor.randomIrreductible();
+    const statementTree = new divideNode_1.DivideNode(rational.toTree(), rational2.toTree());
+    const answerTree = rational.divide(rational2).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: {
+            rationalNum: [rational.num, rational.denum],
+            rationalDenum: [rational2.num, rational2.denum],
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    (0, exercise_1.tryToAddWrongProp)(propositions, rational.multiply(rational2).toTree().toTex());
+    while (propositions.length < n) {
+        const randomRational = rational_1.RationalConstructor.randomIrreductible();
+        const wrongAnswerTree = randomRational.divide(rational2).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { rationalDenum, rationalNum }) => {
+    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    const answerTree = rational
+        .divide(rational2)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.fractionsDivision = {
+    id: "fractionsDivision",
+    connector: "=",
+    label: "Divisions de fractions",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsDivision, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAqDF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}

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

@@ -1,51 +1,60 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fractionsProduct = void 0;
-const exercise_1 = require("../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const rational_1 = require("../../../math/numbers/rationals/rational");
-const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
-const shuffle_1 = require("../../../utils/shuffle");
-const getFractionsProduct = () => {
-    const rational = rational_1.RationalConstructor.randomIrreductible();
-    const rational2 = rational_1.RationalConstructor.randomIrreductible();
-    const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), rational2.toTree());
-    const answerTree = rational.multiply(rational2).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,
-            rationalNum: [rational.num, rational.denum],
-            rationalDenum: [rational2.num, rational2.denum],
-        },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
-    while (propositions.length < n) {
-        const randomRational = rational_1.RationalConstructor.randomIrreductible();
-        const wrongAnswerTree = randomRational.multiply(rational2).toTree();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.fractionsProduct = {
-    id: 'fractionsProduct',
-    connector: '=',
-    label: 'Produits de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionsProduct = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getFractionsProduct = () => {
+    const rational = rational_1.RationalConstructor.randomIrreductible();
+    const rational2 = rational_1.RationalConstructor.randomIrreductible();
+    const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), rational2.toTree());
+    const answerTree = rational.multiply(rational2).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: {
+            rationalNum: [rational.num, rational.denum],
+            rationalDenum: [rational2.num, rational2.denum],
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    while (propositions.length < n) {
+        const randomRational = rational_1.RationalConstructor.randomIrreductible();
+        const wrongAnswerTree = randomRational.multiply(rational2).toTree();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { rationalDenum, rationalNum }) => {
+    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    const answerTree = rational
+        .multiply(rational2)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.fractionsProduct = {
+    id: "fractionsProduct",
+    connector: "=",
+    label: "Produits de fractions",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}
+{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AA4DF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAYlD,CAAC"}