math-exercises 3.0.37 → 3.0.39

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

@@ -4,16 +4,56 @@ import { Affine, AffineConstructor } from "../../../../math/polynomials/affine.j
 import { randint } from "../../../../math/utils/random/randint.js";
 import { polynomialParser } from "../../../../tree/parsers/polynomialParser.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    return `Soit une fonction affine $f$ dont le coefficient directeur vaut $${a}$ et l'ordonnée à l'origine vaut $${b}$. 
+  
+Écrire l'expression algébrique de $f(x)$.`;
+};
+const getAnswer = (identifiers) => {
+    const f = new Affine(identifiers.a, identifiers.b);
+    return f.toTex();
+};
+const getHint = (identifiers) => {
+    return `L'expression algébrique d'une fonction affine est : 
+  
+$$
+f(x) = ax+b
+$$
+
+où $a$ est le coefficient directeur et $b$ l'ordonnée à l'origine.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b } = identifiers;
+    return `L'expression algébrique d'une fonction affine est : 
+  
+$$
+f(x) = ax+b
+$$
+
+où $a$ est le coefficient directeur et $b$ l'ordonnée à l'origine.
+  
+Ici, $a = ${a}$ et $b = ${b}$.
+
+Donc, l'expression algébrique de $f$ est : 
+
+$$
+f(x)=${getAnswer(identifiers)}
+$$`;
+};
 const getAlgebricExpressionOfAffineQuestion = () => {
     const f = AffineConstructor.random();
     const a = f.a;
     const b = f.b;
+    const identifiers = { a, b };
     const question = {
-        answer: f.toTex(),
-        instruction: `Soit une fonction affine $f$ dont le coefficient directeur vaut $${a}$ et l'ordonnée à l'origine vaut $${b}$. Écrire l'expression algébrique de $f(x)$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: { a, b },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -52,13 +92,16 @@ const generatePropositions = (a, b) => {
 export const algebricExpressionOfAffine = {
     id: "algebricExpressionOfAffine",
     label: "Écrire l'expression algébrique d'une fonction affine",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Fonctions affines"],
     generator: (nb) => getDistinctQuestions(getAlgebricExpressionOfAffineQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAYrC,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;AAiFF,KAAK,OAAO,GAAG;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAYF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB7D,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAiBrC,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;AAkHF,KAAK,OAAO,GAAG;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAYF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoB7D,CAAC"}

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

@@ -3,14 +3,35 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
 import { randomColor } from "../../../../geogebra/colors.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
-import { Rational } from "../../../../math/numbers/rationals/rational.js";
+import { Rational, RationalConstructor, } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 const getInstruction = (identifiers) => {
     return "Déterminer le coefficient directeur de la droite représentée ci-dessous : ";
 };
+const getHint = (identifiers) => {
+    return `Le coefficient directeur d'une droite passant par deux points $A(x_A; y_A)$ et $B(x_B; y_B)$ est :
+  
+$$
+\\frac{y_B - y_A}{x_B - x_A}
+$$
+
+Repère donc deux points appartenant à la droite, et utilise cette formule.`;
+};
+const getCorrection = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
+    return `On lit graphiquement que la droite passe par les deux points $A(${xA},${yA})$ et $B(${xB},${yB})$. 
+  
+Le coefficient directeur est donc : 
+
+$$
+${frac(substract(yB, yA), substract(xB, xA)).toSimplificationTex()}
+$$`;
+};
 const getAnswer = (identifiers) => {
     const { xA, yA, xB, yB } = identifiers;
     const a = frac(yB - yA, xB - xA).simplify();
@@ -32,7 +53,13 @@ const getGGBOptions = (identifiers) => {
         commands,
     });
     return ggb.getOptions({
-        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        coords: ggb.getAdaptedCoords({
+            xMin,
+            xMax,
+            yMin,
+            yMax,
+            ratio: 2,
+        }),
     });
 };
 const getLeadingCoefficientQuestion = (opts) => {
@@ -43,8 +70,14 @@ const getLeadingCoefficientQuestion = (opts) => {
     }
     else
         [xA, yA] = [1, 2].map((el) => randint(-5, 6));
-    xB = xA > 0 ? randint(xA - 4, 6, [xA]) : randint(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
-    yB = yA > 0 ? randint(yA - 4, 6) : randint(-4, yA + 5);
+    const aIsInt = coinFlip();
+    const a = aIsInt
+        ? [randint(-3, 3, [0])]
+        : RationalConstructor.randomIrreductible(5).toArray();
+    xB = xA + (aIsInt ? 1 : a[0]);
+    yB = yA + (aIsInt ? a[0] : a[1]);
+    // xB = xA > 0 ? randint(xA - 4, 6, [xA]) : randint(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
+    // yB = yA > 0 ? randint(yA - 4, 6) : randint(-4, yA + 5);
     const identifiers = { xA, xB, yA, yB };
     const question = {
         instruction: getInstruction(identifiers),
@@ -53,6 +86,8 @@ const getLeadingCoefficientQuestion = (opts) => {
         ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -96,4 +131,7 @@ export const leadingCoefficient = {
     getInstruction,
     getGGBOptions,
     options,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/integral/integralAffines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralAffines.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralAffines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAiFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"integralAffines.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralAffines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA6FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/functions/integral/integralAffines.js

@@ -1,31 +1,47 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { Trinom, TrinomConstructor } from "../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { IntegralNode } from "../../../../tree/nodes/functions/integralNode.js";
+const getInstruction = (identifiers) => {
+    const { lowerBound, upperBound, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const affine = trinom.derivate();
+    const integral = new IntegralNode(affine.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
+    return `Calculer : 
+  
+$$
+${integral}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBound, upperBound, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const answer = (trinom.calculate(upperBound) - trinom.calculate(lowerBound))
+        .toTree()
+        .toTex();
+    return answer;
+};
 const getIntegralAffinesQuestion = () => {
     const trinomial = TrinomConstructor.random();
-    const affine = trinomial.derivate();
     let lowerBound = randint(-5, 5);
     let upperBound = randint(-5, 5);
     while (lowerBound >= upperBound) {
         lowerBound = randint(-5, 5);
         upperBound = randint(-5, 5);
     }
-    const integral = new IntegralNode(affine.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
-    const answer = (trinomial.calculate(upperBound) - trinomial.calculate(lowerBound))
-        .toTree()
-        .toTex();
+    const identifiers = {
+        lowerBound,
+        upperBound,
+        trinomial: [trinomial.a, trinomial.b, trinomial.c],
+    };
     const question = {
-        answer: answer,
-        instruction: `Calculer : $${integral}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            lowerBound,
-            upperBound,
-            trinomial: [trinomial.a, trinomial.b, trinomial.c],
-        },
+        identifiers,
     };
     return question;
 };
@@ -52,18 +68,18 @@ const getPropositions = (n, { answer, lowerBound, upperBound, trinomial }) => {
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    return numberVEA(ans, answer);
 };
 export const integralAffines = {
     id: "integralAffines",
     label: "Calcul d'intégrales de fonctions affines",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralAffinesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/functions/integral/integralTrinomials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralTrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralTrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAuFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"integralTrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralTrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAoGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/math/functions/integral/integralTrinomials.js

@@ -1,8 +1,28 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { Polynomial, } from "../../../../math/polynomials/polynomial.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { IntegralNode } from "../../../../tree/nodes/functions/integralNode.js";
+const getInstruction = (identifiers) => {
+    const { lowerBound, upperBound, quadrinomial } = identifiers;
+    const quadrinomial1 = new Polynomial(quadrinomial);
+    const trinomial = quadrinomial1.derivate();
+    const integral = new IntegralNode(trinomial.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
+    return `Calculer : 
+
+$$
+${integral}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBound, upperBound, quadrinomial } = identifiers;
+    const quadrinomial1 = new Polynomial(quadrinomial);
+    const answer = (quadrinomial1.calculate(upperBound) - quadrinomial1.calculate(lowerBound))
+        .toTree()
+        .toTex();
+    return answer;
+};
 const getIntegralTrinomialsQuestion = () => {
     const quadCoeffs = [
         randint(-5, 5),
@@ -10,28 +30,23 @@ const getIntegralTrinomialsQuestion = () => {
         randint(-2, 3),
         randint(-5, 5, [0]),
     ];
-    const quadrinomial = new Polynomial(quadCoeffs);
-    const trinomial = quadrinomial.derivate();
     let lowerBound = randint(-3, 4);
     let upperBound = randint(-3, 4);
     while (lowerBound >= upperBound) {
         lowerBound = randint(-3, 4);
         upperBound = randint(-3, 4);
     }
-    const integral = new IntegralNode(trinomial.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
-    const answer = (quadrinomial.calculate(upperBound) - quadrinomial.calculate(lowerBound))
-        .toTree()
-        .toTex();
+    const identifiers = {
+        lowerBound,
+        upperBound,
+        quadrinomial: quadCoeffs,
+    };
     const question = {
-        answer: answer,
-        instruction: `Calculer : $${integral}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            lowerBound,
-            upperBound,
-            quadrinomial: quadrinomial.coefficients,
-        },
+        identifiers,
     };
     return question;
 };
@@ -58,18 +73,18 @@ const getPropositions = (n, { answer, lowerBound, upperBound, quadrinomial }) =>
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    return numberVEA(ans, answer);
 };
 export const integralTrinomials = {
     id: "integralTrinomials",
     label: "Calcul d'intégrales de fonctions trinômes",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralTrinomialsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/functions/trinoms/factoForm/factorizedFormFromRoots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factorizedFormFromRoots.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/factoForm/factorizedFormFromRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoGF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"factorizedFormFromRoots.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/factoForm/factorizedFormFromRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuJF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAiBzD,CAAC"}

package/lib/exercises/math/functions/trinoms/factoForm/factorizedFormFromRoots.js

@@ -8,6 +8,7 @@ import { substract } from "../../../../../tree/nodes/operators/substractNode.js"
 import { parseAlgebraic } from "../../../../../tree/parsers/latexParser.js";
 import { probaFlip } from "../../../../../utils/alea/probaFlip.js";
 import { handleVEAError } from "../../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../../utils/latex/alignTex.js";
 const getAnswerNode = (identifiers) => {
     const { a, roots } = identifiers;
     const isSingleRoot = roots.length === 1;
@@ -28,6 +29,49 @@ const getInstruction = (identifiers) => {
   
 Déterminer la forme factorisée de $f$.`;
 };
+const getHint = (identifiers) => {
+    return `Soit $f$ un polynôme du second degré de la forme 
+  
+$$
+f(x)=ax^2+bx+c
+$$
+
+Si $f$ admet deux racines $x_1$ et $x_2$, alors la forme factorisée de $f$ est :
+
+$$
+f(x)=a(x-x_1)(x-x_2)
+$$
+
+Si $f$ n'admet qu'une racine $x_0$, alors sa forme factorisée est :
+
+$$
+f(x) = a(x-x_0)^2
+$$
+
+Si $f$ n'admet pas de racine, alors il n'admet pas de forme factorisée.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, roots } = identifiers;
+    const rawForm = roots.length === 1
+        ? multiply(a, square(substract("x", roots[0])))
+        : multiply(a, multiply(substract("x", roots[0]), substract("x", roots[1])));
+    const simpForm = rawForm.simplify();
+    const hasSimplified = rawForm.toTex() !== simpForm.toTex();
+    return roots.length === 1
+        ? `Puisque $f$ n'admet qu'une racine, sa forme factorisée est : 
+    
+${alignTex([
+            ["f(x)", "=", rawForm.toTex()],
+            hasSimplified ? ["", "=", simpForm.toTex()] : [],
+        ])}
+`
+        : `Puisque $f$ admet deux racines distinctes, sa forme factorisée est : 
+    
+${alignTex([
+            ["f(x)", "=", rawForm.toTex()],
+            hasSimplified ? ["", "=", simpForm.toTex()] : [],
+        ])}`;
+};
 const getFactorizedFormFromRootsQuestion = () => {
     const a = randint(-10, 10, [0]);
     const firstRoot = randint(-10, 10);
@@ -43,6 +87,8 @@ const getFactorizedFormFromRootsQuestion = () => {
         keys: ["x"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -92,4 +138,7 @@ export const factorizedFormFromRoots = {
     subject: "Mathématiques",
     getInstruction,
     getAnswer,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/trinoms/parabole/trinomSymetryAxisFromFacto.js

@@ -53,7 +53,7 @@ const getCorrection = (identifiers) => {
 L'axe de symétrie de la parabole représentant $f$ a donc pour équation : 
 
 $$
-x=${fraction.toTex()}=${frac(x1 + x2, 2).toSimplificationString()}
+x=${fraction.toTex()}=${frac(x1 + x2, 2).toSimplificationTex()}
 $$`;
 };
 const getKeys = (identifiers) => {

package/lib/exercises/math/functions/trinoms/roots/findSecondRoot.js

@@ -63,7 +63,7 @@ $$
 Or on sait que $x_1 = ${firstRoot.toTex()}$. On a donc : 
 
 $$
-x_2 = ${frac(cOverA, firstRoot).toSimplificationString()}
+x_2 = ${frac(cOverA, firstRoot).toSimplificationTex()}
 $$
 `;
 };

package/lib/exercises/math/functions/trinoms/roots/rootsProduct.js

@@ -59,7 +59,7 @@ $$
 Ici, on a $a = ${aTex}$ et $c = ${cTex}$, donc :
 
 $$
-P = ${ans.toSimplificationString()}
+P = ${ans.toSimplificationTex()}
 $$
   `;
 };

package/lib/exercises/math/functions/trinoms/roots/rootsSum.js

@@ -59,7 +59,7 @@ $$
 Ici, on a $a = ${aTex}$ et $b = ${bTex}$, donc :
 
 $$
-S = ${ans.toSimplificationString()}
+S = ${ans.toSimplificationTex()}
 $$
 `;
 };

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAsKF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAiB1D,CAAC"}

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.js

@@ -4,25 +4,70 @@ import { Point } from "../../../../math/geometry/point.js";
 import { SquareRoot, } from "../../../../math/numbers/reals/real.js";
 import { distinctRandTupleInt } from "../../../../math/utils/random/randTupleInt.js";
 import { round } from "../../../../math/utils/round.js";
-import { SqrtNode } from "../../../../tree/nodes/functions/sqrtNode.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
-const getDistanceBetweenTwoPoints = () => {
-    const [coords1, coords2] = distinctRandTupleInt(2, 2, { from: -9, to: 10 });
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getInstruction = (identifiers) => {
+    const { coords1, coords2 } = identifiers;
+    let A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
+    let B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
+    return `Dans un repère orthonormé, soit deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. 
+    
+Calculer la distance $AB$.`;
+};
+const getAnswer = (identifiers) => {
+    const { coords1, coords2 } = identifiers;
     let A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
     let B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
     const answer = new SquareRoot(round(A.distanceTo(B) ** 2, 0))
         .simplify()
         .toTree()
         .toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    const A = new Point("A", "x_A".toTree(), "y_A".toTree());
+    const B = new Point("B", "x_B".toTree(), "y_B".toTree());
+    return `Dans un repère orthonormé, la distance entre deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$ est : 
+  
+$$
+AB = ${A.distanceToNode(B).toTex()}
+$$
+`;
+};
+const getCorrection = (identifiers) => {
+    const { coords1, coords2 } = identifiers;
+    let A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
+    let B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
+    const Ax = new Point("A", "x_A".toTree(), "y_A".toTree());
+    const Bx = new Point("B", "x_B".toTree(), "y_B".toTree());
+    return `Dans un repère orthonormé, la distance entre deux points $${Ax.toTexWithCoords()}$ et $${Bx.toTexWithCoords()}$ est : 
+  
+$$
+AB = ${Ax.distanceToNode(Bx).toTex()}
+$$
+
+Ici, on a donc : 
+
+${alignTex([
+        ["AB", "=", A.distanceToNode(B).toTex()],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
+const getDistanceBetweenTwoPoints = () => {
+    const [coords1, coords2] = distinctRandTupleInt(2, 2, { from: -9, to: 10 });
+    const identifiers = { coords1, coords2 };
     const question = {
-        instruction: `Dans un repère orthonormé, soit deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. 
-    
-Calculer la distance $AB$.`,
+        instruction: getInstruction(identifiers),
         startStatement: "AB",
-        answer,
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { coords1, coords2 },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -69,21 +114,19 @@ const getPropositions = (n, { answer, coords1, coords2 }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { coords1, coords2 }) => {
-    const A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
-    const B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
-    const answer = new SqrtNode(new NumberNode(round(A.distanceTo(B) ** 2, 0)), {
-        allowSimplifySqrt: true,
-    });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, coords1, coords2 }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const distanceBetweenTwoPoints = {
     id: "distanceBetweenTwoPoints",
     connector: "=",
     label: "Distance entre deux points",
-    levels: ["2nde", "1reESM"],
-    sections: ["Géométrie cartésienne"],
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getDistanceBetweenTwoPoints, nb),
     qcmTimer: 60,
@@ -91,4 +134,9 @@ export const distanceBetweenTwoPoints = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getCorrection,
+    getHint,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/cartesian/midpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmFF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}
+{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA2IF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAgB1C,CAAC"}