math-exercises 3.0.81 → 3.0.83

package/lib/exercises/math/calcul/arithmetics/isNumberDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isNumberDecimal.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/isNumberDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAW7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE;QACP,CAAC,EAAE,eAAe,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;CACL,CAAC;AA6HF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAmBjD,CAAC"}
+{"version":3,"file":"isNumberDecimal.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/isNumberDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAa7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE;QACP,CAAC,EAAE,eAAe,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;CACL,CAAC;AAqIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAmBjD,CAAC"}

package/lib/exercises/math/calcul/arithmetics/isNumberDecimal.js

@@ -4,10 +4,12 @@ import { RationalConstructor } from "../../../../math/numbers/rationals/rational
 import { randfloat } from "../../../../math/utils/random/randfloat.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
+import { isConstantNode } from "../../../../tree/nodes/numbers/constantNode.js";
 import { PiNode } from "../../../../tree/nodes/numbers/piNode.js";
 import { isFractionNode, } from "../../../../tree/nodes/operators/fractionNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { random } from "../../../../utils/alea/random.js";
+import { doWhile } from "../../../../utils/doWhile.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const getPropositions = (n, { answer, options }) => {
     const propositions = [];
@@ -37,7 +39,10 @@ const getCorrection = (identifiers) => {
     for (const { a, isDecimal } of options) {
         const node = reifyAlgebraic(a);
         const tex = node.toTex();
-        if (isFractionNode(node)) {
+        if (isConstantNode(node)) {
+            correction += `- $${tex}$ n'est pas un nombre décimal, car il s'écrit avec un nombre infini de chiffres après la virgule.\n\n`;
+        }
+        else if (isFractionNode(node)) {
             const denom = node.rightChild.toTex();
             if (isDecimal) {
                 correction += `- $${tex} = ${node
@@ -75,15 +80,15 @@ const isAnswerValid = (ans, { answer }) => {
 };
 const generateNonDecimalNumber = () => {
     const nonDecimals = [];
-    nonDecimals.push(RationalConstructor.randomPureRational().toTree().toIdentifiers());
-    nonDecimals.push(PiNode.toIdentifiers());
+    nonDecimals.push(RationalConstructor.randomPureRational().toTree());
+    nonDecimals.push(PiNode);
     return random(nonDecimals);
 };
 const generateDecimalNumber = () => {
     const decimals = [];
-    decimals.push(randint(0, 100).toTree().toIdentifiers());
-    decimals.push(randfloat(0, 100, 2).toTree().toIdentifiers());
-    decimals.push(RationalConstructor.randomDecimal().toTree().toIdentifiers());
+    decimals.push(randint(0, 100).toTree());
+    decimals.push(randfloat(0, 100, 2).toTree());
+    decimals.push(RationalConstructor.randomDecimal().toTree());
     return random(decimals);
 };
 const getIsNumberdecimalQuestion = (ops) => {
@@ -94,12 +99,17 @@ const getIsNumberdecimalQuestion = (ops) => {
     choices.push({ a: nonDecimal, isDecimal: false });
     for (let i = 0; i < 2; i++) {
         const isDecimal = coinFlip();
-        const randomNumber = isDecimal
-            ? generateDecimalNumber()
-            : generateNonDecimalNumber();
+        const randomNumber = doWhile(() => (isDecimal ? generateDecimalNumber() : generateNonDecimalNumber()), (a) => choices.some((c) => c.a.toTex() === a.toTex()));
         choices.push({ a: randomNumber, isDecimal });
     }
-    const identifiers = { options: choices };
+    const identifiers = {
+        options: choices.map((c) => {
+            return {
+                a: c.a.toIdentifiers(),
+                isDecimal: c.isDecimal,
+            };
+        }),
+    };
     return getQuestionFromIdentifiers(identifiers);
 };
 const getQuestionFromIdentifiers = (identifiers) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.81",
+  "version": "3.0.83",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [