math-exercises 2.2.90 → 2.2.92

package/lib/exercises/math/calculLitteral/equation/choseOperationToSolveEquation.js

@@ -28,6 +28,7 @@
 // } from "../../../../tree/nodes/nodeConstructor";
 // type Identifiers = {
 //   equaIdentifiers: EqualNodeIdentifiers;
+//   type: number
 // };
 // const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
 //   const propositions: Proposition[] = [];
@@ -71,22 +72,28 @@
 //   switch (type) {
 //     case 1:
 //       //ax = b tous entiers
-//       a = randint(-10);
-//       break;
-//     case 2:
+//       a = randint(2, 10);
+//       b = randint(2, 10)
 //       break;
+//     case 2 :
+//      // ax + b = c tous entiers
+//      break;
 //     case 3:
+//         //ax-b = c tous entiers
 //       break;
 //     case 4:
-//       break;
+//       //x/a = b tous entiers
+//     break;
 //     case 5:
-//       break;
+//         //x+a = b
+//     break;
 //     case 6:
+//         //x-a = b
 //       break;
 //     case 7:
 //       break;
 //   }
-//   const identifiers: Identifiers = {};
+//   const identifiers: Identifiers = {type, };
 //   const question: Question<Identifiers> = {
 //     answer: getAnswer(identifiers),
 //     instruction: getInstruction(identifiers),

package/lib/exercises/math/calculLitteral/equation/equationSimpleSquare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AA0BlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAuKF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AA2BlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA+JF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAkBtD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationSimpleSquare.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationSimpleSquare = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const real_1 = require("../../../../math/numbers/reals/real");
 const randint_1 = require("../../../../math/utils/random/randint");
@@ -15,6 +14,7 @@ const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const diceFlip_1 = require("../../../../utils/alea/diceFlip");
 const isInt_1 = require("../../../../utils/isInt");
 const random_1 = require("../../../../utils/alea/random");
+const discreteSetParser_1 = require("../../../../tree/parsers/discreteSetParser");
 const squares = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12].map((el) => el ** 2);
 const higherFactor = (n) => {
     for (let i = Math.floor(Math.sqrt(n)); i > 0; i--)
@@ -22,65 +22,77 @@ const higherFactor = (n) => {
             return i;
     return 1;
 };
-const getEquationSimpleSquare = () => {
-    let randNbr = (0, randint_1.randint)(-10, 101);
-    const rand = (0, diceFlip_1.diceFlip)(3);
-    if (rand === 0)
-        randNbr = (0, randint_1.randint)(-20, 0);
-    else if (rand === 1)
-        randNbr = (0, random_1.random)(squares);
-    else
-        randNbr = (0, randint_1.randint)(2, 100);
-    const instruction = `Résoudre l'équation : $x^2 = ${randNbr}$`;
-    const sqrt = Math.sqrt(randNbr);
+const getInstruction = (identifiers) => {
+    const { randNbr } = identifiers;
+    return `Résoudre l'équation : 
+  
+$$
+x^2 = ${randNbr}
+$$`;
+};
+const getHint = (identifiers) => {
+    return `L'équation $x^2 = k$ : 
+    
+- n'admet pas de solution si $k<0$, 
+- admet une solution si $k=0$, qui est $0$
+- admet deux solutions si $k>0$, qui sont $-\\sqrt{k}$ et $\\sqrt{k}$
+    `;
+};
+const getAnswer = (identifiers) => {
+    const { randNbr } = identifiers;
     let solutionsSet;
-    let simplifiedRoot;
     if (randNbr < 0) {
         solutionsSet = new discreteSetNode_1.DiscreteSetNode([]);
     }
-    else if (sqrt === Math.floor(sqrt)) {
-        if (sqrt === 0)
-            solutionsSet = new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(0)]);
-        else
-            solutionsSet = new discreteSetNode_1.DiscreteSetNode([
-                new numberNode_1.NumberNode(-sqrt),
-                new numberNode_1.NumberNode(+sqrt),
-            ]);
+    else if (randNbr === 0) {
+        solutionsSet = new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(0)]);
     }
     else {
         const tree = new real_1.SquareRoot(randNbr).simplify().toTree();
         solutionsSet = new discreteSetNode_1.DiscreteSetNode([new oppositeNode_1.OppositeNode(tree), tree]);
     }
     const answer = new equationSolutionNode_1.EquationSolutionNode(solutionsSet).toTex();
