math-exercises 2.2.3 → 2.2.5

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

@@ -11,6 +11,8 @@ const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const shuffle_1 = require("../../../../utils/shuffle");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
+const alignTex_1 = require("../../../../utils/alignTex");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const getEquationType1ExerciseQuestion = () => {
     const b = (0, randint_1.randint)(-10, 11);
     const a = (0, randint_1.randint)(-10, 11, [0]);
@@ -18,13 +20,26 @@ const getEquationType1ExerciseQuestion = () => {
     const affine = new affine_1.Affine(1, a).toTree();
     const tree = new equalNode_1.EqualNode(affine, new numberNode_1.NumberNode(b));
     const answer = `x=${solution}`;
+    const statementTree = tree.toTex();
     const question = {
-        instruction: `Résoudre : $${tree.toTex()}$`,
-        startStatement: tree.toTex(),
+        instruction: `Résoudre : $${statementTree}$`,
+        startStatement: statementTree,
         answer,
         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],
+        ])}
+    `,
     };
     return question;
 };
@@ -58,4 +73,5 @@ exports.equationType1Exercise = {
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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,EAQT,MAAM,0BAA0B,CAAC;AAgBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqDF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAmBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}

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

@@ -12,6 +12,9 @@ const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/shuffle");
+const alignTex_1 = require("../../../../utils/alignTex");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const getEquationType2ExerciseQuestion = () => {
     const b = (0, randint_1.randint)(-10, 11);
     const a = (0, randint_1.randint)(-9, 10, [0, 1]);
@@ -19,13 +22,26 @@ const getEquationType2ExerciseQuestion = () => {
     const affine = new affine_1.Affine(a, 0).toTree();
     const tree = new equalNode_1.EqualNode(affine, b.toTree());
     const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree()).toTex();
+    const statementTex = tree.toTex();
     const question = {
-        instruction: `Résoudre : $${tree.toTex()}$`,
-        startStatement: tree.toTex(),
+        instruction: `Résoudre : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
         identifiers: { a, b: 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 la multiplication par $${a}$.`,
+        correction: `Pour isoler $x$ à gauche, on divise les deux côtés de l'équation par $${a}$: 
+    
+${(0, alignTex_1.alignTex)([
+            [
+                `${statementTex}`,
+                "\\iff",
+                new equalNode_1.EqualNode(new fractionNode_1.FractionNode(affine, new numberNode_1.NumberNode(a)), new fractionNode_1.FractionNode(b.toTree(), new numberNode_1.NumberNode(a))).toTex(),
+            ],
+            ["", "\\iff", answer],
+        ])}
+    `,
     };
     return question;
 };
@@ -60,4 +76,5 @@ exports.equationType2Exercise = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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;AAalC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}
+{"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;AAgBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}

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

@@ -13,6 +13,8 @@ const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode")
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/shuffle");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
+const alignTex_1 = require("../../../../utils/alignTex");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const getEquationType3ExerciseQuestion = () => {
     const b = (0, randint_1.randint)(-10, 11, [0]);
     const a = (0, randint_1.randint)(-10, 11, [0, 1]);
@@ -22,12 +24,22 @@ const getEquationType3ExerciseQuestion = () => {
     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 : $${statementTree.toTex()}$`,
+        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 
     l'éliminer du côté gauche. Ensuite, diviser les deux côtés de l'équation par 
-    $${a}$ pour isoler $x$, ce qui donne : \n $ ${a}x = ${c}${b < 0 ? "+" + Math.abs(b) : "-" + Math.abs(b)} \\Leftrightarrow x=\\frac{${c}${b < 0 ? "+" + Math.abs(b) : "-" + Math.abs(b)}}{${a}} \\Leftrightarrow ${answer}$.`,
+    $${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,
         keys: equationKeys_1.equationKeys,
@@ -66,4 +78,5 @@ exports.equationType3Exercise = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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;AA2DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}
+{"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;AAgBlC;;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;AA4EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}

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

@@ -13,18 +13,19 @@ const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode")
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getEquationType4ExerciseQuestion = () => {
-    const a = (0, randint_1.randint)(-10, 11, [0]);
-    const b = (0, randint_1.randint)(-10, 11);
+    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);
+    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 question = {
-        instruction: `Résoudre : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Résoudre : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
@@ -34,6 +35,20 @@ const getEquationType4ExerciseQuestion = () => {
             c: c,
             d: d,
         },
+        //     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([
+        //   [
+        //     statementTex,
+        //     "\\iff",
+        //     new EqualNode(
+        //       new Affine(a, 0).toTree(),
+        //       affines[1].add(-b).toTree(),
+        //     ).toTex(),
+        //   ],
+        //   ["", "\\iff", answer],
+        // ])}
+        //     `,
     };
     return question;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6CF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}
