math-exercises 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Générateurs d'exercices et questions mathématiques en latex",
   "main": "src/index.js",
   "scripts": {

package/src/exercises/calcul/operationsPriorities.js

@@ -41,7 +41,10 @@ function getPriorityQuestions() {
                     new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new addNode_1.AddNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d))).shuffle()
                 : //a*b middle
                     new addNode_1.AddNode(new addNode_1.AddNode(new numberNode_1.NumberNode(c), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b))), new numberNode_1.NumberNode(d));
-            answer = a * b + c + d + "";
+            answer = (a * b + c + d).toString();
+            console.log("type", type);
+            console.log("statement", statement);
+            console.log("answer", answer);
             break;
         case 2: // a/b ±c±d
             _c = [1, 2, 3].map(function (el) { return (0, randint_1.randint)(-10, 11, [0]); }), b = _c[0], c = _c[1], d = _c[2];
@@ -51,33 +54,48 @@ function getPriorityQuestions() {
                     new addNode_1.AddNode(new divideNode_1.DivideNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new addNode_1.AddNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d))).shuffle()
                 : //a/b middle
                     new addNode_1.AddNode(new addNode_1.AddNode(new numberNode_1.NumberNode(c), new divideNode_1.DivideNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b))), new numberNode_1.NumberNode(d));
-            answer = a / b + c + d + "";
+            answer = (a / b + c + d).toString();
+            console.log("type", type);
+            console.log("statement", statement);
+            console.log("answer", answer);
             break;
         case 3: // a*b ± c*d
             _d = [1, 2, 3, 4].map(function (el) { return (0, randint_1.randint)(-10, 11); }), a = _d[0], b = _d[1], c = _d[2], d = _d[3];
             statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)));
-            answer = a * b + c * d + "";
+            answer = (a * b + c * d).toString();
+            console.log("type", type);
+            console.log("statement", statement);
+            console.log("answer", answer);
             break;
         case 4: // a*b ± c/d
             _e = [1, 2].map(function (el) { return (0, randint_1.randint)(-10, 11); }), a = _e[0], b = _e[1];
             d = (0, randint_1.randint)(-10, 11, [0]);
             c = d * (0, randint_1.randint)(0, 11);
             statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new divideNode_1.DivideNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d))).shuffle();
-            answer = a * b + c / d + "";
+            answer = (a * b + c / d).toString();
+            console.log("type", type);
+            console.log("statement", statement);
+            console.log("answer", answer);
             break;
         case 5: // a/b ± c/d
             _f = [1, 2].map(function (el) { return (0, randint_1.randint)(-10, 11, [0]); }), b = _f[0], d = _f[1];
             a = b * (0, randint_1.randint)(0, 11);
             c = d * (0, randint_1.randint)(0, 11);
             statement = new addNode_1.AddNode(new divideNode_1.DivideNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new divideNode_1.DivideNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)));
-            answer = a / b + c / d + "";
+            answer = (a / b + c / d).toString();
+            console.log("type", type);
+            console.log("statement", statement);
+            console.log("answer", answer);
             break;
         case 5: // a*b*c ± d
             _g = [1, 2].map(function (el) { return (0, randint_1.randint)(-10, 11, [0]); }), b = _g[0], d = _g[1];
             a = b * (0, randint_1.randint)(0, 11);
             c = d * (0, randint_1.randint)(0, 11);
             statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c)), new numberNode_1.NumberNode(d)).shuffle();
-            answer = (a * b * c) / d + "";
+            answer = a * b * c + d + "";
+            console.log("type", type);
+            console.log("statement", statement.toString());
+            console.log("answer", answer);
             break;
     }
     var question = {

package/src/exercises/calcul/operationsPriorities.ts

@@ -1,7 +1,4 @@
 import { randint } from "../../mathutils/random/randint";
-import { Integer } from "../../numbers/integer/integer";
-import { DiscreteSet } from "../../sets/discreteSet";
-import { Interval } from "../../sets/intervals/intervals";
 import { latexParse } from "../../tree/latexParser/latexParse";
 import { Node } from "../../tree/nodes/node";
 import { NumberNode } from "../../tree/nodes/numbers/numberNode";
@@ -52,7 +49,7 @@ export function getPriorityQuestions(): Question {
             new AddNode(new NumberNode(c), new MultiplyNode(new NumberNode(a), new NumberNode(b))),
             new NumberNode(d)
           );
-      answer = a * b + c + d + "";
+      answer = (a * b + c + d).toString();
       break;
     case 2: // a/b ±c±d
       [b, c, d] = [1, 2, 3].map((el) => randint(-10, 11, [0]));
@@ -68,7 +65,7 @@ export function getPriorityQuestions(): Question {
             new AddNode(new NumberNode(c), new DivideNode(new NumberNode(a), new NumberNode(b))),
             new NumberNode(d)
           );
-      answer = a / b + c + d + "";
+      answer = (a / b + c + d).toString();
       break;
     case 3: // a*b ± c*d
       [a, b, c, d] = [1, 2, 3, 4].map((el) => randint(-10, 11));
@@ -76,7 +73,7 @@ export function getPriorityQuestions(): Question {
         new MultiplyNode(new NumberNode(a), new NumberNode(b)),
         new MultiplyNode(new NumberNode(c), new NumberNode(d))
       );
-      answer = a * b + c * d + "";
+      answer = (a * b + c * d).toString();
       break;
     case 4: // a*b ± c/d
       [a, b] = [1, 2].map((el) => randint(-10, 11));
@@ -86,7 +83,7 @@ export function getPriorityQuestions(): Question {
         new MultiplyNode(new NumberNode(a), new NumberNode(b)),
         new DivideNode(new NumberNode(c), new NumberNode(d))
       ).shuffle();
-      answer = a * b + c / d + "";
+      answer = (a * b + c / d).toString();
       break;
     case 5: // a/b ± c/d
       [b, d] = [1, 2].map((el) => randint(-10, 11, [0]));
@@ -96,7 +93,7 @@ export function getPriorityQuestions(): Question {
         new DivideNode(new NumberNode(a), new NumberNode(b)),
         new DivideNode(new NumberNode(c), new NumberNode(d))
       );
-      answer = a / b + c / d + "";
+      answer = (a / b + c / d).toString();
       break;
     case 5: // a*b*c ± d
       [b, d] = [1, 2].map((el) => randint(-10, 11, [0]));
@@ -106,7 +103,7 @@ export function getPriorityQuestions(): Question {
         new MultiplyNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c)),
         new NumberNode(d)
       ).shuffle();