-    const question = {
-        instruction,
-        answer,
-        keys: equationKeys_1.equationKeys,
-        answerFormat: "tex",
-        identifiers: { randNbr },
-        hint: `L'équation $x^2 = k$ : 
-    
-- n'admet pas de solution si $k<0$, 
-- admet une solution si $k=0$, qui est $0$
-- admet deux solutions si $k>0$, qui sont $-\\sqrt{k}$ et $\\sqrt{k}$
-    `,
-        correction: `
+    return answer;
+};
+const getCorrection = (identifiers) => {
+    const { randNbr } = identifiers;
+    const answer = getAnswer(identifiers);
+    return `
 ${randNbr < 0
-            ? `L'équation $x^2 = ${randNbr}$ n'admet pas de solution, car $${randNbr}$ est négatif. Ainsi, $${answer}$.`
-            : randNbr === 0
-                ? `L'équation $x^2 = 0$ admet une unique solution : $0$. En effet, $0$ est le seul nombre qui au carré est égal à $0$. Ainsi, $${answer}$.`
-                : `Puisque $${randNbr}>0$, l'équation $x^2 = ${randNbr}$ admet deux solutions : $-\\sqrt{${randNbr}}$ et $\\sqrt{${randNbr}}$. 
+        ? `L'équation $x^2 = ${randNbr}$ n'admet pas de solution, car $${randNbr}$ est négatif. Ainsi, $${answer}$.`
+        : randNbr === 0
+            ? `L'équation $x^2 = 0$ admet une unique solution : $0$. En effet, $0$ est le seul nombre qui au carré est égal à $0$. Ainsi, $${answer}$.`
+            : `Puisque $${randNbr}>0$, l'équation $x^2 = ${randNbr}$ admet deux solutions : $-\\sqrt{${randNbr}}$ et $\\sqrt{${randNbr}}$. 
     
 ${new real_1.SquareRoot(randNbr).isSimplifiable()
-                    ? `Or, $\\sqrt{${randNbr}}=${new real_1.SquareRoot(randNbr)
-                        .simplify()
-                        .toTree()
-                        .toTex()}$.`
-                    : ""}
+                ? `Or, $\\sqrt{${randNbr}}=${new real_1.SquareRoot(randNbr)
+                    .simplify()
+                    .toTree()
+                    .toTex()}$.`
+                : ""}
 
 Ainsi, $${answer}$.
 `}
-    `,
+    `;
+};
+const getEquationSimpleSquare = () => {
+    let randNbr;
+    const rand = (0, diceFlip_1.diceFlip)(10);
+    if (rand === 1)
+        randNbr = (0, randint_1.randint)(-20, 0);
+    else if (rand < 6)
+        randNbr = (0, random_1.random)(squares);
+    else
+        randNbr = (0, randint_1.randint)(2, 100);
+    const identifiers = { randNbr };
+    const question = {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "varnothing"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -121,32 +133,16 @@ const getPropositions = (n, { answer, randNbr }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { randNbr }) => {
-    let answerTrees = [];
-    if (randNbr < 0) {
-        answerTrees = [new equationSolutionNode_1.EquationSolutionNode(discreteSetNode_1.EmptySet)];
+const isAnswerValid = (ans, { answer, randNbr }) => {
+    try {
+        const parsed = (0, discreteSetParser_1.discreteSetParser)(ans);
+        if (!parsed)
+            return false;
+        return "S=" + parsed.simplify().toTex() === answer;
     }
-    else if (randNbr === 0) {
-        answerTrees = [
-            new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(0)])),
-        ];
-    }
-    // else if (randNbr === 1) {
-    //   answerTrees = [
-    //     new EquationSolutionNode(new DiscreteSetNode([new NumberNode(1)])),
-    //   ];
-    // }
-    else {
-        const sqrt = new real_1.SquareRoot(randNbr);
-        const sqrtTree = sqrt.toTree();
-        answerTrees.push(new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new oppositeNode_1.OppositeNode(sqrtTree), sqrtTree])));
-        if (sqrt.isSimplifiable()) {
-            const simplified = sqrt.simplify().toTree();
-            answerTrees.push(new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new oppositeNode_1.OppositeNode(simplified), simplified])));
-        }
+    catch (err) {
+        return false;
     }
-    const texs = answerTrees.flatMap((tree) => tree.toAllValidTexs());
-    return texs.includes(ans);
 };
 exports.equationSimpleSquare = {
     id: "equationSimpleSquare",
@@ -162,4 +158,8 @@ exports.equationSimpleSquare = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getAnswer,
+    getCorrection,
+    getInstruction,
+    getHint,
 };

package/lib/exercises/math/calculLitteral/equation/equationType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}
+{"version":3,"file":"equationType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAclC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAoBvD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationType1Exercise.js

@@ -12,33 +12,65 @@ const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
-const getEquationType1ExerciseQuestion = () => {
-    const b = (0, randint_1.randint)(-10, 11);
-    const a = (0, randint_1.randint)(-10, 11, [0]);
-    const solution = b - a;
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
     const affine = new affine_1.Affine(1, a).toTree();
     const tree = new equalNode_1.EqualNode(affine, new numberNode_1.NumberNode(b));
+    const statementTree = tree.toTex();
+    return `Résoudre : 
+  
+$$
+${statementTree}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const solution = b - a;
     const answer = `x=${solution}`;
+    return answer;
+};
+const getHint = (identifiers) => {
+    const { a, b } = identifiers;
+    return `Il faut isoler $x$ à gauche. Pour cela, effectue l'opération des deux côtés de l'équation qui permet de supprimer le terme $${a < 0 ? "" : "+"}${a}$.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(1, a).toTree();
+    const tree = new equalNode_1.EqualNode(affine, new numberNode_1.NumberNode(b));
     const statementTree = tree.toTex();
+    const answer = getAnswer(identifiers);
+    return `Pour isoler $x$ à gauche, on effectue l'opération $${a > 0 ? `$-${a}$` : `+${Math.abs(a)}`}$ des deux côtés de l'équation : 
+    
+${(0, alignTex_1.alignTex)([
+        [
+            `${statementTree}`,
+            "\\iff",
+            new equalNode_1.EqualNode(new addNode_1.AddNode(affine, new numberNode_1.NumberNode(-a)), new addNode_1.AddNode(b.toTree(), new numberNode_1.NumberNode(-a))).toTex(),
+        ],
+        ["", "\\iff", answer],
+    ])}
+    `;
+};
+const getStartStatement = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(1, a).toTree();
+    const tree = new equalNode_1.EqualNode(affine, new numberNode_1.NumberNode(b));
+    const statementTree = tree.toTex();
+    return statementTree;
+};
+const getEquationType1ExerciseQuestion = () => {
+    const b = (0, randint_1.randint)(-10, 11);
+    const a = (0, randint_1.randint)(-10, 11, [0]);
+    const identifiers = { a, b };
     const question = {
-        instruction: `Résoudre : $${statementTree}$`,
-        startStatement: statementTree,
-        answer,
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        identifiers: { a, b },
-        hint: `Il faut isoler $x$ à gauche. Pour cela, effectue l'opération des deux côtés de l'équation qui permet de supprimer le terme $${a < 0 ? "" : "+"}${a}$.`,
-        correction: `Pour isoler $x$ à gauche, on effectue l'opération $${a > 0 ? `$-${a}$` : `+${Math.abs(a)}`}$ des deux côtés de l'équation : 
-    
-${(0, alignTex_1.alignTex)([
-            [
-                `${statementTree}`,
-                "\\iff",
-                new equalNode_1.EqualNode(new addNode_1.AddNode(affine, new numberNode_1.NumberNode(-a)), new addNode_1.AddNode(b.toTree(), new numberNode_1.NumberNode(-a))).toTex(),
-            ],
-            ["", "\\iff", answer],
-        ])}
-    `,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -46,10 +78,10 @@ const getPropositions = (n, { answer, a, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const solution = b - a;
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x = ${b + a}`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x=${b + a}`);
     while (propositions.length < n) {
         const wrongAnswer = solution + (0, randint_1.randint)(-3, 4, [0]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `x = ${wrongAnswer}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `x=${wrongAnswer}`);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
@@ -71,4 +103,9 @@ exports.equationType1Exercise = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getCorrection,
+    getHint,
+    getInstruction,
+    getAnswer,
+    getStartStatement,
 };

package/lib/exercises/math/calculLitteral/equation/equationType2Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAsBlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAM1C;;GAEG;AAGH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA2GF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAaF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBhE,CAAC"}
+{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAsBlC,OAAO,EAEL,eAAe,EAEhB,MAAM,kCAAkC,CAAC;AAM1C;;GAEG;AAGH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAaF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBhE,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationType2Exercise.js

@@ -19,7 +19,7 @@ const substractNode_1 = require("../../../../tree/nodes/operators/substractNode"
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const rebuildIdentifiers = (oldIdentifiers) => {
-    if (!!oldIdentifiers.numberType)
+    if (!!oldIdentifiers.aNumberType)
         return oldIdentifiers;
     return {
         a: oldIdentifiers.a.toTree().toIdentifiers(),
@@ -28,6 +28,61 @@ const rebuildIdentifiers = (oldIdentifiers) => {
         aNumberType: "Entier",
     };
 };
+const getInstruction = (identifiers) => {
+    return `Résoudre : 
+  
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, isXRight, aNumberType } = identifiers;
+    const aTree = (0, nodeConstructor_1.reifyAlgebraic)(a);
+    const bTree = (0, nodeConstructor_1.reifyAlgebraic)(b);
+    const solution = (0, fractionNode_1.frac)(bTree, aTree).simplify();
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution).toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    const { a, b, isXRight, aNumberType } = identifiers;
+    const aTree = (0, nodeConstructor_1.reifyAlgebraic)(a);
+    const bTree = (0, nodeConstructor_1.reifyAlgebraic)(b);
+    return `Il faut isoler $x$ à ${isXRight ? "droite" : "gauche"}. Pour cela, effectue l'opération des deux côtés de l'équation qui permet de supprimer la multiplication par $${aTree.toTex()}$.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, isXRight, aNumberType } = identifiers;
+    const aTree = (0, nodeConstructor_1.reifyAlgebraic)(a);
+    const bTree = (0, nodeConstructor_1.reifyAlgebraic)(b);
+    const affine = new generalAffine_1.GeneralAffine(aTree, 0).toTree();
+    const equalTree = new equalNode_1.EqualNode(affine, bTree);
+    const tree = isXRight ? equalTree.reverse() : equalTree;
+    const answer = getAnswer(identifiers);
+    return `Pour isoler $x$ à ${isXRight ? "droite" : "gauche"}, on divise les deux côtés de l'équation par $${aTree.toTex()}$ : 
+    
+${(0, alignTex_1.alignTex)([
+        [
+            `${tree.toTex()}`,
+            "\\iff",
+            isXRight
+                ? (0, equalNode_1.equal)((0, fractionNode_1.frac)(bTree, aTree), (0, fractionNode_1.frac)(affine, aTree)).toTex()
+                : (0, equalNode_1.equal)((0, fractionNode_1.frac)(affine, aTree), (0, fractionNode_1.frac)(bTree, aTree)).toTex(),
+        ],
+        ["", "\\iff", answer],
+    ])}
+    `;
+};
+const getStatementNode = (identifiers) => {
+    const { a, b, isXRight, aNumberType } = identifiers;
+    const aTree = (0, nodeConstructor_1.reifyAlgebraic)(a);
+    const bTree = (0, nodeConstructor_1.reifyAlgebraic)(b);
+    const affine = new generalAffine_1.GeneralAffine(aTree, 0).toTree();
+    const equalTree = new equalNode_1.EqualNode(affine, bTree);
+    const tree = isXRight ? equalTree.reverse() : equalTree;
+    return tree;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
 const getEquationType2ExerciseQuestion = (opts) => {
     const types = opts?.aNumberType ?? ["Entier"];
     const b = (0, randint_1.randint)(-10, 11).toTree();
@@ -35,13 +90,7 @@ const getEquationType2ExerciseQuestion = (opts) => {
     const a = type === "Entier"
         ? (0, randint_1.randint)(-9, 10, [0, 1]).toTree()
         : rational_1.RationalConstructor.randomIrreductibleWithSign().toTree();
-    const solution = (0, fractionNode_1.frac)(b, a).simplify();
-    const affine = new generalAffine_1.GeneralAffine(a, 0).toTree();
     const isXRight = (0, coinFlip_1.coinFlip)();
-    const equalTree = new equalNode_1.EqualNode(affine, b);
-    const tree = isXRight ? equalTree.reverse() : equalTree;
-    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution).toTex();
-    const statementTex = tree.toTex();
     const identifiers = {
         a: a.toIdentifiers(),
         b: b.toIdentifiers(),
@@ -49,26 +98,14 @@ const getEquationType2ExerciseQuestion = (opts) => {
         aNumberType: type,
     };
     const question = {
-        instruction: `Résoudre : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        identifiers: identifiers,
-        hint: `Il faut isoler $x$ à ${isXRight ? "droite" : "gauche"}. Pour cela, effectue l'opération des deux côtés de l'équation qui permet de supprimer la multiplication par $${a.toTex()}$.`,
-        correction: `Pour isoler $x$ à ${isXRight ? "droite" : "gauche"}, on divise les deux côtés de l'équation par $${a.toTex()}$ : 
-    
-${(0, alignTex_1.alignTex)([
-            [
-                `${statementTex}`,
-                "\\iff",
-                isXRight
-                    ? (0, equalNode_1.equal)((0, fractionNode_1.frac)(b, a), (0, fractionNode_1.frac)(affine, a)).toTex()
-                    : (0, equalNode_1.equal)((0, fractionNode_1.frac)(affine, a), (0, fractionNode_1.frac)(b, a)).toTex(),
-            ],
-            ["", "\\iff", answer],
-        ])}
-    `,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -117,5 +154,10 @@ exports.equationType2Exercise = {
     subject: "Mathématiques",
     hasHintAndCorrection: true,
     options,
+    getCorrection,
+    getHint,
+    getInstruction,
+    getAnswer,
+    getStartStatement,
     rebuildIdentifiers,
 };

package/lib/exercises/math/calculLitteral/equation/equationType3Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType3Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType3Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAelC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}
+{"version":3,"file":"equationType3Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType3Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAelC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAqBvD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationType3Exercise.js

@@ -15,36 +15,63 @@ const alignTex_1 = require("../../../../utils/latex/alignTex");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
-const getEquationType3ExerciseQuestion = () => {
-    const b = (0, randint_1.randint)(-10, 11, [0]);
-    const a = (0, randint_1.randint)(-10, 11, [0, 1]);
-    const c = (0, randint_1.randint)(-10, 11);
+const getStatementNode = (identifiers) => {
+    const { a, b, c } = identifiers;
     const affine = new affine_1.Affine(a, b).toTree();
-    const solution = new rational_1.Rational(c - b, a).simplify();
     const statementTree = new equalNode_1.EqualNode(affine, new numberNode_1.NumberNode(c));
-    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
-    const answer = answerTree.toTex();
-    const statementTex = statementTree.toTex();
-    const question = {
-        instruction: `Résoudre : $${statementTex}$`,
-        hint: "Isolez le terme $x$ dans la partie gauche de l'équation.",
-        correction: `Commencer par soustraire $${b}$ des deux côtés de l'équation pour 
+    return statementTree;
+};
+const getInstruction = (identifiers) => {
+    return `Résoudre : 
+  
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getHint = (identifiers) => {
+    return "Isolez le terme $x$ dans la partie gauche de l'équation.";
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c } = identifiers;
+    const statementTex = getStatementNode(identifiers).toTex();
+    const answer = getAnswer(identifiers);
+    return `Commencer par soustraire $${b}$ des deux côtés de l'équation pour 
     l'éliminer du côté gauche. Ensuite, diviser les deux côtés de l'équation par 
     $${a}$ pour isoler $x$, ce qui donne : 
     
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "\\iff",
-                new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(a.toTree(), new variableNode_1.VariableNode("x")), (c - b).toTree()).toTex(),
-            ],
-            ["", "\\iff", answer],
-        ])}`,
-        startStatement: statementTree.toTex(),
-        answer,
+        [
+            statementTex,
+            "\\iff",
+            new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(a.toTree(), new variableNode_1.VariableNode("x")), (c - b).toTree()).toTex(),
+        ],
+        ["", "\\iff", answer],
+    ])}`;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c } = identifiers;
+    const solution = new rational_1.Rational(c - b, a).simplify();
+    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
+    const answer = answerTree.toTex();
+    return answer;
+};
+const getEquationType3ExerciseQuestion = () => {
+    const b = (0, randint_1.randint)(-10, 11, [0]);
+    const a = (0, randint_1.randint)(-10, 11, [0, 1]);
+    const c = (0, randint_1.randint)(-10, 11);
+    const identifiers = { a, b, c };
+    const question = {
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        identifiers: { a, b, c },
+        identifiers,
     };
     return question;
 };
@@ -77,4 +104,9 @@ exports.equationType3Exercise = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getAnswer,
+    getInstruction,
+    getCorrection,
+    getHint,
+    getStartStatement,
 };

package/lib/exercises/math/calculLitteral/equation/equationType4Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAelC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAelC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+FF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationType4Exercise.js

@@ -12,29 +12,47 @@ const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const getStatementNode = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    const affines = [new affine_1.Affine(a, b), new affine_1.Affine(c, d)];
+    const statementTree = new equalNode_1.EqualNode(affines[0].toTree(), affines[1].toTree());
+    return statementTree;
+};
+const getInstruction = (identifiers) => {
+    return `Résoudre : 
+
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    const solution = new rational_1.Rational(d - b, a - c).simplify();
+    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
+    const answer = answerTree.toTex();
+    return answer;
+};
 const getEquationType4ExerciseQuestion = () => {
     const a = (0, randint_1.randint)(-10, 11, [0, 1]);
     const b = (0, randint_1.randint)(-10, 11, [0]);
     const c = (0, randint_1.randint)(-10, 11, [0, a]);
     const d = (0, randint_1.randint)(-10, 11, [0]);
-    const affines = [new affine_1.Affine(a, b), new affine_1.Affine(c, d)];
-    const solution = new rational_1.Rational(d - b, a - c).simplify();
-    const statementTree = new equalNode_1.EqualNode(affines[0].toTree(), affines[1].toTree());
-    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
-    const answer = answerTree.toTex();
-    const statementTex = statementTree.toTex();
+    const identifiers = {
+        a,
+        b,
+        c,
+        d,
+    };
     const question = {
-        instruction: `Résoudre : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        identifiers: {
-            a: a,
-            b: b,
-            c: c,
-            d: d,
-        },
+        identifiers,
         //     hint: `Commence par regrouper les termes en $x$ d'un même côté de l'équation. Puis, isole $x$ en effectuant les bonnes opérations.`,
         //     correction: `On isole $x$ à gauche en soustrayant par $${b}$ puis en divisant par $${a}$ :
         // ${alignTex([
@@ -80,4 +98,6 @@ exports.equationType4Exercise = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };