math-exercises 2.0.0 → 2.0.2

package/lib/exercises/sets/setBelonging.js

@@ -14,42 +14,51 @@ const getSetBelongingQuestion = () => {
     //racine carrée simplifiable en entier / Fraction
     //
     const type = (0, randint_1.randint)(0, 5);
-    let answer = '';
-    let nb = '';
+    let answer = "";
+    let nb = "";
     switch (type) {
         case 0:
-            nb = (0, randint_1.randint)(0, 1000) + '';
-            answer = '\\mathbb{N}';
+            nb = (0, randint_1.randint)(0, 1000) + "";
+            answer = "\\mathbb{N}";
             break;
         case 1:
-            nb = -(0, randint_1.randint)(0, 1000) + '';
-            answer = '\\mathbb{Z}';
+            nb = -(0, randint_1.randint)(0, 1000) + "";
+            answer = "\\mathbb{Z}";
             break;
         case 2:
             nb = decimal_1.DecimalConstructor.random(-50, 50, (0, randint_1.randint)(1, 4)).toTree().toTex();
-            answer = '\\mathrm{D}';
+            answer = "\\mathrm{D}";
             break;
         case 3:
             nb = rational_1.RationalConstructor.randomIrreductible().toTree().toTex();
-            answer = '\\mathbb{Q}';
+            answer = "\\mathbb{Q}";
             break;
         case 4:
-            nb = (0, random_1.random)(['\\sqrt 2', '\\pi']);
-            answer = '\\mathbb{R}';
+            nb = (0, random_1.random)(["\\sqrt 2", "\\pi"]);
+            answer = "\\mathbb{R}";
             break;
     }
     const question = {
         answer,
         instruction: `Donner le plus petit ensemble auquel le nombre $${nb}$ appartient.`,
-        keys: ['emptyset', 'naturals', 'integers', 'decimals', 'rationals', 'reals'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: [
+            "emptyset",
+            "naturals",
+            "integers",
+            "decimals",
+            "rationals",
+            "reals",
+        ],
+        answerFormat: "tex",
+        identifiers: { nb, type },
     };
     return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
-    const availableSets = ['N', 'Z', 'D', 'Q', 'R'].map((el) => `\\mathbb{${el}}`).filter((el) => el !== answer);
+    const availableSets = ["N", "Z", "D", "Q", "R"]
+        .map((el) => `\\mathbb{${el}}`)
+        .filter((el) => el !== answer);
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const wrongAnswer = (0, random_1.random)(availableSets);
@@ -57,15 +66,19 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return [answer, answer.replace("mathbb", "mathrm")].includes(ans);
+};
 exports.setBelonging = {
-    id: 'setBelonging',
-    connector: '\\iff',
-    label: 'Déterminer le plus petit ensemble auquel un nombre appartient',
-    levels: ['2nde', '1reESM'],
+    id: "setBelonging",
+    connector: "\\iff",
+    label: "Déterminer le plus petit ensemble auquel un nombre appartient",
+    levels: ["2nde", "1reESM"],
     isSingleStep: true,
-    sections: ['Ensembles et intervalles'],
+    sections: ["Ensembles et intervalles"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSetBelongingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/squareRoots/index.d.ts

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

package/lib/exercises/squareRoots/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/squareRoots/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC"}

package/lib/exercises/squareRoots/index.js

@@ -0,0 +1,18 @@
+"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("./simpifySquareRoot"), exports);
+__exportStar(require("./squareRootEquation"), exports);

package/lib/exercises/squareRoots/simpifySquareRoot.d.ts

@@ -1,8 +1,7 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
+    sqrtOperand: number;
 };
-type VEAProps = {};
-export declare const simplifySquareRoot: MathExercise<QCMProps, VEAProps>;
+export declare const simplifySquareRoot: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=simpifySquareRoot.d.ts.map

package/lib/exercises/squareRoots/simpifySquareRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpifySquareRoot.d.ts","sourceRoot":"","sources":["../../../src/exercises/squareRoots/simpifySquareRoot.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}
+{"version":3,"file":"simpifySquareRoot.d.ts","sourceRoot":"","sources":["../../../src/exercises/squareRoots/simpifySquareRoot.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0CF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAYxD,CAAC"}

package/lib/exercises/squareRoots/simpifySquareRoot.js

@@ -17,8 +17,8 @@ const getSimplifySquareRoot = () => {
         startStatement: sqrtTex,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answerFormat: "tex",
+        identifiers: { sqrtOperand: squareRoot.operand },
     };
     return question;
 };
@@ -34,15 +34,21 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { sqrtOperand }) => {
+    const answer = new real_1.SquareRoot(sqrtOperand).simplify().toTree();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.simplifySquareRoot = {
-    id: 'simplifySqrt',
-    connector: '=',
-    label: 'Simplification de racines carrées',
+    id: "simplifySqrt",
+    connector: "=",
+    label: "Simplification de racines carrées",
     isSingleStep: false,
-    levels: ['3ème', '2nde', '1reESM'],
-    sections: ['Racines carrées'],
+    levels: ["3ème", "2nde", "1reESM"],
+    sections: ["Racines carrées"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimplifySquareRoot, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/squareRoots/squareRootEquation.d.ts

@@ -1,9 +1,7 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     k: number;
 };
-type VEAProps = {};
-export declare const squareRootEquation: MathExercise<QCMProps, VEAProps>;
+export declare const squareRootEquation: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=squareRootEquation.d.ts.map

package/lib/exercises/squareRoots/squareRootEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"squareRootEquation.d.ts","sourceRoot":"","sources":["../../../src/exercises/squareRoots/squareRootEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}
+{"version":3,"file":"squareRootEquation.d.ts","sourceRoot":"","sources":["../../../src/exercises/squareRoots/squareRootEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwCF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAaxD,CAAC"}

package/lib/exercises/squareRoots/squareRootEquation.js

@@ -4,16 +4,19 @@ exports.squareRootEquation = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../tree/nodes/equations/equationSolutionNode");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const discreteSetNode_1 = require("../../tree/nodes/sets/discreteSetNode");
 const shuffle_1 = require("../../utils/shuffle");
 const getSquareRootEquationQuestion = () => {
     const k = Math.random() < 0.2 ? (0, randint_1.randint)(-20, 0) : (0, randint_1.randint)(0, 11);
-    const answer = k < 0 ? 'S=\\emptyset' : `S=\\left\\{${k ** 2}\\right\\}`;
+    const answer = k < 0 ? "S=\\emptyset" : `S=\\left\\{${k ** 2}\\right\\}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'équation suivante : $\\sqrt x = ${k}$`,
-        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { k, answer },
+        keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "emptyset"],
+        answerFormat: "tex",
+        identifiers: { k },
     };
     return question;
 };
@@ -21,7 +24,7 @@ const getPropositions = (n, { answer, k }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     if (k >= 0)
-        (0, exercise_1.tryToAddWrongProp)(propositions, 'S=\\emptyset');
+        (0, exercise_1.tryToAddWrongProp)(propositions, "S=\\emptyset");
     if (Math.sqrt(k) !== k ** 2)
         (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{\\sqrt{${k}}\\}`);
     while (propositions.length < n) {
@@ -30,15 +33,22 @@ const getPropositions = (n, { answer, k }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { k }) => {
+    const solution = k < 0 ? discreteSetNode_1.EmptySet : new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(k ** 2)]);
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(solution);
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.squareRootEquation = {
-    id: 'squareRootEquation',
-    connector: '\\iff',
-    label: 'Résoudre une équation du type $\\sqrt x = k$',
-    levels: ['2nde', '1reESM', '1reSpé'],
+    id: "squareRootEquation",
+    connector: "\\iff",
+    label: "Résoudre une équation du type $\\sqrt x = k$",
+    levels: ["2nde", "1reESM", "1reSpé"],
     isSingleStep: true,
-    sections: ['Racines carrées', 'Équations', 'Fonctions de référence'],
+    sections: ["Racines carrées", "Équations", "Fonctions de référence"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSquareRootEquationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,6 @@
+export * from "./mainRemarkableValues";
+export * from "./remarkableValues";
+export * from "./trigonometry";
+export * from "./trigonometryAngleCalcul";
+export * from "./trigonometrySideCalcul";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC"}

package/lib/exercises/trigonometry/index.js

@@ -0,0 +1,21 @@
+"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("./mainRemarkableValues"), exports);
+__exportStar(require("./remarkableValues"), exports);
+__exportStar(require("./trigonometry"), exports);
+__exportStar(require("./trigonometryAngleCalcul"), exports);
+__exportStar(require("./trigonometrySideCalcul"), exports);

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

@@ -1,8 +1,8 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
+    valueIndex: number;
+    isCos: boolean;
 };
-type VEAProps = {};
-export declare const mainRemarkableValuesExercise: MathExercise<QCMProps, VEAProps>;
+export declare const mainRemarkableValuesExercise: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=mainRemarkableValues.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/mainRemarkableValues.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA6CnB,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYzE,CAAC"}
+{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/mainRemarkableValues.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EASb,MAAM,aAAa,CAAC;AAErB,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAsDF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAclE,CAAC"}

package/lib/exercises/trigonometry/mainRemarkableValues.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mainRemarkableValuesExercise = void 0;
-const remarkableValue_1 = require("../../math/trigonometry/remarkableValue");
+const remarkableValues_1 = require("../../math/trigonometry/remarkableValues");
+const randint_1 = require("../../math/utils/random/randint");
 const coinFlip_1 = require("../../utils/coinFlip");
+const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const getMainRemarkableValues = () => {
     const isCos = (0, coinFlip_1.coinFlip)();
-    const remarkableValue = remarkableValue_1.RemarkableValueConstructor.mainInterval();
-    const answer = isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex();
+    const valueIndex = (0, randint_1.randint)(0, remarkableValues_1.remarkableTrigoValues.length);
+    const remarkableValue = remarkableValues_1.remarkableTrigoValues[valueIndex];
+    const answer = isCos
+        ? remarkableValue.cos.toTex()
+        : remarkableValue.sin.toTex();
     const statement = isCos
         ? `\\cos\\left(${remarkableValue.angle.toTex()}\\right)`
         : `\\sin\\left(${remarkableValue.angle.toTex()}\\right)`;
@@ -16,9 +21,9 @@ const getMainRemarkableValues = () => {
         instruction: `Donner la valeur exacte de : $${statement}$`,
         startStatement: statement,
         answer: answer,
-        keys: ['pi', 'cos', 'sin'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: ["pi", "cos", "sin"],
+        answerFormat: "tex",
+        identifiers: { valueIndex, isCos },
     };
     return question;
 };
@@ -26,31 +31,39 @@ const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const values = [
-        '-1',
-        '-\\frac{\\sqrt 3}{2}',
-        '-\\frac{\\sqrt 2}{2}',
-        '-\\frac{1}{2}',
-        '0',
-        '\\frac{\\sqrt 3}{2}',
-        '\\frac{\\sqrt 2}{2}',
-        '\\frac{1}{2}',
-        '1',
+        "-1",
+        "-\\frac{\\sqrt 3}{2}",
+        "-\\frac{\\sqrt 2}{2}",
+        "-\\frac{1}{2}",
+        "0",
+        "\\frac{\\sqrt 3}{2}",
+        "\\frac{\\sqrt 2}{2}",
+        "\\frac{1}{2}",
+        "1",
     ];
+    (0, shuffle_1.shuffle)(values);
     values.forEach((value) => {
         (0, exercise_1.tryToAddWrongProp)(propositions, value);
     });
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { valueIndex, isCos }) => {
+    const remarkableValue = remarkableValues_1.remarkableTrigoValues[valueIndex];
+    const answer = isCos ? remarkableValue.cos : remarkableValue.sin;
+    const texs = answer.toAllValidTexs({ allowFractionToDecimal: true });
+    return texs.includes(ans);
+};
 exports.mainRemarkableValuesExercise = {
-    id: 'mainRemarkableValues',
-    connector: '=',
-    label: 'Valeurs remarquables de $\\cos$ et $\\sin$ sur $[-\\pi, \\pi]$',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    id: "mainRemarkableValues",
+    connector: "=",
+    label: "Valeurs remarquables de $\\cos$ et $\\sin$ sur $[-\\pi, \\pi]$",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ['Trigonométrie'],
+    sections: ["Trigonométrie"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMainRemarkableValues, nb, 18),
     qcmTimer: 60,
     freeTimer: 60,
     maxAllowedQuestions: 18,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -1,8 +1,8 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
+    valueIndex: number;
+    isCos: boolean;
 };
-type VEAProps = {};
-export declare const remarkableValuesExercise: MathExercise<QCMProps, VEAProps>;
+export declare const remarkableValuesExercise: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=remarkableValues.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAqCrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAYnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrE,CAAC"}
+{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAerB,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAwCF,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,WAAW,CAY9D,CAAC"}

package/lib/exercises/trigonometry/remarkableValues.js

@@ -2,26 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remarkableValuesExercise = void 0;
 const remarkableValue_1 = require("../../math/trigonometry/remarkableValue");
+const remarkableValues_1 = require("../../math/trigonometry/remarkableValues");
 const coinFlip_1 = require("../../utils/coinFlip");
 const random_1 = require("../../utils/random");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const values = [
-    '-1',
-    '-\\frac{\\sqrt 3}{2}',
-    '-\\frac{\\sqrt 2}{2}',
-    '-\\frac{1}{2}',
-    '0',
-    '\\frac{\\sqrt 3}{2}',
-    '\\frac{\\sqrt 2}{2}',
-    '\\frac{1}{2}',
-    '1',
+    "-1",
+    "-\\frac{\\sqrt 3}{2}",
+    "-\\frac{\\sqrt 2}{2}",
+    "-\\frac{1}{2}",
+    "0",
+    "\\frac{\\sqrt 3}{2}",
+    "\\frac{\\sqrt 2}{2}",
+    "\\frac{1}{2}",
+    "1",
 ];
 const getRemarkableValues = () => {
     const isCos = (0, coinFlip_1.coinFlip)();
     const remarkableValue = remarkableValue_1.RemarkableValueConstructor.simplifiable();
-    const answer = isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex();
+    const valueIndex = remarkableValue.index;
+    const answer = isCos
+        ? remarkableValue.cos.toTex()
+        : remarkableValue.sin.toTex();
     (0, shuffle_1.shuffle)(values);
     const statement = isCos
         ? `\\cos\\left(${remarkableValue.angle.toTex()}\\right)`
@@ -30,9 +34,9 @@ const getRemarkableValues = () => {
         instruction: `Donner la valeur exacte de : $${statement}$`,
         startStatement: statement,
         answer: answer,
-        keys: ['pi', 'cos', 'sin'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: ["pi", "cos", "sin"],
+        answerFormat: "tex",
+        identifiers: { isCos, valueIndex },
     };
     return question;
 };
@@ -45,15 +49,22 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { valueIndex, isCos }) => {
+    const remarkableValue = remarkableValues_1.remarkableTrigoValues[valueIndex];
+    const answer = isCos ? remarkableValue.cos : remarkableValue.sin;
+    const texs = answer.toAllValidTexs({ allowFractionToDecimal: true });
+    return texs.includes(ans);
+};
 exports.remarkableValuesExercise = {
-    id: 'remarkableValues',
-    connector: '=',
-    label: 'Valeurs remarquables de $\\cos$ et $\\sin$',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    id: "remarkableValues",
+    connector: "=",
+    label: "Valeurs remarquables de $\\cos$ et $\\sin$",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ['Trigonométrie'],
+    sections: ["Trigonométrie"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRemarkableValues, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,11 @@
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    sideA: string;
+    sideB: string;
+    sideC: string;
+    randAngle: number;
+    randTrigo: number;
+};
+export declare const trigonometry: MathExercise<Identifiers>;
+export {};
+//# sourceMappingURL=trigonometry.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/trigonometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgHF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/trigonometry/trigonometry.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trigonometry = 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 lengthNode_1 = require("../../tree/nodes/geometry/lengthNode");
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
+const shuffle_1 = require("../../utils/shuffle");
+const getTrigonometry = () => {
+    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.7,
+        maxRapport: 1.3,
+        names: vertices,
+    });
+    const sideA = triangle.getSideAName();
+    const sideB = triangle.getSideBName();
+    const sideC = triangle.getSideCName();
+    const trigo = ["le cosinus", "le sinus", "la tangente"];
+    const randTrigo = (0, randint_1.randint)(0, 3);
+    const angle = [triangle.vertexB.name, triangle.vertexC.name];
+    const randAngle = (0, randint_1.randint)(0, 2);
+    let quotient;
+    switch (randAngle) {
+        case 0:
+            quotient = [
+                `\\frac{${sideC}}{${sideA}}`,
+                `\\frac{${sideB}}{${sideA}}`,
+                `\\frac{${sideB}}{${sideC}}`,
+            ];
+            break;
+        case 1:
+            quotient = [
+                `\\frac{${sideB}}{${sideA}}`,
+                `\\frac{${sideC}}{${sideA}}`,
+                `\\frac{${sideC}}{${sideB}}`,
+            ];
+            break;
+        default:
+            quotient = [""];
+    }
+    const answer = quotient[randTrigo];
+    const question = {
+        instruction: `À quel quotient est égal ${trigo[randTrigo]} de l'angle $\\widehat{${angle[randAngle]}}$?`,
+        answer,
+        keys: [...vertices, "equal"],
+        commands: [
+            ...triangle.generateCommands({ highlightedAngle: angle[randAngle] }),
+        ],
+        coords: triangle.generateCoords(),
+        answerFormat: "tex",
+        identifiers: { sideA, sideB, sideC, randAngle, randTrigo },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, sideA, sideB, sideC }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const wrongQuotients = [
+        `\\frac{${sideC}}{${sideA}}`,
+        `\\frac{${sideB}}{${sideA}}`,
+        `\\frac{${sideB}}{${sideC}}`,
+        `\\frac{${sideB}}{${sideA}}`,
+        `\\frac{${sideC}}{${sideA}}`,
+        `\\frac{${sideC}}{${sideB}}`,
+        `\\frac{${sideA}}{${sideC}}`,
+        `\\frac{${sideA}}{${sideB}}`,
+        `\\frac{${sideC}}{${sideB}}`,
+        `\\frac{${sideA}}{${sideB}}`,
+        `\\frac{${sideA}}{${sideC}}`,
+        `\\frac{${sideB}}{${sideC}}`,
+    ];
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongQuotients[(0, randint_1.randint)(0, 12)]);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { randAngle, randTrigo, sideA, sideB, sideC }) => {
+    let quotients = [];
+    if (randAngle === 0)
+        quotients = [
+            [sideC, sideA],
+            [sideB, sideA],
+            [sideB, sideC],
+        ];
+    else
+        quotients = [
+            [sideB, sideA],
+            [sideC, sideA],
+            [sideC, sideB],
+        ];
+    const quotient = quotients[randTrigo];
+    const answer = new fractionNode_1.FractionNode(new lengthNode_1.LengthNode(quotient[0]), new lengthNode_1.LengthNode(quotient[1]));
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.trigonometry = {
+    id: "trigonometry",
+    connector: "=",
+    label: "Écrire le quotient égal au cosinus, au sinus ou à la tangente d'un angle dans un triangle rectangle",
+    levels: ["4ème", "3ème", "2nde"],
+    isSingleStep: false,
+    sections: ["Trigonométrie", "Géométrie euclidienne"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTrigonometry, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};