math-exercises 3.0.68 → 3.0.70

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

@@ -4,6 +4,25 @@ import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    const { rand, a, b } = identifiers;
+    return `Que vaut $${String(a).replace(".", ",")}\\%$ de $${b}$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { rand, a, b } = identifiers;
+    const answer = ((a * b) / 100).frenchify();
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getMentalPercentage = () => {
     let a = 1, b = 1;
     const rand = randint(1, 10);
@@ -46,15 +65,8 @@ const getMentalPercentage = () => {
             b = 1000;
             break;
     }
-    const answer = ((a * b) / 100 + "").replace(".", ",");
-    const question = {
-        instruction: `Calculer : $${String(a).replace(".", ",")}\\%$ de $${b}$.`,
-        answer,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { rand, a, b },
-    };
-    return question;
+    const identifiers = { rand, a, b };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, rand }) => {
     const propositions = [];
@@ -120,4 +132,5 @@ export const mentalPercentage = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -1,6 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
-    nodeIds: any;
+    nodeIds: NodeIdentifiers;
     type: number;
     subType: number;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"expressionNature.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/expressionNature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAoLnE,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAgBlD,CAAC"}
+{"version":3,"file":"expressionNature.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/expressionNature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AA6M/E,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

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

@@ -1,11 +1,44 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
 import { diceFlip } from "../../../../utils/alea/diceFlip.js";
+const getInstruction = (identifiers) => {
+    const { nodeIds, type, subType } = identifiers;
+    const statement = reifyAlgebraic(nodeIds);
+    return `L'expression $${statement.toTex()}$ est : `;
+};
+const getAnswer = (identifiers) => {
+    const { type } = identifiers;
+    switch (type) {
+        case 0:
+            //somme
+            return "une somme";
+        case 1:
+            //différence
+            return "une différence";
+        case 2:
+            //produit
+            return "un produit";
+        case 3:
+        default:
+            return "un quotient";
+    }
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "raw",
+        identifiers,
+    };
+    return question;
+};
 const getExpressionNatureQuestion = () => {
     let answer = "";
     let statement = "";
@@ -43,7 +76,6 @@ const getExpressionNatureQuestion = () => {
                     node = new AddNode(new DivideNode(a, b), new DivideNode(c, d));
                     break;
             }
-            answer = "une somme";
             break;
         case 1:
             //différence
@@ -73,7 +105,6 @@ const getExpressionNatureQuestion = () => {
                     node = new SubstractNode(new DivideNode(a, b), new DivideNode(c, d));
                     break;
             }
-            answer = "une différence";
             break;
         case 2:
             //produit
@@ -100,7 +131,6 @@ const getExpressionNatureQuestion = () => {
                     node = new MultiplyNode(new SubstractNode(a, b), new SubstractNode(c, d));
                     break;
             }
-            answer = "un produit";
             break;
         case 3:
         default:
@@ -131,18 +161,10 @@ const getExpressionNatureQuestion = () => {
                     node = new DivideNode(new SubstractNode(a, b), new SubstractNode(c, d));
                     break;
             }
-            answer = "un quotient";
             break;
     }
-    statement = node.toTex();
-    const question = {
-        answer,
-        instruction: `L'expression $${statement}$ est : `,
-        keys: [],
-        answerFormat: "raw",
-        identifiers: { nodeIds: node.toIdentifiers(), type, subType },
-    };
-    return question;
+    const identifiers = { nodeIds: node.toIdentifiers(), type, subType };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -160,9 +182,7 @@ export const expressionNature = {
     id: "expressionNature",
     connector: "=",
     label: "Déterminer la nature d'une expression (somme/produit/différence/quotient)",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getExpressionNatureQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -170,4 +190,5 @@ export const expressionNature = {
     isAnswerValid,
     subject: "Mathématiques",
     answerType: "QCU",
+    getQuestionFromIdentifiers,
 };

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

@@ -1,6 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
-    nodeIds: any;
+    nodeIds: NodeIdentifiers;
     type: number;
 };
 export declare const operationsPrioritiesParenthesis: Exercise<Identifiers>;

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,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAYjE,CAAC"}
+{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAiIF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}

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

