math-exercises 3.0.55 → 3.0.56

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeOfPyramidWithSquareOrRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA2JF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}
+{"version":3,"file":"volumeOfPyramidWithSquareOrRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAoBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAkNF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.js

@@ -3,36 +3,136 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { RationalConstructor, } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
 import { isNumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
-import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { multiply, MultiplyNode, } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { square } from "../../../../tree/nodes/operators/powerNode.js";
 import { random } from "../../../../utils/alea/random.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const polygonTypes = ["Square", "Rectangular"];
 const getVolumeOfPyramidWithSquareOrRectBaseQuestion = () => {
-    const exercise = generateExercise();
-    const baseOfPyramid = exercise.baseOfPyramid;
-    const commands = exercise.ggbCommands;
+    const h = randint(1, 11);
+    const polygonType = random(polygonTypes);
+    let sideOne = 0;
+    let sideTwo = 0;
+    switch (polygonType) {
+        case "Square":
+            const randomSide = randint(1, 10);
+            sideOne = randomSide;
+            sideTwo = randomSide;
+            break;
+        case "Rectangular":
+            sideOne = randint(1, 11);
+            sideTwo = randint(1, 11, [sideOne]);
+            break;
+    }
+    const identifiers = {
+        h,
+        baseOfPyramid: { sideSizes: [sideOne, sideTwo], type: polygonType },
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getGGBOptions = (identifiers) => {
+    const { baseOfPyramid, h } = identifiers;
+    const { sideSizes, type } = baseOfPyramid;
+    const [sideOne, sideTwo] = sideSizes;
+    let commands = [
+        `A=Point({0,0,0})`,
+        `B=Point({${sideOne},0,0})`,
+        `C=Point({${sideOne},${sideTwo},0})`,
+        `D=Point({0,${sideTwo},0})`,
+        `ShowLabel(A,true)`,
+        `ShowLabel(B,true)`,
+        `ShowLabel(C,true)`,
+        `ShowLabel(D,true)`,
+        `SetFixed(A,true)`,
+        `SetFixed(B,true)`,
+        `SetFixed(C,true)`,
+        `SetFixed(D,true)`,
+        `Poly=Polygon(A,B,C,D)`,
+    ];
+    commands = commands.concat([
+        `H=Point({${sideSizes[0] / 2},${sideSizes[1] / 2},${h}})`,
+        `SetFixed(H,true)`,
+        `ShowLabel(H,true)`,
+        `Pyra=Pyramid(Poly,H)`,
+    ]);
     const ggb = new GeogebraConstructor({
         commands,
         hideAxes: true,
         hideGrid: true,
         is3D: true,
     });
-    const h = exercise.h;
+    const maxCoord = Math.max(baseOfPyramid.sideSizes[0], baseOfPyramid.sideSizes[1]);
+    return ggb.getOptions({
+        coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, h + 1],
+    });
+};
+const getInstruction = (identifiers) => {
+    const { baseOfPyramid, h } = identifiers;
     const instruction = `$ABCDH$ est une pyramide à base ${getPolygonNameInFr(baseOfPyramid.type)} de hauteur $${h}$. Calculer son volume en sachant que : ${baseOfPyramid.type === "Square"
         ? `$AB=${baseOfPyramid.sideSizes[0]}$`
         : `$AB=${baseOfPyramid.sideSizes[0]}$ et $BC=${baseOfPyramid.sideSizes[1]}$`}.`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { baseOfPyramid, h } = identifiers;
     const volume = calculateVolume(baseOfPyramid.sideSizes, h).simplify();
-    const maxCoord = Math.max(baseOfPyramid.sideSizes[0], baseOfPyramid.sideSizes[1]);
+    return volume.toTex();
+};
+const getHint = (identifiers) => {
+    const { baseOfPyramid, h } = identifiers;
+    const { sideSizes, type } = baseOfPyramid;
+    const baseShape = type === "Square" ? "carré" : "rectangle";
+    return `Le volume d'une pyramide est donné par la formule :
+  
+$$
+V = \\frac{1}{3} \\times \\text{aire de la base} \\times \\text{hauteur}
+$$
+
+La base de la pyramide est ici un ${baseShape}. Il faut donc commencer par calculer son aire.`;
+};
+const getCorrection = (identifiers) => {
+    const { baseOfPyramid, h } = identifiers;
+    const { sideSizes, type } = baseOfPyramid;
+    const baseShape = type === "Square" ? "carré" : "rectangle";
+    const isSquare = type === "Square";
+    const aera = round(isSquare ? sideSizes[0] ** 2 : sideSizes[0] * sideSizes[1], 2).frenchify();
+    return `Le volume d'une pyramide est donné par la formule :
+      
+$$
+V = \\frac{1}{3} \\times \\text{aire de la base} \\times \\text{hauteur}
+$$
+
+Ici, la base est un ${baseShape}. Son aire est donc égale à :
+
+$$
+${isSquare
+        ? square(sideSizes[0]).toTex()
+        : multiply(sideSizes[0], sideSizes[1]).toTex({
+            forceNoSimplification: true,
+        })} = ${aera}
+$$
+
+Le volume de la pyramide est donc : 
+
+${alignTex([
+        ["V", "=", `\\frac{1}{3}\\times ${aera} \\times ${h}`],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: volume.toTex(),
-        instruction: instruction,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        ggbOptions: ggb.getOptions({
-            coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, exercise.h + 1],
-        }),
-        identifiers: { h, baseOfPyramid },
+        ggbOptions: getGGBOptions(identifiers),
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -63,58 +163,9 @@ const generatePropositions = (baseOfPyramid, h) => {
         .toTex();
     return [firstProposition, secondProposition];
 };
-const generateExercise = () => {
-    const h = randint(1, 11);
-    const polygonType = random(polygonTypes);
-    const base = generatePolygonWithGgbCmnds(polygonType);
-    const ggbCommands = base.commands.concat([
-        `H=Point({${base.sideSizes[0] / 2},${base.sideSizes[1] / 2},${h}})`,
-        `SetFixed(H,true)`,
-        `ShowLabel(H,true)`,
-        `Pyra=Pyramid(Poly,H)`,
-    ]);
-    return {
-        ggbCommands,
-        h,
-        baseOfPyramid: { sideSizes: base.sideSizes, type: polygonType },
-    };
-};
 const calculateVolume = (baseOfPyramidSides, h) => {
     return new MultiplyNode(new FractionNode((1).toTree(), (3).toTree()), (baseOfPyramidSides[0] * baseOfPyramidSides[1] * h).toTree());
 };
-const generatePolygonWithGgbCmnds = (polygonType) => {
-    let sideOne = 0;
-    let sideTwo = 0;
-    switch (polygonType) {
-        case "Square":
-            const randomSide = randint(1, 10);
-            sideOne = randomSide;
-            sideTwo = randomSide;
-            break;
-        case "Rectangular":
-            sideOne = randint(1, 11);
-            sideTwo = randint(1, 11, [sideOne]);
-            break;
-    }
-    return {
-        commands: [
-            `A=Point({0,0,0})`,
-            `B=Point({${sideOne},0,0})`,
-            `C=Point({${sideOne},${sideTwo},0})`,
-            `D=Point({0,${sideTwo},0})`,
-            `ShowLabel(A,true)`,
-            `ShowLabel(B,true)`,
-            `ShowLabel(C,true)`,
-            `ShowLabel(D,true)`,
-            `SetFixed(A,true)`,
-            `SetFixed(B,true)`,
-            `SetFixed(C,true)`,
-            `SetFixed(D,true)`,
-            `Poly=Polygon(A,B,C,D)`,
-        ],
-        sideSizes: [sideOne, sideTwo],
-    };
-};
 const getPolygonNameInFr = (polygonType) => {
     switch (polygonType) {
         case "Square":
@@ -128,9 +179,7 @@ const getPolygonNameInFr = (polygonType) => {
 export const volumeOfPyramidWithSquareOrRectBase = {
     id: "volumeOfPyramidWithSquareOrRectBase",
     label: "Calculer le volume d'une pyramide à base carrée ou rectangulaire",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getVolumeOfPyramidWithSquareOrRectBaseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -138,4 +187,6 @@ export const volumeOfPyramidWithSquareOrRectBase = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeOfPyramidWithTriangleBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AASF,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmKF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"volumeOfPyramidWithTriangleBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA0MF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.js

@@ -3,10 +3,12 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
 import { isNumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
-import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
-import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { frac, FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply, MultiplyNode, } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { random } from "../../../../utils/alea/random.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const pythagoreTriplet = [
     [5, 12, 13],
     [8, 15, 17],
@@ -19,10 +21,91 @@ const pythagoreTriplet = [
     [16, 63, 65],
 ];
 const getVolumeOfPyramidWithTriangleBaseQuestion = () => {
-    const exercise = generateExercise();
-    const commands = exercise.ggbCommands;
-    const baseOfPyramidSides = exercise.baseOfPyramidSides;
-    const volume = calculateVolume(baseOfPyramidSides, exercise.h);
+    // const exercise = generateExercise();
+    const h = randint(3, 21);
+    // const baseOfPyramidSides = exercise.baseOfPyramidSides;
+    const rectTriangle = random(pythagoreTriplet);
+    const ABSide = rectTriangle[0];
+    const ACSide = rectTriangle[1];
+    const BCSide = rectTriangle[2];
+    const identifiers = { h, baseOfPyramidSides: { ABSide, ACSide, BCSide } };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getInstruction = (identifiers) => {
+    const { baseOfPyramidSides, h } = identifiers;
+    return `$ABCH$ est une pyramide à base triangulaire de hauteur $${h}$. Le point $D$ est le pied de la hauteur issue de $C$ dans le triangle $ABC$.
+
+Calculer le volume de la pyramide en sachant que $AB=${baseOfPyramidSides.ABSide}$ et $CD=${baseOfPyramidSides.ACSide}$.`;
+};
+const getAnswer = (identifiers) => {
+    const { baseOfPyramidSides, h } = identifiers;
+    const volume = calculateVolume(baseOfPyramidSides, h);
+    return volume.simplify().toTex();
+};
+const getHint = (identifiers) => {
+    return `Le volume d'une pyramide est donné par la formule :
+  
+$$
+V = \\frac{1}{3} \\times \\text{aire de la base} \\times \\text{hauteur}
+$$
+
+La base de la pyramide est ici un triangle. Son aire se calcule par la formule : 
+
+$$
+A = \\frac{\\text{base}\\times\\text{hauteur}}{2}
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { h, baseOfPyramidSides } = identifiers;
+    const { ABSide, ACSide, BCSide } = baseOfPyramidSides;
+    const aera = round((ABSide * ACSide) / 2, 2).frenchify();
+    return `Le volume d'une pyramide est donné par la formule :
+  
+$$
+V = \\frac{1}{3} \\times \\text{aire de la base} \\times \\text{hauteur}
+$$
+
+Ici, la base est un triangle rectangle dont une hauteur est $${ACSide}$ et sa base associée vaut $${ABSide}$. Son aire est donc égale à :
+
+$$
+${frac(multiply(ACSide, ABSide), 2).toTex()} = ${aera}
+$$
+
+Le volume de la pyramide est donc : 
+
+${alignTex([
+        ["V", "=", `\\frac{1}{3}\\times ${aera} \\times ${h}`],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
+const getGGBOptions = (identifiers) => {
+    const { baseOfPyramidSides, h } = identifiers;
+    const { ABSide, ACSide, BCSide } = baseOfPyramidSides;
+    // const triangle = generateTriangleWithGGBCommands();
+    //!!!!!!!!!!!
+    const originX = randint(-ABSide + 4, -2);
+    let commands = [
+        `A=Point({${originX},0,0})`,
+        `B=Point({${ABSide + originX},0,0})`,
+        `C=Point({0,${ACSide},0})`,
+        `ShowLabel(A,True)`,
+        `ShowLabel(B,True)`,
+        `ShowLabel(C,True)`,
+        `SetFixed(A,true)`,
+        `SetFixed(B,true)`,
+        `SetFixed(C,true)`,
+        `Poly=Polygon(A,B,C)`,
+    ];
+    commands = commands.concat([
+        `H=Point({0,${ACSide / 4},${h}})`,
+        `D=Point({0,0,0})`,
+        `ShowLabel(D,true)`,
+        `ShowLabel(H,true)`,
+        `SetFixed(H,true)`,
+        `SetFixed(D,true)`,
+        `Pyra=Pyramid(Poly,H)`,
+    ]);
     const ggb = new GeogebraConstructor({
         commands,
         hideAxes: true,
@@ -30,23 +113,20 @@ const getVolumeOfPyramidWithTriangleBaseQuestion = () => {
         is3D: true,
     });
     const maxCoord = Math.max(baseOfPyramidSides.ABSide, baseOfPyramidSides.ACSide);
+    return ggb.getOptions({
+        coords: [originX, maxCoord + 1, -2, maxCoord + 1, -2, h + 1],
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: volume.simplify().toTex(),
-        instruction: `$ABCH$ est une pyramide à base triangulaire de hauteur $${exercise.h}$. Le point $D$ est le pied de la hauteur issue de $C$ dans le triangle $ABC$.
-    Calculer le volume de la pyramide en sachant que $AB=${baseOfPyramidSides.ABSide}$ et $CD=${baseOfPyramidSides.ACSide}$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        ggbOptions: ggb.getOptions({
-            coords: [
-                exercise.originX,
-                maxCoord + 1,
-                -2,
-                maxCoord + 1,
-                -2,
-                exercise.h + 1,
-            ],
-        }),
-        identifiers: { h: exercise.h, baseOfPyramidSides },
+        ggbOptions: getGGBOptions(identifiers),
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -83,54 +163,10 @@ const generatePropositions = (baseOfPyramidSides, h) => {
 const calculateVolume = (sideSize, h) => {
     return new FractionNode(new MultiplyNode(new FractionNode((sideSize.ABSide * sideSize.ACSide).toTree(), (2).toTree()), h.toTree()), (3).toTree());
 };
-const generateExercise = () => {
-    const h = randint(3, 21);
-    const triangle = generateTriangleWithGGBCommands();
-    const ggbCommands = triangle.commands.concat([
-        `H=Point({0,${triangle.sideSizes.ACSide / 4},${h}})`,
-        `D=Point({0,0,0})`,
-        `ShowLabel(D,true)`,
-        `ShowLabel(H,true)`,
-        `SetFixed(H,true)`,
-        `SetFixed(D,true)`,
-        `Pyra=Pyramid(Poly,H)`,
-    ]);
-    return {
-        ggbCommands,
-        h,
-        baseOfPyramidSides: triangle.sideSizes,
-        originX: triangle.originX,
-    };
-};
-const generateTriangleWithGGBCommands = () => {
-    const rectTriangle = random(pythagoreTriplet);
-    const ABSide = rectTriangle[0];
-    const originX = randint(-ABSide + 4, -2);
-    const ACSide = rectTriangle[1];
-    const BCSide = rectTriangle[2];
-    return {
-        commands: [
-            `A=Point({${originX},0,0})`,
-            `B=Point({${ABSide + originX},0,0})`,
-            `C=Point({0,${ACSide},0})`,
-            `ShowLabel(A,True)`,
-            `ShowLabel(B,True)`,
-            `ShowLabel(C,True)`,
-            `SetFixed(A,true)`,
-            `SetFixed(B,true)`,
-            `SetFixed(C,true)`,
-            `Poly=Polygon(A,B,C)`,
-        ],
-        sideSizes: { ABSide, ACSide, BCSide },
-        originX,
-    };
-};
 export const volumeOfPyramidWithTriangleBase = {
     id: "volumeOfPyramidWithTriangleBase",
     label: "Calculer le volume d'une pyramide à base triangulaire",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getVolumeOfPyramidWithTriangleBaseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -138,4 +174,6 @@ export const volumeOfPyramidWithTriangleBase = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeOfPyramidWithTriangleRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AAQF,KAAK,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA2JxE,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}
+{"version":3,"file":"volumeOfPyramidWithTriangleRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AAEF,KAAK,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAyMxE,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.js

@@ -3,10 +3,12 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
 import { isNumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
-import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
-import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { frac, FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply, MultiplyNode, } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { random } from "../../../../utils/alea/random.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const pythagoreTriplet = [
     [3, 4, 5],
     [5, 12, 13],
@@ -20,27 +22,108 @@ const pythagoreTriplet = [
     [16, 63, 65],
 ];
 const getVolumeOfPyramidWithTriangleRectBase = () => {
-    const exercise = generateExercise();
-    const commands = exercise.commands;
-    const baseOfPyramidSides = exercise.baseOfPyramidSides;
-    const volume = calculateVolume(baseOfPyramidSides, exercise.h);
+    const h = randint(1, 11);
+    const values = random(pythagoreTriplet);
+    const baseOfPyramidSides = {
+        ABSide: values[0],
+        ACSide: values[1],
+        BCSide: values[2],
+    };
+    const identifiers = { h: h, baseOfPyramidSides };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getInstruction = (identifiers) => {
+    const { h, baseOfPyramidSides } = identifiers;
+    return `$ABCH$ est une pyramide à base triangulaire de hauteur $${h}$. 
+    
+Calculer le volume de la pyramide en sachant que : $AB=${baseOfPyramidSides.ABSide}$, $AC=${baseOfPyramidSides.ACSide}$, $BC=${baseOfPyramidSides.BCSide}$ et $(AC)\\perp(AB)$.`;
+};
+const getAnswer = (identifiers) => {
+    const { h, baseOfPyramidSides } = identifiers;
+    const volume = calculateVolume(baseOfPyramidSides, h);
+    return volume.simplify().toTex();
+};
+const getGGBOptions = (identifiers) => {
+    const { h, baseOfPyramidSides } = identifiers;
+    const { ABSide, ACSide, BCSide } = baseOfPyramidSides;
+    let commands = [
+        `A=Point({0,0,0})`,
+        `B=Point({${ABSide},0,0})`,
+        `C=Point({0,${ACSide},0})`,
+        `ang=Angle(C,A,B)`,
+        `ShowLabel(ang,false)`,
+        `ShowLabel(A,True)`,
+        `ShowLabel(B,True)`,
+        `ShowLabel(C,True)`,
+        `SetFixed(A,true)`,
+        `SetFixed(B,true)`,
+        `SetFixed(C,true)`,
+        `Poly=Polygon(A,B,C)`,
+    ];
+    commands = commands.concat([
+        `H=Point({${ABSide / 4},${ACSide / 4},${h}})`,
+        `SetFixed(H,true)`,
+        `ShowLabel(H,true)`,
+        `Pyra=Pyramid(Poly,H)`,
+    ]);
     const ggb = new GeogebraConstructor({
         commands,
         hideAxes: true,
         hideGrid: true,
         is3D: true,
     });
-    const maxCoord = Math.max(baseOfPyramidSides.ABSide, baseOfPyramidSides.ACSide);
+    const maxCoord = Math.max(ABSide, ACSide);
+    return ggb.getOptions({
+        coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, h + 1],
+    });
+};
+const getHint = (identifiers) => {
+    return `Le volume d'une pyramide est donné par la formule :
+  
+$$
+V = \\frac{1}{3} \\times \\text{aire de la base} \\times \\text{hauteur}
+$$
+
+La base de la pyramide est ici un triangle rectangle. Son aire se calcule par la formule : 
+
+$$
+A = \\frac{\\text{base}\\times\\text{hauteur}}{2}
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { h, baseOfPyramidSides } = identifiers;
+    const { ABSide, ACSide, BCSide } = baseOfPyramidSides;
+    const aera = round((ABSide * ACSide) / 2, 2).frenchify();
+    return `Le volume d'une pyramide est donné par la formule :
+  
+$$
+V = \\frac{1}{3} \\times \\text{aire de la base} \\times \\text{hauteur}
+$$
+
+Ici, la base est un triangle rectangle dont une hauteur est $${ACSide}$ et sa base associée vaut $${ABSide}$. Son aire est donc égale à :
+
+$$
+${frac(multiply(ACSide, ABSide), 2).toTex()} = ${aera}
+$$
+
+Le volume de la pyramide est donc : 
+
+${alignTex([
+        ["V", "=", `\\frac{1}{3}\\times ${aera} \\times ${h}`],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: volume.simplify().toTex(),
-        instruction: `$ABCH$ est une pyramide à base triangulaire de hauteur $${exercise.h}$. 
-    Calculer le volume de la pyramide en sachant que : $AB=${baseOfPyramidSides.ABSide}$, $AC=${baseOfPyramidSides.ACSide}$, $BC=${baseOfPyramidSides.BCSide}$ et $(AC)\\perp(AB)$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        ggbOptions: ggb.getOptions({
-            coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, exercise.h + 1],
-        }),
-        identifiers: { h: exercise.h, baseOfPyramidSides },
+        ggbOptions: getGGBOptions(identifiers),
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -76,52 +159,13 @@ const generatePropositions = (baseOfPyramidSides, h) => {
         .toTex();
     return [firstProposition, secondProposition];
 };
-const generateExercise = () => {
-    const h = randint(1, 11);
-    const base = generatePolygonWithGgbCmnds();
-    const commands = base.commands.concat([
-        `H=Point({${base.sideSizes.ABSide / 4},${base.sideSizes.ACSide / 4},${h}})`,
-        `SetFixed(H,true)`,
-        `ShowLabel(H,true)`,
-        `Pyra=Pyramid(Poly,H)`,
-    ]);
-    return {
-        commands,
-        h,
-        baseOfPyramidSides: base.sideSizes,
-    };
-};
 const calculateVolume = (sideSize, h) => {
     return new FractionNode(new MultiplyNode(new FractionNode((sideSize.ABSide * sideSize.ACSide).toTree(), (2).toTree()), h.toTree()), (3).toTree());
 };
-const generatePolygonWithGgbCmnds = () => {
-    const values = random(pythagoreTriplet);
-    const ABSide = values[0];
-    const ACSide = values[1];
-    return {
-        commands: [
-            `A=Point({0,0,0})`,
-            `B=Point({${ABSide},0,0})`,
-            `C=Point({0,${ACSide},0})`,
-            `ang=Angle(C,A,B)`,
-            `ShowLabel(ang,false)`,
-            `ShowLabel(A,True)`,
-            `ShowLabel(B,True)`,
-            `ShowLabel(C,True)`,
-            `SetFixed(A,true)`,
-            `SetFixed(B,true)`,
-            `SetFixed(C,true)`,
-            `Poly=Polygon(A,B,C)`,
-        ],
-        sideSizes: { ABSide, ACSide, BCSide: values[2] },
-    };
-};
 export const volumeOfPyramid = {
     id: "volumeOfPyramidWithTriangleRectBase",
     label: "Calculer le volume d'une pyramide dont la base est un triangle rectangle",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getVolumeOfPyramidWithTriangleRectBase, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -129,4 +173,6 @@ export const volumeOfPyramid = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/sequences/geometric/geometricFirstTermsGeneralSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricFirstTermsGeneralSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFirstTermsGeneralSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAyDF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}
+{"version":3,"file":"geometricFirstTermsGeneralSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFirstTermsGeneralSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAsEF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAc/D,CAAC"}