math-exercises 1.4.18 → 2.0.0

package/lib/exercises/calcul/arithmetics/primeNumbers.js

@@ -1,36 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrimeNumbers = exports.primeNumbers = void 0;
+exports.primeNumbers = void 0;
 const randint_1 = require("../../../math/utils/random/randint");
-const uuid_1 = require("uuid");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
-/**
- * a±b±c±d
- */
-exports.primeNumbers = {
-    id: 'primeNumbers',
-    connector: '=',
-    instruction: '',
-    label: 'Décomposition en nombres premiers',
-    levels: ['5ème', '4ème', '3ème', '2nde'],
-    sections: ['Arithmétique'],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPrimeNumbers, nb),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 function prodNumbers(tab) {
     let temp = 1;
     for (let i = 0; i < tab.length; i++)
         temp *= tab[i];
     return temp;
 }
-function getPrimeNumbers() {
-    const primes = [2, 3, 5, 7, 11];
+const primes = [2, 3, 5, 7, 11];
+const getPrimeNumbers = () => {
     const rand = (0, randint_1.randint)(3, 5);
-    let choosenNumbers = [];
+    let chosenNumbers = [];
     let elevenCount = 0;
     for (let i = 0; i < rand; i++) {
         let temp = (0, randint_1.randint)(0, 5);
@@ -38,56 +24,81 @@ function getPrimeNumbers() {
             elevenCount++;
         while (elevenCount >= 2 && temp === 4)
             temp = (0, randint_1.randint)(0, 5);
-        choosenNumbers.push(primes[temp]);
+        chosenNumbers.push(primes[temp]);
     }
-    const prod = prodNumbers(choosenNumbers);
-    choosenNumbers = choosenNumbers.sort((a, b) => a - b);
-    let answer = `${choosenNumbers[0]}`;
-    for (let i = 1; i < choosenNumbers.length; i++) {
-        answer += `\\times` + choosenNumbers[i];
+    const prod = prodNumbers(chosenNumbers);
+    chosenNumbers = chosenNumbers.sort((a, b) => a - b);
+    const numberNodes = chosenNumbers.map((nb) => new numberNode_1.NumberNode(nb));
+    let tree = new multiplyNode_1.MultiplyNode(numberNodes[numberNodes.length - 2], numberNodes[numberNodes.length - 1]);
+    for (let i = numberNodes.length - 3; i > -1; i--) {
+        tree = new multiplyNode_1.MultiplyNode(numberNodes[i], tree);
     }
-    const getPropositions = (n) => {
-        const res = [];
-        res.push({
-            id: (0, uuid_1.v4)() + '',
-            statement: answer,
-            isRightAnswer: true,
-            format: 'tex',
-        });
-        const wrongFactors = [...choosenNumbers];
-        for (let i = 0; i < n - 1; i++) {
-            let wrongFactor, newFactor, randomIndex, wrongAnswer;
-            do {
-                randomIndex = (0, randint_1.randint)(0, wrongFactors.length);
-                wrongFactor = wrongFactors[randomIndex];
-                newFactor = wrongFactor;
-                while (newFactor === wrongFactor) {
-                    const temp = (0, randint_1.randint)(0, primes.length);
-                    newFactor = primes[temp];
-                }
-                wrongFactors[randomIndex] = newFactor;
-                wrongAnswer = `${prod} = ${wrongFactors[0]}`;
-                for (let j = 1; j < wrongFactors.length; j++) {
-                    wrongAnswer += `\\times` + wrongFactors[j];
-                }
-            } while (res.find((el) => el.statement === wrongAnswer));
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: wrongAnswer,
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        }
-        return (0, exercise_1.shuffleProps)(res, n);
-    };
+    let answer = tree.toTex();
     const question = {
         instruction: `Donner la décomposition en nombres premiers de : $${prod}$`,
         startStatement: `${prod}`,
         answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, chosenNumbers },
+        veaProps: { chosenNumbers },
     };
     return question;
-}
-exports.getPrimeNumbers = getPrimeNumbers;
+};
+const getPropositions = (n, { answer, chosenNumbers }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const wrongFactors = [...chosenNumbers];
+    while (propositions.length < n) {
+        let wrongFactor, newFactor, randomIndex, wrongAnswer;
+        randomIndex = (0, randint_1.randint)(0, wrongFactors.length);
+        wrongFactor = wrongFactors[randomIndex];
+        newFactor = wrongFactor;
+        while (newFactor === wrongFactor) {
+            const temp = (0, randint_1.randint)(0, primes.length);
+            newFactor = primes[temp];
+        }
+        wrongFactors[randomIndex] = newFactor;
+        wrongAnswer = `${wrongFactors[0]}`;
+        for (let j = 1; j < wrongFactors.length; j++) {
+            wrongAnswer += `\\times` + wrongFactors[j];
+        }
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { chosenNumbers }) => {
+    //array of [nombre, power]
+    const nbsToPower = [];
+    chosenNumbers.forEach((nb) => {
+        if (nbsToPower.some((el) => el[0] === nb))
+            return;
+        const count = chosenNumbers.filter((el) => el === nb).length;
+        nbsToPower.push([nb, count]);
+    });
+    const nodes = nbsToPower.map((el) => {
+        if (el[1] === 1)
+            return new numberNode_1.NumberNode(el[0]);
+        else
+            return new powerNode_1.PowerNode(new numberNode_1.NumberNode(el[0]), new numberNode_1.NumberNode(el[1]), { allowProductSyntax: true });
+    });
+    let tree = new multiplyNode_1.MultiplyNode(nodes[nodes.length - 1], nodes[nodes.length - 2]);
+    for (let i = nodes.length - 3; i > -1; i--) {
+        tree = new multiplyNode_1.MultiplyNode(nodes[i], tree);
+    }
+    const texs = tree.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.primeNumbers = {
+    id: 'primeNumbers',
+    connector: '=',
+    label: 'Décomposition en nombres premiers',
+    levels: ['5ème', '4ème', '3ème', '2nde'],
+    sections: ['Arithmétique'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPrimeNumbers, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

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

@@ -1,4 +1,15 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const fractionAndIntegerDivision: MathExercise;
-export declare function getFractionAndIntegerDivision(): Question;
+import { MathExercise } from '../../../exercises/exercise';
+type QCMProps = {
+    answer: string;
+    integerFirst: boolean;
+    integer: number;
+    rational: [number, number];
+};
+type VEAProps = {
+    integerFirst: boolean;
+    integer: number;
+    rational: [number, number];
+};
+export declare const fractionAndIntegerDivision: MathExercise<QCMProps, VEAProps>;
+export {};
 //# sourceMappingURL=fractionAndIntegerDivision.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAgB,MAAM,0BAA0B,CAAC;AAU7F,eAAO,MAAM,0BAA0B,EAAE,YAYxC,CAAC;AAEF,wBAAgB,6BAA6B,IAAI,QAAQ,CA+DxD"}
+{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAmClC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAsBF,KAAK,QAAQ,GAAG;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAaF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYvE,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionAndIntegerDivision = exports.fractionAndIntegerDivision = void 0;
+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");
@@ -8,21 +8,7 @@ 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 uuid_1 = require("uuid");
-exports.fractionAndIntegerDivision = {
-    id: 'fractionAndIntegerDivision',
-    connector: '=',
-    instruction: '',
-    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),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionAndIntegerDivision() {
+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]));
@@ -30,48 +16,58 @@ function getFractionAndIntegerDivision() {
         ? 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 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: !integerFirst ? integer.divide(rational).toTree().toTex() : rational.divide(integer).toTree().toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const wrongRational = rational_1.RationalConstructor.randomIrreductible();
-                const wrongAnswerTree = integerFirst
-                    ? integer.divide(wrongRational).toTree()
-                    : wrongRational.divide(integer).toTree();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswerTree.toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, exercise_1.shuffleProps)(res, n);
-    };
+    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: answerTree.toTex(),
+        answer: answerTex,
         keys: [],
-        getPropositions,
         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;
-}
-exports.getFractionAndIntegerDivision = getFractionAndIntegerDivision;
+};
+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,
+};

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

