math-exercises 3.0.47 → 3.0.48

package/lib/exercises/math/geometry/triangles/triangleThirdAngleValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangleThirdAngleValue.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/triangles/triangleThirdAngleValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAGL,mBAAmB,EAEpB,MAAM,2CAA2C,CAAC;AAQnD,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAkIF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAmBzD,CAAC"}
+{"version":3,"file":"triangleThirdAngleValue.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/triangles/triangleThirdAngleValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAGL,mBAAmB,EAEpB,MAAM,2CAA2C,CAAC;AASnD,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA8IF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAoBzD,CAAC"}

package/lib/exercises/math/geometry/triangles/triangleThirdAngleValue.js

@@ -6,6 +6,7 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
 import { DegreeNode } from "../../../../tree/nodes/geometry/degree.js";
 import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
 import { degreeParser } from "../../../../tree/parsers/degreeParser.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const getPropositions = (n, { answer }) => {
@@ -20,7 +21,13 @@ const getPropositions = (n, { answer }) => {
 const getAnswer = (identifiers) => {
     const { triangleIdentifiers, angleAsked } = identifiers;
     const triangle = TriangleConstructor.fromIdentifiers(triangleIdentifiers);
-    return triangle.angles[angleAsked].getValueNode(true).toTex() + "^{\\circ}";
+    const angles = [
+        triangle.angles[(angleAsked + 1) % 3].getValueNode(true),
+        triangle.angles[(angleAsked + 2) % 3].getValueNode(true),
+    ];
+    const addAngles = add(angles[0], angles[1]);
+    const simp = addAngles.simplify();
+    return substract(180, simp).simplify().toTex() + "^{\\circ}";
 };
 const getInstruction = (identifiers) => {
     const { triangleIdentifiers, angleAsked } = identifiers;
@@ -66,7 +73,9 @@ $$`;
 const getGGBOptions = (identifiers) => {
     const { triangleIdentifiers, angleAsked } = identifiers;
     const triangle = TriangleConstructor.fromIdentifiers(triangleIdentifiers);
-    triangle.drawAngles([angleAsked], { fitCaption: true, color: "red" });
+    // triangle.drawAngles([angleAsked], { fitCaption: true, color: "black" });
+    triangle.drawAngles([angleAsked]);
+    triangle.highlightAngle(angleAsked, { color: "red" });
     const ggb = new GeogebraConstructor({
         commands: [...triangle.commands],
         hideAxes: true,
@@ -101,7 +110,10 @@ const getTriangleThirdAngleValueQuestion = (opts) => {
         triangleIdentifiers: triangle.toIdentifiers(),
         angleAsked: randint(0, 3),
     };
-    const question = {
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
         keys: getKeys(identifiers),
@@ -111,7 +123,6 @@ const getTriangleThirdAngleValueQuestion = (opts) => {
         correction: getCorrection(identifiers),
         ggbOptions: getGGBOptions(identifiers),
     };
-    return question;
 };
 export const triangleThirdAngleValue = {
     id: "triangleThirdAngleValue",
@@ -131,4 +142,5 @@ export const triangleThirdAngleValue = {
     getGGBOptions,
     hasGeogebra: true,
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/trigonometry/trigonometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AASnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAsHF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAe9C,CAAC"}
+{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AASnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAyJF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAmB9C,CAAC"}

package/lib/exercises/math/trigonometry/trigonometry.js

@@ -7,17 +7,18 @@ import { LengthNode } from "../../../tree/nodes/geometry/lengthNode.js";
 import { FractionNode } from "../../../tree/nodes/operators/fractionNode.js";
 import { random } from "../../../utils/alea/random.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
-const getTrigonometry = () => {
-    const triangle = RightTriangleConstructor.randomNiceSides({
-        randomName: true,
-    });
+const getInstruction = (identifiers) => {
+    const { randAngle, triangleIdentifiers, randTrigo } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
     const trigo = ["le cosinus", "le sinus", "la tangente"];
-    const randTrigo = randint(0, 3);
-    const randAngle = random([1, 2]);
-    triangle.highlightAngle(randAngle, { color: "red" });
-    const [sideA, sideB, sideC] = triangle.sides.map((s) => s.toInsideName());
     const angleSummit = triangle.points[randAngle].name;
+    return `À quel quotient est égal ${trigo[randTrigo]} de l'angle $${triangle.angles[randAngle].toTex()}$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { randAngle, triangleIdentifiers, randTrigo } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
     let quotient;
+    const [sideA, sideB, sideC] = triangle.sides.map((s) => s.toInsideName());
     switch (randAngle) {
         case 1: //angle B
             quotient = [
@@ -35,27 +36,49 @@ const getTrigonometry = () => {
             ];
             break;
     }
+    const answer = quotient[randTrigo];
+    return answer;
+};
+const getKeys = (identifiers) => {
+    const { randAngle, triangleIdentifiers, randTrigo } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    return [...triangle.points.map((p) => p.name), "equal"];
+};
+const getGGBOptions = (identifiers) => {
+    const { randAngle, triangleIdentifiers, randTrigo } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    triangle.highlightAngle(randAngle, { color: "red" });
     const ggb = new GeogebraConstructor({
         commands: triangle.commands,
         hideAxes: true,
         hideGrid: true,
     });
-    const answer = quotient[randTrigo];
-    const question = {
-        instruction: `À quel quotient est égal ${trigo[randTrigo]} de l'angle $\\widehat{${angleSummit}}$ ?`,
-        answer,
-        keys: [...triangle.points.map((p) => p.name), "equal"],
-        ggbOptions: ggb.getOptions({
-            coords: triangle.generateCoords(),
-        }),
+    return ggb.getOptions({
+        coords: triangle.generateCoords(),
+    });
+};
+const getTrigonometry = () => {
+    const triangle = RightTriangleConstructor.randomNiceSides({
+        randomName: true,
+    });
+    const randTrigo = randint(0, 3);
+    const randAngle = random([1, 2]);
+    const identifiers = {
+        triangleIdentifiers: triangle.toIdentifiers(),
+        randAngle,
+        randTrigo,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: getKeys(identifiers),
+        ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
-        identifiers: {
-            triangleIdentifiers: triangle.toIdentifiers(),
-            randAngle,
-            randTrigo,
-        },
+        identifiers,
     };
-    return question;
 };
 const getPropositions = (n, { answer, triangleIdentifiers }) => {
     const propositions = [];
@@ -116,4 +139,8 @@ export const trigonometry = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getGGBOptions,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/trigonometry/trigonometryAngleCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAOnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAyDF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAOnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA+EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAmBzD,CAAC"}

package/lib/exercises/math/trigonometry/trigonometryAngleCalcul.js

@@ -5,39 +5,57 @@ import { RightTriangleConstructor } from "../../../math/geometry/triangles/right
 import { randint } from "../../../math/utils/random/randint.js";
 import { round } from "../../../math/utils/round.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
-const getTrigonometryAngleCalcul = () => {
-    const triangle = RightTriangleConstructor.randomNiceSides({
-        randomName: true,
-    });
-    const randAngle = randint(1, 3);
-    const hiddenSide = randint(0, 3);
+const getInstruction = (identifiers) => {
+    const { randAngle, hiddenSide, triangleIdentifiers } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
     const givenSides = triangle.sides.filter((s, i) => i !== hiddenSide);
+    return `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${givenSides[0].toLengthTex()}$ cm et $${givenSides[1].toLengthTex()}$ cm. 
+    
+Calculer $\\widehat{${triangle.points[randAngle].name}}$ à $1^\\circ$ près.`;
+};
+const getAnswer = (identifiers) => {
+    const { randAngle, hiddenSide, triangleIdentifiers } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const answer = round(triangle.angles[randAngle].evaluate(), 0);
+    return answer + "^{\\circ}";
+};
+const getGGBOptions = (identifiers) => {
+    const { randAngle, hiddenSide, triangleIdentifiers } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
     triangle.showSidesLength([hiddenSide]);
     triangle.highlightAngle(randAngle, { color: "red" });
-    const answer = round(triangle.angles[randAngle].evaluate(), 0);
-    const answerTex = answer + "^{\\circ}";
     const ggb = new GeogebraConstructor({
         commands: triangle.commands,
         hideAxes: true,
         hideGrid: true,
     });
-    const question = {
-        instruction: `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${givenSides[0].toLengthTex()}$ cm et $${givenSides[1].toLengthTex()}$ cm. 
-    
-Calculer $\\widehat{${triangle.points[randAngle].name}}$ à $1^\\circ$ près.`,
-        answer: answerTex,
+    return ggb.getOptions({
+        coords: triangle.generateCoords(),
+    });
+};
+const getTrigonometryAngleCalcul = () => {
+    const triangle = RightTriangleConstructor.randomNiceSides({
+        randomName: true,
+    });
+    const randAngle = randint(1, 3);
+    const hiddenSide = randint(0, 3);
+    const identifiers = {
+        randAngle,
+        hiddenSide,
+        triangleIdentifiers: triangle.toIdentifiers(),
+    };
+    const question = getQuestionFromIdentifiers(identifiers);
+    return question;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["degree"],
-        ggbOptions: ggb.getOptions({
-            coords: triangle.generateCoords(),
-        }),
+        ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
-        identifiers: {
-            randAngle,
-            hiddenSide,
-            triangleIdentifiers: triangle.toIdentifiers(),
-        },
+        identifiers,
     };
-    return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -64,4 +82,8 @@ export const trigonometryAngleCalcul = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getGGBOptions,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAMnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA8OF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}
+{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAMnD,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAiPF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAoBxD,CAAC"}

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.js

@@ -12,7 +12,7 @@ const getInstruction = (identifiers) => {
     const { givenAngle, givenSide, sideAsked, triangleIdentifiers } = identifiers;
     const triangle = TriangleConstructor.fromIdentifiers(triangleIdentifiers);
     const angleValue = triangle.angles[givenAngle].evaluate().frenchify();
-    return `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${triangle.sides[givenSide].toLengthTex()}$ cm et $\\widehat{${triangle.points[givenAngle].name}} = ${angleValue}^\\circ$. 
+    return `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${triangle.sides[givenSide].toLengthTex()}$ cm et $${triangle.angles[givenAngle].toTex()} = ${angleValue}^\\circ$. 
     
 Calculer $${triangle.sides[sideAsked].toInsideName()}$ à $0,1$ cm près.`;
 };
@@ -51,7 +51,10 @@ const getTrigonometrySideCalcul = () => {
         sideAsked,
         triangleIdentifiers: triangle.toIdentifiers(),
     };
-    const question = {
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
         instruction: getInstruction(identifiers),
         answer: getAnswer(identifiers),
         hint: getHint(identifiers),
@@ -61,7 +64,6 @@ const getTrigonometrySideCalcul = () => {
         answerFormat: "tex",
         identifiers,
     };
-    return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -223,4 +225,5 @@ export const trigonometrySideCalcul = {
     getGGBOptions,
     getCorrection,
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/math/geometry/triangles/triangle.js

@@ -78,7 +78,7 @@ export class Triangle {
         this.props = props;
         this.name = points.map((p) => p.name).join("");
         this.points = points;
-        const anglePoints = [points[0], points[2], points[1]];
+        const anglePoints = [points[0], points[1], points[2]];
         this.angles = [
             new Angle(arrayRotation(anglePoints, 2), {
                 radianValueNode: props?.anglesRadianValues?.[0],
@@ -166,7 +166,7 @@ export class Triangle {
     showSidesLength(hiddenSides) {
         this.commands.push(...this.sides
             .filter((s, i) => !hiddenSides?.includes(i))
-            .flatMap((s) => s.getFitCaptionCommands()));
+            .flatMap((s) => s.getFitCaptionCommands({ size: "scriptsize" })));
     }
     getHeight(summitIndex, opts) {
         const base = LineConstructor.fromSegment(this.sides[summitIndex]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.47",
+  "version": "3.0.48",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [