math-exercises 2.2.25 → 2.2.26

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

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAkHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

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

@@ -18,7 +18,7 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
         case 1: //a*(b+-c)
             a = (0, randint_1.randint)(-10, 11, [0, 1, -1]);
             [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11, [0]));
-            statement = new multiplyNode_1.MultiplyNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree()));
+            statement = new multiplyNode_1.MultiplyNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree()), { forceTimesSign: true });
             statement.shuffle();
             answer = (a * (b + c)).frenchify();
             break;
@@ -45,7 +45,7 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
             if ((0, coinFlip_1.coinFlip)()) {
                 //(a+-b)*(c+-d)
                 [a, b, c, d] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(-10, 11, [0]));
-                statement = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a.toTree(), b.toTree()), new addNode_1.AddNode(c.toTree(), d.toTree()));
+                statement = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a.toTree(), b.toTree()), new addNode_1.AddNode(c.toTree(), d.toTree()), { forceTimesSign: true });
                 answer = ((a + b) * (c + d)).frenchify();
             }
             else {
@@ -71,7 +71,9 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
             else
                 c = (0, randint_1.randint)(-10, 11, [0]);
             const isAdd2 = (0, coinFlip_1.coinFlip)();
-            statement = new (isAdd ? addNode_1.AddNode : substractNode_1.SubstractNode)(a.toTree(), new (isAdd2 ? addNode_1.AddNode : substractNode_1.SubstractNode)(b.toTree(), new (isDivide ? divideNode_1.DivideNode : multiplyNode_1.MultiplyNode)(c.toTree(), d.toTree()), { forceParenthesis: isAdd }));
+            statement = new (isAdd ? addNode_1.AddNode : substractNode_1.SubstractNode)(a.toTree(), new (isAdd2 ? addNode_1.AddNode : substractNode_1.SubstractNode)(b.toTree(), new (isDivide ? divideNode_1.DivideNode : multiplyNode_1.MultiplyNode)(c.toTree(), d.toTree(), {
+                forceTimesSign: true,
+            }), { forceParenthesis: isAdd }));
             answer = statement.evaluate({}).toString();
             break;
     }

package/lib/exercises/math/derivation/derivative/usualderivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usualderivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/usualderivative.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAMT,MAAM,mBAAmB,CAAC;AAuB3B,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA0FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAqBjD,CAAC"}
+{"version":3,"file":"usualderivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/usualderivative.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAMT,MAAM,mBAAmB,CAAC;AAuB3B,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA4FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAqBjD,CAAC"}

package/lib/exercises/math/derivation/derivative/usualderivative.js

@@ -26,6 +26,8 @@ const getUsualDerivative = () => {
             break;
         case 4:
             question = (0, constanteDerivative_1.getConstanteDerivative)();
+            question.hint = undefined;
+            question.correction = undefined;
             identifiers = { ...question.identifiers, type: 4 };
             break;
         default:

package/lib/exercises/math/geometry/areas/circleArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/circleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAyCF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAa5C,CAAC"}
+{"version":3,"file":"circleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/circleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAwCF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAa5C,CAAC"}

package/lib/exercises/math/probaStat/conditionalProbability.js

@@ -95,7 +95,7 @@ ${(0, alignTex_1.alignTex)([
             pB = (0, randint_1.randint)(2, 100);
             pBStr = (pB / 100).frenchify();
             pA_B = (0, randint_1.randint)(1, pB);
-            pA_BStr = pA_B.frenchify();
+            pA_BStr = (pA_B / 100).frenchify();
             pAB = (0, round_1.round)((pA_B * pB) / 10000, 2);
             pABStr = pAB.frenchify();
             instruction += `$P(B) = ${pBStr}\\ $ et $\\ P_B(A) = ${pA_BStr}$.$\\\\$Déterminer $P(A \\cap B)$ (arrondir au centième).`;

package/lib/exercises/math/sets/setBelonging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setBelonging.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sets/setBelonging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"setBelonging.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sets/setBelonging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA8EF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/sets/setBelonging.js

@@ -8,6 +8,13 @@ const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
+const getAnswer = (identifiers) => {
+    const sets = ["N", "Z", "D", "Q", "R"];
+    if (identifiers.type > -1) {
+        return `\\mathbb{${sets[identifiers.type]}}`;
+    }
+    return "";
+};
 const getSetBelongingQuestion = () => {
     //N Z D Q R (racine2, pi)
     //fraction simplifiable en décimal/entier
@@ -27,7 +34,7 @@ const getSetBelongingQuestion = () => {
             break;
         case 2:
             nb = decimal_1.DecimalConstructor.random(-50, 50, (0, randint_1.randint)(1, 4)).toTree().toTex();
-            answer = "\\mathrm{D}";
+            answer = "\\mathbb{D}";
             break;
         case 3:
             nb = rational_1.RationalConstructor.randomIrreductible().toTree().toTex();
@@ -67,7 +74,7 @@ const getPropositions = (n, { answer }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return [answer, answer.replace("mathbb", "mathrm")].includes(ans);
+    return [answer].includes(ans);
 };
 exports.setBelonging = {
     id: "setBelonging",
@@ -82,4 +89,5 @@ exports.setBelonging = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [