math-exercises 3.0.69 → 3.0.71

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"}

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

@@ -14,13 +14,93 @@ import { DivideNode } from "../../../../tree/nodes/operators/divideNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    return `Calculer : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    return getStatementNode(identifiers).simplify().toTex();
+};
+const getStatementNode = (identifiers) => {
+    const { type, flip, a, b, c, d, subFlip } = identifiers;
+    switch (type) {
+        case 1: // a*b ± c±d
+            switch (flip) {
+                case 1:
+                    //a*b first
+                    return new AddNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new AddNode(new NumberNode(c), new NumberNode(d)));
+                case 2:
+                    //a*b last
+                    return new AddNode(new AddNode(new NumberNode(c), new NumberNode(d)), new MultiplyNode(new NumberNode(a), new NumberNode(b)));
+                case 3:
+                default:
+                    //a*b middle
+                    return new AddNode(new AddNode(new NumberNode(c), new MultiplyNode(new NumberNode(a), new NumberNode(b))), new NumberNode(d));
+            }
+            break;
+        case 2: // a/b ±c±d
+            switch (flip) {
+                case 1:
+                    //a/b first
+                    return new AddNode(new DivideNode(new NumberNode(a), new NumberNode(b)), new AddNode(new NumberNode(c), new NumberNode(d)));
+                case 2:
+                    //a/b last
+                    return new AddNode(new AddNode(new NumberNode(c), new NumberNode(d)), new DivideNode(new NumberNode(a), new NumberNode(b)));
+                case 3:
+                default:
+                    //a/b middle
+                    return new AddNode(new AddNode(new NumberNode(c), new DivideNode(new NumberNode(a), new NumberNode(b))), new NumberNode(d));
+            }
+            break;
+        case 3: // a*b ± c*d
+            return new AddNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new MultiplyNode(new NumberNode(c), new NumberNode(d)));
+        case 4: // a*b ± c/d
+            if (subFlip) {
+                return new AddNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new DivideNode(new NumberNode(c), new NumberNode(d)));
+            }
+            else {
+                return new AddNode(new DivideNode(new NumberNode(c), new NumberNode(d)), new MultiplyNode(new NumberNode(a), new NumberNode(b)));
+            }
+            break;
+        case 5: // a/b ± c/d
+            return new AddNode(new DivideNode(new NumberNode(a), new NumberNode(b)), new DivideNode(new NumberNode(c), new NumberNode(d)));
+        case 6: // a*b*c ± d
+            if (subFlip) {
+                return new AddNode(new MultiplyNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c)), new NumberNode(d));
+            }
+            else {
+                return new AddNode(new MultiplyNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c)), new NumberNode(d));
+            }
+        case 7: //a/b*c et c*a/b
+            return new MultiplyNode(new DivideNode(a.toTree(), b.toTree()), c.toTree()).shuffle();
+        case 8: //a+-b+-c
+        default:
+            return new AddNode(new AddNode(a.toTree(), b.toTree()), c.toTree());
+    }
+};
+const getStartStatement = (identifiers) => {
+    const { type, flip, a, b, c, d } = identifiers;
+    return getStatementNode(identifiers).toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getOperationsPrioritiesWithoutRelative = () => {
     const type = randint(1, 9);
     const flip = randint(1, 4);
-    let startStatement = "";
-    let answer = "";
     let a = 1, b = 1, c = 1, d = 1;
-    let statement;
+    const subFlip = coinFlip();
     switch (type) {
         case 1: // a*b ± c±d
             switch (flip) {
@@ -29,9 +109,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                     [a, b] = [1, 2].map((el) => randint(0, 11));
                     c = randint(-(a * b), 11, [0]);
                     d = randint(-(a * b + c), 11, [0]);
-                    statement = new AddNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new AddNode(new NumberNode(c), new NumberNode(d)));
-                    startStatement = statement.toTex();
-                    answer = (a * b + c + d).toString();
                     break;
                 case 2:
                     //a*b last
@@ -41,9 +118,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                         a = randint(-10, 11);
                         b = randint(0, 11);
                     } while (c + d + a * b < 0);
-                    statement = new AddNode(new AddNode(new NumberNode(c), new NumberNode(d)), new MultiplyNode(new NumberNode(a), new NumberNode(b)));
-                    startStatement = statement.toTex();
-                    answer = (a * b + c + d).toString();
                     break;
                 case 3:
                     //a*b middle
@@ -53,9 +127,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                         b = randint(0, 11);
                     } while (c + a * b < 0);
                     d = randint(-(c + a * b), 11, [0]);
-                    statement = new AddNode(new AddNode(new NumberNode(c), new MultiplyNode(new NumberNode(a), new NumberNode(b))), new NumberNode(d));
-                    startStatement = statement.toTex();
-                    answer = (a * b + c + d).toString();
                     break;
             }
             break;
