math-exercises 2.0.1 → 2.0.2

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

@@ -0,0 +1,9 @@
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    sideLengths: number[];
+    randAngle: number;
+    randSides: number[];
+};
+export declare const trigonometryAngleCalcul: MathExercise<Identifiers>;
+export {};
+//# sourceMappingURL=trigonometryAngleCalcul.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAyEF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}

package/lib/exercises/trigonometry/trigonometryAngleCalcul.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trigonometryAngleCalcul = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const triangles_1 = require("../../math/geometry/triangles");
+const randint_1 = require("../../math/utils/random/randint");
+const round_1 = require("../../math/utils/round");
+const shuffle_1 = require("../../utils/shuffle");
+const getTrigonometryAngleCalcul = () => {
+    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 = triangles_1.TriangleConstructor.createRandomRightTriangle({
+        minRapport: 0.5,
+        maxRapport: 1.5,
+        names: vertices,
+    });
+    const sides = [
+        triangle.getSideCName(),
+        triangle.getSideBName(),
+        triangle.getSideAName(),
+    ];
+    const sideLengths = [
+        triangle.getSideCnumber(),
+        triangle.getSideBnumber(),
+        triangle.getSideAnumber(),
+    ].map((el) => (0, round_1.round)(el / 2, 2));
+    const angle = [triangle.vertexB.name, triangle.vertexC.name];
+    const randAngle = (0, randint_1.randint)(0, 2);
+    const randSides = (0, shuffle_1.shuffle)([0, 1, 2]);
+    const answer = randAngle === 0
+        ? Math.round((Math.acos(sideLengths[0] / sideLengths[2]) * 180) / Math.PI)
+        : Math.round((Math.acos(sideLengths[1] / sideLengths[2]) * 180) / Math.PI);
+    const answerTex = answer + "^{\\circ}";
+    const question = {
+        instruction: `Le triangle $${triangle.getTriangleName()}$ rectangle en $${triangle.getRightAngle()}$ est tel que $${sides[randSides[0]]} = ${(sideLengths[randSides[0]] + "").replace(".", ",")}$ cm et $${sides[randSides[1]]} = ${(sideLengths[randSides[1]] + "").replace(".", ",")}$ cm. Calculer $\\widehat{${angle[randAngle]}}$ à $1^\\circ$ près.`,
+        answer: answerTex,
+        keys: ["degree"],
+        commands: [
+            ...triangle.generateCommands({ highlightedAngle: angle[randAngle] }),
+        ],
+        coords: triangle.generateCoords(),
+        answerFormat: "tex",
+        identifiers: { randAngle, sideLengths, randSides },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(20, 80) + "°");
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return [answer, answer.split("^")[0]].includes(ans);
+};
+exports.trigonometryAngleCalcul = {
+    id: "trigonometryAngleCalcul",
+    connector: "=",
+    label: "Utiliser la trigonométrie pour calculer un angle",
+    levels: ["4ème", "3ème", "2nde"],
+    isSingleStep: false,
+    sections: ["Trigonométrie", "Géométrie euclidienne"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometryAngleCalcul, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

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

@@ -0,0 +1,10 @@
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    sideLengths: number[];
+    randAngle: number;
+    randSide: number;
+    randSideQuestion: number;
+};
+export declare const trigonometrySideCalcul: MathExercise<Identifiers>;
+export {};
+//# sourceMappingURL=trigonometrySideCalcul.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAwFF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAa5D,CAAC"}

package/lib/exercises/trigonometry/trigonometrySideCalcul.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trigonometrySideCalcul = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const triangles_1 = require("../../math/geometry/triangles");
+const randint_1 = require("../../math/utils/random/randint");
+const round_1 = require("../../math/utils/round");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const shuffle_1 = require("../../utils/shuffle");
+const getTrigonometrySideCalcul = () => {
+    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 = triangles_1.TriangleConstructor.createRandomRightTriangle({
+        minRapport: 0.5,
+        maxRapport: 1.5,
+        names: vertices,
+    });
+    const sides = [
+        triangle.getSideCName(),
+        triangle.getSideBName(),
+        triangle.getSideAName(),
+    ];
+    const sideLengths = [
+        triangle.getSideCnumber(),
+        triangle.getSideBnumber(),
+        triangle.getSideAnumber(),
+    ].map((el) => (0, round_1.round)(el / 2, 2));
+    const angle = [triangle.vertexB.name, triangle.vertexC.name];
+    const randAngle = (0, randint_1.randint)(0, 2);
+    const randSide = (0, randint_1.randint)(0, 3); // valeurs possible : 0 1 2
+    const randSideQuestion = (0, randint_1.randint)(0, 3, [randSide]); // si rand = 0, valeurs possible 1 2
+    const angleValue = [
+        (0, round_1.round)((Math.acos(sideLengths[0] / sideLengths[2]) * 180) / Math.PI, 1),
+        (0, round_1.round)((Math.acos(sideLengths[1] / sideLengths[2]) * 180) / Math.PI, 1),
+    ];
+    const commands = [
+        ...triangle.generateCommands({
+            highlightedAngle: angle[randAngle],
+            colorHighlightedAngle: "Black",
+            showLabels: [sides[randSideQuestion]],
+            setCaptions: ["?"],
+            highlightedSide: sides[randSideQuestion],
+        }),
+    ];
+    const answer = `${((0, round_1.round)(sideLengths[randSideQuestion], 1) + "").replace(".", ",")}`;
+    const question = {
+        instruction: `Le triangle $${triangle.getTriangleName()}$ rectangle en $${triangle.getRightAngle()}$ est tel que $${sides[randSide]} = ${(sideLengths[randSide] + "").replace(".", ",")}$ cm et $\\widehat{${angle[randAngle]}} = ${(angleValue[randAngle] + "").replace(".", ",")}^\\circ$. Calculer $${sides[randSideQuestion]}$ à $0,1$ cm près.`,
+        answer,
+        keys: [],
+        commands,
+        coords: triangle.generateCoords(),
+        answerFormat: "tex",
+        identifiers: { randAngle, randSide, randSideQuestion, sideLengths },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `${((0, round_1.round)((0, randint_1.randint)(11, 100) / 10, 1) + "").replace(".", ",")}`);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { answer }) => {
+    const answerTree = new numberNode_1.NumberNode(Number(answer.replace(",", ".")));
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.trigonometrySideCalcul = {
+    id: "trigonometrySideCalcul",
+    connector: "=",
+    label: "Utiliser la trigonométrie pour calculer un côté",
+    levels: ["4ème", "3ème", "2nde"],
+    isSingleStep: false,
+    sections: ["Trigonométrie", "Géométrie euclidienne"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometrySideCalcul, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/utils/getDistinctQuestions.d.ts

@@ -1,4 +1,4 @@
-import { Question } from '../exercise';
+import { Question } from "../exercise";
 export declare function equalTab<T>(array1: T[], array2: T[]): boolean;
 /**
  *
@@ -7,5 +7,5 @@ export declare function equalTab<T>(array1: T[], array2: T[]): boolean;
  * @param max included
  * @returns
  */
-export declare const getDistinctQuestions: (generator: () => Question<any, any>, nb: number, max?: number) => Question<any, any>[];
+export declare const getDistinctQuestions: (generator: () => Question<any>, nb: number, max?: number) => Question<any>[];
 //# sourceMappingURL=getDistinctQuestions.d.ts.map

package/lib/exercises/utils/getDistinctQuestions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDistinctQuestions.d.ts","sourceRoot":"","sources":["../../../src/exercises/utils/getDistinctQuestions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,WAMnD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,cACpB,MAAM,SAAS,GAAG,EAAE,GAAG,CAAC,MAC/B,MAAM,QACJ,MAAM,KACX,SAAS,GAAG,EAAE,GAAG,CAAC,EAmBpB,CAAC"}
+{"version":3,"file":"getDistinctQuestions.d.ts","sourceRoot":"","sources":["../../../src/exercises/utils/getDistinctQuestions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,WAOnD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,cACpB,MAAM,SAAS,GAAG,CAAC,MAC1B,MAAM,QACJ,MAAM,KACX,SAAS,GAAG,CAAC,EAkBf,CAAC"}

package/lib/exercises/utils/getDistinctQuestions.js

@@ -23,14 +23,13 @@ exports.equalTab = equalTab;
  */
 const getDistinctQuestions = (generator, nb, max) => {
     const res = [];
-    const trueStop = max === undefined ? nb : nb > max ? max : nb;
+    const trueStop = max === undefined ? nb : Math.min(nb, max);
     for (let i = 0; i < trueStop ?? nb; i++) {
         let question;
         do {
             question = generator();
         } while (res.some((q) => q.instruction === question.instruction &&
-            q.startStatement === question.startStatement &&
-            equalTab(q.commands, question.commands)));
+            (!q.commands || equalTab(q.commands, question.commands))));
         res.push(question);
     }
     return res;

package/lib/exercises/utils/keys/equationKeys.d.ts

@@ -0,0 +1,3 @@
+import { KeyId } from "../../../types/keyIds";
+export declare const equationKeys: KeyId[];
+//# sourceMappingURL=equationKeys.d.ts.map

package/lib/exercises/utils/keys/equationKeys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"equationKeys.d.ts","sourceRoot":"","sources":["../../../../src/exercises/utils/keys/equationKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,eAAO,MAAM,YAAY,EAAE,KAAK,EAQ/B,CAAC"}

package/lib/exercises/utils/keys/equationKeys.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.equationKeys = void 0;
+exports.equationKeys = [
+    "x",
+    "S",
+    "equal",
+    "lbrace",
+    "semicolon",
+    "rbrace",
+    "emptyset",
+];

package/lib/exercises/utils/keys/inequationKeys.d.ts

@@ -0,0 +1,3 @@
+import { KeyId } from "../../../types/keyIds";
+export declare const inequationKeys: KeyId[];
+//# sourceMappingURL=inequationKeys.d.ts.map

package/lib/exercises/utils/keys/inequationKeys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inequationKeys.d.ts","sourceRoot":"","sources":["../../../../src/exercises/utils/keys/inequationKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,eAAO,MAAM,cAAc,EAAE,KAAK,EAajC,CAAC"}

package/lib/exercises/utils/keys/inequationKeys.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inequationKeys = void 0;
+exports.inequationKeys = [
+    "x",
+    "sup",
+    "inf",
+    "geq",
+    "leq",
+    "S",
+    "equal",
+    "lbracket",
+    "semicolon",
+    "rbracket",
+    "infty",
+    "emptyset",
+];