-      answer = (a * b * c) / d + "";
+      answer = (a * b * c + d).toString();
       break;
   }
 

package/src/exercises/calculLitteral/equation/equationType1Exercise.js

@@ -18,7 +18,7 @@ exports.equationType1Exercise = {
     label: "Equations $x+a = b$",
     levels: ["4", "3", "2"],
     section: "Calcul littéral",
-    isSingleStep: false,
+    isSingleStep: true,
     generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType1ExerciseQuestion, nb); }
 };
 function getEquationType1ExerciseQuestion() {

package/src/exercises/calculLitteral/equation/equationType1Exercise.ts

@@ -17,7 +17,7 @@ export const equationType1Exercise: Exercise = {
   label: "Equations $x+a = b$",
   levels: ["4", "3", "2"],
   section: "Calcul littéral",
-  isSingleStep: false,
+  isSingleStep: true,
   generator: (nb: number) => getDistinctQuestions(getEquationType1ExerciseQuestion, nb),
 };
 

package/src/exercises/calculLitteral/equation/equationType2Exercise.js

@@ -20,7 +20,7 @@ exports.equationType2Exercise = {
     label: "Equations $ax=b$",
     levels: ["4", "3", "2"],
     section: "Calcul littéral",
-    isSingleStep: false,
+    isSingleStep: true,
     generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType2ExerciseQuestion, nb); }
 };
 function getEquationType2ExerciseQuestion() {

package/src/exercises/calculLitteral/equation/equationType2Exercise.ts

@@ -20,7 +20,7 @@ export const equationType2Exercise: Exercise = {
   label: "Equations $ax=b$",
   levels: ["4", "3", "2"],
   section: "Calcul littéral",
-  isSingleStep: false,
+  isSingleStep: true,
   generator: (nb: number) => getDistinctQuestions(getEquationType2ExerciseQuestion, nb),
 };
 

package/src/index.ts

@@ -1,6 +1,11 @@
+import { operationsPriorities } from "./exercises/calcul/operationsPriorities";
 import { exercises } from "./exercises/exercises";
+import { latexParse } from "./tree/latexParser/latexParse";
+import { NumberNode } from "./tree/nodes/numbers/numberNode";
+import { MultiplyNode } from "./tree/nodes/operators/multiplyNode";
 
 // exercises.forEach((exo) => {
 //   console.log(exo.instruction, exo.generator(10));
 // });
+
 export { exercises };

package/src/tree/latexParser/latexParse.js

@@ -62,13 +62,7 @@ function latexParse(node) {
                     }
                     if (needBrackets)
                         rightTex = "(".concat(rightTex, ")");
-                    //  permet de gérer le cas 3*2^x
-                    var showTimesSign = !isNaN(+rightTex[0]);
-                    if (rightChild.type === node_1.NodeType.operator) {
-                        var operatorRightChild = rightChild;
-                        showTimesSign || (showTimesSign = [operatorNode_1.OperatorIds.fraction].includes(operatorRightChild.id));
-                    }
-                    return "".concat(leftTex).concat(showTimesSign ? "\\div " : "").concat(rightTex);
+                    return "".concat(leftTex, " \\div ").concat(rightTex);
                 }
                 case operatorNode_1.OperatorIds.fraction: {
                     return "\\frac{".concat(leftTex, "}{").concat(rightTex, "}");

package/src/tree/latexParser/latexParse.ts

@@ -65,13 +65,7 @@ export function latexParse(node: Node): string {
           }
           if (needBrackets) rightTex = `(${rightTex})`;
 
-          //  permet de gérer le cas 3*2^x
-          let showTimesSign = !isNaN(+rightTex[0]);
-          if (rightChild.type === NodeType.operator) {
-            const operatorRightChild = rightChild as OperatorNode;
-            showTimesSign ||= [OperatorIds.fraction].includes(operatorRightChild.id);
-          }
-          return `${leftTex}${showTimesSign ? "\\div " : ""}${rightTex}`;
+          return `${leftTex} \\div ${rightTex}`;
         }
 
         case OperatorIds.fraction: {