@@ -1,22 +1,43 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+const getInstruction = (identifiers) => {
+    const statement = reifyAlgebraic(identifiers.nodeIds);
+    return `Calculer : 
+  
+$$
+${statement.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const statement = reifyAlgebraic(identifiers.nodeIds);
+    return statement.simplify().toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getOperationsPrioritiesParenthesisQuestion = () => {
     const type = randint(1, 5);
     let a, b, c, d;
     let statement;
-    let answer = "";
     switch (type) {
         case 1: //a*(b+-c)
             a = randint(-10, 11, [0, 1, -1]);
             [b, c] = [1, 2].map((el) => randint(-10, 11, [0]));
             statement = new MultiplyNode(a.toTree(), new AddNode(b.toTree(), c.toTree()), { forceTimesSign: true }).shuffle();
-            answer = (a * (b + c)).frenchify();
             break;
         case 2: //a/(b+-c) ou (b+-c)/a
             if (coinFlip()) {
@@ -25,7 +46,6 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
                 c = randint(-10, 11, [-b]);
                 a = (b + c) * randint(2, 10);
                 statement = new DivideNode(a.toTree(), new AddNode(b.toTree(), c.toTree()));
-                answer = (a / (b + c)).frenchify();
             }
             else {
                 //(b+-c)/a
@@ -34,7 +54,6 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
                 b = k - randint(-10, 11, [0]);
                 c = k - b;
                 statement = new DivideNode(new AddNode(b.toTree(), c.toTree()), a.toTree());
-                answer = ((b + c) / a).frenchify();
             }
             break;
         case 3: // (a+-b)*/(c+-d)
@@ -42,7 +61,6 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
                 //(a+-b)*(c+-d)
                 [a, b, c, d] = [1, 2, 3, 4].map((el) => randint(-10, 11, [0]));
                 statement = new MultiplyNode(new AddNode(a.toTree(), b.toTree()), new AddNode(c.toTree(), d.toTree()), { forceTimesSign: true });
-                answer = ((a + b) * (c + d)).frenchify();
             }
             else {
                 //(a+-b)/(c+-d)
@@ -52,7 +70,6 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
                 a = k - randint(-10, 11, [0]);
                 b = k - a;
                 statement = new DivideNode(new AddNode(a.toTree(), b.toTree()), new AddNode(c.toTree(), d.toTree()));
-                answer = ((a + b) / (c + d)).frenchify();
             }
             break;
         case 4: // a +- (b+- c/*d)
@@ -70,17 +87,10 @@ const getOperationsPrioritiesParenthesisQuestion = () => {
             statement = new (isAdd ? AddNode : SubstractNode)(a.toTree(), new (isAdd2 ? AddNode : SubstractNode)(b.toTree(), new (isDivide ? DivideNode : MultiplyNode)(c.toTree(), d.toTree(), {
                 forceTimesSign: true,
             }), { forceParenthesis: isAdd }));
-            answer = statement.evaluate({}).toString();
             break;
     }
-    const question = {
-        answer,
-        instruction: `Calculer : $${statement.toTex()}$`,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { nodeIds: statement.toIdentifiers(), type },
-    };
-    return question;
+    const identifiers = { nodeIds: statement.toIdentifiers(), type };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -103,5 +113,6 @@ export const operationsPrioritiesParenthesis = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
+    getQuestionFromIdentifiers,
     subject: "Mathématiques",
 };

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

@@ -1,6 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
-    nodeIds: any;
+    nodeIds: NodeIdentifiers;
     type: number;
 };
 export declare const operationsPrioritiesParenthesisNoRelatives: Exercise<Identifiers>;

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

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesParenthesisNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesisNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAmIF,eAAO,MAAM,0CAA0C,EAAE,QAAQ,CAAC,WAAW,CAkB1E,CAAC"}
+{"version":3,"file":"operationsPrioritiesParenthesisNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesisNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA+IF,eAAO,MAAM,0CAA0C,EAAE,QAAQ,CAAC,WAAW,CAiB1E,CAAC"}

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

@@ -1,23 +1,44 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+const getInstruction = (identifiers) => {
+    const statement = reifyAlgebraic(identifiers.nodeIds);
+    return `Calculer : 
+
+$$
+${statement.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const statement = reifyAlgebraic(identifiers.nodeIds);
+    return statement.simplify().toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
     const type = randint(1, 5);
     let a, b, c, d;
     let statement;
-    let answer = "";
     switch (type) {
         case 1: //a*(b+-c)
             a = randint(2, 11);
             b = randint(1, 11);
             c = randint(-b, 11, [0]);
             statement = new MultiplyNode(a.toTree(), new AddNode(b.toTree(), c.toTree())).shuffle();
-            answer = (a * (b + c)).frenchify();
             break;
         case 2: //a/(b+-c) ou (b+-c)/a
             if (coinFlip()) {
@@ -26,7 +47,6 @@ const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
                 c = randint(-b + 1, 11);
                 a = (b + c) * randint(2, 10);
                 statement = new DivideNode(a.toTree(), new AddNode(b.toTree(), c.toTree()));
-                answer = (a / (b + c)).frenchify();
             }
             else {
                 //(b+-c)/a
@@ -35,7 +55,6 @@ const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
                 b = Math.max(k - randint(-10, 11, [0]), 1);
                 c = k - b;
                 statement = new DivideNode(new AddNode(b.toTree(), c.toTree()), a.toTree());
-                answer = ((b + c) / a).frenchify();
             }
             break;
         case 3: // (a+-b)*/(c+-d)
@@ -45,7 +64,6 @@ const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
                 b = randint(-a, 11, [0]);
                 d = randint(-c, 11, [0]);
                 statement = new MultiplyNode(new AddNode(a.toTree(), b.toTree()), new AddNode(c.toTree(), d.toTree()));
-                answer = ((a + b) * (c + d)).frenchify();
             }
             else {
                 //(a+-b)/(c+-d)
@@ -55,7 +73,6 @@ const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
                 a = Math.max(k - randint(-10, 11, [0]), 1);
                 b = k - a;
                 statement = new DivideNode(new AddNode(a.toTree(), b.toTree()), new AddNode(c.toTree(), d.toTree()));
-                answer = ((a + b) / (c + d)).frenchify();
             }
             break;
         case 4: // a +- (b+- c/*d)
@@ -84,17 +101,10 @@ const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
                 a = randint(secondValue + 1, secondValue + 10);
             }
             statement = new (isAdd ? AddNode : SubstractNode)(a.toTree(), new (isAdd2 ? AddNode : SubstractNode)(b.toTree(), new (isDivide ? DivideNode : MultiplyNode)(c.toTree(), d.toTree()), { forceParenthesis: isAdd }));
-            answer = statement.evaluate({}).toString();
             break;
     }
-    const question = {
-        answer,
-        instruction: `Calculer : $${statement.toTex()}$`,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { nodeIds: statement.toIdentifiers(), type },
-    };
-    return question;
+    const identifiers = { nodeIds: statement.toIdentifiers(), type };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -111,13 +121,12 @@ export const operationsPrioritiesParenthesisNoRelatives = {
     id: "operationsPrioritiesParenthesisNoRelatives",
     connector: "=",
     label: "Priorités opératoires avec parenthèses (sans relatifs)",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getOperationsPrioritiesParenthesisNoRelativesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -9,6 +9,7 @@ import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     type: number;
     flip: number;
+    subFlip: boolean;
     a: number;
     b: number;
     c: number;

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

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgSF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}
+{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAySF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAarE,CAAC"}