math-exercises 2.2.4 → 2.2.6

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

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

@@ -6,6 +6,9 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 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 getFactoType1Question = () => {
     const affine = affine_1.AffineConstructor.random({
         min: 1,
@@ -13,6 +16,9 @@ const getFactoType1Question = () => {
     }, { excludes: [0] });
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = affine.multiply(affine2).toTree();
+    const statementTex = statementTree.toTex();
+    const bPositive = Math.abs(affine.b);
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
     const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
     const answer = answerTree.toTex();
     const question = {
@@ -25,6 +31,18 @@ const getFactoType1Question = () => {
             affine1Coeffs: affine.coefficients,
             affine2Coeffs: affine2.coefficients,
         },
+        hint: `Utilise l'identité remarquable $a^2 - b^2 = (a-b)(a+b)$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - b^2=(a-b)(a+b)$ en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}`,
     };
     return question;
 };
@@ -63,4 +81,5 @@ exports.factoIdRmq3 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyHF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA0HF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

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

@@ -12,6 +12,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const random_1 = require("../../../../utils/random");
 const shuffle_1 = require("../../../../utils/shuffle");
+//TODO fix { "affinesCoeffs": [ [ -2, 8 ], [ -5, 4 ], [ 0, -8 ] ], "operation": "substract" } donne trop de moins
 const getFactoType1Question = () => {
     const affines = affine_1.AffineConstructor.differentRandoms(3);
     const permut = [

package/lib/exercises/math/calculLitteral/factorisation/factorizeCanonicalForm.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    b: number;
+};
+export declare const factorizeCanonicalForm: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=factorizeCanonicalForm.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"factorizeCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factorizeCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuFF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.factorizeCanonicalForm = 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 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");
+//(x-a)^2-b^2 avec b entier
+const getFactorizeCanonicalFormQuestion = () => {
+    const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 10, [0]));
+    const b = (0, randint_1.randint)(-10, 10, [0]);
+    const statement = new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), (b ** 2).toTree());
+    const bPositive = Math.abs(b);
+    const answer = new multiplyNode_1.MultiplyNode(affine.add(-bPositive).toTree(), affine.add(bPositive).toTree()).toTex();
+    const statementTex = statement.toTex();
+    const question = {
+        answer,
+        instruction: `Factoriser : $${statementTex}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.b, b },
+        hint: `Utilise l'identité remarquable $a^2 - b^2 = (a-b)(a+b)$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - b^2=(a-b)(a+b)$ en prenant $a=${affine.toTex()}$ et $b=${bPositive}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+            ],
+            [
+                "",
+                "=",
+                new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(affine.toTree(), (-bPositive).toTree()), new addNode_1.AddNode(affine.toTree(), bPositive.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}`,
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const affine = new affine_1.Affine(a, b);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.add(-(b ** 2)).toTree(), affine.add(b ** 2).toTree()).toTex());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new affine_1.Affine(1, (0, randint_1.randint)(-10, 10)).toTree(), new affine_1.Affine(1, (0, randint_1.randint)(-10, 10)).toTree()).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, a, b }) => {
+    const affine = new affine_1.Affine(1, a);
+    const bPositive = Math.abs(b);
+    const answerTree = new multiplyNode_1.MultiplyNode(affine.add(-bPositive).toTree(), affine.add(bPositive).toTree());
+    return answerTree.toAllValidTexs().includes(ans);
+};
+exports.factorizeCanonicalForm = {
+    id: "factorizeCanonicalForm",
+    connector: "=",
+    label: "Factoriser une expression du type $(x-a)^2-b^2$ avec $b$ entier",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactorizeCanonicalFormQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    bOperand: number;
+};
+export declare const factorizeCanonicalFormWithSqrt: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=factorizeCanonicalFormWithSqrt.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"factorizeCanonicalFormWithSqrt.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAehE,CAAC"}

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

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.factorizeCanonicalFormWithSqrt = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const real_1 = require("../../../../math/numbers/reals/real");
+const affine_1 = require("../../../../math/polynomials/affine");
+const randint_1 = require("../../../../math/utils/random/randint");
+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");
+//(x-a)^2-b^2 avec b irrational
+const getFactorizeCanonicalFormWithSqrtQuestion = () => {
+    const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 10, [0]));
+    const b = real_1.SquareRootConstructor.randomIrreductible(10);
+    const statement = new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), b.operand.toTree());
+    const answer = new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(affine.toTree(), b.toTree()), new addNode_1.AddNode(affine.toTree(), b.toTree()))
+        .simplify({ forbidFactorize: true })
+        .toTex();
+    const statementTex = statement.toTex();
+    const question = {
+        answer,
+        instruction: `Factoriser : $${statementTex}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.b, bOperand: b.operand },
+        hint: `Utilise l'identité remarquable $a^2 - b^2 = (a-b)(a+b)$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - b^2=(a-b)(a+b)$ en prenant $a=${affine.toTex()}$ et $b=${b
+            .toTree()
+            .toTex()}$ : 
+
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), new powerNode_1.SquareNode(b.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+
+`,
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, bOperand }) => {
+    const propositions = [];
+    const affine = new affine_1.Affine(1, a);
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.add(bOperand).toTree(), affine.add(-bOperand).toTree()).toTex());
+    while (propositions.length < n) {
+        const randomSqrt = real_1.SquareRootConstructor.randomIrreductible(10);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(affine.toTree(), randomSqrt.toTree()), new addNode_1.AddNode(affine.toTree(), randomSqrt.toTree())).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, a, bOperand }) => {
+    const affine = new affine_1.Affine(1, a);
+    const b = new real_1.SquareRoot(bOperand);
+    const answerTree = new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(affine.toTree(), b.toTree()), new addNode_1.AddNode(affine.toTree(), b.toTree())).simplify({ forbidFactorize: true });
+    return answerTree.toAllValidTexs().includes(ans);
+};
+exports.factorizeCanonicalFormWithSqrt = {
+    id: "factorizeCanonicalFormWithSqrt",
+    connector: "=",
+    label: "Factoriser une expression du type $(x-a)^2-b^2$ avec $b$ irrationnel",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactorizeCanonicalFormWithSqrtQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/factorisation/index.d.ts

@@ -2,4 +2,6 @@ export * from "./factoIdRmq1";
 export * from "./factoIdRmq2";
 export * from "./factoIdRmq3";
 export * from "./factoType1Exercise";
+export * from "./factorizeCanonicalForm";
+export * from "./factorizeCanonicalFormWithSqrt";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC"}

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

@@ -18,3 +18,5 @@ __exportStar(require("./factoIdRmq1"), exports);
 __exportStar(require("./factoIdRmq2"), exports);
 __exportStar(require("./factoIdRmq3"), exports);
 __exportStar(require("./factoType1Exercise"), exports);
+__exportStar(require("./factorizeCanonicalForm"), exports);
+__exportStar(require("./factorizeCanonicalFormWithSqrt"), exports);

package/lib/exercises/math/equaDiff/equaDiffGeneralForme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equaDiffGeneralForme.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/equaDiff/equaDiffGeneralForme.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6EF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"equaDiffGeneralForme.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/equaDiff/equaDiffGeneralForme.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6EF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/equaDiff/equaDiffGeneralForme.js

@@ -63,4 +63,5 @@ exports.exponentialDifferentialEquation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };