math-exercises 3.0.5 → 3.0.7

package/lib/exercises/math/percent/globalPercent.js

@@ -4,49 +4,67 @@ import { getDistinctQuestions } from "../../utils/getDistinctQuestions.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
 import { round } from "../../../math/utils/round.js";
 import { percentParser } from "../../../tree/parsers/percentParser.js";
-const getGlobalPercentQuestion = () => {
-    const tab = ["hausse", "baisse"];
-    let ans = 1;
+const getInstruction = (identifiers) => {
     let instruction = "Le prix d'un article subit une ";
+    identifiers.evolutions.forEach((evolution, i) => {
+        const type = evolution[0] === "-" ? "baisse" : "hausse";
+        if (i === 0)
+            instruction += `${type} de $${evolution.substring(1)}\\%$`;
+        else
+            instruction += `, puis une ${type} de $${evolution.substring(1)}\\%$`;
+    });
+    instruction += `. 
+
+Déterminer le taux d'évolution global du prix de cet article (arrondir au centième de pourcentage).`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { evolutions } = identifiers;
+    const cms = evolutions.map((e) => 1 + Number(e) / 100);
+    const prod = cms.reduce((acc, curr) => acc * curr, 1);
+    const answer = round((prod - 1) * 100, 2).frenchify() + "\\%";
+    return answer;
+};
+const getHint = (identifiers) => {
+    return "Transforme chaque taux d'évolution en coefficient multiplicateur, puis multiplie ces coefficients multiplicateurs entre eux pour obtenir le coefficient multiplicateur global. Transforme alors ce CM global en taux d'évolution.";
+};
+const getCorrection = (identifiers) => {
+    const { evolutions } = identifiers;
+    const answer = getAnswer(identifiers);
+    return `On transforme les taux d'évolution en coefficients multiplicateurs puis on les multiplie entre eux : 
+
+$$
+${evolutions
+        .map((e) => round(1 + Number(e) / 100, 2).frenchify())
+        .join(" \\times ")} = ${round(evolutions.reduce((acc, curr) => acc * round(1 + Number(curr) / 100, 2), 1), 4).frenchify()}
+$$
+    
+Enfin, on transforme ce CM global en taux d'évolution : 
+
+$$
+(${round(evolutions.reduce((acc, curr) => acc * round(1 + Number(curr) / 100, 2), 1), 4).frenchify()} - 1)\\times 100 = ${answer.replace("\\%", "")}
+$$
+
+Le taux d'évolution global est donc de $${answer}$.
+    `;
+};
+const getGlobalPercentQuestion = () => {
     const indice = randint(2, 4);
     const evolutions = [];
     for (let i = 0; i < indice; i++) {
         const randPercent = randint(1, 50);
         let a = randint(0, 2);
-        instruction += `${tab[a]} de $${randPercent}\\%$`;
         evolutions.push((a === 0 ? "+" : "-") + randPercent);
-        if (i + 1 < indice)
-            instruction += ", puis une ";
-        if (a == 0)
-            ans *= 1 + randPercent / 100;
-        else
-            ans *= 1 - randPercent / 100;
     }
-    ans = round((ans - 1) * 100, 2);
-    instruction +=
-        ". \nDéterminer le taux d'évolution global du prix de cet article (arrondir au centième de pourcentage).";
-    const answer = `${(ans + "").replace(".", ",")}\\%`;
+    const identifiers = { evolutions };
     const question = {
-        instruction,
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["percent"],
         answerFormat: "tex",
-        identifiers: { evolutions },
-        hint: "Transforme chaque taux d'évolution en coefficient multiplicateur, puis multiplie ces coefficients multiplicateurs entre eux pour obtenir le coefficient multiplicateur global. Transforme alors ce CM global en taux d'évolution.",
-        correction: `On transforme les taux d'évolution en coefficients multiplicateurs puis on les multiplie entre eux : 
-
-$$${evolutions
-            .map((e) => round(1 + Number(e) / 100, 2).frenchify())
-            .join(" \\times ")} = ${round(evolutions.reduce((acc, curr) => acc * round(1 + Number(curr) / 100, 2), 1), 4).frenchify()}
-$$
-    
-Enfin, on transforme ce CM global en taux d'évolution : 
-
-$$(${round(evolutions.reduce((acc, curr) => acc * round(1 + Number(curr) / 100, 2), 1), 4).frenchify()} - 1)\\times 100 = ${answer.replace("\\%", "")}
-$$
-
-Le taux d'évolution global est donc de $${answer}$.
-    `,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };

package/lib/exercises/math/probaStat/diceBasicProbas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diceBasicProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/diceBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAwIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAiBjD,CAAC"}
+{"version":3,"file":"diceBasicProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/diceBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAwIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAgBjD,CAAC"}

package/lib/exercises/math/probaStat/diceBasicProbas.js

@@ -54,7 +54,7 @@ const getInstruction = (identifiers) => {
     const target = isParityQuestion
         ? `un nombre ${isEvenQuestion ? "pair" : "impair"}`
         : `la face $${faceAsked}$`;
-    return `On lance un dé équilibré à $${nbFaces}$ faces. 
+    return `On lance un dé équilibré à $${nbFaces}$ faces.
   
 Quelle est la probabilité d'obtenir ${target} ?`;
 };

package/lib/exercises/math/probaStat/probaFromTableNoContext.d.ts

@@ -8,9 +8,7 @@ type Identifiers = {
     type: string;
     probaFrac: number[];
 };
-type Options = {
-    allowNonIrreductible?: boolean;
-};
+type Options = {};
 export declare const probaFromTableNoContext: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=probaFromTableNoContext.d.ts.map

package/lib/exercises/math/probaStat/probaFromTableNoContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAoIF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAsBF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBlE,CAAC"}
+{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA4IF,KAAK,OAAO,GAAG,EAEd,CAAC;AAgBF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBlE,CAAC"}

package/lib/exercises/math/probaStat/probaFromTableNoContext.js

@@ -1,11 +1,10 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
-import { allowNonIrreductibleOption } from "../../../exercises/options/allowNonIrreductibleFractions.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Rational } from "../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../math/utils/random/randint.js";
-import { FractionNode } from "../../../tree/nodes/operators/fractionNode.js";
 import { rationalParser } from "../../../tree/parsers/rationalParser.js";
 import { random } from "../../../utils/alea/random.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 import { dollarize } from "../../../utils/latex/dollarize.js";
 import { mdTable } from "../../../utils/markdown/mdTable.js";
 const getInstruction = ({ aBarreCapB, aBarreCapBBarre, aCapB, aCapBBarre, event, probaFrac, type, }) => {
@@ -33,6 +32,14 @@ ${mdTable([
 Calculer la probabilité $${event}$.
     `;
 };
+const getAnswer = (identifiers) => {
+    const { probaFrac } = identifiers;
+    const answer = new Rational(probaFrac[0], probaFrac[1])
+        .simplify()
+        .toTree()
+        .toTex();
+    return answer;
+};
 const getProbaFromTableNoContextQuestion = () => {
     const aCapB = randint(1, 20);
     const aCapBBarre = randint(1, 20, [aCapB]);
@@ -83,7 +90,6 @@ const getProbaFromTableNoContextQuestion = () => {
                 ["P_{\\overline B}(\\overline A)", [aBarreCapBBarre, bBarreTotal]],
             ]);
     }
-    const answer = new Rational(proba[0], proba[1]).simplify().toTree().toTex();
     const identifiers = {
         aBarreCapB,
         aBarreCapBBarre,
@@ -94,7 +100,7 @@ const getProbaFromTableNoContextQuestion = () => {
         probaFrac: proba,
     };
     const question = {
-        answer,
+        answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
@@ -114,19 +120,16 @@ const getPropositions = (n, { answer, aBarreCapB, aBarreCapBBarre, aCapB, aCapBB
     }
     return shuffleProps(propositions, n);
 };
-const options = [allowNonIrreductibleOption];
+// const options: GeneratorOption[] = [allowNonIrreductibleOption];
 const isAnswerValid = (ans, { answer, probaFrac }, options) => {
-    if (options?.allowNonIrreductible) {
+    try {
         const parsed = rationalParser(ans);
         if (!parsed)
             return false;
         return parsed.simplify().toTex() === answer;
     }
-    else {
-        const fracTexs = new FractionNode(probaFrac[0].toTree(), probaFrac[1].toTree())
-            .simplify()
-            .toAllValidTexs();
-        return fracTexs.includes(ans);
+    catch (err) {
+        return handleVEAError(err);
     }
 };
 export const probaFromTableNoContext = {
@@ -143,5 +146,5 @@ export const probaFromTableNoContext = {
     isAnswerValid,
     subject: "Mathématiques",
     getInstruction,
-    options,
+    // options,
 };

package/lib/exercises/math/probaStat/probaFromTableWithContext.d.ts

@@ -8,9 +8,7 @@ type Identifiers = {
     type: string;
     probaFrac: number[];
 };
-type Options = {
-    allowNonIrreductible?: boolean;
-};
+type Options = {};
 export declare const probaFromTableWithContext: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=probaFromTableWithContext.d.ts.map

package/lib/exercises/math/probaStat/probaFromTableWithContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA4IF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAsBF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBpE,CAAC"}
+{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAoJF,KAAK,OAAO,GAAG,EAEd,CAAC;AAgBF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBpE,CAAC"}

package/lib/exercises/math/probaStat/probaFromTableWithContext.js

@@ -3,9 +3,9 @@ import { allowNonIrreductibleOption } from "../../../exercises/options/allowNonI
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Rational } from "../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../math/utils/random/randint.js";
-import { FractionNode } from "../../../tree/nodes/operators/fractionNode.js";
 import { rationalParser } from "../../../tree/parsers/rationalParser.js";
 import { random } from "../../../utils/alea/random.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 import { dollarize } from "../../../utils/latex/dollarize.js";
 import { mdTable } from "../../../utils/markdown/mdTable.js";
 const getInstruction = ({ aBarreCapB, aBarreCapBBarre, aCapB, aCapBBarre, event, probaFrac, type, }) => {
@@ -36,6 +36,14 @@ ${mdTable([
 On choisit un élève au hasard. Quelle est la probabilité de tomber sur ${event} ?
     `;
 };
+const getAnswer = (identifiers) => {
+    const { probaFrac } = identifiers;
+    const answer = new Rational(probaFrac[0], probaFrac[1])
+        .simplify()
+        .toTree()
+        .toTex();
+    return answer;
+};
 const getProbaFromTableWithContextQuestion = () => {
     const aCapB = randint(1, 20);
     const aCapBBarre = randint(1, 20);
@@ -91,7 +99,6 @@ const getProbaFromTableWithContextQuestion = () => {
             ]);
             break;
     }
-    const answer = new Rational(proba[0], proba[1]).simplify().toTree().toTex();
     const identifiers = {
         aBarreCapB,
         aBarreCapBBarre,
@@ -102,7 +109,7 @@ const getProbaFromTableWithContextQuestion = () => {
         probaFrac: proba,
     };
     const question = {
-        answer,
+        answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
@@ -124,26 +131,21 @@ const getPropositions = (n, { answer, aBarreCapB, aBarreCapBBarre, aCapB, aCapBB
 };
 const options = [allowNonIrreductibleOption];
 const isAnswerValid = (ans, { answer, probaFrac }, options) => {
-    if (options?.allowNonIrreductible) {
+    try {
         const parsed = rationalParser(ans);
         if (!parsed)
             return false;
         return parsed.simplify().toTex() === answer;
     }
-    else {
-        const fracTexs = new FractionNode(probaFrac[0].toTree(), probaFrac[1].toTree())
-            .simplify()
-            .toAllValidTexs();
-        return fracTexs.includes(ans);
+    catch (err) {
+        return handleVEAError(err);
     }
 };
 export const probaFromTableWithContext = {
     id: "probaFromTableWithContext",
     connector: "=",
     label: "Utiliser un tableau à double entrée pour calculer une probabilité (avec contexte)",
-    levels: ["1rePro", "1reSpé", "1reTech", "1reESM", "2ndPro"],
     isSingleStep: true,
-    sections: ["Probabilités"],
     generator: (nb, options) => getDistinctQuestions(() => getProbaFromTableWithContextQuestion(options), nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormula.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticFindExplicitFormula.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA8IF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}
+{"version":3,"file":"arithmeticFindExplicitFormula.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAsIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}

package/lib/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormula.js

@@ -80,12 +80,6 @@ const isAnswerValid = (ans, { answer, reason, firstValue }, opts) => {
         const parsed = parseAlgebraic(formated);
         if (!parsed)
             return false;
-        console.log(parsed
-            .simplify({
-            towardsDistribute: true,
-            forbidFactorize: true,
-        })
-            .toTex());
         return (parsed
             .simplify({
             towardsDistribute: true,

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

@@ -1 +1 @@
-{"version":3,"file":"simpifySquareRoot.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/simpifySquareRoot.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAE3B,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0CF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"simpifySquareRoot.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/simpifySquareRoot.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAWT,MAAM,mBAAmB,CAAC;AAE3B,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA4DF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}

package/lib/exercises/math/squareRoots/simpifySquareRoot.js

@@ -2,20 +2,38 @@ import { SquareRoot, SquareRootConstructor, } from "../../../math/numbers/reals/
 import { shuffle } from "../../../utils/alea/shuffle.js";
 import { addValidProp, tryToAddWrongProp, } from "../../exercise.js";
 import { getDistinctQuestions } from "../../utils/getDistinctQuestions.js";
+const getStatementNode = (identifiers) => {
+    const squareRoot = new SquareRoot(identifiers.sqrtOperand);
+    return squareRoot.toTree();
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Simplifier : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const squareRoot = new SquareRoot(identifiers.sqrtOperand);
+    const answer = squareRoot.simplify().toTree().toTex();
+    return answer;
+};
 const getSimplifySquareRoot = () => {
     const squareRoot = SquareRootConstructor.randomSimplifiable({
         allowPerfectSquare: false,
         maxSquare: 11,
     });
-    const sqrtTex = squareRoot.toTree().toTex();
-    const answer = squareRoot.simplify().toTree().toTex();
+    const identifiers = { sqrtOperand: squareRoot.operand };
     const question = {
-        instruction: `Simplifier : $${sqrtTex}$`,
-        startStatement: sqrtTex,
-        answer,
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { sqrtOperand: squareRoot.operand },
+        identifiers,
     };
     return question;
 };
@@ -49,4 +67,6 @@ export const simplifySquareRoot = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"squareRootEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/squareRootEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwCF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAcpD,CAAC"}
+{"version":3,"file":"squareRootEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/squareRootEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwDF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAgBpD,CAAC"}

package/lib/exercises/math/squareRoots/squareRootEquation.js

@@ -5,15 +5,28 @@ import { EquationSolutionNode } from "../../../tree/nodes/equations/equationSolu
 import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
 import { DiscreteSetNode, EmptySet, } from "../../../tree/nodes/sets/discreteSetNode.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    const { k } = identifiers;
+    return `Résoudre l'équation suivante : 
+  
+$$
+\\sqrt{x} = ${k}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { k } = identifiers;
+    const answer = k < 0 ? "S=\\varnothing" : `S=\\left\\{${k ** 2}\\right\\}`;
+    return answer;
+};
 const getSquareRootEquationQuestion = () => {
     const k = Math.random() < 0.2 ? randint(-20, 0) : randint(0, 11);
-    const answer = k < 0 ? "S=\\varnothing" : `S=\\left\\{${k ** 2}\\right\\}`;
+    const identifiers = { k };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'équation suivante : $\\sqrt x = ${k}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "varnothing"],
         answerFormat: "tex",
-        identifiers: { k },
+        identifiers,
     };
     return question;
 };
@@ -49,4 +62,6 @@ export const squareRootEquation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/mainRemarkableValues.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAST,MAAM,mBAAmB,CAAC;AAE3B,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAyDF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAe9D,CAAC"}
+{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/mainRemarkableValues.ts"],"names":[],"mappings":"AASA,OAAO,EACL,QAAQ,EAYT,MAAM,mBAAmB,CAAC;AAE3B,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAqFF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAe9D,CAAC"}

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

@@ -1,26 +1,47 @@
 import { remarkableTrigoValues } from "../../../math/trigonometry/remarkableValues.js";
 import { randint } from "../../../math/utils/random/randint.js";
+import { cos } from "../../../tree/nodes/functions/cosNode.js";
+import { sin } from "../../../tree/nodes/functions/sinNode.js";
+import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../exercise.js";
 import { getDistinctQuestions } from "../../utils/getDistinctQuestions.js";
+const getStatementNode = (identifiers) => {
+    const { isCos, valueIndex } = identifiers;
+    const remarkableValue = remarkableTrigoValues[valueIndex];
+    const statement = isCos
+        ? cos(remarkableValue.angle)
+        : sin(remarkableValue.angle);
+    return statement;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Donner la valeur exacte de : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { isCos, valueIndex } = identifiers;
+    const remarkableValue = remarkableTrigoValues[valueIndex];
+    return isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex();
+};
 const getMainRemarkableValues = () => {
     const isCos = coinFlip();
     const valueIndex = randint(0, remarkableTrigoValues.length);
-    const remarkableValue = 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)`;
+    const identifiers = { valueIndex, isCos };
     const question = {
-        instruction: `Donner la valeur exacte de : $${statement}$`,
-        startStatement: statement,
-        answer: answer,
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["pi", "cos", "sin"],
         answerFormat: "tex",
-        identifiers: { valueIndex, isCos },
+        identifiers,
     };
     return question;
 };
@@ -29,12 +50,12 @@ const getPropositions = (n, { answer }) => {
     addValidProp(propositions, answer);
     const values = [
         "-1",
-        "-\\frac{\\sqrt 3}{2}",
-        "-\\frac{\\sqrt 2}{2}",
+        "-\\frac{\\sqrt{3}}{2}",
+        "-\\frac{\\sqrt{2}}{2}",
         "-\\frac{1}{2}",
         "0",
-        "\\frac{\\sqrt 3}{2}",
-        "\\frac{\\sqrt 2}{2}",
+        "\\frac{\\sqrt{3}}{2}",
+        "\\frac{\\sqrt{2}}{2}",
         "\\frac{1}{2}",
         "1",
     ];
@@ -44,14 +65,18 @@ const getPropositions = (n, { answer }) => {
     });
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { valueIndex, isCos }) => {
-    const remarkableValue = remarkableTrigoValues[valueIndex];
-    const answer = isCos ? remarkableValue.cos : remarkableValue.sin;
-    const texs = answer.toAllValidTexs({
-        allowFractionToDecimal: true,
-        allowMinusAnywhereInFraction: true,
-    });
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, valueIndex, isCos }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({ forbidTrigo: true, decimalToFractions: true })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const mainRemarkableValuesExercise = {
     id: "mainRemarkableValues",

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

@@ -1,7 +1,9 @@
+import { NodeIdentifiers } from "../../../tree/nodes/nodeConstructor.js";
 import { Exercise } from "../../exercise.js";
 type Identifiers = {
     mainValue: number;
     isCos: boolean;
+    angleIdentifiers: NodeIdentifiers;
 };
 export declare const remarkableValuesExercise: Exercise<Identifiers>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAe3B,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AA4CF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAa1D,CAAC"}
+{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAM7C,OAAO,EACL,QAAQ,EAWT,MAAM,mBAAmB,CAAC;AA2C3B,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,gBAAgB,EAAE,eAAe,CAAC;CACnC,CAAC;AA4CF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}