math-exercises 2.2.90 → 2.2.91

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;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"}
+{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}

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

@@ -7,41 +7,63 @@ 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/latex/alignTex");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const getFirstDegreeEquation = () => {
-    const a = (0, randint_1.randint)(-30, 30, [0]);
-    const b = (0, randint_1.randint)(-30, 30, [0]);
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    const frac = new fractionNode_1.FractionNode(a.toTree(), "x".toTree());
+    const statement = new equalNode_1.EqualNode(frac, b.toTree()).toTex();
+    return `Résoudre l'équation suivante : 
+ 
+$$
+${statement}
+$$`;
+};
+const getHint = (identifiers) => {
+    return `Multiplie les deux côtés de l'équation par $x$, puis isole $x$ dans la partie droite de l'équation.`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
     const answer = `x=${new rational_1.Rational(a, b).simplify().toTree().toTex()}`;
+    return answer;
+};
+const getCorrection = (identifiers) => {
+    const { a, b } = identifiers;
     const frac = new fractionNode_1.FractionNode(a.toTree(), "x".toTree());
     const statement = new equalNode_1.EqualNode(frac, b.toTree()).toTex();
+    const answer = getAnswer(identifiers);
+    return `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],
+    ])}
+    `;
+};
+const getFirstDegreeEquation = () => {
+    const a = (0, randint_1.randint)(-30, 30, [0]);
+    const b = (0, randint_1.randint)(-30, 30, [0]);
+    const identifiers = { a, b };
     const question = {
-        instruction: `Résoudre l'équation suivante : $${statement}$`,
+        instruction: getInstruction(identifiers),
         startStatement: `x`,
-        answer,
+        answer: getAnswer(identifiers),
         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],
-        ])}
-    `,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -59,11 +81,7 @@ const getPropositions = (n, { answer, a, b }) => {
 };
 const isAnswerValid = (ans, { a, b }) => {
     const solution = new rational_1.Rational(a, b).simplify().toTree();
-    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
-        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
-    });
-    const validLatexs = answerTree.toAllValidTexs();
-    return validLatexs.includes(ans);
+    return (0, equationVEA_1.equationVEA)(ans, solution.toTex());
 };
 exports.firstDegreeEquation = {
     id: "firstDegreeEquation",
@@ -79,4 +97,8 @@ exports.firstDegreeEquation = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getHint,
+    getInstruction,
+    getCorrection,
+    getAnswer,
 };

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;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"}
+{"version":3,"file":"firstDegreeEquationIntType1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+GF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAkB7D,CAAC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeEquationIntType1 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
@@ -10,31 +11,55 @@ 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/latex/alignTex");
+const getAnswer = (identifiers) => {
+    const { a, b, x } = identifiers;
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree()).toTex();
+    return answer;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, x } = identifiers;
+    const answer = getAnswer(identifiers);
+    const aMonom = new affine_1.Affine(a, 0).toTree();
+    const statementTex = new equalNode_1.EqualNode(aMonom, new numberNode_1.NumberNode(b)).toTex();
+    return `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],
+    ])}
+    `;
+};
+const getInstruction = (identifiers) => {
+    const { a, b, x } = identifiers;
+    const aMonom = new affine_1.Affine(a, 0).toTree();
+    const statementTex = new equalNode_1.EqualNode(aMonom, new numberNode_1.NumberNode(b)).toTex();
+    return `Résoudre l'équation suivante : 
+  
+$$
+${statementTex}
+$$`;
+};
+const getHint = (identifiers) => {
+    const { a, b, x } = 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 la multiplication par $${a}$.`;
+};
 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 identifiers = { a: a, x: x, b: b };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'équation suivante : $${statementTex}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         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],
-        ])}
-    `,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -64,9 +89,7 @@ const getPropositions = (n, { answer, a, b }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, x }) => {
-    const ans1 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree());
-    const latexs = ans1.toAllValidTexs({ allowRawRightChildAsSolution: true });
-    return latexs.includes(ans);
+    return (0, equationVEA_1.equationVEA)(ans, answer.split("=")[1]);
 };
 exports.firstDegreeEquationIntType1 = {
     id: "firstDegreeEquationIntType1",
@@ -81,4 +104,8 @@ exports.firstDegreeEquationIntType1 = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getHint,
+    getInstruction,
+    getCorrection,
+    getAnswer,
 };

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;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"}
+{"version":3,"file":"firstDegreeEquationIntType2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,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;AA8HF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeEquationIntType2 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const randint_1 = require("../../../../math/utils/random/randint");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
@@ -10,33 +11,56 @@ 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/latex/alignTex");
+const getInstruction = (identifiers) => {
+    const { a, b, c, x } = identifiers;
+    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();
+    return `Résoudre l'équation suivante : 
+
+$$
+${statementTex}
+$$`;
+};
+const getHint = (identifiers) => {
+    return "Isolez le terme $x$ dans la partie gauche de l'équation.";
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c, x } = identifiers;
+    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 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],
+    ])}`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c, x } = identifiers;
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree()).toTex();
+    return answer;
+};
 const getFirstDegreeEquationIntQuestion = () => {
     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, 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 identifiers = { a, b, c, x };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'équation suivante : $${statementTex}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         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],
-        ])}`,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -68,9 +92,7 @@ const getPropositions = (n, { answer, a, b, c }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, x }) => {
-    const ans1 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree());
-    const latexs = ans1.toAllValidTexs({ allowRawRightChildAsSolution: true });
-    return latexs.includes(ans);
+    return (0, equationVEA_1.equationVEA)(ans, x.toTree().toTex());
 };
 exports.firstDegreeEquationIntType2 = {
     id: "firstDegreeEquationIntType2",

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquationIntType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType3.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;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsFF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAa7D,CAAC"}
+{"version":3,"file":"firstDegreeEquationIntType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,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;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAe7D,CAAC"}

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

@@ -3,26 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeEquationIntType3 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const randint_1 = require("../../../../math/utils/random/randint");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 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 getInstruction = (identifiers) => {
+    const { a, b, c, d, x } = identifiers;
+    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 }), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(c.toTree(), new variableNode_1.VariableNode("x")), d.toTree()).simplify({ forbidFactorize: true }));
+    return `Résoudre l'équation suivante : 
+  
+$$
+${equation.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c, d, x } = identifiers;
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree()).toTex();
+    return answer;
+};
 const getFirstDegreeEquationIntQuestion = () => {
     const a = (0, randint_1.randint)(-15, 15, [0]);
     const x = (0, randint_1.randint)(-15, 15, [0]);
     const c = (0, randint_1.randint)(-15, 15, [0, a]);
     const d = (0, randint_1.randint)(-15, 15, [0]);
     const b = d - (a - c) * 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 }), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(c.toTree(), new variableNode_1.VariableNode("x")), d.toTree()).simplify({ forbidFactorize: true }));
+    const identifiers = { a: a, x: x, b: b, c: c, d: d };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'équation suivante : $${equation.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["x", "equal"],
         answerFormat: "tex",
-        identifiers: { a: a, x: x, b: b, c: c, d: d },
+        identifiers,
     };
     return question;
 };
@@ -59,9 +73,7 @@ const getPropositions = (n, { answer, a, b, c, d }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, x }) => {
-    const ans1 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), x.toTree());
-    const latexs = ans1.toAllValidTexs({ allowRawRightChildAsSolution: true });
-    return latexs.includes(ans);
+    return (0, equationVEA_1.equationVEA)(ans, x.toTree().toTex());
 };
 exports.firstDegreeEquationIntType3 = {
     id: "firstDegreeEquationIntType3",
@@ -75,4 +87,6 @@ exports.firstDegreeEquationIntType3 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };

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,EAUT,MAAM,0BAA0B,CAAC;AAclC;;;GAGG;AACH,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAoJF,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,EAUT,MAAM,0BAA0B,CAAC;AAkBlC;;;GAGG;AACH,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAiKF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

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

@@ -14,7 +14,6 @@ const substractNode_1 = require("../../../../tree/nodes/operators/substractNode"
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
 const random_1 = require("../../../../utils/alea/random");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-//TODO fix { "affinesCoeffs": [ [ -2, 8 ], [ -5, 4 ], [ 0, -8 ] ], "operation": "substract" } donne trop de moins
 const getStatementNode = (identifiers) => {
     const { affinesCoeffs, operation } = identifiers;
     const affines = affinesCoeffs.map((coeffs) => new affine_1.Affine(coeffs[1], coeffs[0]));
@@ -37,15 +36,16 @@ $$`;
 };
 const getAnswer = (identifiers) => {
     const { affinesCoeffs, operation } = identifiers;
-    const affine1 = new affine_1.Affine(affinesCoeffs[0][1], affinesCoeffs[0][0]);
-    const affine2 = new affine_1.Affine(affinesCoeffs[1][1], affinesCoeffs[1][0]);
-    const answerTree = affine2.coefficients[0] === 0
-        ? affine1.coefficients[0] === 0
-            ? affine1.multiply(affine2).toTree()
-            : new multiplyNode_1.MultiplyNode(affine2.toTree(), affine1.toTree())
-        : new multiplyNode_1.MultiplyNode(affine1.toTree(), affine2.toTree());
-    const answer = answerTree.simplify().toTex();
-    return answer;
+    const factor = new affine_1.Affine(affinesCoeffs[0][1], affinesCoeffs[0][0]);
+    const affine2 = new affine_1.Affine(affinesCoeffs[2][1], affinesCoeffs[2][0]);
+    const affine1 = new affine_1.Affine(affinesCoeffs[1][1], affinesCoeffs[1][0]);
+    const secondTerm = (operation === "add"
+        ? (0, addNode_1.add)(affine1.toTree(), affine2.toTree())
+        : (0, substractNode_1.substract)(affine1.toTree(), affine2.toTree())).simplify({ forbidFactorize: true, towardsDistribute: true });
+    const sol = (0, multiplyNode_1.multiply)(factor.toTree(), secondTerm).simplify({
+        forbidFactorize: true,
+    });
+    return sol.toTex();
 };
 const getFactoType1Question = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
@@ -58,7 +58,11 @@ const getFactoType1Question = () => {
         d = (0, randint_1.randint)(-9, 10, [0]);
         e = (0, randint_1.randint)(-9, 10, [0]);
         f = (0, randint_1.randint)(-9, 10, [0]);
-    } while (c / a === d / b || e / a === f / b);
+    } while (c / a === d / b ||
+        e / a === f / b ||
+        //éviter un multiple +-1
+        (operation === "add" && f === -d && Math.abs(e + c) === 1) ||
+        (operation === "substract" && f === d && Math.abs(e - c) === 1));
     const identifiers = {
         affinesCoeffs: [
             [a, b],
@@ -96,16 +100,23 @@ const getPropositions = (n, { answer, affinesCoeffs, operation }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { affinesCoeffs, operation, answer }) => {
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
+        console.log(ans, answer, identifiers);
         const parsed = (0, latexParser_1.parseAlgebraic)(ans);
         if (!parsed)
             return false;
-        if (!(0, multiplyNode_1.isMultiplyNode)(parsed))
+        if (answer !== "0" && !(0, multiplyNode_1.isMultiplyNode)(parsed))
             return false;
-        const simp = parsed.simplify();
-        const reversed = parsed.toReversed().simplify();
-        return simp.toTex() === answer || reversed.toTex() === answer;
+        const simp = parsed.simplify({
+            forbidFactorize: true,
+            towardsDistribute: true,
+        });
+        const answerSimp = getStatementNode(identifiers).simplify({
+            towardsDistribute: true,
+            forbidFactorize: true,
+        });
+        return simp.toTex() === answerSimp.toTex();
     }
     catch (err) {
         return false;

package/lib/exercises/math/combinatory/ballsCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAsHF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiJF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAe/C,CAAC"}

package/lib/exercises/math/combinatory/ballsCounting.js

@@ -4,54 +4,78 @@ exports.ballsCounting = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
-const getBallsCountingQuestion = () => {
-    const type = (0, randint_1.randint)(0, 6);
-    let instruction = "";
+const getAnswer = (identifiers) => {
+    const { reds, greens, blacks, type } = identifiers;
     let answer = "";
-    const blacks = (0, randint_1.randint)(2, 6);
-    const greens = (0, randint_1.randint)(2, 6);
-    const reds = (0, randint_1.randint)(3, 6);
     const total = blacks + greens + reds;
     switch (type) {
         case 0:
-            instruction = ``;
             answer = total * (total - 1) * (total - 2) + "";
             break;
         case 1:
-            instruction = `comportant trois boules rouges`;
             answer = reds * (reds - 1) * (reds - 2) + "";
             break;
         case 2:
-            instruction = `ne comportant pas de boule noire`;
             answer = (reds + greens) * (reds + greens - 1) * (reds + greens - 2) + "";
             break;
         case 3:
-            instruction = `comportant au moins une boule noire`;
             answer =
                 total * (total - 1) * (total - 2) -
                     (reds + greens) * (reds + greens - 1) * (reds + greens - 2) +
                     "";
             break;
         case 4:
-            instruction = `comportant trois boules de trois couleurs différentes`;
             answer = 6 * (blacks * greens * reds) + "";
             break;
         case 5:
-            instruction = `comportant exactement une boule verte et deux boules noires`;
             answer = 3 * (greens * blacks * (blacks - 1)) + "";
             break;
         case 6:
-            instruction = `comportant exactement une boule verte`;
             answer = 3 * greens * (reds + blacks) * (reds + blacks - 1) + "";
     }
-    const question = {
-        answer: answer,
-        instruction: `Une urne contient $${blacks}$ boules noires numérotées de $1$ à $${blacks}$, $${reds}$ boules rouges numérotées de $1$ à $${reds}$ et $${greens}$ boules vertes numérotées de $1$ à $${greens}$.
+    return answer;
+};
+const getInstruction = (identifiers) => {
+    const { reds, greens, blacks, type } = identifiers;
+    let instruction = "";
+    switch (type) {
+        case 0:
+            instruction = ``;
+            break;
+        case 1:
+            instruction = `comportant trois boules rouges`;
+            break;
+        case 2:
+            instruction = `ne comportant pas de boule noire`;
+            break;
+        case 3:
+            instruction = `comportant au moins une boule noire`;
+            break;
+        case 4:
+            instruction = `comportant trois boules de trois couleurs différentes`;
+            break;
+        case 5:
+            instruction = `comportant exactement une boule verte et deux boules noires`;
+            break;
+        case 6:
+            instruction = `comportant exactement une boule verte`;
+    }
+    return `Une urne contient $${blacks}$ boules noires numérotées de $1$ à $${blacks}$, $${reds}$ boules rouges numérotées de $1$ à $${reds}$ et $${greens}$ boules vertes numérotées de $1$ à $${greens}$.
     On tire successivement et sans remise $3$ boules dans l'urne. 
-    Combien de tirages ${instruction} sont possibles ?`,
+    Combien de tirages ${instruction} sont possibles ?`;
+};
+const getBallsCountingQuestion = () => {
+    const type = (0, randint_1.randint)(0, 6);
+    const blacks = (0, randint_1.randint)(2, 6);
+    const greens = (0, randint_1.randint)(2, 6);
+    const reds = (0, randint_1.randint)(3, 6);
+    const identifiers = { type, reds, greens, blacks };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { type, reds, greens, blacks },
+        identifiers,
     };
     return question;
 };
@@ -110,4 +134,6 @@ exports.ballsCounting = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/functions/affines/affineAdjustment.d.ts

@@ -1,9 +1,5 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
-    G1x: number;
-    G2x: number;
-    G2y: number;
-    G1y: number;
     xValues: number[];
     yValues: number[];
 };

package/lib/exercises/math/functions/affines/affineAdjustment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineAdjustment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA6JF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}
+{"version":3,"file":"affineAdjustment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAyJF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAgB1D,CAAC"}