math-exercises 2.0.1 → 2.0.3

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

@@ -1,113 +1,115 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.paritySumsAndProducts = void 0;
-const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const randint_1 = require("../../../math/utils/random/randint");
-const shuffle_1 = require("../../../utils/shuffle");
-const uuid_1 = require("uuid");
-const getParitySumsAndProductsQuestion = () => {
-    const type = (0, randint_1.randint)(0, 12);
-    let instruction = '';
-    let answer = 'Pair';
-    switch (type) {
-        case 0:
-            instruction = 'La somme de deux nombres pairs est un nombre...';
-            answer = 'Pair';
-            break;
-        case 1:
-            instruction = 'La somme de deux nombres impairs est un nombre...';
-            answer = 'Pair';
-            break;
-        case 2:
-            instruction = "La somme d'un nombre pair et d'un nombre impair un nombre...";
-            answer = 'Impair';
-            break;
-        case 3:
-            instruction = 'La somme de trois nombres impairs est un nombre...';
-            answer = 'Impair';
-            break;
-        case 4:
-            instruction = 'La somme de trois nombres consécutifs est un nombre...';
-            answer = 'Parfois pair, parfois impair';
-            break;
-        case 5:
-            instruction = 'La somme de quatre nombres consécutifs est un nombre...';
-            answer = 'Pair';
-            break;
-        case 6:
-            instruction = 'Le produit de deux nombres pairs est un nombre...';
-            answer = 'Pair';
-            break;
-        case 7:
-            instruction = 'Le produit de deux nombres impairs est un nombre...';
-            answer = 'Impair';
-            break;
-        case 8:
-            instruction = "Le produit d'un nombre pair et d'un nombre impair est un nombre...";
-            answer = 'Pair';
-            break;
-        case 9:
-            instruction = 'Le produit de trois nombres consécutifs est un nombre...';
-            answer = 'Pair';
-            break;
-        case 10:
-            instruction = 'Le produit de trois nombres impairs est un nombre...';
-            answer = 'Impair';
-            break;
-        case 11:
-            instruction = 'Le produit de trois nombres pairs est un nombre...';
-            answer = 'Pair';
-            break;
-    }
-    const question = {
-        answer: answer,
-        instruction,
-        keys: [],
-        answerFormat: 'raw',
-        qcmGeneratorProps: { answer },
-    };
-    return question;
-};
-const getPropositions = (n, { answer }) => {
-    const propositions = [
-        {
-            id: (0, uuid_1.v4)(),
-            statement: `Pair`,
-            isRightAnswer: answer === 'Pair',
-            format: 'raw',
-        },
-        {
-            id: (0, uuid_1.v4)(),
-            statement: `Impair`,
-            isRightAnswer: answer === 'Impair',
-            format: 'raw',
-        },
-        {
-            id: (0, uuid_1.v4)(),
-            statement: `Parfois pair, parfois impair`,
-            isRightAnswer: answer === 'Parfois pair, parfois impair',
-            format: 'raw',
-        },
-        {
-            id: (0, uuid_1.v4)(),
-            statement: `Premier`,
-            isRightAnswer: answer === 'Premier',
-            format: 'raw',
-        },
-    ];
-    return (0, shuffle_1.shuffle)(propositions);
-};
-exports.paritySumsAndProducts = {
-    id: 'paritySumsAndProducts',
-    connector: '=',
-    label: 'Parité de sommes et de produits',
-    levels: ['2nde'],
-    isSingleStep: true,
-    sections: ['Arithmétique'],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getParitySumsAndProductsQuestion, nb, 12),
-    qcmTimer: 60,
-    freeTimer: 60,
-    answerType: 'QCM',
-    maxAllowedQuestions: 12,
-    getPropositions,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.paritySumsAndProducts = void 0;
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../math/utils/random/randint");
+const shuffle_1 = require("../../../utils/shuffle");
+const uuid_1 = require("uuid");
+const getParitySumsAndProductsQuestion = () => {
+    const type = (0, randint_1.randint)(0, 12);
+    let instruction = "";
+    let answer = "Pair";
+    switch (type) {
+        case 0:
+            instruction = "La somme de deux nombres pairs est un nombre...";
+            answer = "Pair";
+            break;
+        case 1:
+            instruction = "La somme de deux nombres impairs est un nombre...";
+            answer = "Pair";
+            break;
+        case 2:
+            instruction =
+                "La somme d'un nombre pair et d'un nombre impair un nombre...";
+            answer = "Impair";
+            break;
+        case 3:
+            instruction = "La somme de trois nombres impairs est un nombre...";
+            answer = "Impair";
+            break;
+        case 4:
+            instruction = "La somme de trois nombres consécutifs est un nombre...";
+            answer = "Parfois pair, parfois impair";
+            break;
+        case 5:
+            instruction = "La somme de quatre nombres consécutifs est un nombre...";
+            answer = "Pair";
+            break;
+        case 6:
+            instruction = "Le produit de deux nombres pairs est un nombre...";
+            answer = "Pair";
+            break;
+        case 7:
+            instruction = "Le produit de deux nombres impairs est un nombre...";
+            answer = "Impair";
+            break;
+        case 8:
+            instruction =
+                "Le produit d'un nombre pair et d'un nombre impair est un nombre...";
+            answer = "Pair";
+            break;
+        case 9:
+            instruction = "Le produit de trois nombres consécutifs est un nombre...";
+            answer = "Pair";
+            break;
+        case 10:
+            instruction = "Le produit de trois nombres impairs est un nombre...";
+            answer = "Impair";
+            break;
+        case 11:
+            instruction = "Le produit de trois nombres pairs est un nombre...";
+            answer = "Pair";
+            break;
+    }
+    const question = {
+        answer: answer,
+        instruction,
+        keys: [],
+        answerFormat: "raw",
+        identifiers: { answer },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [
+        {
+            id: (0, uuid_1.v4)(),
+            statement: `Pair`,
+            isRightAnswer: answer === "Pair",
+            format: "raw",
+        },
+        {
+            id: (0, uuid_1.v4)(),
+            statement: `Impair`,
+            isRightAnswer: answer === "Impair",
+            format: "raw",
+        },
+        {
+            id: (0, uuid_1.v4)(),
+            statement: `Parfois pair, parfois impair`,
+            isRightAnswer: answer === "Parfois pair, parfois impair",
+            format: "raw",
+        },
+        {
+            id: (0, uuid_1.v4)(),
+            statement: `Premier`,
+            isRightAnswer: answer === "Premier",
+            format: "raw",
+        },
+    ];
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.paritySumsAndProducts = {
+    id: "paritySumsAndProducts",
+    connector: "=",
+    label: "Parité de sommes et de produits",
+    levels: ["2nde"],
+    isSingleStep: true,
+    sections: ["Arithmétique"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getParitySumsAndProductsQuestion, nb, 12),
+    qcmTimer: 60,
+    freeTimer: 60,
+    answerType: "QCM",
+    maxAllowedQuestions: 12,
+    getPropositions,
+};

package/lib/exercises/calcul/arithmetics/primeNumbers.d.ts

@@ -1,11 +1,7 @@
-import { MathExercise } from '../../exercise';
-type QCMProps = {
-    answer: string;
-    chosenNumbers: number[];
-};
-type VEAProps = {
-    chosenNumbers: number[];
-};
-export declare const primeNumbers: MathExercise<QCMProps, VEAProps>;
-export {};
+import { MathExercise } from "../../exercise";
+type Identifiers = {
+    chosenNumbers: number[];
+};
+export declare const primeNumbers: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=primeNumbers.d.ts.map

package/lib/exercises/calcul/arithmetics/primeNumbers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EASb,MAAM,gBAAgB,CAAC;AAmDxB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA6BF,KAAK,QAAQ,GAAG;IACd,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAqBF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYzD,CAAC"}
+{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EASb,MAAM,gBAAgB,CAAC;AAsDxB,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAuDF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAYlD,CAAC"}

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

@@ -1,104 +1,105 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.primeNumbers = void 0;
-const randint_1 = require("../../../math/utils/random/randint");
-const exercise_1 = require("../../exercise");
-const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
-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;
-}
-const primes = [2, 3, 5, 7, 11];
-const getPrimeNumbers = () => {
-    const rand = (0, randint_1.randint)(3, 5);
-    let chosenNumbers = [];
-    let elevenCount = 0;
-    for (let i = 0; i < rand; i++) {
-        let temp = (0, randint_1.randint)(0, 5);
-        if (temp === 4)
-            elevenCount++;
-        while (elevenCount >= 2 && temp === 4)
-            temp = (0, randint_1.randint)(0, 5);
-        chosenNumbers.push(primes[temp]);
-    }
-    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);
-    }
-    let answer = tree.toTex();
-    const question = {
-        instruction: `Donner la décomposition en nombres premiers de : $${prod}$`,
-        startStatement: `${prod}`,
-        answer,
-        keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, chosenNumbers },
-        veaProps: { chosenNumbers },
-    };
-    return question;
-};
-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,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.primeNumbers = void 0;
+const randint_1 = require("../../../math/utils/random/randint");
+const exercise_1 = require("../../exercise");
+const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
+const operatorComposition_1 = require("../../../tree/utilities/operatorComposition");
+function prodNumbers(tab) {
+    let temp = 1;
+    for (let i = 0; i < tab.length; i++)
+        temp *= tab[i];
+    return temp;
+}
+const primes = [2, 3, 5, 7, 11];
+const getPrimeNumbers = () => {
+    const rand = (0, randint_1.randint)(3, 5);
+    let chosenNumbers = [];
+    let elevenCount = 0;
+    for (let i = 0; i < rand; i++) {
+        let temp = (0, randint_1.randint)(0, 5);
+        if (temp === 4)
+            elevenCount++;
+        while (elevenCount >= 2 && temp === 4)
+            temp = (0, randint_1.randint)(0, 5);
+        chosenNumbers.push(primes[temp]);
+    }
+    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);
+    }
+    let answer = tree.toTex();
+    const question = {
+        instruction: `Donner la décomposition en nombres premiers de : $${prod}$`,
+        startStatement: `${prod}`,
+        answer,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { chosenNumbers },
+    };
+    return question;
+};
+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) => {
+        const nbNode = new numberNode_1.NumberNode(el[0]);
+        if (el[1] === 1) {
+            return nbNode;
+        }
+        else {
+            return new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(el[1]));
+        }
+    });
+    const answer = nodes.length === 1 ? nodes[0] : (0, operatorComposition_1.operatorComposition)(multiplyNode_1.MultiplyNode, nodes);
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    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,15 +1,9 @@
-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 {};
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    integerFirst: boolean;
+    integer: number;
+    rational: [number, number];
+};
+export declare const fractionAndIntegerDivision: MathExercise<Identifiers>;
+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,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"}
+{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAwClC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAyCF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,WAAW,CAahE,CAAC"}