math-exercises 2.2.68 → 2.2.70

package/lib/exercises/math/calcul/arithmetics/divisorsList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"divisorsList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/divisorsList.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgDF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAY9C,CAAC"}
+{"version":3,"file":"divisorsList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/divisorsList.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgDF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/calcul/arithmetics/divisorsList.js

@@ -51,10 +51,11 @@ exports.divisorsList = {
     levels: ["2nde"],
     isSingleStep: true,
     sections: ["Arithmétique"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDivisorsListQuestion, nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDivisorsListQuestion, nb, 30),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    maxAllowedQuestions: 30,
 };

package/lib/exercises/math/calcul/arithmetics/primeNumbers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAoD3B,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAsDF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAoD3B,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAsDF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/calcul/arithmetics/primeNumbers.js

@@ -96,10 +96,11 @@ exports.primeNumbers = {
     levels: ["5ème", "4ème", "3ème", "2nde"],
     sections: ["Arithmétique"],
     isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPrimeNumbers, nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPrimeNumbers, nb, 30),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    maxAllowedQuestions: 30,
 };

package/lib/exercises/math/calcul/fractions/fractionsOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsOperations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAS1C,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,eAAe,CAAC;CACvC,CAAC;AA6EF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAgBrD,CAAC"}
+{"version":3,"file":"fractionsOperations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAS1C,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,eAAe,CAAC;CACvC,CAAC;AA8EF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAgBrD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsOperations.js

@@ -20,6 +20,7 @@ const getPropositions = (n, { answer }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const getAnswer = (identifiers) => {
+    console.log(identifiers);
     const statement = nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.statementIdentifiers);
     return statement.simplify().toTex();
 };

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

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

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

@@ -6,13 +6,12 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
-const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const getEquationType1ExerciseQuestion = () => {
     const b = (0, randint_1.randint)(-10, 11);
     const a = (0, randint_1.randint)(-10, 11, [0]);
@@ -55,10 +54,8 @@ const getPropositions = (n, { answer, a, b }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { a, b }) => {
-    const solution = b - a;
-    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(solution)]));
-    const validLatexs = answerTree.toAllValidTexs();
-    return validLatexs.includes(ans);
+    const solution = (b - a).toTree().toTex();
+    return (0, equationVEA_1.equationVEA)(ans, solution);
 };
 exports.equationType1Exercise = {
     id: "equa1",

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

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

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

@@ -6,9 +6,7 @@ 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 equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
 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/alea/shuffle");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
@@ -19,6 +17,7 @@ const generalAffine_1 = require("../../../../math/polynomials/generalAffine");
 const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const rebuildIdentifiers = (oldIdentifiers) => {
     if (!!oldIdentifiers.numberType)
         return oldIdentifiers;
@@ -90,12 +89,8 @@ const getPropositions = (n, { answer, a, b }) => {
 const isAnswerValid = (ans, { a, b }) => {
     const aNode = nodeConstructor_1.NodeConstructor.fromIdentifiers(a);
     const bNode = nodeConstructor_1.NodeConstructor.fromIdentifiers(b);
-    const solution = (0, fractionNode_1.frac)(bNode, aNode).simplify();
-    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
-        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
-    });
-    const validLatexs = answerTree.toAllValidTexs();
-    return validLatexs.includes(ans);
+    const solution = (0, fractionNode_1.frac)(bNode, aNode).simplify().toTex();
+    return (0, equationVEA_1.equationVEA)(ans, solution);
 };
 const options = [
     {

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

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

@@ -7,14 +7,14 @@ const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
-const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
 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/alea/shuffle");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
 const getEquationType3ExerciseQuestion = () => {
     const b = (0, randint_1.randint)(-10, 11, [0]);
     const a = (0, randint_1.randint)(-10, 11, [0, 1]);
@@ -57,13 +57,11 @@ const getPropositions = (n, { answer, a, b, c }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b, c }) => {
-    const solution = new rational_1.Rational(c - b, a).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);
+const isAnswerValid = (ans, { answer, a, b, c }) => {
+    const solution = (0, fractionNode_1.frac)(c - b, a)
+        .simplify()
+        .toTex();
+    return (0, equationVEA_1.equationVEA)(ans, solution);
 };
 exports.equationType3Exercise = {
     id: "equa3",

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

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

@@ -7,11 +7,11 @@ const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
-const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
 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/alea/shuffle");
+const equationVEA_1 = require("../../../../exercises/vea/equationVEA");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const getEquationType4ExerciseQuestion = () => {
     const a = (0, randint_1.randint)(-10, 11, [0, 1]);
     const b = (0, randint_1.randint)(-10, 11, [0]);
@@ -62,23 +62,10 @@ const getPropositions = (n, { answer, a, b, c, d }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { a, b, c, d }) => {
-    // try {
-    //   const parsed = equationSolutionParser(ans);
-    //   if (!parsed) return false;
-    //   const solution = new Rational(d - b, a - c).simplify().toTree();
-    //   const solutionTex = solution.toTex();
-    //   const decimal = round(solution.evaluate({}), 12).frenchify();
-    //   const parsedSolution = parsed.simplify().toTex();
-    //   return solutionTex === parsedSolution || decimal === parsedSolution;
-    // } catch (err) {
-    //   return false;
-    // }
-    const solution = new rational_1.Rational(d - b, a - c).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);
+    const solution = (0, fractionNode_1.frac)(d - b, a - c)
+        .simplify()
+        .toTex();
+    return (0, equationVEA_1.equationVEA)(ans, solution);
 };
 exports.equationType4Exercise = {
     id: "equa4",

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

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

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

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

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

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.factoByX = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
+const gcd_1 = require("../../../../math/utils/arithmetic/gcd");
+const randint_1 = require("../../../../math/utils/random/randint");
+const oppositeNode_1 = require("../../../../tree/nodes/functions/oppositeNode");
+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 latexParser_1 = require("../../../../tree/parsers/latexParser");
+const alignTex_1 = require("../../../../utils/latex/alignTex");
+const getPropositions = (n, { answer, ...identifiers }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const { a, b } = identifiers;
+    let pgcd = (0, gcd_1.gcd)(a, b);
+    if (a < 0 && b < 0)
+        pgcd = -pgcd;
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)("x", (0, addNode_1.add)(a, b)).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)("x", (0, addNode_1.add)((0, multiplyNode_1.multiply)(a / pgcd, "x").simplify(), b / pgcd)).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)((0, multiplyNode_1.multiply)(pgcd, "x").simplify(), (0, addNode_1.add)((0, multiplyNode_1.multiply)(a, "x").simplify(), b / pgcd)).toTex());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)("x", affine_1.AffineConstructor.random().toTree()).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    let pgcd = (0, gcd_1.gcd)(a, b);
+    if (a < 0 && b < 0)
+        pgcd = -pgcd;
+    const affine = (0, addNode_1.add)((0, multiplyNode_1.multiply)(a / pgcd, "x"), b / pgcd);
+    return (0, multiplyNode_1.multiply)((0, multiplyNode_1.multiply)(pgcd, "x"), affine).toTex();
+};
+const getStatementNode = (identifiers) => {
+    return (0, addNode_1.add)((0, multiplyNode_1.multiply)(identifiers.a, (0, powerNode_1.square)("x")), (0, multiplyNode_1.multiply)(identifiers.b, "x").simplify());
+};
+const getInstruction = (identifiers) => {
+    const statement = getStatementNode(identifiers);
+    return `Factoriser : 
+  
+$$
+${statement.toTex()}
+$$`;
+};
+const getHint = (identifiers) => {
+    const { a, b } = identifiers;
+    const aMonom = (0, multiplyNode_1.multiply)(a, (0, powerNode_1.square)("x")).toTex();
+    const bMonom = (0, multiplyNode_1.multiply)(b, "x").toTex();
+    return `Repère le facteur commun : c'est le terme qui apparaît à la fois dans $${aMonom}$ et dans $${bMonom}$.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b } = identifiers;
+    const answer = getAnswer(identifiers);
+    const aMonom = (0, multiplyNode_1.multiply)(a, (0, powerNode_1.square)("x"));
+    const bMonom = (0, multiplyNode_1.multiply)(b, "x");
+    const statement = (0, addNode_1.add)(aMonom, bMonom).toTex();
+    let pgcd = (0, gcd_1.gcd)(a, b);
+    if (a < 0 && b < 0)
+        pgcd = -pgcd;
+    // ne renvoit pas des négatifs : devrait ?
+    const xMonom = (0, multiplyNode_1.multiply)(pgcd, "x");
+    let common = pgcd === -1 ? (0, oppositeNode_1.opposite)("x") : "x".toTree();
+    let hasCommon = false;
+    if (Math.abs(a) === Math.abs(b)) {
+        hasCommon = true;
+        if (a === b)
+            common = (0, multiplyNode_1.multiply)(a, common);
+        else
+            common = (0, multiplyNode_1.multiply)(Math.abs(a), common);
+    }
+    const detailed = (0, addNode_1.add)((0, multiplyNode_1.multiply)(xMonom, (0, multiplyNode_1.multiply)(a / pgcd, "x").simplify(), {
+        toTexOptions: { forceTimesSign: true, noPropagation: true },
+    }), (0, multiplyNode_1.multiply)(xMonom, b / pgcd)).toTex();
+    return `Le terme $${common.toTex()}$ apparaît à la fois dans $${aMonom.toTex()}$ et dans $${bMonom.toTex()}$. 
+  
+${!hasCommon && pgcd !== 1 && pgcd !== -1
+        ? `D'autre part, on peut factoriser $${a}$ et $${b}$ par $${pgcd}$. En effet, 
+    
+$${a} = ${a / pgcd}\\times ${pgcd}$ et $${b} = ${b / pgcd}\\times ${pgcd}$.`
+        : ""}
+
+On peut donc factoriser l'expression par $${xMonom.toTex()}$ :
+
+${(0, alignTex_1.alignTex)([
+        ["", "", statement],
+        ["", "=", detailed],
+        ["", "=", answer],
+    ])}
+  `;
+};
+const getKeys = (identifiers) => {
+    return ["x"];
+};
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    try {
+        const statement = getStatementNode(identifiers);
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed || !(0, multiplyNode_1.isMultiplyNode)(parsed))
+            return false;
+        return (parsed
+            .simplify({ forbidFactorize: true, towardsDistribute: true })
+            .toTex() === statement.toTex());
+    }
+    catch (err) {
+        return false;
+    }
+};
+const getFactoByXQuestion = (ops) => {
+    const a = (0, randint_1.randint)(-10, 10, [0], { favor: { value: 1, proba: 0.3 } });
+    const b = (0, randint_1.randint)(-10, 10, [0], a !== 1 ? { favor: { value: 1, proba: 0.3 } } : undefined);
+    const identifiers = {
+        a,
+        b,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.factoByX = {
+    id: "factoByX",
+    connector: "=",
+    label: "Factorisation du type $ax^2 + bx$",
+    isSingleStep: false,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFactoByXQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    hasHintAndCorrection: true,
+};

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

@@ -5,4 +5,5 @@ export * from "./factoType1Exercise";
 export * from "./factorizeCanonicalForm";
 export * from "./factorizeCanonicalFormWithSqrt";
 export * from "./factoType2";
+export * from "./factoByX";
 //# 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;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,cAAc,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;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC"}

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

@@ -21,3 +21,4 @@ __exportStar(require("./factoType1Exercise"), exports);
 __exportStar(require("./factorizeCanonicalForm"), exports);
 __exportStar(require("./factorizeCanonicalFormWithSqrt"), exports);
 __exportStar(require("./factoType2"), exports);
+__exportStar(require("./factoByX"), exports);

package/lib/exercises/math/functions/absolute/absolueValueAffineEquation.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise";
+import { GeneralAffineIdentifiers } from "../../../../math/polynomials/generalAffine";
+type Identifiers = {
+    firstAffine: GeneralAffineIdentifiers;
+    secondAffine: GeneralAffineIdentifiers;
+};
+export declare const absolueValueAffineEquation: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=absolueValueAffineEquation.d.ts.map

package/lib/exercises/math/functions/absolute/absolueValueAffineEquation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"absolueValueAffineEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/absolute/absolueValueAffineEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAGL,wBAAwB,EACzB,MAAM,sCAAsC,CAAC;AAM9C,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,wBAAwB,CAAC;IACtC,YAAY,EAAE,wBAAwB,CAAC;CACxC,CAAC;AAyKF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAiB5D,CAAC"}

package/lib/exercises/math/functions/absolute/absolueValueAffineEquation.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.absolueValueAffineEquation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const integer_1 = require("../../../../math/numbers/integer/integer");
+const nombre_1 = require("../../../../math/numbers/nombre");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const generalAffine_1 = require("../../../../math/polynomials/generalAffine");
+const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
+const absNode_1 = require("../../../../tree/nodes/functions/absNode");
+const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const fracs = [
+            rational_1.RationalConstructor.randomIrreductibleWithSign().toTree(),
+            rational_1.RationalConstructor.randomIrreductibleWithSign().toTree(),
+        ].sort((a, b) => a.evaluate() - b.evaluate());
+        (0, exercise_1.tryToAddWrongProp)(propositions, `x=${fracs[0].toTex()}\\text{ ou }${fracs[1].toTex()}`);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswerNode = (identifiers) => {
+    const affines = [
+        generalAffine_1.GeneralAffineConstructor.fromIdentifiers(identifiers.firstAffine),
+        generalAffine_1.GeneralAffineConstructor.fromIdentifiers(identifiers.secondAffine),
+    ];
+    const firstIntersec = affines[0].xIntersect(affines[1]);
+    const oppositeAffine = affines[1].opposite();
+    const secondIntersec = oppositeAffine.xIntersect(affines[0]);
+    const res = [firstIntersec, secondIntersec]
+        .filter(Boolean)
+        .sort((a, b) => a.evaluate() - b.evaluate());
+    return res;
+};
+const getAnswer = (identifiers) => {
+    const nodes = getAnswerNode(identifiers);
+    if (nodes.length > 1)
+        return `x=${nodes[0].toTex()}\\text{ ou }x=${nodes[1].toTex()}`;
+    return `x=${nodes[0]?.toTex() || nodes[1]?.toTex()}`;
+};
+const getInstruction = (identifiers) => {
+    const affines = [
+        generalAffine_1.GeneralAffineConstructor.fromIdentifiers(identifiers.firstAffine),
+        generalAffine_1.GeneralAffineConstructor.fromIdentifiers(identifiers.secondAffine),
+    ];
+    const node = (0, equalNode_1.equal)((0, absNode_1.abs)(affines[0].toTree()), (0, absNode_1.abs)(affines[1].toTree()));
+    return `Résoudre : 
+  
+$$
+${node.toTex()}
+$$`;
+};
+const getHint = (identifiers) => {
+    return `L'égalité $|a|=|b|$ est vraie si et seulement si $a = b$ ou $a = -b$.`;
+};
+const getCorrection = (identifiers) => {
+    const affines = [
+        generalAffine_1.GeneralAffineConstructor.fromIdentifiers(identifiers.firstAffine),
+        generalAffine_1.GeneralAffineConstructor.fromIdentifiers(identifiers.secondAffine),
+    ];
+    const firstIntersec = affines[0].xIntersect(affines[1]);
+    const oppositeAffine = affines[1].opposite();
+    const secondIntersec = oppositeAffine.xIntersect(affines[0]);
+    const res = [firstIntersec, secondIntersec]
+        .filter(Boolean)
+        .sort((a, b) => a.evaluate() - b.evaluate());
+    return `L'égalité $|a|=|b|$ est vraie si et seulement si $a = b$ ou $a=-b$.
+  
+On doit donc résoudre deux équations: d'une part,
+
+$$
+${affines[0].toTree().toTex()} = ${affines[1].toTree().toTex()}
+$$
+
+${firstIntersec
+        ? `ce qui donne : 
+  
+  $$
+  x=${firstIntersec?.toTex()}
+  $$`
+        : "qui n'a pas de solution, "}
+
+et d'autre part :
+
+$$
+${affines[0].toTree().toTex()} = ${oppositeAffine.toTree().toTex()}
+$$
+
+${secondIntersec
+        ? `ce qui donne : 
+  
+$$
+x=${secondIntersec?.toTex()}
+$$`
+        : "qui n'a pas de solution."}
+
+
+Ainsi, la solution de cette équation est :
+
+$$
+${res.length > 1
+        ? `x=${res[0].toTex()} \\text{ ou } x=${res[1].toTex()}`
+        : `x=${res[0]?.toTex() || res[1]?.toTex()}`}
+`;
+};
+const getKeys = (identifiers) => {
+    return ["x", "equal", "ou"];
+};
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    const parsedOu = ans.split("\\text{ ou }");
+    try {
+        const nodes = [];
+        parsedOu.forEach((item) => {
+            //un eleve qui efface le ou peut se retrouver avec un texte vide
+            let formated = item.replaceAll("\\text{ }", "");
+            const equalForm = formated.split("=");
+            if (equalForm.length > 1 && equalForm[0] !== "x")
+                throw Error("wrong answer");
+            const nbStr = equalForm.length > 1 ? equalForm[1] : formated;
+            const node = (0, rationalParser_1.rationalParser)(nbStr);
+            if (!node)
+                throw Error("wrong answer");
+            nodes.push(node);
+        });
+        const answerNodes = getAnswerNode(identifiers);
+        return answerNodes.every((e) => nodes.some((n) => n.evaluate() === e.evaluate()));
+    }
+    catch (err) {
+        return false;
+    }
+};
+const getAbsolueValueAffineEquationQuestion = (ops) => {
+    const types = [nombre_1.NumberType.Integer];
+    const [a, c] = nombre_1.NombreConstructor.manyRandom(4, {
+        types,
+        excludes: [new integer_1.Integer(0)],
+    }).map((e) => e.toTree());
+    const [b, d] = nombre_1.NombreConstructor.manyRandom(4, {
+        types,
+    }).map((e) => e.toTree());
+    const identifiers = {
+        firstAffine: new generalAffine_1.GeneralAffine(a, b).toIdentifiers(),
+        secondAffine: new generalAffine_1.GeneralAffine(c, d).toIdentifiers(),
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.absolueValueAffineEquation = {
+    id: "absolueValueAffineEquation",
+    connector: "\\iff",
+    label: "Résoudre une équation avec valeur absolue du type $|ax+b|=|cx+d|$",
+    isSingleStep: false,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getAbsolueValueAffineEquationQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/functions/absolute/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./absoluteValueEquations";
 export * from "./absoluteValueInequations";
+export * from "./absolueValueAffineEquation";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/functions/absolute/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/absolute/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/absolute/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC"}

package/lib/exercises/math/functions/absolute/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./absoluteValueEquations"), exports);
 __exportStar(require("./absoluteValueInequations"), exports);
+__exportStar(require("./absolueValueAffineEquation"), exports);

package/lib/exercises/math/functions/trinoms/coefficientsIdentification.js

@@ -4,7 +4,7 @@ exports.coefficientsIdentification = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
-const generalTrinom_1 = require("../../../../math/polynomials/generalTrinom");
+const trinomNode_1 = require("../../../../tree/nodes/polynomials/trinomNode");
 const randint_1 = require("../../../../math/utils/random/randint");
 const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
@@ -15,7 +15,7 @@ const random_1 = require("../../../../utils/alea/random");
 const getPropositions = (n, { answer, aIdentifiers, bIdentifiers, cIdentifiers, isAsking }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const trinom = new generalTrinom_1.GeneralTrinom(nodeConstructor_1.NodeConstructor.fromIdentifiers(aIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(bIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(cIdentifiers));
+    const trinom = new trinomNode_1.TrinomNode(nodeConstructor_1.NodeConstructor.fromIdentifiers(aIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(bIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(cIdentifiers));
     if (answer === "1") {
         (0, exercise_1.tryToAddWrongProp)(propositions, "0");
     }
@@ -50,7 +50,7 @@ const getAnswer = (identifiers) => {
             : nodeConstructor_1.NodeConstructor.fromIdentifiers(cIdentifiers).toTex();
 };
 const getInstruction = (identifiers) => {
-    const trinom = new generalTrinom_1.GeneralTrinom(nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.aIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.bIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.cIdentifiers));
+    const trinom = new trinomNode_1.TrinomNode(nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.aIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.bIdentifiers), nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.cIdentifiers));
     return `Soit $f$ la fonction polynôme de degré $2$ définie sur $\\mathbb{R}$ par :
   
 $$