+{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

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

@@ -6,20 +6,42 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../../math/utils/random/randint");
+const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getFirstDegreeEquation = () => {
     const a = (0, randint_1.randint)(-30, 30, [0]);
     const b = (0, randint_1.randint)(-30, 30, [0]);
     const answer = `x=${new rational_1.Rational(a, b).simplify().toTree().toTex()}`;
+    const frac = new fractionNode_1.FractionNode(a.toTree(), "x".toTree());
+    const statement = new equalNode_1.EqualNode(frac, b.toTree()).toTex();
     const question = {
-        instruction: `Résoudre l'équation suivante : $\\frac{${a}}{x} = ${b}$`,
+        instruction: `Résoudre l'équation suivante : $${statement}$`,
         startStatement: `x`,
         answer,
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
         identifiers: { a, b },
+        hint: `Multiplie les deux côtés de l'équation par $x$, puis isole $x$ dans la partie droite de l'équation.`,
+        correction: `On multiplie les deux côtés de l'équation par $x$, puis on divise par $b$ : 
+    
+${(0, alignTex_1.alignTex)([
+            ["", `${statement}`],
+            [
+                "\\iff",
+                new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode("x".toTree(), frac), new multiplyNode_1.MultiplyNode("x".toTree(), b.toTree())).toTex(),
+            ],
+            [
+                "\\iff",
+                new equalNode_1.EqualNode(a.toTree(), new multiplyNode_1.MultiplyNode(b.toTree(), "x".toTree())).toTex(),
+            ],
+            ["\\iff", answer],
+        ])}
+    `,
     };
     return question;
 };
@@ -56,4 +78,5 @@ exports.firstDegreeEquation = {
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquationIntType1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAa7D,CAAC"}
+{"version":3,"file":"firstDegreeEquationIntType1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqFF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}

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

@@ -3,20 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeEquationIntType1 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
+const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const getFirstDegreeEquationIntQuestion = () => {
     const a = (0, randint_1.randint)(-15, 15, [0]);
     const x = (0, randint_1.randint)(-15, 15, [0]);
     const b = a * x;
     const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree()).toTex();
+    const aMonom = new affine_1.Affine(a, 0).toTree();
+    const statementTex = new equalNode_1.EqualNode(aMonom, new numberNode_1.NumberNode(b)).toTex();
     const question = {
         answer: answer,
-        instruction: `Résoudre l'équation suivante : $${a}x = ${b}$`,
+        instruction: `Résoudre l'équation suivante : $${statementTex}$`,
         keys: ["x", "equal"],
         answerFormat: "tex",
         identifiers: { a: a, x: x, b: 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 la multiplication par $${a}$.`,
+        correction: `Pour isoler $x$ à gauche, on divise les deux côtés de l'équation par $${a}$: 
+    
+${(0, alignTex_1.alignTex)([
+            [
+                `${statementTex}`,
+                "\\iff",
+                new equalNode_1.EqualNode(new fractionNode_1.FractionNode(aMonom, new numberNode_1.NumberNode(a)), new fractionNode_1.FractionNode(b.toTree(), new numberNode_1.NumberNode(a))).toTex(),
+            ],
+            ["", "\\iff", answer],
+        ])}
+    `,
     };
     return question;
 };
@@ -62,4 +80,5 @@ exports.firstDegreeEquationIntType1 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquationIntType2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AASlC,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;AA6EF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAa7D,CAAC"}
+{"version":3,"file":"firstDegreeEquationIntType2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,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;AA8FF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}

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

@@ -9,19 +9,34 @@ const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const getFirstDegreeEquationIntQuestion = () => {
-    const a = (0, randint_1.randint)(-15, 15, [0]);
+    const a = (0, randint_1.randint)(-15, 15, [0, 1]);
     const x = (0, randint_1.randint)(-15, 15, [0]);
-    const c = (0, randint_1.randint)(-15, 15, [0]);
+    const c = (0, randint_1.randint)(-15, 15, [0, a * x]);
     const b = c - a * x;
     const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree()).toTex();
     const equation = new equalNode_1.EqualNode(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a.toTree(), new variableNode_1.VariableNode("x")), b.toTree()).simplify({ forbidFactorize: true }), c.toTree());
+    const statementTex = equation.toTex();
     const question = {
         answer: answer,
-        instruction: `Résoudre l'équation suivante : $${equation.toTex()}$`,
+        instruction: `Résoudre l'équation suivante : $${statementTex}$`,
         keys: ["x", "equal"],
         answerFormat: "tex",
         identifiers: { a: a, x: x, c: c, b: b },
+        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 
+    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],
+        ])}`,
     };
     return question;
 };
@@ -69,4 +84,5 @@ exports.firstDegreeEquationIntType2 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"fractionEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/fractionEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC,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;AA8EF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"fractionEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/fractionEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAgBlC,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,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}

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

@@ -6,8 +6,11 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
 const randint_1 = require("../../../../math/utils/random/randint");
+const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getFractionEquation = () => {
     // (ax + b)/(cx + d) = 0
@@ -17,15 +20,14 @@ const getFractionEquation = () => {
     const d = (0, randint_1.randint)(-9, 10, [0]);
     const polynome1 = new polynomial_1.Polynomial([b, a]);
     const polynome2 = new polynomial_1.Polynomial([d, c]);
-    const answer = -d / c === -b / a
-        ? `S=\\varnothing`
-        : `S=\\left\\{${new rational_1.Rational(-b, a)
-            .simplify()
-            .toTree()
-            .toTex()}\\right\\}`;
+    const root1 = new rational_1.Rational(-b, a).simplify().toTree().toTex();
+    const root2 = new rational_1.Rational(-d, c).simplify().toTree().toTex();
+    const hasSolution = -d / c !== -b / a;
+    const answer = -d / c === -b / a ? `S=\\varnothing` : `S=\\left\\{${root1}\\right\\}`;
+    const statement = new equalNode_1.EqualNode(new fractionNode_1.FractionNode(polynome1.toTree(), polynome2.toTree()), (0).toTree()).toTex();
     const question = {
-        instruction: `Résoudre : $\\frac{${polynome1.toTex()}}{${polynome2.toTex()}} = 0$`,
-        startStatement: `\\frac{${polynome1.toTex()}}{${polynome2.toTex()}} = 0`,
+        instruction: `Résoudre : $${statement}$`,
+        startStatement: statement,
         answer,
         keys: [
             "x",
@@ -39,6 +41,19 @@ const getFractionEquation = () => {
         ],
         answerFormat: "tex",
         identifiers: { a, b, c, d },
+        hint: `Un quotient est nul si est seulement si le numérateur est nul et le dénominateur est non nul. Il faut donc déterminer la valeur de $x$ qui rend le numérateur nul, sans rendre le dénominateur nul.`,
+        correction: `Un quotient est nul si est seulement si le numérateur est nul et le dénominateur est non nul. Ainsi : 
+  
+${(0, alignTex_1.alignTex)([
+            ["", statement],
+            ["\\iff", `${polynome1.toTex()}=0 \\text{ et } ${polynome2.toTex()}\\neq 0`],
+            ["\\iff", `x=${root1} \\text{ et } x\\neq ${root2}`],
+        ])}
+
+${!hasSolution
+            ? `Il n'y a donc pas de solution pour cette équation. Ainsi, $${answer}$.`
+            : `Il y a donc bien une solution pour cette équation : $${answer}$.`}
+`,
     };
     return question;
 };
@@ -80,4 +95,5 @@ exports.fractionEquation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,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;AAuEF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAalC,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;AA0FF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

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

@@ -7,7 +7,9 @@ const rational_1 = require("../../../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
 const randint_1 = require("../../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getMultiplicationEquation = () => {
     // (ax + b)(cx + d) = 0
@@ -24,13 +26,29 @@ const getMultiplicationEquation = () => {
     const sol2 = new rational_1.Rational(-d, c).simplify().toTree();
     const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
     const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(sortedSols)).toTex();
+    const statementTex = new multiplyNode_1.MultiplyNode(polynome1.toTree(), polynome2.toTree()).toTex();
     const question = {
-        instruction: `Résoudre : $(${polynome1.toTex()})(${polynome2.toTex()}) = 0$`,
-        startStatement: `(${polynome1.toTex()})(${polynome2.toTex()}) = 0`,
+        instruction: `Résoudre : $${statementTex} = 0$`,
+        startStatement: `${statementTex} = 0`,
         answer,
         keys: ["x", "S", "equal", "lbrace", "rbrace", "semicolon", "ou"],
         answerFormat: "tex",
         identifiers: { a, b, c, d },
+        hint: "Un produit est nul si et seulement si un des deux facteurs est nul. Donc, il faut trouver les valeurs de $x$ qui rendent un des deux facteurs nuls.",
+        correction: `Un produit est nul si et seulement si un des deux facteurs est nul. On résout donc deux équations : 
+    
+  ${(0, alignTex_1.alignTex)([
+            ["", `${statementTex} = 0`],
+            [
+                "\\iff",
+                `${polynome1.toTree().toTex()} = 0 \\text{ ou } ${polynome2
+                    .toTree()
+                    .toTex()} = 0`,
+            ],
+            ["\\iff", `x=${sol1.toTex()} \\text{ ou } x=${sol2.toTex()}`],
+        ])}
+  
+  Ainsi, $${answer}$`,
     };
     return question;
 };
@@ -76,4 +94,5 @@ exports.multiplicationEquation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8EF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAc7C,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq1.js

@@ -6,22 +6,41 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getFactoType1Question = () => {
-    const affine = affine_1.AffineConstructor.random(undefined, {
-        excludes: [0],
+    const affine = affine_1.AffineConstructor.random({ min: 1, max: 10 }, {
+        min: 1,
+        max: 10,
     });
     const statementTree = affine.multiply(affine).toTree();
+    const aMonom = new affine_1.Affine(affine.a, 0).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = answerTree.toTex();
+    const statementTex = statementTree.toTex();
     const question = {
-        instruction: `Factoriser : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Factoriser : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: ["x"],
         answerFormat: "tex",
         identifiers: { a: affine.a, b: affine.b },
+        hint: `Essaie de réécrire cette expression sous la forme $a^2 + 2ab+b^2$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 + 2ab+b^2 = (a+b)^2$ en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new addNode_1.AddNode(new addNode_1.AddNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, affine.b.toTree()))), new powerNode_1.SquareNode(affine.b.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+`,
     };
     return question;
 };
@@ -54,4 +73,5 @@ exports.factoIdRmq1 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAc7C,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq2.js

@@ -6,23 +6,42 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getFactoType1Question = () => {
     const affine = affine_1.AffineConstructor.random({
-        min: 0,
-        max: 11,
-    }, { min: -10, max: 0 });
+        min: 1,
+        max: 10,
+    }, { min: -9, max: 0 });
     const statementTree = affine.multiply(affine).toTree();
+    const statementTex = statementTree.toTex();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = answerTree.toTex();
+    const aMonom = new affine_1.Affine(affine.a, 0).toTree();
     const question = {
-        instruction: `Factoriser : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Factoriser : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: ["x"],
         answerFormat: "tex",
         identifiers: { a: affine.a, b: affine.b },
+        hint: `Essaie de réécrire cette expression sous la forme $a^2 - 2ab+b^2$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - 2ab+b^2 = (a-b)^2$ en prenant $a=${aMonom.toTex()}$ et $b=${-affine.b}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new addNode_1.AddNode(new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, (-affine.b).toTree()))), new powerNode_1.SquareNode((-affine.b).toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+`,
     };
     return question;
 };
@@ -56,4 +75,5 @@ exports.factoIdRmq2 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAgFF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAmGF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAc7C,CAAC"}