math-exercises 2.2.84 → 2.2.85

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

@@ -34,7 +34,7 @@ const getFractionToPercentToDecimal = () => {
             break;
         }
         case 2: {
-            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de fraction.`;
+            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de fraction irréductible.`;
             answer = fracTex;
             break;
         }
@@ -44,7 +44,7 @@ const getFractionToPercentToDecimal = () => {
             break;
         }
         case 4: {
-            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme de fraction.`;
+            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme de fraction irréductible.`;
             answer = fracTex;
             break;
         }

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

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

package/lib/exercises/math/derivation/derivative/expDerivativeFour.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA8DF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAcnD,CAAC"}
+{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA4EF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}

package/lib/exercises/math/derivation/derivative/expDerivativeFour.js

@@ -6,22 +6,37 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const expNode_1 = require("../../../../tree/nodes/functions/expNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
-const getExpDerivativeFourQuestion = () => {
-    const affine1 = affine_1.AffineConstructor.random();
-    const affine2 = affine_1.AffineConstructor.random();
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getInstruction = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine1 = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
     const exp = new expNode_1.ExpNode(affine2.toTree());
     const fct = new multiplyNode_1.MultiplyNode(affine1.toTree(), exp);
+    return `Déterminer la dérivée de la fonction $f(x) = ${fct.toTex()}$`;
+};
+const getAnswer = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine1 = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
+    const exp = new expNode_1.ExpNode(affine2.toTree());
     const deriv = new multiplyNode_1.MultiplyNode(new affine_1.Affine(affine2.a * affine1.a, affine1.a + affine2.a * affine1.b).toTree(), exp);
+    return deriv.simplify().toTex();
+};
+const getExpDerivativeFourQuestion = () => {
+    const affine1 = affine_1.AffineConstructor.random();
+    const affine2 = affine_1.AffineConstructor.random();
+    const identifiers = {
+        affine1Coeffs: affine1.coefficients,
+        affine2Coeffs: affine2.coefficients,
+    };
     //ae^cx+d  + c(ax+b)e^cx+d = (a+c(ax+b))e^cx+d = (cax + a +cb) e^cx+d
     const question = {
-        answer: deriv.toTex(),
-        instruction: `Déterminer la dérivée de la fonction $f(x) = ${fct.toTex()}$`,
-        keys: ["x", "exp"],
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["x", "epower", "exp"],
         answerFormat: "tex",
-        identifiers: {
-            affine1Coeffs: affine1.coefficients,
-            affine2Coeffs: affine2.coefficients,
-        },
+        identifiers,
     };
     return question;
 };
@@ -34,12 +49,15 @@ const getPropositions = (n, { answer }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, affine1Coeffs, affine2Coeffs }) => {
-    const affine1 = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
-    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
-    const exp = new expNode_1.ExpNode(affine2.toTree());
-    const deriv = new multiplyNode_1.MultiplyNode(new affine_1.Affine(affine2.a * affine1.a, affine1.a + affine2.a * affine1.b).toTree(), exp);
-    const texs = deriv.toAllValidTexs();
-    return texs.includes(ans);
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.expDerivativeFour = {
     id: "expDerivativeFour",
@@ -54,4 +72,6 @@ exports.expDerivativeFour = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };

package/lib/exercises/math/derivation/derivative/expDerivativeThree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeThree.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;CACX,CAAC;AAmEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"expDerivativeThree.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/expDerivativeThree.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;CACX,CAAC;AAwFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}

package/lib/exercises/math/derivation/derivative/expDerivativeThree.js

@@ -9,19 +9,33 @@ const expNode_1 = require("../../../../tree/nodes/functions/expNode");
 const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    const myfunction = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
+    return `Déterminer la dérivée de la fonction $f$ définie par : 
+    
+$$
+f(x) = ${myfunction.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const derivative = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b + a, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
+    const answer = derivative.simplify().toTex();
+    return answer;
+};
 const getExpDerivativeThree = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const b = (0, randint_1.randint)(-9, 10);
-    const myfunction = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
-    const derivative = new multiplyNode_1.MultiplyNode(new polynomial_1.Polynomial([b + a, a]).toTree(), new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
-    const answer = derivative.toTex();
+    const identifiers = { a, b };
     const question = {
-        instruction: `Déterminer la dérivée de la fonction $f(x) = ${myfunction.toTex()}$.`,
+        instruction: getInstruction(identifiers),
         startStatement: "f'(x)",
-        answer,
+        answer: getAnswer(identifiers),
         keys: ["x", "epower", "exp"],
         answerFormat: "tex",
-        identifiers: { a, b },
+        identifiers,
     };
     return question;
 };
@@ -34,11 +48,18 @@ const getPropositions = (n, { answer, a, b }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x")), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))).toTex());
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { a, b }) => {
-    const affine = new polynomial_1.Polynomial([a + b, a]).toTree();
-    const derivative = new multiplyNode_1.MultiplyNode(affine, new expNode_1.ExpNode(new variableNode_1.VariableNode("x")));
-    const texs = derivative.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { a, b, answer }) => {
+    try {
+        console.log(ans, answer);
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        console.log(parsed.simplify().toTex());
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.expDerivativeThree = {
     id: "expDerivativeThree",
@@ -53,4 +74,6 @@ exports.expDerivativeThree = {
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };

package/lib/exercises/math/derivation/derivative/quotientDerivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quotientDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/quotientDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAmFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAcpD,CAAC"}
+{"version":3,"file":"quotientDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/quotientDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAoHF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAcpD,CAAC"}

package/lib/exercises/math/derivation/derivative/quotientDerivative.js

@@ -4,9 +4,30 @@ exports.quotientDerivative = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
-const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getInstruction = (identifiers) => {
+    const poly1 = new polynomial_1.Polynomial(identifiers.poly1Coeffs);
+    const poly2 = new polynomial_1.Polynomial(identifiers.poly2Coeffs);
+    return `Déterminer la dérivée de la fonction $f$ définie par: 
+  
+$$
+f(x) = ${new fractionNode_1.FractionNode(poly1.toTree(), poly2.toTree()).toTex()}
+$$`;
+};
+const getAnwer = (identifiers) => {
+    const poly1 = new polynomial_1.Polynomial(identifiers.poly1Coeffs);
+    const poly2 = new polynomial_1.Polynomial(identifiers.poly2Coeffs);
+    const answerNum = poly1
+        .derivate()
+        .multiply(poly2)
+        .add(poly1.opposite().multiply(poly2.derivate()))
+        .toTree();
+    const answerDenum = new powerNode_1.SquareNode(poly2.toTree());
+    const answer = new fractionNode_1.FractionNode(answerNum, answerDenum).toTex();
+    return answer;
+};
 const getProductDerivativeQuestion = () => {
     const poly1 = polynomial_1.PolynomialConstructor.randomWithLength(2, 2);
     let poly2;
@@ -18,22 +39,16 @@ const getProductDerivativeQuestion = () => {
                 poly2.coefficients.every((coeff, index) => coeff / poly1.coefficients[index] ===
                     poly2.coefficients[0] / poly1.coefficients[0]);
     } while (isMultiple);
-    const answerNum = poly1
-        .derivate()
-        .multiply(poly2)
-        .add(poly1.opposite().multiply(poly2.derivate()))
-        .toTree();
-    const answerDenum = new powerNode_1.SquareNode(poly2.toTree());
-    const answer = new fractionNode_1.FractionNode(answerNum, answerDenum).toTex();
+    const identifiers = {
+        poly1Coeffs: poly1.coefficients,
+        poly2Coeffs: poly2.coefficients,
+    };
     const question = {
-        answer,
-        instruction: `Déterminer la dérivée de la fonction $f$ définie par $f(x) = ${new fractionNode_1.FractionNode(poly1.toTree(), poly2.toTree()).toTex()}$`,
+        answer: getAnwer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["x", "xsquare", "xcube"],
         answerFormat: "tex",
-        identifiers: {
-            poly1Coeffs: poly1.coefficients,
-            poly2Coeffs: poly2.coefficients,
-        },
+        identifiers,
     };
     return question;
 };
@@ -55,18 +70,34 @@ const getPropositions = (n, { answer, poly1Coeffs, poly2Coeffs }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { poly1Coeffs, poly2Coeffs }) => {
-    const poly1 = new polynomial_1.Polynomial(poly1Coeffs);
-    const poly2 = new polynomial_1.Polynomial(poly2Coeffs);
-    const answerNum = poly1
-        .derivate()
-        .multiply(poly2)
-        .add(poly1.opposite().multiply(poly2.derivate()))
-        .toTree({ forbidPowerToProduct: true });
-    const answerDenum = new powerNode_1.PowerNode(poly2.toTree(), new numberNode_1.NumberNode(2));
-    const answer = new fractionNode_1.FractionNode(answerNum, answerDenum);
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, poly1Coeffs, poly2Coeffs }) => {
+    // const poly1 = new Polynomial(poly1Coeffs);
+    // const poly2 = new Polynomial(poly2Coeffs);
+    // const answerNum = poly1
+    //   .derivate()
+    //   .multiply(poly2)
+    //   .add(poly1.opposite().multiply(poly2.derivate()))
+    //   .toTree({ forbidPowerToProduct: true });
+    // const answerDenum = new PowerNode(poly2.toTree(), new NumberNode(2));
+    // const answer = new FractionNode(answerNum, answerDenum);
+    // const texs = answer.toAllValidTexs();
+    // return texs.includes(ans);
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        const simp = parsed
+            .simplify({ keepPowers: true, forbidFactorize: true })
+            .toTex();
+        const parsedAnswer = (0, latexParser_1.parseAlgebraic)(answer);
+        const simpAnswer = parsedAnswer
+            .simplify({ keepPowers: true, forbidFactorize: true })
+            .toTex();
+        console.log(answer);
+        console.log(simp);
+        return simp === simpAnswer;
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.quotientDerivative = {
     id: "quotientDerivative",

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

@@ -1 +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"}
+{"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;AA0KF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAiB5D,CAAC"}

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

@@ -104,6 +104,7 @@ $$
 ${res.length > 1
         ? `x=${res[0].toTex()} \\text{ ou } x=${res[1].toTex()}`
         : `x=${res[0]?.toTex() || res[1]?.toTex()}`}
+$$
 `;
 };
 const getKeys = (identifiers) => {

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;AA2JF,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,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"}

package/lib/exercises/math/functions/affines/affineAdjustment.js

@@ -21,6 +21,8 @@ const getInstruction = ({ xValues, yValues }) => {
     return `On considère la série statistique ci-dessous. Déterminez l'équation de la droite d'ajustement obtenue par la méthode des moindres carrés. 
 
 ${dataTable}
+
+Arrondir les coefficients au dixième.
 `;
 };
 function generateLinearData(n) {

package/lib/exercises/math/functions/affines/affineAdjustmentComplete.js

@@ -66,7 +66,7 @@ const getAffineAdjustmentCompleteQuestion = () => {
     ]);
     const question = {
         answer: `${answerEq}\\newline ${answerR}`,
-        instruction: `On considère la série statistique ci-dessous. A l'aide de la calculatrice, déterminer l'équation de la droite d'ajustement et la valeur du coefficient de détermination. Arrondir au centième. ${dataTable}
+        instruction: `On considère la série statistique ci-dessous. A l'aide de la calculatrice, déterminer l'équation de la droite d'ajustement et la valeur du coefficient de détermination. ${dataTable}
 `,
         keys: [],
         answerFormat: "tex",

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

@@ -1 +1 @@
-{"version":3,"file":"affineExpressionFromTwoImages.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionFromTwoImages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA2GF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}
+{"version":3,"file":"affineExpressionFromTwoImages.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionFromTwoImages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgJF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}

package/lib/exercises/math/functions/affines/affineExpressionFromTwoImages.js

@@ -11,6 +11,7 @@ const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const getCorrection = (identifiers) => {
@@ -18,9 +19,7 @@ const getCorrection = (identifiers) => {
     const a = new fractionNode_1.FractionNode(new substractNode_1.SubstractNode(yB.toTree(), yA.toTree()), new substractNode_1.SubstractNode(xB.toTree(), xA.toTree()));
     const aSimplified = a.simplify();
     const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
-    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b)
-        .simplify({ forceDistributeFractions: true })
-        .toTex();
+    const answer = getAnswer(identifiers);
     return `On calcule d'abord le taux d'accroissement $a$ : 
     
 ${(0, alignTex_1.alignTex)([
@@ -46,24 +45,38 @@ $$
 Ainsi, $f(x) = ${answer}$.
     `;
 };
-const getAffineExpressionFromTwoImagesQuestion = () => {
-    const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
-    const xB = (0, randint_1.randint)(-9, 10, [xA]);
-    const yB = (0, randint_1.randint)(-9, 10);
+const getInstruction = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
+    return `Soit $f$ une fonction affine telle que $f(${xA}) = ${yA}$ et $f(${xB}) = ${yB}$.
+    
+Quelle est l'expression algébrique de $f$ ?`;
+};
+const getHint = (identifiers) => {
+    return "Calcule d'abord le taux d'accroissement de $f$ en utilisant la formule $a = \\frac{y_2-y_1}{x_2-x_1}$. Ensuite, utilise les coordonnées d'un des deux points pour déterminer l'ordonnée à l'origine.";
+};
+const getAnswer = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
     const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
     //yA = axA+b donc b = yA-axA
     const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
-    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b)
-        .simplify({ forceDistributeFractions: true })
+    return new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b)
+        .simplify({
+        forceDistributeFractions: true,
+        towardsDistribute: true,
+        forbidFactorize: true,
+    })
         .toTex();
+};
+const getAffineExpressionFromTwoImagesQuestion = () => {
+    const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
+    const xB = (0, randint_1.randint)(-9, 10, [xA]);
+    const yB = (0, randint_1.randint)(-9, 10);
     const identifiers = { xA, xB, yA, yB };
     const question = {
-        instruction: `Soit $f$ une fonction affine telle que $f(${xA}) = ${yA}$ et $f(${xB}) = ${yB}$.
-    
-Quelle est l'expression algébrique de $f$ ?`,
+        instruction: getInstruction(identifiers),
         startStatement: "a",
-        answer,
-        hint: "Calcule d'abord le taux d'accroissement de $f$ en utilisant la formule $a = \\frac{y_2-y_1}{x_2-x_1}$. Ensuite, utilise les coordonnées d'un des deux points pour déterminer l'ordonnée à l'origine.",
+        answer: getAnswer(identifiers),
+        hint: getHint(identifiers),
         correction: getCorrection(identifiers),
         answerFormat: "tex",
         keys: ["x"],
@@ -81,14 +94,37 @@ const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
-    const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
-    //yA = axA+b donc b = yA-axA
-    const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
-    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b, {
-        allowFractionToDecimal: true,
-    }).simplify({ forceDistributeFractions: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+    try {
+        // const parsed = affineParser(ans);
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({
+            towardsDistribute: true,
+            forbidFactorize: true,
+            forceDistributeFractions: true,
+        })
+            .toTex() === ans);
+    }
+    catch (err) {
+        return false;
+    }
+    // const a = new Rational(yB - yA, xB - xA).simplify().toTree();
+    // //yA = axA+b donc b = yA-axA
+    // const b = new SubstractNode(
+    //   yA.toTree(),
+    //   new MultiplyNode(a, xA.toTree()),
+    // ).simplify();
+    // const answer = new AddNode(new MultiplyNode(a, new VariableNode("x")), b, {
+    //   allowFractionToDecimal: true,
+    // }).simplify({
+    //   forceDistributeFractions: true,
+    //   towardsDistribute: true,
+    //   forbidFactorize: true,
+    // });
+    // const texs = answer.toAllValidTexs();
+    // return texs.includes(ans);
 };
 exports.affineExpressionFromTwoImages = {
     id: "affineExpressionFromTwoImages",

package/lib/exercises/math/functions/exponential/expEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAelC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwEF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAiBlC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2FF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAgB7C,CAAC"}

package/lib/exercises/math/functions/exponential/expEquation.js

@@ -14,27 +14,45 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const equationSolutionParser_1 = require("../../../../tree/parsers/equationSolutionParser");
+const discreteSetParser_1 = require("../../../../tree/parsers/discreteSetParser");
+const getInstruction = (identifiers) => {
+    const { a, k } = identifiers;
+    const equation = new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(k));
+    return `Résoudre l'équation : 
+  
+$$
+${equation.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, k } = identifiers;
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new logNode_1.LogNode(new rational_1.Rational(k, a).toTree()).simplify()])).toTex();
+    return answer;
+};
+const getKeys = (identifiers) => {
+    return [
+        "x",
+        "equal",
+        "epower",
+        "exp",
+        "lnBrackets",
+        "S",
+        "lbrace",
+        "semicolon",
+        "rbrace",
+    ];
+};
 const getExpEquation = () => {
     const a = (0, randint_1.randint)(-9, 20, [0]);
     const k = a > 0 ? (0, randint_1.randint)(1, 20) : (0, randint_1.randint)(-20, 0);
-    const equation = new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(k));
-    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new logNode_1.LogNode(new rational_1.Rational(k, a).simplify().toTree())])).toTex();
+    const identifiers = { a, k };
     const question = {
-        instruction: `Résoudre l'équation $${equation.toTex()}$.`,
-        answer: answer,
-        keys: [
-            "x",
-            "equal",
-            "epower",
-            "exp",
-            "lnBrackets",
-            "S",
-            "lbrace",
-            "semicolon",
-            "rbrace",
-        ],
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { a, k },
+        identifiers,
     };
     return question;
 };
@@ -50,14 +68,24 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, k }) => {
-    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
-        new logNode_1.LogNode(new rational_1.Rational(k, a)
-            .simplify()
-            .toTree({ allowFractionToDecimal: true })),
-    ], { allowRawRightChildAsSolution: true }));
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, a, k }) => {
+    try {
+        const eqParsed = (0, equationSolutionParser_1.equationSolutionParser)(ans);
+        if (eqParsed) {
+            const set = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([eqParsed]));
+            return set.simplify().toTex() === answer;
+        }
+        else {
+            const setParsed = (0, discreteSetParser_1.discreteSetParser)(ans);
+            if (!setParsed) {
+                return false;
+            }
+            return "S=" + setParsed.simplify().toTex() === answer;
+        }
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.expEquation = {
     id: "expEquation",
@@ -72,4 +100,7 @@ exports.expEquation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getKeys,
+    getInstruction,
+    getAnswer,
 };

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

@@ -10,4 +10,5 @@ export * from "./parity";
 export * from "./square";
 export * from "./integral";
 export * from "./exponentials";
+export * from "./sign";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/functions/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/functions/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC"}

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

@@ -26,3 +26,4 @@ __exportStar(require("./parity"), exports);
 __exportStar(require("./square"), exports);
 __exportStar(require("./integral"), exports);
 __exportStar(require("./exponentials"), exports);
+__exportStar(require("./sign"), exports);

package/lib/exercises/math/functions/logarithm/logPowerEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAwGF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB3D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmB7D,CAAC"}
+{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAgGF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB3D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmB7D,CAAC"}