math-exercises 2.2.69 → 2.2.71

package/lib/exercises/math/geometry/areas/rightTriangleArea.js

@@ -4,31 +4,17 @@ exports.rightTriangleArea = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
-const triangle_1 = require("../../../../math/geometry/triangle");
+const rightTriangle_1 = require("../../../../math/geometry/rightTriangle");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../../math/utils/random/randint");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 const getRightTriangleArea = () => {
-    const vertices = [];
-    const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
-    for (let i = 0; i < 3; i++)
-        vertices.push(String.fromCharCode(code + i));
-    const triangle = triangle_1.TriangleConstructor.createRandomRightTriangle({
-        minRapport: 0.4,
-        maxRapport: 1.6,
-        names: vertices,
+    const triangle = rightTriangle_1.RightTriangleConstructor.randomNiceSides({
+        randomName: true,
     });
-    const sidesLengths = [
-        Math.round(triangle.getSideBnumber() / 2),
-        Math.round(triangle.getSideCnumber() / 2),
-    ];
-    const commands = [
-        ...triangle.generateCommands({
-            showLabels: [triangle.getSideBName(), triangle.getSideCName()],
-            setCaptions: [sidesLengths[0] + "", sidesLengths[1] + ""],
-        }),
-    ];
-    const answer = ((sidesLengths[0] * sidesLengths[1]) / 2 + "").replace(".", ",");
+    triangle.showSidesLength([0]);
+    const commands = [...triangle.commands];
+    const answer = triangle.getArea().frenchify();
     const answerTex = answer + "\\text{cm}^2";
     const ggb = new geogebraConstructor_1.GeogebraConstructor({
         commands,
@@ -36,14 +22,16 @@ const getRightTriangleArea = () => {
         hideGrid: true,
     });
     const question = {
-        instruction: `Calculer l'aire du triangle $${triangle.getTriangleName()}$ rectangle en ${triangle.getRightAngle()} sachant que $${triangle.getSideBName()} = ${sidesLengths[0]}$ cm et $${triangle.getSideCName()} = ${sidesLengths[1]}$ cm.`,
+        instruction: `Le triangle $${triangle.name}$ ci-dessous est rectangle en $${triangle.points[0].name}$, et tel que $${triangle.sides[1].toLengthTex()}$ cm et $${triangle.sides[2].toLengthTex()}$ cm.
+    
+Calculer l'aire de $${triangle.name}$.`,
         answer: answerTex,
         keys: ["cm", "cm2"],
         ggbOptions: ggb.getOptions({
             coords: triangle.generateCoords(),
         }),
         answerFormat: "tex",
-        identifiers: { sidesLengths },
+        identifiers: { triangleIdentifiers: triangle.toIdentifiers() },
     };
     return question;
 };

package/lib/exercises/math/geometry/areas/triangleArea.d.ts

@@ -1,5 +1,10 @@
 import { Exercise } from "../../../../exercises/exercise";
-type Identifiers = {};
+import { TriangleIdentifiers } from "../../../../math/geometry/triangle";
+type Identifiers = {
+    triangleIdentifiers: TriangleIdentifiers;
+    height: number;
+    base: number;
+};
 export declare const triangleArea: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=triangleArea.d.ts.map

package/lib/exercises/math/geometry/areas/triangleArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/triangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA6GtB,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}
+{"version":3,"file":"triangleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/triangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAYtC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAwFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/geometry/areas/triangleArea.js

@@ -9,65 +9,51 @@ const rational_1 = require("../../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../../math/utils/random/randint");
 const randomLetter_1 = require("../../../../utils/strings/randomLetter");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+const point_1 = require("../../../../math/geometry/point");
+const doWhile_1 = require("../../../../utils/doWhile");
+const segment_1 = require("../../../../math/geometry/segment");
+const round_1 = require("../../../../math/utils/round");
 const getTriangleArea = () => {
-    const vertices = [];
-    const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
-    for (let i = 0; i < 3; i++)
-        vertices.push(String.fromCharCode(code + i));
-    const triangle = triangle_1.TriangleConstructor.createRandomTriangle({
-        minAngle: 0.69,
-        maxAngle: 1.5,
-        names: vertices,
+    //segment de taille fixé
+    //puis hauteur de taille fixée placée sur segment (élargi)
+    //puis rotation
+    const base = (0, randfloat_1.randfloat)(1, 7, 1);
+    const height = (0, randfloat_1.randfloat)(1, 5, 1);
+    const angle = (0, randfloat_1.randfloat)(0, 2 * Math.PI);
+    const names = triangle_1.TriangleConstructor.randomName();
+    const A = point_1.PointConstructor.origin(names[0]);
+    const C = new point_1.Point(names[2], base.toTree(), (0).toTree()).rotate(angle, A);
+    const xH = (0, randfloat_1.randfloat)(-0.5 * base, 1.5 * base, 1, (x) => Math.abs(x) < 0.2 * base || Math.abs(x - base) < 0.2 * base);
+    const footName = (0, doWhile_1.doWhile)(() => (0, randomLetter_1.randomLetter)(true), (p) => names.includes(p));
+    const H = new point_1.Point(footName, xH.toTree(), (0).toTree()).rotate(angle, A);
+    const B = new point_1.Point(names[1], xH.toTree(), height.toTree()).rotate(angle, A);
+    const triangle = new triangle_1.Triangle([A, B, C], {
+        sidesLengths: [undefined, base.toTree(), undefined],
     });
-    const sides = [
-        triangle.getSideAName(),
-        triangle.getSideBName(),
-        triangle.getSideCName(),
-    ];
-    const sidesLengths = [
-        triangle.getSideAnumber(),
-        triangle.getSideBnumber(),
-        triangle.getSideCnumber(),
-    ].map((el) => Math.round(el / 2));
-    const angles = [
-        triangle.getAngleA(),
-        triangle.getAngleB(),
-        triangle.getAngleC(),
-    ];
-    const randoms = (0, shuffle_1.shuffle)([0, 1, 2]);
-    const height = Math.round(sidesLengths[randoms[1]] * Math.sin(angles[randoms[2]]));
-    const interceptName = (0, randomLetter_1.randomLetter)(true, vertices);
-    const commands = [
-        ...triangle.generateCommands({
-            showLabels: [sides[randoms[0]]],
-            setCaptions: [sidesLengths[randoms[0]] + ""],
-        }),
-        `poi = Intersect(PerpendicularLine(${vertices[randoms[0]]},${sides[randoms[0]]}),${sides[randoms[0]]})`,
-        `SetCaption(poi, "${interceptName}")`,
-        `ShowLabel(poi, true)`,
-        `seg = Segment(${vertices[randoms[0]]}, poi)`,
-        `ShowLabel(seg, true)`,
-        `SetCaption(seg, "${height}")`,
-        `SetLineStyle(seg, 1)`,
-        `alpha = Angle(${vertices[randoms[0]]},poi ,${vertices[randoms[1]]}, Line(${vertices[randoms[0]]},poi))`,
-        `ShowLabel(alpha, false)`,
-    ];
+    const heightSegment = new segment_1.Segment(B, H, { lengthNode: height.toTree() });
+    triangle.drawHeight(1, { footName });
     const ggb = new geogebraConstructor_1.GeogebraConstructor({
-        commands,
+        commands: triangle.commands,
         hideAxes: true,
         hideGrid: true,
     });
-    const answer = ((sidesLengths[randoms[0]] * height) / 2 + "").replace(".", ",");
-    const answerTex = answer + "\\text{cm}^2";
+    const answer = (0, round_1.round)((height * base) / 2, 1);
     const question = {
-        instruction: `Calculer l'aire du triangle $${triangle.getTriangleName()}$ sachant que $${sides[randoms[0]]} = ${sidesLengths[randoms[0]]}$ cm et $${vertices[randoms[0]]}${interceptName} = ${height}$ cm.`,
-        answer: answerTex,
+        instruction: `Calculer l'aire du triangle $${triangle.name}$ sachant que $${triangle.sides[1].toLengthTex()}$ cm et $${heightSegment.toLengthTex()}$ cm. 
+    
+Arrondir à $0,1$ cm près.`,
+        answer: answer.frenchify() + "\\text{cm}^2",
         keys: ["cm", "cm2"],
         ggbOptions: ggb.getOptions({
-            coords: triangle.generateCoords(),
+            coords: ggb.getCoordsForPoints([A, B, C, H]),
         }),
         answerFormat: "tex",
-        identifiers: { sidesLengths },
+        identifiers: {
+            triangleIdentifiers: triangle.toIdentifiers(),
+            height,
+            base,
+        },
     };
     return question;
 };

package/lib/exercises/math/geometry/euclidianConstructions/pointImageFromTranslation.js

@@ -23,7 +23,7 @@ const getEndPoint = (identifiers) => {
     ];
     const vector = vector_1.VectorConstructor.fromPoints(translationPoints[0], translationPoints[1]);
     const startPoint = point_1.PointConstructor.fromIdentifiers(identifiers.points.find((p) => p.name === identifiers.startPoint));
-    const end = vector.getEndPoint(startPoint, "M");
+    const end = vector.getEndPoint(startPoint, identifiers.startPoint + "'");
     return end;
 };
 // const getHint: GetHint<Identifiers> = (identifiers) => {};

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

@@ -9,4 +9,6 @@ export * from "./volumes";
 export * from "./euclidianConstructions";
 export * from "./shapes";
 export * from "./parametric";
+export * from "./quadrilaterals";
+export * from "./angles";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/geometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAE1B,cAAc,0BAA0B,CAAC;AACzC,cAAc,UAAU,CAAC;AAEzB,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/geometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAE1B,cAAc,0BAA0B,CAAC;AACzC,cAAc,UAAU,CAAC;AAEzB,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC"}

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

@@ -27,3 +27,5 @@ __exportStar(require("./euclidianConstructions"), exports);
 __exportStar(require("./shapes"), exports);
 // export * from "./euclidian";
 __exportStar(require("./parametric"), exports);
+__exportStar(require("./quadrilaterals"), exports);
+__exportStar(require("./angles"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"isTriangleRight.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/isTriangleRight.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAyGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAiBjD,CAAC"}
+{"version":3,"file":"isTriangleRight.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/isTriangleRight.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAyGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAiBjD,CAAC"}

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

@@ -1,9 +1,6 @@
 import { Exercise } from "../../../../exercises/exercise";
 import { TriangleIdentifiers } from "../../../../math/geometry/triangle";
 type Identifiers = {
-    sideA: string;
-    sideB: string;
-    sideC: string;
     triangleIdentifiers: TriangleIdentifiers;
 };
 export declare const pythagore: Exercise<Identifiers>;

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,0BAA0B,CAAC;AAElC,OAAO,EAEL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAStC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAiEF,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,EAST,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAUtC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA8DF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}

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

@@ -3,57 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pythagore = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const triangle_1 = require("../../../../math/geometry/triangle");
-const randint_1 = require("../../../../math/utils/random/randint");
 const lengthNode_1 = require("../../../../tree/nodes/geometry/lengthNode");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
+const rightTriangle_1 = require("../../../../math/geometry/rightTriangle");
 const getPythagore = () => {
-    const vertices = [];
-    const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
-    for (let i = 0; i < 3; i++)
-        vertices.push(String.fromCharCode(code + i));
-    const triangle = triangle_1.TriangleConstructor.createRandomRightTriangle({
-        minRapport: 0.7,
-        maxRapport: 1.3,
-        names: vertices,
+    const triangle = rightTriangle_1.RightTriangleConstructor.randomNiceSides({
+        randomName: true,
     });
-    const sideA = triangle.getSideAName();
-    const sideB = triangle.getSideBName();
-    const sideC = triangle.getSideCName();
     const triangleIdentifiers = triangle.toIdentifiers();
     const ggb = new geogebraConstructor_1.GeogebraConstructor({
-        commands: triangle.generateCommands({}),
+        commands: triangle.commands,
         hideAxes: true,
         hideGrid: true,
     });
-    const answer = `${sideA}^2=${sideB}^2+${sideC}^2`;
+    const answer = triangle.getPythagorianTex();
     const question = {
         instruction: "Écrire l'égalité de Pythagore pour le triangle rectangle suivant : ",
         answer,
-        keys: [...vertices, "equal"],
+        keys: [...triangle.points.map((p) => p.name), "equal"],
         ggbOptions: ggb.getOptions({
             coords: triangle.generateCoords(),
         }),
         answerFormat: "tex",
-        identifiers: { sideA, sideB, sideC, triangleIdentifiers },
+        identifiers: { triangleIdentifiers },
     };
     return question;
 };
-const getPropositions = (n, { answer, sideA, sideB, sideC }) => {
+const getPropositions = (n, { answer, triangleIdentifiers }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA} = ${sideB} + ${sideC}`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2 = ${sideB}^2 - ${sideC}^2`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideB}^2 = ${sideA}^2 + ${sideC}^2`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideC}^2 = ${sideA}^2 + ${sideB}^2`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2 = ${sideB} + ${sideC}^2`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2 = ${sideB}^2 + ${sideC}`);
+    const triangle = rightTriangle_1.RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const [sideA, sideB, sideC] = triangle.sides.map((s) => s.toInsideName());
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}=${sideB}+${sideC}`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2=${sideB}^2-${sideC}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideB}^2=${sideA}^2+${sideC}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideC}^2= ${sideA}^2+${sideB}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2=${sideB}+${sideC}^2`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `${sideA}^2=${sideB}^2+${sideC}`);
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { sideA, sideB, sideC }) => {
+const isAnswerValid = (ans, { triangleIdentifiers }) => {
+    const triangle = rightTriangle_1.RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const [sideA, sideB, sideC] = triangle.sides.map((s) => s.toInsideName());
     const answer = new equalNode_1.EqualNode(new powerNode_1.SquareNode(new lengthNode_1.LengthNode(sideA)), new addNode_1.AddNode(new powerNode_1.SquareNode(new lengthNode_1.LengthNode(sideB)), new powerNode_1.SquareNode(new lengthNode_1.LengthNode(sideC))));
     const texs = answer.toAllValidTexs();
     return texs.includes(ans);

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

@@ -1,8 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise";
 import { TriangleIdentifiers } from "../../../../math/geometry/triangle";
 type Identifiers = {
-    square: number;
-    sideLengths: number[];
+    sideAsked: number;
     triangleIdentifiers: TriangleIdentifiers;
 };
 export declare const pythagoreCalcul: Exercise<Identifiers>;

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,0BAA0B,CAAC;AAGlC,OAAO,EAEL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAUtC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAoGF,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,EAQT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAEL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAiBtC,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"}

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

@@ -4,95 +4,60 @@ exports.pythagoreCalcul = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
-const triangle_1 = require("../../../../math/geometry/triangle");
-const real_1 = require("../../../../math/numbers/reals/real");
-const randint_1 = require("../../../../math/utils/random/randint");
-const sqrtNode_1 = require("../../../../tree/nodes/functions/sqrtNode");
-const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
-const coinFlip_1 = require("../../../../utils/alea/coinFlip");
-const isInt_1 = require("../../../../utils/isInt");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const random_1 = require("../../../../utils/alea/random");
+const rightTriangle_1 = require("../../../../math/geometry/rightTriangle");
+const sqrtVEA_1 = require("../../../../exercises/vea/sqrtVEA");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+const round_1 = require("../../../../math/utils/round");
 const getPythagoreCalcul = () => {
-    const vertices = [];
-    const code = 65 + (0, randint_1.randint)(0, 24); // Générer un code de caractère majuscule aléatoire (A-Z)
-    for (let i = 0; i < 3; i++)
-        vertices.push(String.fromCharCode(code + i));
-    const triangle = triangle_1.TriangleConstructor.createRandomRightTriangle({
-        minRapport: 0.7,
-        maxRapport: 1.3,
-        names: vertices,
+    const triangle = rightTriangle_1.RightTriangleConstructor.randomNiceSides({
+        randomName: true,
     });
-    const sides = [
-        triangle.getSideCName(),
-        triangle.getSideBName(),
-        triangle.getSideAName(),
-    ];
-    const sideLengths = [
-        triangle.getSideCnumber(),
-        triangle.getSideBnumber(),
-        triangle.getSideAnumber(),
-    ].map((el) => Math.round(el / 2));
-    const zeroOrOne = (0, shuffle_1.shuffle)([0, 1]);
-    const randoms = (0, coinFlip_1.coinFlip)() ? [...zeroOrOne, 2] : [2, ...zeroOrOne];
-    // le but est d'avoir une chance sur 2 d'avoir un hépoténus et une 1 chance sur 2 d'avoir un a des 2 autres cote
-    let answer;
-    let square;
-    if (randoms[2] === 2) {
-        // cas de l'hypoténus
-        square = sideLengths[0] ** 2 + sideLengths[1] ** 2;
-    }
-    else {
-        // les deux autres cotés
-        square = sideLengths[randoms[0]] ** 2 - sideLengths[randoms[1]] ** 2;
-    }
-    const sqrt = Math.sqrt(square);
-    answer = (0, isInt_1.isInt)(sqrt) ? sqrt + "" : `\\sqrt{${square}}`;
-    const commands = [
-        ...triangle.generateCommands({
-            showLabels: [...sides, sides[randoms[2]]],
-            setCaptions: [...sideLengths.map((el) => el + ""), "?"],
-            highlightedSide: sides[randoms[2]],
-        }),
-    ];
+    //une chance sur deux d'avoir hypoténuse
+    const sideIndexAsked = (0, random_1.random)([0, (0, random_1.random)([1, 2])]);
+    const answer = triangle.sides[sideIndexAsked].getLengthNode().toTex();
+    triangle.showSidesLength([sideIndexAsked]);
+    const commands = [...triangle.commands];
     const ggb = new geogebraConstructor_1.GeogebraConstructor({
         commands,
         hideAxes: true,
         hideGrid: true,
     });
     const triangleIdentifiers = triangle.toIdentifiers();
-    answer = answer + "";
     const question = {
-        instruction: `Dans le triangle $${triangle.getTriangleName()}$ rectangle en $${triangle.getRightAngle()}$, on sait que $${sides[randoms[0]]} = ${sideLengths[randoms[0]]}$ et que $${sides[randoms[1]]} = ${sideLengths[randoms[1]]}$. Calculer la longueur exacte $${sides[randoms[2]]}$.`,
+        instruction: `Dans le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$, on sait que $${triangle.sides[(sideIndexAsked + 1) % 3].toLengthTex()}$ et que $${triangle.sides[(sideIndexAsked + 2) % 3].toLengthTex()}$. 
+    
+Calculer la longueur exacte $${triangle.sides[sideIndexAsked].toInsideName()}$.`,
         answer,
-        keys: [...vertices, "equal"],
+        keys: [],
         ggbOptions: ggb.getOptions({
             coords: triangle.generateCoords(),
         }),
         answerFormat: "tex",
-        identifiers: { square, sideLengths, triangleIdentifiers },
+        identifiers: { sideAsked: sideIndexAsked, triangleIdentifiers },
     };
     return question;
 };
-const getPropositions = (n, { answer }) => {
+const getPropositions = (n, { answer, triangleIdentifiers, sideAsked }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    const triangle = rightTriangle_1.RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const lengths = triangle.sides.map((s) => s.getLength());
+    //erreur d'oubli de la racine
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, powerNode_1.square)(answer.unfrenchify()).simplify().toTex());
+    if (sideAsked !== 0) {
+        //erreur d'application a^2+b^2 = c^2 alors qu'on cherche pas l'hypo
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(Math.sqrt(lengths[0] ** 2 + lengths[3 - sideAsked] ** 2), 1).frenchify());
+    }
     while (propositions.length < n) {
-        const temp = (0, randint_1.randint)(2, 300);
-        const squareRoot = new real_1.SquareRoot(temp);
-        const wrongAnswer = Math.sqrt(temp) === Math.floor(Math.sqrt(temp))
-            ? Math.sqrt(temp).toString()
-            : squareRoot.toTree().toTex();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randfloat_1.randfloat)(1, 100, 1).frenchify());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { square }) => {
-    const sqrt = Math.sqrt(square);
-    const answer = (0, isInt_1.isInt)(sqrt)
-        ? new numberNode_1.NumberNode(sqrt)
-        : new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(square), { allowSimplifySqrt: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, sideAsked, triangleIdentifiers }) => {
+    return (0, sqrtVEA_1.sqrtVEA)(ans, answer);
 };
 exports.pythagoreCalcul = {
     id: "pythagoreCalcul",

package/lib/exercises/math/geometry/quadrilaterals/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./quadrilateralRecognition";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/geometry/quadrilaterals/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/quadrilaterals/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC"}

package/lib/exercises/math/geometry/quadrilaterals/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./quadrilateralRecognition"), exports);

package/lib/exercises/math/geometry/quadrilaterals/quadrilateralRecognition.d.ts

@@ -0,0 +1,14 @@
+import { Exercise } from "../../../../exercises/exercise";
+import { ParallelogramIdentifiers } from "../../../../math/geometry/parallelogram";
+import { RectangleIdentifiers } from "../../../../math/geometry/rectangle";
+import { RhombusIdentifiers } from "../../../../math/geometry/rhombus";
+import { SquareIdentifiers } from "../../../../math/geometry/square";
+type Identifiers = {
+    shape: string;
+    showDiagonals: boolean;
+    drawAngles: boolean;
+    shapeIdentifiers: RectangleIdentifiers | SquareIdentifiers | RhombusIdentifiers | ParallelogramIdentifiers;
+};
+export declare const quadrilateralRecognition: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=quadrilateralRecognition.d.ts.map

package/lib/exercises/math/geometry/quadrilaterals/quadrilateralRecognition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quadrilateralRecognition.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/quadrilaterals/quadrilateralRecognition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAEL,wBAAwB,EACzB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAEL,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGL,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AAIpC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,EACZ,oBAAoB,GACpB,iBAAiB,GACjB,kBAAkB,GAClB,wBAAwB,CAAC;CAC9B,CAAC;AA0MF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAoB1D,CAAC"}