math-exercises 3.0.64 → 3.0.66

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

@@ -1,14 +1,19 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../exercises/vea/rationalVEA.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { round } from "../../../math/utils/round.js";
+import { frac } from "../../../tree/nodes/operators/fractionNode.js";
+import { percentParser } from "../../../tree/parsers/percentParser.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
+import { approxOrEqual } from "../../../utils/latex/approxOrEqual.js";
 const getInstruction = (identifiers) => {
     const { total, lefties } = identifiers;
-    return `Dans un lycée de $${total}$ élèves, $${lefties}$ sont gauchers. Quel est le pourcentage de gauchers dans ce lycée ? Arrondir au centième de pourcentage.`;
+    return `Dans un lycée de $${total}$ élèves, $${lefties}$ sont gauchers. Quelle est la proportion de gauchers dans ce lycée, en pourcentage ? Arrondir au centième de pourcentage.`;
 };
 const getHint = (identifiers) => {
-    return `La proportion de gauchers s'obtient par la formule  :
+    return `La proportion de gauchers en pourcentage s'obtient par la formule  :
     
 $$
 \\frac{\\text{nombre de gauchers}}{\\text{nombre d'élèves}}\\times 100
@@ -17,11 +22,14 @@ $$
 };
 const getCorrection = (identifiers) => {
     const { total, lefties } = identifiers;
-    return `Le pourcentage de gauchers dans ce lycée est de : 
+    const frac = (100 * lefties) / total;
+    return `La proportion de gauchers en pourcentage dans ce lycée est de : 
 
 $$
-\\frac{${lefties}}{${total}}\\times 100 = ${getAnswer(identifiers)}
+\\frac{${lefties}}{${total}}\\times 100 ${approxOrEqual(frac, 2).join("")}
 $$
+
+Il y a donc $${getAnswer(identifiers)}$ de gauchers dans ce lycée.
 `;
 };
 const getAnswer = (identifiers) => {
@@ -33,6 +41,9 @@ const getFindProportionQuestion = () => {
     const total = randint(120, 200);
     const lefties = randint(30, 120);
     const identifiers = { total, lefties };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -53,7 +64,23 @@ const getPropositions = (n, { answer, total, lefties }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
+const isAnswerValid = (ans, { answer, lefties, total }) => {
+    try {
+        if (ans.includes("\\%")) {
+            return percentParser(ans) === answer;
+        }
+        const nb = ans.unfrenchify();
+        if (!isNaN(nb)) {
+            const value = answer.replace("\\%", "").unfrenchify();
+            return nb === value || nb === round(value / 100, 4);
+        }
+        else {
+            return rationalVEA(ans, frac(lefties, total).simplify().toTex());
+        }
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
     const texs = [answer, answer.replace("\\%", "")];
     return texs.includes(ans);
 };
@@ -61,9 +88,7 @@ export const findProportion = {
     id: "findProportion",
     connector: "=",
     label: "Calculer une proportion en pourcentage",
-    levels: ["4ème", "3ème", "2nde"],
     isSingleStep: true,
-    sections: ["Pourcentages"],
     generator: (nb) => getDistinctQuestions(getFindProportionQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -71,9 +96,6 @@ export const findProportion = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
-    getInstruction,
-    getAnswer,
-    getHint,
-    getCorrection,
+    getQuestionFromIdentifiers,
     shouldHaveCalculator: true,
 };

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

@@ -26,7 +26,7 @@ const getInstruction = (identifiers) => {
 Quel était son prix initial ? Arrondir au centième.`;
 };
 const getHint = (identifiers) => {
-    return `Transforme le taux d'évolution en coefficient multiplicateur. Puis, divise le prix final par ce coefficient multiplicateur.`;
+    return `Transforme le taux d'évolution en coefficient multiplicateur. Puis divise le prix final par ce coefficient multiplicateur.`;
 };
 const getCorrection = (identifiers) => {
     const evolution = identifiers.percentRate < 0 ? "baisse" : "hausse";

package/lib/exercises/math/percent/findTVA.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findTVA.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findTVA.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAuEF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAiBzC,CAAC"}
+{"version":3,"file":"findTVA.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findTVA.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AA4EF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAczC,CAAC"}

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

@@ -57,6 +57,9 @@ const getFindTvaQuestion = () => {
     const ttc = round(ht * (1 + tva / 100), 2);
     const identifiers = { ht, tva, ttc };
     //20, 10, 5.5, 2.1
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -80,9 +83,6 @@ export const findTVA = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getHint,
-    getCorrection,
-    getAnswer,
-    getInstruction,
+    getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };

package/lib/exercises/math/percent/htToTTC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"htToTTC.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/htToTTC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAmEF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAkBzC,CAAC"}
+{"version":3,"file":"htToTTC.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/htToTTC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA6EF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAgBzC,CAAC"}

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

@@ -6,6 +6,7 @@ import { round } from "../../../math/utils/round.js";
 import { numberParser } from "../../../tree/parsers/numberParser.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
 import { random } from "../../../utils/alea/random.js";
+import { approxOrEqual } from "../../../utils/latex/approxOrEqual.js";
 const getAnswer = (identifiers) => {
     const { TVA, ht } = identifiers;
     const answer = round(ht * (1 + TVA / 100), 2).frenchify();
@@ -13,7 +14,7 @@ const getAnswer = (identifiers) => {
 };
 const getInstruction = (identifiers) => {
     const { TVA, ht } = identifiers;
-    return `Un objet coûte $${ht.frenchify()}€$ en HT. Quel est son prix TTC, sachant que la TVA est de $${TVA.frenchify()}\\%$ ? Arrondir au centième.`;
+    return `Un objet coûte $${ht.frenchify()}€$ HT. Quel est son prix TTC, sachant que la TVA est de $${TVA.frenchify()}\\%$ ? Arrondir le prix au centième.`;
 };
 const getHint = (identifiers) => {
     const { TVA, ht } = identifiers;
@@ -22,16 +23,18 @@ const getHint = (identifiers) => {
 const getCorrection = (identifiers) => {
     const { TVA, ht } = identifiers;
     const answer = getAnswer(identifiers);
+    const roundTVA = round(1 + TVA / 100, 3);
+    const final = roundTVA * ht;
     return `Pour augmenter $${ht.frenchify()}$ de $${TVA.frenchify()}\\%$, on le multiplie par :
     
 $$
-1 + \\frac{${TVA.frenchify()}}{100} = ${round(1 + TVA / 100, 3).frenchify()}
+1 + \\frac{${TVA.frenchify()}}{100} = ${roundTVA.frenchify()}
 $$ 
 
 Le prix TTC est donc : 
 
 $$
-${ht.frenchify()} \\times ${round(1 + TVA / 100, 3).frenchify()} = ${answer}
+${ht.frenchify()} \\times ${roundTVA.frenchify()} ${approxOrEqual(final, 2).join("")}
 $$
 `;
 };
@@ -39,6 +42,9 @@ const getHtToTtcQuestion = () => {
     const TVA = random([20, 5.5]);
     const ht = coinFlip() ? randint(50, 1000) : randfloat(20, 200, 2);
     const identifiers = { TVA, ht };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -77,8 +83,6 @@ export const htToTTC = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
-    getAnswer,
-    getInstruction,
-    getHint,
-    getCorrection,
+    getQuestionFromIdentifiers,
+    shouldHaveCalculator: true,
 };

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

@@ -1,20 +1,11 @@
-export * from "./applyPercent.js";
-export * from "./averageEvolutionRate.js";
-export * from "./evolutionToCM.js";
-export * from "./globalPercent.js";
-export * from "./reciprocalPercentage.js";
 export * from "./percentToDecimal.js";
 export * from "./valuePercent.js";
 export * from "./findProportion.js";
-export * from "./cmToEvolution.js";
 export * from "./htToTTC.js";
 export * from "./ttcToHT.js";
 export * from "./findTVA.js";
-export * from "./evolutionRateFromValues.js";
-export * from "./findStartValueAfterEvolution.js";
 export * from "./subPopulationEffectifFromPercent.js";
 export * from "./populationEffectifFromSubPopulation.js";
-export * from "./findEndValueAfterEvolution.js";
-export * from "./findRightCalculForPriceEvolution.js";
 export * from "./percentWritings.js";
+export * from "./evolutions/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,iCAAiC,CAAC;AAChD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC"}

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

@@ -1,19 +1,10 @@
-export * from "./applyPercent.js";
-export * from "./averageEvolutionRate.js";
-export * from "./evolutionToCM.js";
-export * from "./globalPercent.js";
-export * from "./reciprocalPercentage.js";
 export * from "./percentToDecimal.js";
 export * from "./valuePercent.js";
 export * from "./findProportion.js";
-export * from "./cmToEvolution.js";
 export * from "./htToTTC.js";
 export * from "./ttcToHT.js";
 export * from "./findTVA.js";
-export * from "./evolutionRateFromValues.js";
-export * from "./findStartValueAfterEvolution.js";
 export * from "./subPopulationEffectifFromPercent.js";
 export * from "./populationEffectifFromSubPopulation.js";
-export * from "./findEndValueAfterEvolution.js";
-export * from "./findRightCalculForPriceEvolution.js";
 export * from "./percentWritings.js";
+export * from "./evolutions/index.js";

package/lib/exercises/math/percent/percentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA2IF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA+IF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAgBlD,CAAC"}

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

@@ -67,6 +67,9 @@ const getPercentToDecimalQuestion = () => {
         isPercentToDecimal,
         nb: round(nb.value, 10),
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -125,4 +128,5 @@ export const percentToDecimal = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/percent/percentWritings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"percentWritings.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentWritings.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EACF,kBAAkB,GAClB,mBAAmB,GACnB,kBAAkB,GAClB,mBAAmB,CAAC;CACzB,CAAC;AA8JF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAgBjD,CAAC"}
+{"version":3,"file":"percentWritings.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentWritings.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EACF,kBAAkB,GAClB,mBAAmB,GACnB,kBAAkB,GAClB,mBAAmB,CAAC;CACzB,CAAC;AAoKF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

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

@@ -113,6 +113,9 @@ const getPercentWritingsQuestion = (ops) => {
         percent,
         target,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -135,8 +138,5 @@ export const percentWritings = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getInstruction,
-    // getHint,
-    // getCorrection,
-    getAnswer,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/percent/populationEffectifFromSubPopulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populationEffectifFromSubPopulation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/populationEffectifFromSubPopulation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAgJF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAiBrE,CAAC"}
+{"version":3,"file":"populationEffectifFromSubPopulation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/populationEffectifFromSubPopulation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAsJF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAgBrE,CAAC"}

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

@@ -24,7 +24,7 @@ const getInstruction = (identifiers) => {
     const arrondi = "Arrondir à l'unité si nécessaire.";
     switch (identifiers.contextType) {
         case 0:
-            return `Dans une classe, $${identifiers.subPopulationPercent.frenchify()}\\%$ des élèves sont des garcons, ce qui représente $${identifiers.subPopulationEffectif}$ élèves. Quel est le nombre d'élèves dans cette classe ? ${arrondi}`;
+            return `Dans une classe, $${identifiers.subPopulationPercent.frenchify()}\\%$ des élèves sont des garçons, ce qui représente $${identifiers.subPopulationEffectif}$ élèves. Quel est le nombre d'élèves dans cette classe ? ${arrondi}`;
         case 1:
             return `Dans un collège, $${identifiers.subPopulationPercent.frenchify()}\\%$ des élèves sont gauchers, ce qui représente $${identifiers.subPopulationEffectif}$ élèves. Quel est le nombre d'élèves dans ce collège ? ${arrondi}`;
         case 2:
@@ -40,14 +40,14 @@ const isAnswerValid = (ans, { answer }) => {
 };
 const getHint = (identifiers) => {
     const itemType = identifiers.contextType === 2 ? "habitants" : "élèves";
-    return `Utilise un produit en croix : si $${identifiers.subPopulationPercent.frenchify()}\\%$ représente $${identifiers.subPopulationEffectif}$ ${itemType}, alors que représente $100\\%$ ?`;
+    return `Détermine la quatrième proportionnelle un produit en croix : si $${identifiers.subPopulationPercent.frenchify()}\\%$ représente $${identifiers.subPopulationEffectif}$ ${itemType}, alors que représente $100\\%$ ?`;
 };
 const getCorrection = (identifiers) => {
     const itemType = identifiers.contextType === 2 ? "habitants" : "élèves";
     const answer = getAnswer(identifiers);
     return `On sait que $${identifiers.subPopulationPercent.frenchify()}\\%$ représente $${identifiers.subPopulationEffectif}$ ${itemType}, et on cherche ce que réprésente $100\\%$ des ${itemType}.
   
-  Pour cela, on peut faire un produit en croix : 
+Pour cela, on peut déterminer la quatrième proportionnelle :
   
 ${mdTable([
         ["$?$", "$100\\%$"],
@@ -94,6 +94,9 @@ const getPopulationEffectifFromSubPopulationQuestion = () => {
         subPopulationEffectif,
         subPopulationPercent,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -120,7 +123,6 @@ export const populationEffectifFromSubPopulation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getHint,
-    getCorrection,
+    getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };

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

@@ -57,7 +57,7 @@ const getReciprocalPercentageQuestion = () => {
         keys: ["percent"],
         answerFormat: "tex",
         identifiers: { isUp, randPercent },
-        hint: `Calcule le coefficient multiplicateur associé à une ${isUp ? "hausse" : "baisse"} de $${randPercent}\\%$. Puis, calcule le coefficient multiplicateur réciproque : c'est l'inverse du coefficient multiplicateur. Il ne reste alors plus qu'à transformer le coefficient multiplicateur réciproque en taux d'évolution.`,
+        hint: `Calcule le coefficient multiplicateur associé à une ${isUp ? "hausse" : "baisse"} de $${randPercent}\\%$. Puis calcule le coefficient multiplicateur réciproque : c'est l'inverse du coefficient multiplicateur. Il ne reste alors plus qu'à transformer le coefficient multiplicateur réciproque en taux d'évolution.`,
         correction: getCorrection(identifiers),
     };
     return question;

package/lib/exercises/math/percent/subPopulationEffectifFromPercent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subPopulationEffectifFromPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/subPopulationEffectifFromPercent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAqGF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAiBlE,CAAC"}
+{"version":3,"file":"subPopulationEffectifFromPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/subPopulationEffectifFromPercent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AA2GF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAgBlE,CAAC"}

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

@@ -20,7 +20,7 @@ const getInstruction = (identifiers) => {
     const arrondi = "Arrondir à l'unité si nécessaire.";
     switch (identifiers.contextType) {
         case 0:
-            return `Dans une classe de $${identifiers.total}$ élèves, $${identifiers.populationPercent.frenchify()}\\%$ des élèves sont des garcons. Quel est le nombre de garcons dans cette classe ? ${arrondi}`;
+            return `Dans une classe de $${identifiers.total}$ élèves, $${identifiers.populationPercent.frenchify()}\\%$ des élèves sont des garçons. Quel est le nombre de garçons dans cette classe ? ${arrondi}`;
         case 1:
             return `Dans un collège de $${identifiers.total}$ élèves, $${identifiers.populationPercent.frenchify()}\\%$ des élèves sont gauchers. Quel est le nombre de gauchers dans ce collège ? ${arrondi}`;
         case 2:
@@ -72,6 +72,9 @@ const getSubPopulationEffectifFromPercentQuestion = () => {
         populationPercent,
         total,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -95,8 +98,7 @@ export const subPopulationEffectifFromPercent = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getAnswer,
-    getCorrection,
-    getHint,
+    getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    shouldHaveCalculator: true,
 };

package/lib/exercises/math/percent/ttcToHT.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ttcToHT.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/ttcToHT.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AA6EF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAkBzC,CAAC"}
+{"version":3,"file":"ttcToHT.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/ttcToHT.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAmFF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAezC,CAAC"}

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

@@ -38,6 +38,9 @@ const getTtcToHtQuestion = () => {
     const TVA = random([20, 5.5]);
     const TTC = coinFlip() ? randint(50, 1000) : randfloat(20, 200, 2);
     const identifiers = { TTC, TVA };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -76,8 +79,5 @@ export const ttcToHT = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
-    getInstruction,
-    getCorrection,
-    getHint,
-    getAnswer,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/percent/valuePercent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valuePercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/valuePercent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA4DF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAiB9C,CAAC"}
+{"version":3,"file":"valuePercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/valuePercent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAkEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

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

@@ -27,6 +27,9 @@ const getValuePercentQuestion = () => {
     const percent = randint(1, 100);
     const nb = randint(1, 100);
     const identifiers = { percent, nb };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -61,9 +64,6 @@ export const valuePercent = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
-    getAnswer,
-    getInstruction,
-    getCorrection,
-    getHint,
+    getQuestionFromIdentifiers,
     shouldHaveCalculator: true,
 };

package/lib/exercises/math/powers/calculateNegativePower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateNegativePower.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/calculateNegativePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAmHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"calculateNegativePower.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/calculateNegativePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAkHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}

package/lib/exercises/math/powers/calculateNegativePower.js

@@ -1,6 +1,5 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.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 { isNumberNode, NumberNode, } from "../../../tree/nodes/numbers/numberNode.js";
 import { frac, isFractionNode, } from "../../../tree/nodes/operators/fractionNode.js";
@@ -18,15 +17,13 @@ $$`;
 };
 const getAnswer = (identifiers) => {
     const { int, power } = identifiers;
-    const answer = new Rational(1, int ** Math.abs(power))
-        .simplify()
-        .toTree()
-        .toTex();
-    return answer;
+    const fraction = frac(1, new PowerNode(int.toTree(), Math.abs(power).toTree()));
+    const answer = fraction.simplify();
+    return answer.toTex();
 };
 const getHint = (identifiers) => {
     const { int, power } = identifiers;
-    return `Pour tous nombre $a$ et tout nombre $x$ positif, on a : 
+    return `Pour tout nombre $a$ et tout nombre $x$ positif, on a : 
   
 $$
 a^{-x} = \\frac{1}{a^x}
@@ -75,9 +72,8 @@ const getPropositions = (n, { answer, int, power }) => {
         tryToAddWrongProp(propositions, -power + "");
     }
     while (propositions.length < n) {
-        const wrongAnswer = new Rational(1, int ** randint(0, 6, [power]))
+        const wrongAnswer = frac(1, int ** randint(0, 6, [power]))
             .simplify()
-            .toTree()
             .toTex();
         tryToAddWrongProp(propositions, wrongAnswer);
     }
@@ -89,7 +85,7 @@ const isAnswerValid = (ans, { answer, int, power }) => {
         if (!isNumberNode(parsed) && !isFractionNode(parsed)) {
             return false;
         }
-        return parsed.simplify({ calculatePowers: true }).toTex() === answer;
+        return parsed.simplify().toTex() === answer;
     }
     catch (err) {
         return handleVEAError(err);

package/lib/exercises/math/powers/calculatePower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculatePower.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/calculatePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAyHF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAchD,CAAC"}
+{"version":3,"file":"calculatePower.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/calculatePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAyHF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}

package/lib/exercises/math/powers/calculatePower.js

@@ -116,4 +116,5 @@ export const calculatePower = {
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    shouldHaveCalculator: true,
 };

package/lib/exercises/math/powers/decimalToScientific.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalToScientific.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/decimalToScientific.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,QAAQ,EAeT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqGF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}
+{"version":3,"file":"decimalToScientific.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/decimalToScientific.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,QAAQ,EAeT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA4HF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

package/lib/exercises/math/powers/decimalToScientific.js

@@ -1,10 +1,12 @@
 import { Decimal, DecimalConstructor, } from "../../../math/numbers/decimals/decimal.js";
 import { IntegerConstructor, } from "../../../math/numbers/integer/integer.js";
 import { randint } from "../../../math/utils/random/randint.js";
-import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
-import { MultiplyNode } from "../../../tree/nodes/operators/multiplyNode.js";
-import { PowerNode } from "../../../tree/nodes/operators/powerNode.js";
+import { isNumberNode, NumberNode, } from "../../../tree/nodes/numbers/numberNode.js";
+import { isMultiplyNode, MultiplyNode, } from "../../../tree/nodes/operators/multiplyNode.js";
+import { isPowerNode, PowerNode, } from "../../../tree/nodes/operators/powerNode.js";
+import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
 import { probaFlip } from "../../../utils/alea/probaFlip.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 import { pluralize } from "../../../utils/strings/pluralize.js";
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../exercise.js";
 import { getDistinctQuestions } from "../../utils/getDistinctQuestions.js";
@@ -19,7 +21,9 @@ $$`;
 const getAnswer = (identifiers) => {
     const { decimal } = identifiers;
     const dec = new Decimal(decimal);
-    const answer = dec.toScientificNotation().toTex();
+    const answer = dec
+        .toScientificNotation()
+        .toTex({ forceNoSimplification: true });
     return answer;
 };
 const getHint = (identifiers) => {
@@ -29,7 +33,7 @@ $$
 a\\times 10^n
 $$
 
-où $a$ est un nombre compris entre $1$ et $10$ (exclus). Repère où placer la virgule pour que $a$ soit correct, puis compte combien de fois il faut déplacer la virgule.`;
+où $a$ est un nombre compris entre $1$ et $10$ (exclus). Repère où placer la virgule pour que $a$ soit effectivement compris entre $1$ et $10$, puis compte combien de fois il faut déplacer la virgule.`;
 };
 const getCorrection = (identifiers) => {
     const { decimal } = identifiers;
@@ -43,7 +47,7 @@ $$
 ${decimal.frenchify()} = ${getAnswer(identifiers)}
 $$
 
-On a déplacé la virgule de $${absExp}$ ${pluralize("rang", absExp)} vers la ${order}, donc l'exposant est $${dec.tenthExponentBelow}$.`;
+On a déplacé la virgule de $${absExp}$ ${pluralize("rang", absExp)} vers la ${order}, donc l'exposant de la puissance de $10$ est $${dec.tenthExponentBelow}$.`;
 };
 const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
@@ -82,9 +86,32 @@ const getPropositions = (n, { answer, decimal }) => {
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { decimal }) => {
-    const answerTree = new Decimal(decimal).toScientificNotation();
-    const texs = answerTree.toAllValidTexs({ forbidPowerToProduct: true });
-    return texs.includes(ans);
+    try {
+        const parsed = parseAlgebraic(ans);
+        if (!isMultiplyNode(parsed))
+            return false;
+        if (!isNumberNode(parsed.leftChild))
+            return false;
+        if (parsed.leftChild.value < 0 || parsed.leftChild.value >= 10)
+            return false;
+        if (isNumberNode(parsed.rightChild)) {
+            if (parsed.rightChild.value !== 10)
+                return false;
+            return parsed.simplify().toTex() === decimal.frenchify();
+        }
+        if (isPowerNode(parsed.rightChild)) {
+            if (!isNumberNode(parsed.rightChild.leftChild))
+                return false;
+            if (parsed.rightChild.leftChild.value !== 10)
+                return false;
+            return (parsed.simplify({ calculatePowers: true }).toTex() ===
+                decimal.frenchify());
+        }
+        return false;
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const decimalToScientific = {
     id: "decimalToScientific",

package/lib/exercises/math/powers/powersMixOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersMixOperations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersMixOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvB,CAAC;AA2KF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}
+{"version":3,"file":"powersMixOperations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersMixOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvB,CAAC;AA2KF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

package/lib/exercises/math/powers/powersMixOperations.js

@@ -159,10 +159,6 @@ export const powersMixOperations = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getInstruction,
-    // getHint,
-    // getCorrection,
-    getAnswer,
     hasHintAndCorrection: true,
     getQuestionFromIdentifiers,
 };

package/lib/exercises/math/powers/powersOfTenMixOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersOfTenMixOperations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersOfTenMixOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAkB1D,CAAC"}
+{"version":3,"file":"powersOfTenMixOperations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersOfTenMixOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}

package/lib/exercises/math/powers/powersOfTenMixOperations.js

@@ -120,10 +120,6 @@ export const powersOfTenMixOperations = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getInstruction,
-    // getHint,
-    // getCorrection,
-    getAnswer,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };