math-exercises 3.0.52 → 3.0.54

package/lib/exercises/math/geometry/lines/reductEquationReading.js

@@ -0,0 +1,142 @@
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { randomColor } from "../../../../geogebra/colors.js";
+import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+const getPropositions = (n, { answer, ...identifiers }) => {
+    const propositions = [];
+    const { b, secondPoint } = identifiers;
+    addValidProp(propositions, answer);
+    while (propositions.length < n) {
+        const randomPoint = [randint(-5, 6, [0]), randint(-5, 6)];
+        const a = frac(substract(randomPoint[1], b), randomPoint[0]);
+        tryToAddWrongProp(propositions, `y=${add(multiply(a, "x"), b)
+            .simplify({ forbidFactorize: true, forceDistributeFractions: true })
+            .toTex()}`);
+    }
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { b, secondPoint } = identifiers;
+    const a = frac(substract(secondPoint[1], b), secondPoint[0]);
+    return `y=${add(multiply(a, "x"), b)
+        .simplify({ forbidFactorize: true, forceDistributeFractions: true })
+        .toTex()}`;
+};
+const getInstruction = (identifiers) => {
+    return `Déterminer graphiquement l'équation réduite de la droite tracée ci-dessous :`;
+};
+const getHint = (identifers) => {
+    return `L'équation réduite de la droite est de la forme :
+  
+$$
+y = ax+b
+$$
+
+$b$ est l'ordonnée à l'origine de la droite : c'est l'ordonnée du point d'abscisse $0$. 
+
+$a$ est le coefficient directeur. Pour le déterminer, on repère deux points $A(x_A; y_A)$ et $B(x_B;y_B)$ de la droite, et on a alors : 
+
+$$
+a = \\frac{y_B-y_A}{x_B-x_A}
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { b, secondPoint } = identifiers;
+    return `On lit graphiquement que l'ordonnée à l'origine est $${b}$ : c'est l'ordonnée du point d'abscisse $0$ appartenant à la droite.
+  
+Pour trouver $a$, on repère que la droite passe par le point de coordonnées $(${secondPoint[0]};${secondPoint[1]})$. On a alors : 
+
+$$
+a = ${frac(substract(secondPoint[1], b), secondPoint[0]).toSimplificationTex()}
+$$
+
+L'équation réduite de $d$ est donc :
+
+$$
+${getAnswer(identifiers)}
+$$`;
+};
+const getGGBOptions = (identifiers) => {
+    const { b, secondPoint } = identifiers;
+    let xMin = Math.min(0, secondPoint[0]);
+    let xMax = Math.max(0, secondPoint[0]);
+    let yMin = Math.min(b, secondPoint[1]);
+    let yMax = Math.max(b, secondPoint[1]);
+    const commands = [
+        `l = Line[(0, ${b}), (${secondPoint[0]}, ${secondPoint[1]})]`,
+        `SetColor(l, "${randomColor()}")`,
+        "SetFixed(l, true)",
+    ];
+    const ggb = new GeogebraConstructor({
+        commands,
+    });
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+    });
+};
+const getKeys = (identifiers) => {
+    return ["y", "equal", "x"];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const formated = ans.replaceAll("y", "").replaceAll("=", "");
+        const parsed = parseAlgebraic(formated);
+        if (!parsed)
+            return false;
+        return ("y=" +
+            parsed
+                .simplify({
+                forbidFactorize: true,
+                decimalToFractions: true,
+                forceDistributeFractions: true,
+            })
+                .toTex() ===
+            answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getReductEquationReadingQuestion = (ops) => {
+    const b = randint(-5, 6);
+    const secondPoint = [randint(-5, 6, [0]), randint(-5, 6)];
+    const identifiers = { b, secondPoint };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        ggbOptions: getGGBOptions(identifiers),
+    };
+};
+export const reductEquationReading = {
+    id: "reductEquationReading",
+    label: "Lire graphiquement l'équation réduite d'une droite",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getReductEquationReadingQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    // getHint,
+    // getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasGeogebra: true,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/geometry/perimeters/circleCircumference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circleCircumference.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/circleCircumference.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2CF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}
+{"version":3,"file":"circleCircumference.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/circleCircumference.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAmGF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/math/geometry/perimeters/circleCircumference.js

@@ -4,24 +4,73 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getCircleCircumference = () => {
-    const radius = randint(1, 13);
-    const diametre = randint(1, 21);
-    const coin = coinFlip();
+const getInstruction = (identifiers) => {
+    const { coin, radius, diametre } = identifiers;
+    return `Calculer la circonférence d'un cercle de ${coin ? "rayon " + `$${radius}$` : "diamètre " + `$${diametre}$`} cm.
+  
+Donner une réponse arrondie au centième.`;
+};
+const getAnswer = (identifiers) => {
+    const { coin, radius, diametre } = identifiers;
     const answerNb = coin
         ? round(2 * Math.PI * radius, 2)
         : round(Math.PI * diametre, 2);
     const answer = (answerNb + "").replace(".", ",");
     const answerTex = answer + "\\text{cm}";
+    return answerTex;
+};
+const getHint = (identifiers) => {
+    return `La circonférence d'un cercle de rayon $r$ est donnée par : 
+  
+$$
+C = 2\\pi r
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { coin, radius, diametre } = identifiers;
+    const isRadius = coin;
+    return `La circonférence d'un cercle de ${isRadius ? "rayon $r$" : "diamètre $d$"} est donnée par : 
+  
+$$
+C = ${isRadius ? "2\\pi r" : "\\pi\\times d"}
+$$
+
+${isRadius
+        ? `Ici, on a $r = ${radius}$ cm.
+  
+La circonférence est donc égale à : 
+
+$$
+C = 2\\pi \\times ${radius} \\approx ${getAnswer(identifiers)}
+$$`
+        : `Ici, on a  $d = ${diametre}$ cm.
+
+La circonférence est donc égale à : 
+
+$$
+C = \\pi \\times ${diametre} \\approx ${getAnswer(identifiers)}
+$$
+`}`;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Calculer la circonférence d'un cercle de ${coin ? "rayon " + `$${radius}$` : "diamètre " + `$${diametre}$`} cm.`,
-        answer: answerTex,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         answerFormat: "tex",
         keys: ["cm", "cm2"],
-        identifiers: { coin, diametre, radius },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
+const getCircleCircumference = () => {
+    const radius = randint(1, 13);
+    const diametre = randint(1, 21);
+    const coin = coinFlip();
+    const identifiers = { coin, diametre, radius };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -38,13 +87,13 @@ export const circleCircumference = {
     id: "circleCircumference",
     connector: "=",
     label: "Calculer la circonférence d'un cercle",
-    levels: ["4ème", "3ème", "2nde"],
     isSingleStep: false,
-    sections: ["Périmètres", "Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getCircleCircumference, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/perimeters/rectanglePerimeter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rectanglePerimeter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/rectanglePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAkCF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAWpD,CAAC"}
+{"version":3,"file":"rectanglePerimeter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/rectanglePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAwEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/math/geometry/perimeters/rectanglePerimeter.js

@@ -2,20 +2,51 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getRectanglePerimeter = () => {
-    const length = randint(3, 13);
-    const width = randint(1, length);
+const getInstruction = (identifiers) => {
+    const { width, length } = identifiers;
+    return `Calculer le périmètre d'un rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`;
+};
+const getAnswer = (identifiers) => {
+    const { width, length } = identifiers;
     const answer = (length + width) * 2 + "";
     const answerTex = answer + "\\text{cm}";
+    return answerTex;
+};
+const getHint = (identifiers) => {
+    return `Le périmètre d'un rectangle est la somme des longueurs de ses quatre côtés.`;
+};
+const getCorrection = (identifiers) => {
+    const { width, length } = identifiers;
+    return `Puisque les côtés opposés d'un rectangle sont égaux, le périmètre d'un rectangle est : 
+  
+$$
+P = 2\\times \\text{Longueur} + 2\\times \\text{largeur}
+$$
+
+Ici, le périmètre du rectangle est donc : 
+
+$$
+P = 2\\times ${width} + 2\\times ${length} = ${getAnswer(identifiers)}
+$$`;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Calculer le périmètre d'un rectangle de $${length}$ cm de longueur et de $${width}$ cm de largeur.`,
-        answer: answerTex,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         answerFormat: "tex",
         keys: ["cm", "cm2"],
-        identifiers: { length, width },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
+const getRectanglePerimeter = () => {
+    const length = randint(3, 13);
+    const width = randint(1, length);
+    const identifiers = { length, width };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -39,4 +70,6 @@ export const rectanglePerimeter = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/perimeters/squarePerimeter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"squarePerimeter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/squarePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAiCF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}
+{"version":3,"file":"squarePerimeter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/squarePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAwEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/geometry/perimeters/squarePerimeter.js

@@ -2,16 +2,49 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getSquarePerimeter = () => {
-    const side = randint(1, 21);
+const getInstruction = (identifiers) => {
+    const { side } = identifiers;
+    return `Calculer le périmètre d'un carré de $${side}$ cm de côté.`;
+};
+const getAnswer = (identifiers) => {
+    const { side } = identifiers;
     const answer = side * 4 + "";
     const answerTex = answer + "\\text{cm}";
+    return answerTex;
+};
+const getHint = (identifiers) => {
+    return "Le périmètre d'un carré est la somme des longueurs de ses côtés.";
+};
+const getCorrection = (identifiers) => {
+    const { side } = identifiers;
+    return `Puisque tous les côtés d'un carré sont égaux, le périmètre d'un carré est égal à :
+
+$$
+P = 4\\times \\text{longueur d'un côté}
+$$
+
+Ici, la longueur d'un côté du carré est $${side}\\ \\text{cm}$.
+
+Le périmètre est donc égal à :
+
+$$
+P = 4\\times ${side} = ${getAnswer(identifiers)}
+$$`;
+};
+const getSquarePerimeter = () => {
+    const side = randint(1, 21);
+    const identifiers = { side };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Calculer le périmètre d'un carré de $${side}$ cm de côté.`,
-        answer: answerTex,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         answerFormat: "tex",
         keys: ["cm", "cm2"],
-        identifiers: { side },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -31,9 +64,7 @@ export const squarePerimeter = {
     id: "squarePerimeter",
     connector: "=",
     label: "Calculer le périmètre d'un carré",
-    levels: ["4ème", "3ème", "2nde"],
     isSingleStep: false,
-    sections: ["Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getSquarePerimeter, nb, 20),
     qcmTimer: 60,
     freeTimer: 60,
@@ -41,4 +72,6 @@ export const squarePerimeter = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/perimeters/trianglePerimeter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trianglePerimeter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/trianglePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAiCF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}
+{"version":3,"file":"trianglePerimeter.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/perimeters/trianglePerimeter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAkEF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}

package/lib/exercises/math/geometry/perimeters/trianglePerimeter.js

@@ -2,19 +2,46 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getTrianglePerimeter = () => {
-    const sides = [randint(1, 13), randint(1, 13), randint(1, 13)];
+const getInstruction = (identifiers) => {
+    const { sides } = identifiers;
+    return `Calculer le périmètre d'un triangle dont les côtés mesurent : $${sides[0]}$ cm, $${sides[1]}$ cm et $${sides[2]}$ cm.`;
+};
+const getAnswer = (identifiers) => {
+    const { sides } = identifiers;
     const answer = sides[0] + sides[1] + sides[2] + "";
     const answerTex = answer + "\\text{cm}";
+    return answerTex;
+};
+const getHint = (identifiers) => {
+    return `Le périmètre d'un triangle est la somme des longueurs de ses $3$ côtés.`;
+};
+const getCorrection = (identifiers) => {
+    const { sides } = identifiers;
+    return `Le périmètre d'un triangle est la somme des longueurs de ses $3$ côtés. 
+  
+Ici, le périmètre est donc : 
+
+$$
+P = ${sides.join("+")} = ${getAnswer(identifiers)}
+$$`;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Calculer le périmètre d'un triangle dont les côtés mesurent : $${sides[0]}$ cm, $${sides[1]}$ cm et $${sides[2]}$ cm.`,
-        answer: answerTex,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         answerFormat: "tex",
         keys: ["cm", "cm2"],
-        identifiers: { sides },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
+const getTrianglePerimeter = () => {
+    const sides = [randint(1, 13), randint(1, 13), randint(1, 13)];
+    const identifiers = { sides };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -32,13 +59,13 @@ export const trianglePerimeter = {
     id: "trianglePerimeter",
     connector: "=",
     label: "Calculer le périmètre d'un triangle",
-    levels: ["5ème", "4ème", "3ème", "2nde"],
     isSingleStep: false,
-    sections: ["Périmètres", "Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getTrianglePerimeter, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/pythagore/pythagore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pythagore.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagore.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAUnD,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA8DF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}
+{"version":3,"file":"pythagore.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagore.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAUnD,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA8GF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}

package/lib/exercises/math/geometry/pythagore/pythagore.js

@@ -6,29 +6,65 @@ import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
 import { SquareNode } from "../../../../tree/nodes/operators/powerNode.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { RightTriangleConstructor } from "../../../../math/geometry/triangles/rightTriangle.js";
-const getPythagore = () => {
-    const triangle = RightTriangleConstructor.randomNiceSides({
-        randomName: true,
-    });
-    const triangleIdentifiers = triangle.toIdentifiers();
+const getInstruction = (identifiers) => {
+    return "Écrire l'égalité de Pythagore pour le triangle rectangle suivant : ";
+};
+const getAnswer = (identifiers) => {
+    const triangle = RightTriangleConstructor.fromIdentifiers(identifiers.triangleIdentifiers);
+    const answer = triangle.getPythagorianTex();
+    return answer;
+};
+const getGGBOptions = (identifiers) => {
+    const triangle = RightTriangleConstructor.fromIdentifiers(identifiers.triangleIdentifiers);
     const ggb = new GeogebraConstructor({
         commands: triangle.commands,
         hideAxes: true,
         hideGrid: true,
     });
-    const answer = triangle.getPythagorianTex();
+    return ggb.getOptions({
+        coords: triangle.generateCoords(),
+    });
+};
+const getHint = (identifiers) => {
+    return "D'après le théorème de Pythagore : dans un triangle rectangle, le carré de l'hypoténuse est égal à la somme des carrés des deux autres côtés.";
+};
+const getCorrection = (identifiers) => {
+    const triangle = RightTriangleConstructor.fromIdentifiers(identifiers.triangleIdentifiers);
+    return `Le triangle $${triangle.name}$ est rectangle en $${triangle.points[0].name}$.
+
+L'hypoténuse dans ce triangle est donc le côté $${triangle.sides[0].toTex()}$.
+  
+D'après le théorème de Pythagore, on a donc : 
+
+$$
+${getAnswer(identifiers)}
+$$`;
+};
+const getKeys = (identifiers) => {
+    const triangle = RightTriangleConstructor.fromIdentifiers(identifiers.triangleIdentifiers);
+    return [...triangle.points.map((p) => p.name), "equal"];
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: "Écrire l'égalité de Pythagore pour le triangle rectangle suivant : ",
-        answer,
-        keys: [...triangle.points.map((p) => p.name), "equal"],
-        ggbOptions: ggb.getOptions({
-            coords: triangle.generateCoords(),
-        }),
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: getKeys(identifiers),
+        ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
-        identifiers: { triangleIdentifiers },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
+const getPythagore = () => {
+    const triangle = RightTriangleConstructor.randomNiceSides({
+        randomName: true,
+    });
+    const triangleIdentifiers = triangle.toIdentifiers();
+    const identifiers = { triangleIdentifiers };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, triangleIdentifiers }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -53,9 +89,7 @@ export const pythagore = {
     id: "pythagore",
     connector: "=",
     label: "Écrire l'égalité de Pythagore",
-    levels: ["4ème", "3ème", "2nde"],
     isSingleStep: false,
-    sections: ["Théorème de Pythagore", "Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getPythagore, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -63,4 +97,6 @@ export const pythagore = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/pythagore/pythagoreCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pythagoreCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagoreCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAiBnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA+EF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}
+{"version":3,"file":"pythagoreCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagoreCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAcnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA8LF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}