@@ -67,9 +138,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                     a = b * randint(0, 11);
                     c = randint(-(a / b), 11, [0]);
                     d = randint(-(a / b + c), 11, [0]);
-                    statement = new AddNode(new DivideNode(new NumberNode(a), new NumberNode(b)), new AddNode(new NumberNode(c), new NumberNode(d)));
-                    startStatement = statement.toTex();
-                    answer = (a / b + c + d).toString();
                     break;
                 case 2:
                     //a/b last
@@ -79,9 +147,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                         b = randint(1, 11);
                         a = b * randint(-10, 11);
                     } while (c + d + a / b < 0);
-                    statement = new AddNode(new AddNode(new NumberNode(c), new NumberNode(d)), new DivideNode(new NumberNode(a), new NumberNode(b)));
-                    startStatement = statement.toTex();
-                    answer = (a / b + c + d).toString();
                     break;
                 case 3:
                     //a/b middle
@@ -91,9 +156,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                         a = b * randint(-10, 11);
                     } while (c + a / b < 0);
                     d = randint(-(c + a / b), 11, [0]);
-                    statement = new AddNode(new AddNode(new NumberNode(c), new DivideNode(new NumberNode(a), new NumberNode(b))), new NumberNode(d));
-                    startStatement = statement.toTex();
-                    answer = (a / b + c + d).toString();
                     break;
             }
             break;
@@ -103,18 +165,12 @@ const getOperationsPrioritiesWithoutRelative = () => {
                 c = randint(-10, 11);
                 d = randint(1, 11);
             } while (a * b + c * d < 0);
-            statement = new AddNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new MultiplyNode(new NumberNode(c), new NumberNode(d)));
-            startStatement = statement.toTex();
-            answer = (a * b + c * d).toString();
             break;
         case 4: // a*b ± c/d
-            if (coinFlip()) {
+            if (subFlip) {
                 [a, b] = [1, 2].map((el) => randint(1, 11));
                 d = randint(0, 11, [0]);
                 c = d * randint(-(a * b), 11);
-                statement = new AddNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new DivideNode(new NumberNode(c), new NumberNode(d)));
-                startStatement = statement.toTex();
-                answer = (a * b + c / d).toString();
             }
             else {
                 d = randint(0, 11, [0]);
@@ -123,9 +179,6 @@ const getOperationsPrioritiesWithoutRelative = () => {
                     a = randint(-10, 11);
                     b = randint(0, 11);
                 } while (c / d + a * b < 0);
-                statement = new AddNode(new DivideNode(new NumberNode(c), new NumberNode(d)), new MultiplyNode(new NumberNode(a), new NumberNode(b)));
-                startStatement = statement.toTex();
-                answer = (a * b + c / d).toString();
             }
             break;
         case 5: // a/b ± c/d
@@ -135,17 +188,11 @@ const getOperationsPrioritiesWithoutRelative = () => {
                 d = randint(0, 11, [0]);
                 c = d * randint(-10, 11);
             } while (a / b + c / d < 0);
-            statement = new AddNode(new DivideNode(new NumberNode(a), new NumberNode(b)), new DivideNode(new NumberNode(c), new NumberNode(d)));
-            startStatement = statement.toTex();
-            answer = (a / b + c / d).toString();
             break;
         case 6: // a*b*c ± d
-            if (coinFlip()) {
+            if (subFlip) {
                 [a, b, c] = [1, 2, 3].map((el) => randint(1, 11));
                 d = randint(-a * b * c, 11);
-                statement = new AddNode(new MultiplyNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c)), new NumberNode(d));
-                startStatement = statement.toTex();
-                answer = (a * b * c + d).toString();
             }
             else {
                 d = randint(1, 11);
@@ -153,39 +200,22 @@ const getOperationsPrioritiesWithoutRelative = () => {
                     a = randint(-10, 11, [0]);
                     [b, c] = [1, 2].map((el) => randint(1, 11));
                 } while (a * b * c + d < 0);
-                statement = new AddNode(new MultiplyNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c)), new NumberNode(d));
-                startStatement = statement.toTex();
-                answer = (a * b * c + d).toString();
             }
             break;
         case 7: //a/b*c et c*a/b
             b = randint(2, 10);
             a = b * randint(2, 10);
             c = randint(2, 10);