@@ -1,4 +1,13 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const fractionAndIntegerProduct: MathExercise;
-export declare function getFractionAndIntegerProduct(): Question;
+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 {};
 //# 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,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,yBAAyB,EAAE,YAYvC,CAAC;AAEF,wBAAgB,4BAA4B,IAAI,QAAQ,CAuDvD"}
+{"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"}

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

@@ -1,72 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionAndIntegerProduct = exports.fractionAndIntegerProduct = void 0;
+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 uuid_1 = require("uuid");
-exports.fractionAndIntegerProduct = {
-    id: 'fractionAndIntegerProduct',
-    connector: '=',
-    instruction: '',
-    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),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionAndIntegerProduct() {
+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 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 rational_1.Rational(integer.value * rational.num, integer.value * rational.denum).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        for (let i = 0; i < n - 2; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const randomMultiplier = (0, randint_1.randint)(-10, 10);
-                const wrongAnswerTree = rational.multiply(new integer_1.Integer(randomMultiplier)).toTree();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswerTree.toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
+    const answer = answerTree.toTex();
     const question = {
         instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, integer: integer.value, rational: [rational.num, rational.denum] },
+        veaProps: { integer: integer.value, rational: [rational.num, rational.denum] },
     };
     return question;
-}
-exports.getFractionAndIntegerProduct = getFractionAndIntegerProduct;
+};
+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,
+};

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

@@ -1,4 +1,13 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const fractionAndIntegerSum: MathExercise;
-export declare function getFractionAndIntegerSum(): Question;
+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 {};
 //# 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,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,qBAAqB,EAAE,YAYnC,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,QAAQ,CAgEnD"}
+{"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"}

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

@@ -1,80 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFractionAndIntegerSum = exports.fractionAndIntegerSum = void 0;
+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 uuid_1 = require("uuid");
-exports.fractionAndIntegerSum = {
-    id: 'fractionAndIntegerSum',
-    connector: '=',
-    instruction: '',
-    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),
-    keys: [],
-    qcmTimer: 60,
-    freeTimer: 60,
-};
-function getFractionAndIntegerSum() {
+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 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 rational_1.Rational(integer.value + rational.num, rational.denum).toTex(),
-            isRightAnswer: false,
-            format: 'tex',
-        });
-        if (integer.value + rational.denum !== 0)
-            res.push({
-                id: (0, uuid_1.v4)() + '',
-                statement: new rational_1.Rational(integer.value + rational.num, integer.value + rational.denum).toTex(),
-                isRightAnswer: false,
-                format: 'tex',
-            });
-        const missing = n - res.length;
-        for (let i = 0; i < missing; i++) {
-            let isDuplicate;
-            let proposition;
-            do {
-                const rational = rational_1.RationalConstructor.randomIrreductible();
-                const wrongAnswerTree = rational.add(integer).toTree();
-                proposition = {
-                    id: (0, uuid_1.v4)() + '',
-                    statement: wrongAnswerTree.toTex(),
-                    isRightAnswer: false,
-                    format: 'tex',
-                };
-                isDuplicate = res.some((p) => p.statement === proposition.statement);
-            } while (isDuplicate);
-            res.push(proposition);
-        }
-        return (0, shuffle_1.shuffle)(res);
-    };
+    const answer = answerTree.toTex();
     const question = {
         instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
+        answer,
         keys: [],
-        getPropositions,
         answerFormat: 'tex',
+        qcmGeneratorProps: { answer, integer: integer.value, rational: [rational.num, rational.denum] },
     };
     return question;
-}
-exports.getFractionAndIntegerSum = getFractionAndIntegerSum;
+};
+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,
+};

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

@@ -1,4 +1,11 @@
-import { MathExercise, Question } from '../../../exercises/exercise';
-export declare const fractionToPercentToDecimal: MathExercise;
-export declare function getFractionToPercentToDecimal(): Question;
+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 {};
 //# 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,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,6BAA6B,IAAI,QAAQ,CAwHxD"}
+{"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"}