math-exercises 2.2.5 → 2.2.7

package/lib/exercises/math/calcul/addAndSub.js

@@ -51,7 +51,7 @@ const isAnswerValid = (studentAns, { answer }) => {
 exports.addAndSubExercise = {
     id: "addAndSub",
     connector: "=",
-    label: "Additions et soustractions",
+    label: "Additions et soustractions de nombres entiers",
     levels: ["6ème", "5ème"],
     sections: ["Calculs"],
     isSingleStep: true,

package/lib/exercises/math/calcul/addAndSubWithoutRelatives.js

@@ -61,7 +61,7 @@ const isAnswerValid = (studentAns, { answer }) => {
 exports.addAndSubWithoutRelatives = {
     id: "addAndSubWithoutRelatives",
     connector: "=",
-    label: "Additions et soustractions sans les nombres relatifs",
+    label: "Additions et soustractions de nombres entiers (sans relatifs)",
     levels: ["6ème", "5ème"],
     sections: ["Calculs"],
     isSingleStep: true,

package/lib/exercises/math/calcul/digitDecimalRank.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"digitDecimalRank.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitDecimalRank.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA0CF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"digitDecimalRank.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitDecimalRank.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA0CF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

package/lib/exercises/math/calcul/digitDecimalRank.js

@@ -5,6 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const decimal_1 = require("../../../math/numbers/decimals/decimal");
 const randint_1 = require("../../../math/utils/random/randint");
+const toSeparatedThousands_1 = require("../../../utils/numberPrototype/toSeparatedThousands");
 const ordinals = ["premier", "deuxième", "troisième", "quatrième"];
 const getDigitDecimalRankQuestion = () => {
     const decimalPartSize = (0, randint_1.randint)(2, 5);
@@ -15,9 +16,7 @@ const getDigitDecimalRankQuestion = () => {
     const answer = decimalPartString[rankAsked];
     const question = {
         answer,
-        instruction: `Quel est le chiffre des ${rankAskedLabel} dans le nombre $${nb
-            .toTree()
-            .toTex()}$ ?`,
+        instruction: `Quel est le chiffre des ${rankAskedLabel} dans le nombre $${(0, toSeparatedThousands_1.toSeperatedThousands)(nb.toTree().toTex())}$ ?`,
         keys: [],
         answerFormat: "tex",
         identifiers: { nb: nb.tex, rankAsked },

package/lib/exercises/math/calcul/digitDecimalRankNumber.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    nb: number;
+    rankAsked: number;
+};
+export declare const digitDecimalRankNumber: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=digitDecimalRankNumber.d.ts.map

package/lib/exercises/math/calcul/digitDecimalRankNumber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"digitDecimalRankNumber.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitDecimalRankNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAkDF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

package/lib/exercises/math/calcul/digitDecimalRankNumber.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.digitDecimalRankNumber = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const decimal_1 = require("../../../math/numbers/decimals/decimal");
+const randint_1 = require("../../../math/utils/random/randint");
+const toSeparatedThousands_1 = require("../../../utils/numberPrototype/toSeparatedThousands");
+const ordinals = ["premier", "deuxième", "troisième", "quatrième"];
+const getDigitRankNumberQuestion = () => {
+    const decimalPartSize = (0, randint_1.randint)(2, 5);
+    const nb = decimal_1.DecimalConstructor.random(0, 1000, decimalPartSize);
+    const rankAsked = (0, randint_1.randint)(0, Math.min(decimalPartSize, 3));
+    const rankAskedLabel = decimal_1.decimalDigitRanks[rankAsked];
+    const str = nb.tex;
+    const answer = str.split(".")[0] + str.split(".")[1].substring(0, rankAsked + 1);
+    const question = {
+        answer,
+        instruction: `Quel est le nombre de ${rankAskedLabel} dans le nombre $${(0, toSeparatedThousands_1.toSeperatedThousands)(nb.toTree().toTex())}$ ?`,
+        keys: [],
+        //   hint: `Attention ! On demande le 'nombre' et non pas le 'chiffre' !`,
+        //   correction: `Le chiffre des ${rankAskedLabel} est le ${ordinals[rankAsked]} chiffre en partant de la droite. Donc le chiffre des ${rankAskedLabel} est $${answer}$.`,
+        answerFormat: "tex",
+        identifiers: { nb: nb.value, rankAsked },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, nb, rankAsked }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const str = nb.toString();
+    const [intPart, fracPart] = str.split(".");
+    (0, exercise_1.tryToAddWrongProp)(propositions, fracPart[rankAsked]);
+    for (let i = 0; i < str.length; i++) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, intPart + fracPart.substring(0, i + 1));
+    }
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(0, 100) + "");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.digitDecimalRankNumber = {
+    id: "digitDecimalRankNumber",
+    connector: "=",
+    label: "Déterminer le nombre de dixièmes, de centièmes...",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDigitRankNumberQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    // hasHintAndCorrection: true,
+};

package/lib/exercises/math/calcul/digitRank.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"digitRank.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitRank.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA0CF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}
+{"version":3,"file":"digitRank.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitRank.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA0CF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}

package/lib/exercises/math/calcul/digitRank.js

@@ -5,6 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const randint_1 = require("../../../math/utils/random/randint");
+const toSeparatedThousands_1 = require("../../../utils/numberPrototype/toSeparatedThousands");
 const ordinals = ["premier", "deuxième", "troisième", "quatrième"];
 const getDigitRankQuestion = () => {
     const size = (0, randint_1.randint)(3, 6);
@@ -15,9 +16,7 @@ const getDigitRankQuestion = () => {
     const answer = nbString[nbString.length - rankAsked - 1];
     const question = {
         answer,
-        instruction: `Quel est le chiffre des ${rankAskedLabel} dans le nombre $${nb
-            .toTree()
-            .toTex()}$ ?`,
+        instruction: `Quel est le chiffre des ${rankAskedLabel} dans le nombre $${(0, toSeparatedThousands_1.toSeperatedThousands)(nb.toTree().toTex())}$ ?`,
         keys: [],
         hint: `Le chiffre des ${rankAskedLabel} est le ${ordinals[rankAsked]} chiffre en partant de la droite.`,
         correction: `Le chiffre des ${rankAskedLabel} est le ${ordinals[rankAsked]} chiffre en partant de la droite. Donc le chiffre des ${rankAskedLabel} est $${answer}$.`,

package/lib/exercises/math/calcul/digitRankNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"digitRankNumber.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitRankNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA8CF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}
+{"version":3,"file":"digitRankNumber.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/digitRankNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA+CF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/calcul/digitRankNumber.js

@@ -5,6 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const randint_1 = require("../../../math/utils/random/randint");
+const toSeparatedThousands_1 = require("../../../utils/numberPrototype/toSeparatedThousands");
 const ordinals = ["premier", "deuxième", "troisième", "quatrième"];
 const getDigitRankNumberQuestion = () => {
     const size = (0, randint_1.randint)(3, 6);
@@ -15,10 +16,8 @@ const getDigitRankNumberQuestion = () => {
     const answer = nbString.substring(0, nbString.length - rankAsked);
     const question = {
         answer,
-        instruction: `Quel est le nombre ${rankAsked === 0 ? "d'" : "de "}${rankAskedLabel} dans le nombre $${nb.toTree().toTex()}$ ?`,
+        instruction: `Quel est le nombre ${rankAsked === 0 ? "d'" : "de "}${rankAskedLabel} dans le nombre $${(0, toSeparatedThousands_1.toSeperatedThousands)(nb.toTree().toTex())}$ ?`,
         keys: [],
-        hint: `Attention ! On demande le 'nombre' et non pas le 'chiffre' !`,
-        correction: `Le chiffre des ${rankAskedLabel} est le ${ordinals[rankAsked]} chiffre en partant de la droite. Donc le chiffre des ${rankAskedLabel} est $${answer}$.`,
         answerFormat: "tex",
         identifiers: { nb, rankAsked },
     };
@@ -43,7 +42,7 @@ const isAnswerValid = (ans, { answer }) => {
 exports.digitRankNumber = {
     id: "digitRankNumber",
     connector: "=",
-    label: "Déterminer le rang d'un chiffre dans un nombre entier",
+    label: "Déterminer le nombre d'unités/de dizaines/de centièmes...",
     levels: [],
     isSingleStep: true,
     sections: [],
@@ -53,5 +52,4 @@ exports.digitRankNumber = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/index.d.ts

@@ -9,4 +9,5 @@ export * from "./rounding";
 export * from "./digitRank";
 export * from "./digitDecimalRank";
 export * from "./digitRankNumber";
+export * from "./digitDecimalRankNumber";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}

package/lib/exercises/math/calcul/index.js

@@ -25,3 +25,4 @@ __exportStar(require("./rounding"), exports);
 __exportStar(require("./digitRank"), exports);
 __exportStar(require("./digitDecimalRank"), exports);
 __exportStar(require("./digitRankNumber"), exports);
+__exportStar(require("./digitDecimalRankNumber"), exports);

package/lib/exercises/math/calcul/mentalCaluls/index.d.ts

@@ -2,4 +2,6 @@ export * from "./mentalAddAndSub";
 export * from "./mentalDivisions";
 export * from "./mentalMultiplications";
 export * from "./mentalPercentage";
+export * from "./mentalAddAndSubNoRelative";
+export * from "./mentalMultiplicationsNoRelative";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/mentalCaluls/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/index.js

@@ -18,3 +18,5 @@ __exportStar(require("./mentalAddAndSub"), exports);
 __exportStar(require("./mentalDivisions"), exports);
 __exportStar(require("./mentalMultiplications"), exports);
 __exportStar(require("./mentalPercentage"), exports);
+__exportStar(require("./mentalAddAndSubNoRelative"), exports);
+__exportStar(require("./mentalMultiplicationsNoRelative"), exports);

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSub.js

@@ -62,7 +62,7 @@ const isAnswerValid = (studentAns, { numbers }) => {
 exports.mentalAddAndSub = {
     id: "mentalAddAndSub",
     connector: "=",
-    label: "Effectuer mentalement des additions et des soustractions simples",
+    label: "Additions et soustractions avec des décimaux",
     levels: [
         "6ème",
         "5ème",

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.d.ts

@@ -0,0 +1,7 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    numbers: number[];
+};
+export declare const mentalAddAndSubNoRelative: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=mentalAddAndSubNoRelative.d.ts.map

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mentalAddAndSubNoRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgEF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSubNoRelative.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mentalAddAndSubNoRelative = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+const randint_1 = require("../../../../math/utils/random/randint");
+const round_1 = require("../../../../math/utils/round");
+const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const getMentalAddAndSubNoRelativeQuestion = () => {
+    let answer = -1;
+    let statementTree;
+    let numbers = [];
+    while (answer < 0) {
+        const nbOperations = (0, randint_1.randint)(2, 4);
+        numbers = [];
+        do {
+            numbers = [];
+            numbers.push((0, randfloat_1.randfloat)(1, 15, (0, randint_1.randint)(1, 3)));
+            let sum = numbers[0];
+            for (let i = 1; i < nbOperations + 1; i++) {
+                numbers.push((0, randfloat_1.randfloat)(-sum, 15, (0, randint_1.randint)(1, 3), [0]));
+                sum += numbers[i];
+            }
+        } while (numbers.every((a) => a > 0));
+        const allNumbersNodes = numbers.map((nb) => new numberNode_1.NumberNode(nb));
+        statementTree = new addNode_1.AddNode(allNumbersNodes[0], allNumbersNodes[1]);
+        for (let i = 2; i < allNumbersNodes.length; i++) {
+            statementTree = new addNode_1.AddNode(statementTree, allNumbersNodes[i]);
+        }
+        answer = (0, round_1.round)(numbers.reduce((a, b) => a + b), 2);
+    }
+    const answerTex = answer.frenchify();
+    const question = {
+        answer: answerTex,
+        instruction: `Calculer : $${statementTree.toTex()}$`,
+        startStatement: statementTree.toTex(),
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { numbers },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const answerNb = answer.unfrenchify();
+    while (propositions.length < n) {
+        const incorrectAnswer = (0, round_1.round)(answerNb + Math.max(-answerNb, (0, randfloat_1.randfloat)(-5, 6, (0, randint_1.randint)(1, 3), [0])), 2);
+        (0, exercise_1.tryToAddWrongProp)(propositions, incorrectAnswer.frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.mentalAddAndSubNoRelative = {
+    id: "mentalAddAndSubNoRelative",
+    connector: "=",
+    label: "Additions et soustractions avec des décimaux (sans relatifs)",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMentalAddAndSubNoRelativeQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalMultiplications.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplications.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAuBvD,CAAC"}
+{"version":3,"file":"mentalMultiplications.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplications.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA6EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAuBvD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplications.js

@@ -10,30 +10,38 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const coinFlip_1 = require("../../../../utils/coinFlip");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getMentalMultiplications = () => {
-    const a = (0, randint_1.randint)(-9, 10, [-1, 0, 1]);
-    const b = (0, coinFlip_1.coinFlip)()
-        ? (0, randint_1.randint)(-99, 100, [-10, 0, 10]) / 10
-        : (0, coinFlip_1.coinFlip)()
-            ? (0, randint_1.randint)(2, 10) * 10 + (0, randint_1.randint)(-1, 2, [0])
-            : (0, randint_1.randint)(2, 10) + (0, randint_1.randint)(-1, 2, [0]) / 10;
-    const c = (0, randint_1.randint)(2, 9, [3, 6, 7]);
-    const d = (0, randint_1.randint)(2, 11, [c]) / c;
-    const f = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(2, 10) / 10 : (0, randint_1.randint)(2, 100) / 100;
-    let numbers = [a, b, c, d, f];
-    const allNumbersNodes = numbers.map((nb) => new numberNode_1.NumberNode(nb));
+    const numbers = [];
+    const nbOfOperations = (0, randint_1.randint)(2, 4);
     let statementTree;
     let answer;
-    if ((0, coinFlip_1.coinFlip)()) {
+    if (nbOfOperations === 2) {
+        const a = (0, randint_1.randint)(-9, 10, [-1, 0, 1]);
+        const b = (0, coinFlip_1.coinFlip)()
+            ? (0, randint_1.randint)(-99, 100, [-10, 0, 10]) / 10
+            : (0, coinFlip_1.coinFlip)()
+                ? (0, randint_1.randint)(2, 10) * 10 + (0, randint_1.randint)(-1, 2, [0]) / 10
+                : (0, randint_1.randint)(2, 10) + (0, randint_1.randint)(-1, 2, [0]) / 10;
+        numbers.push(a);
+        numbers.push(b);
+        const allNumbersNodes = numbers.map((nb) => new numberNode_1.NumberNode(nb));
         statementTree = new multiplyNode_1.MultiplyNode(allNumbersNodes[0], allNumbersNodes[1]);
         answer = numbers[0] * numbers[1];
     }
     else {
-        statementTree = new multiplyNode_1.MultiplyNode(allNumbersNodes[2], new multiplyNode_1.MultiplyNode(allNumbersNodes[3], allNumbersNodes[4]));
-        answer = numbers[2] * numbers[3] * numbers[4];
+        //nbOfOperations = 3
+        const c = (0, randint_1.randint)(2, 9, [3, 6, 7]);
+        const d = (0, randint_1.randint)(2, 11, [c]) / c;
+        const f = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(2, 10) / 10 : (0, randint_1.randint)(2, 100) / 100;
+        numbers.push(c);
+        numbers.push(d);
+        numbers.push(f);
+        const allNumbersNodes = numbers.map((nb) => new numberNode_1.NumberNode(nb));
+        statementTree = new multiplyNode_1.MultiplyNode(allNumbersNodes[0], new multiplyNode_1.MultiplyNode(allNumbersNodes[1], allNumbersNodes[2]));
+        answer = numbers[0] * numbers[1] * numbers[2];
     }
     statementTree.shuffle();
     const statementTex = statementTree.toTex();
-    const answerTex = ((0, round_1.round)(answer, 2) + "").replace(".", ",");
+    const answerTex = (0, round_1.round)(answer, 2).frenchify();
     const question = {
         instruction: `Calculer : $${statementTex}$`,
         startStatement: statementTex,
@@ -47,7 +55,7 @@ const getMentalMultiplications = () => {
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const result = Number(answer.replace(",", "."));
+    const result = answer.unfrenchify();
     while (propositions.length < n) {
         let incorrectAnswer = (0, round_1.round)(result + ((0, coinFlip_1.coinFlip)() ? 1 : -1) * Math.random() * 10, 2);
         (0, exercise_1.tryToAddWrongProp)(propositions, incorrectAnswer.toString().replace(".", ","));
@@ -62,7 +70,7 @@ const isAnswerValid = (studentAns, { answer }) => {
 exports.mentalMultiplications = {
     id: "mentalMultiplications",
     connector: "=",
-    label: "Effectuer mentalement des multiplications simples",
+    label: "Multiplications avec des décimaux",
     levels: [
         "6ème",
         "5ème",

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.d.ts

@@ -0,0 +1,7 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    numbers: number[];
+};
+export declare const mentalMultiplicationsNoRelative: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=mentalMultiplicationsNoRelative.d.ts.map

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mentalMultiplicationsNoRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA4EF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAwBjE,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplicationsNoRelative.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mentalMultiplicationsNoRelative = 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 multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const shuffle_1 = require("../../../../utils/shuffle");
+const getMentalMultiplicationsNoRelative = () => {
+    const numbers = [];
+    const nbOfOperations = (0, randint_1.randint)(2, 4);
+    let statementTree;
+    let answer;
+    if (nbOfOperations === 2) {
+        const a = (0, randint_1.randint)(2, 10);
+        const b = (0, coinFlip_1.coinFlip)()
+            ? (0, randint_1.randint)(1, 100, [10]) / 10
+            : (0, coinFlip_1.coinFlip)()
+                ? (0, randint_1.randint)(2, 10) * 10 + (0, randint_1.randint)(-1, 2, [0]) / 10
+                : (0, randint_1.randint)(2, 10) + (0, randint_1.randint)(-1, 2, [0]) / 10;
+        numbers.push(a);
+        numbers.push(b);
+        const allNumbersNodes = numbers.map((nb) => new numberNode_1.NumberNode(nb));
+        statementTree = new multiplyNode_1.MultiplyNode(allNumbersNodes[0], allNumbersNodes[1]);
+        answer = numbers[0] * numbers[1];
+    }
+    else {
+        //nbOfOperations = 3
+        const c = (0, randint_1.randint)(2, 9, [3, 6, 7]);
+        const d = (0, randint_1.randint)(2, 11, [c]) / c;
+        const f = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(2, 10) / 10 : (0, randint_1.randint)(2, 100) / 100;
+        numbers.push(c);
+        numbers.push(d);
+        numbers.push(f);
+        const allNumbersNodes = numbers.map((nb) => new numberNode_1.NumberNode(nb));
+        statementTree = new multiplyNode_1.MultiplyNode(allNumbersNodes[0], new multiplyNode_1.MultiplyNode(allNumbersNodes[1], allNumbersNodes[2]));
+        answer = numbers[0] * numbers[1] * numbers[2];
+    }
+    statementTree.shuffle();
+    const statementTex = statementTree.toTex();
+    const answerTex = (0, round_1.round)(answer, 2).frenchify();
+    const question = {
+        instruction: `Calculer : $${statementTex}$`,
+        startStatement: statementTex,
+        answer: answerTex,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { numbers },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const result = answer.unfrenchify();
+    while (propositions.length < n) {
+        let incorrectAnswer = (0, round_1.round)(result + Math.random() * 10, 2);
+        (0, exercise_1.tryToAddWrongProp)(propositions, incorrectAnswer.toString().replace(".", ","));
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (studentAns, { answer }) => {
+    const answerTree = answer.unfrenchify().toTree();
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(studentAns);
+};
+exports.mentalMultiplicationsNoRelative = {
+    id: "mentalMultiplicationsNoRelative",
+    connector: "=",
+    label: "Multiplications avec des décimaux (sans relatifs)",
+    levels: [
+        "6ème",
+        "5ème",
+        "4ème",
+        "3ème",
+        "2nde",
+        "1reESM",
+        "CAP",
+        "2ndPro",
+        "1rePro",
+    ],
+    sections: ["Calculs"],
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMentalMultiplicationsNoRelative, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calcul/operations/expressionNature.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=expressionNature.d.ts.map

package/lib/exercises/math/calcul/operations/expressionNature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"expressionNature.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/expressionNature.ts"],"names":[],"mappings":""}

package/lib/exercises/math/calcul/operations/expressionNature.js

@@ -0,0 +1,81 @@
+"use strict";
+// import {
+//   Exercise,
+//   Proposition,
+//   QCMGenerator,
+//   Question,
+//   QuestionGenerator,
+//   VEA,
+//   GGBVEA,
+//   addValidProp,
+//   shuffleProps,
+//   tryToAddWrongProp,
+// } from "../../../../exercises/exercise";
+// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions";
+// import { AddNode } from "../../../../tree/nodes/operators/addNode";
+// import { diceFlip } from "../../../../utils/diceFlip";
+// type Identifiers = {};
+// const getExpressionNatureQuestion: QuestionGenerator<Identifiers> = () => {
+//   let answer  = "";
+//   let statement = "";
+//   let numbers = [0, 0];
+//   const type = diceFlip(4)
+//   switch(type){
+//     case 0 :
+//       //somme
+//       //ab+c , ac + bc, a/b + c, a + b/c
+//       const node= new AddNode(
+//       )
+//       answer = "une somme"
+//     break;
+//     case 1 :
+//       //différence
+//       answer = "une différence"
+//     break;
+//     case 2 :
+//       //produit
+//       answer = "un produit"
+//     break;
+//     case 3 :
+//     default:
+//       //quotient
+//       answer = "un quotient"
+//     break;
+//   }
+//   const question: Question<Identifiers> = {
+//     answer,
+//     instruction: `L'expression ${statement} est : `,
+//     keys: [],
+//     answerFormat: "tex",
+//     identifiers: {},
+//   };
+//   return question;
+// };
+// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
+//   const propositions: Proposition[] = [];
+//   addValidProp(propositions, answer);
+//   tryToAddWrongProp(propositions, "une somme");
+//   tryToAddWrongProp(propositions, "un produit");
+//   tryToAddWrongProp(propositions, "une différence");
+//   tryToAddWrongProp(propositions, "un quotient");
+//   return shuffleProps(propositions, n);
+// };
+// const isAnswerValid: VEA<Identifiers> = (ans, { answer }) => {
+//   return ans === answer;
+// };
+// export const expressionNature: Exercise<Identifiers> = {
+//   id: "expressionNature",
+//   connector: "=",
+//   label:
+//     "Déterminer la nature d'une expression (somme/produit/différence/quotient)",
+//   levels: [],
+//   isSingleStep: true,
+//   sections: [],
+//   generator: (nb: number) =>
+//     getDistinctQuestions(getExpressionNatureQuestion, nb),
+//   qcmTimer: 60,
+//   freeTimer: 60,
+//   getPropositions,
+//   isAnswerValid,
+//   subject: "Mathématiques",
+// };

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.d.ts

@@ -2,6 +2,8 @@ import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
     xValues: number[];
     imageValues: number[];
+    isAskingImage: boolean;
+    value: number;
 };
 export declare const inverseImageFunctionTable: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA8GF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgFF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}