-            statement = new MultiplyNode(new DivideNode(a.toTree(), b.toTree()), c.toTree()).shuffle();
-            answer = ((a / b) * c).frenchify();
-            startStatement = statement.toTex();
             break;
         case 8: //a+-b+-c
+        default:
             a = randint(5, 15);
             b = randint(-a, 10);
             c = b > 0 ? randint(-(a + b), 0) : randint(-(a + b), 10);
-            statement = new AddNode(new AddNode(a.toTree(), b.toTree()), c.toTree());
-            answer = (a + b + c).frenchify();
-            startStatement = statement.toTex();
             break;
-        default:
-            throw Error("impossible");
     }
-    const question = {
-        instruction: `Calculer : $${startStatement}$`,
-        startStatement,
-        answer,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { a, b, c, d, flip, type },
-    };
-    return question;
+    const identifiers = { a, b, c, d, flip, type, subFlip };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -204,8 +234,6 @@ export const operationsPrioritiesWithoutRelative = {
     id: "operationsPrioritiesWithoutRelative",
     connector: "=",
     label: "Priorités opératoires sans les nombres relatifs",
-    levels: ["6ème", "5ème", "4ème"],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getOperationsPrioritiesWithoutRelative, nb),
     qcmTimer: 60,
@@ -213,4 +241,5 @@ export const operationsPrioritiesWithoutRelative = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/ordering/decimalOrdering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAgE1D,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"decimalOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAoF1D,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/calcul/ordering/decimalOrdering.js

@@ -3,6 +3,33 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { randfloat } from "../../../../math/utils/random/randfloat.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    return `Compléter par le bon symbole : 
+    
+$$
+${a.frenchify()}\\ ...... \\ ${b.frenchify()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const answer = a < b ? "<" : a === b ? "=" : ">";
+    return answer;
+};
+// const getHint: GetHint<Identifiers> =(identifiers)=>{
+// }
+// const getCorrection: GetCorrection<Identifiers> = (identifiers)=>{
+// }
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getDecimalOrderingQuestion = () => {
     const type = randint(1, 5);
     let a = 0;
@@ -34,19 +61,8 @@ const getDecimalOrderingQuestion = () => {
                 break;
         }
     }
-    const answer = a < b ? "<" : a === b ? "=" : ">";
-    const question = {
-        answer,
-        instruction: `Compléter par le bon symbole : 
-    
-$$
-${a.frenchify()}\\ ...... \\ ${b.frenchify()}
-$$`,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { type, a, b },
-    };
-    return question;
+    const identifiers = { type, a, b };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -71,4 +87,5 @@ export const decimalOrdering = {
     isAnswerValid,
     subject: "Mathématiques",
     answerType: "QCU",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/ordering/decimalOrderingNoRelatives.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalOrderingNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrderingNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAkE1D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAe5D,CAAC"}
+{"version":3,"file":"decimalOrderingNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrderingNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAmF1D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAgB5D,CAAC"}

package/lib/exercises/math/calcul/ordering/decimalOrderingNoRelatives.js

@@ -3,6 +3,29 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { randfloat } from "../../../../math/utils/random/randfloat.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    return `Compléter par le bon symbole : 
+    
+$$
+${a.frenchify()}\\ ...... \\ ${b.frenchify()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const answer = a < b ? "<" : a === b ? "=" : ">";
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getDecimalOrderingNoRelativesQuestion = () => {
     const type = randint(1, 5);
     let a = 0;
@@ -34,19 +57,8 @@ const getDecimalOrderingNoRelativesQuestion = () => {
                 break;
         }
     }
-    const answer = a < b ? "<" : a === b ? "=" : ">";
-    const question = {
-        answer,
-        instruction: `Compléter par le bon symbole : 
-    
-$$
-${a.frenchify()}\\ ...... \\ ${b.frenchify()}
-$$`,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { type, a, b },
-    };
-    return question;
+    const identifiers = { type, a, b };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -73,4 +85,5 @@ export const decimalOrderingNoRelatives = {
     isAnswerValid,
     subject: "Mathématiques",
     answerType: "QCU",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/ordering/framing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"framing.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/framing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAwJF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAczC,CAAC"}
+{"version":3,"file":"framing.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/framing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAqBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AA2KF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAazC,CAAC"}