math-exercises 3.0.141 → 3.0.144

package/lib/exercises/math/calcul/arithmetics/divisibiltyCriteria.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"divisibiltyCriteria.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/divisibiltyCriteria.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA4FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}
+{"version":3,"file":"divisibiltyCriteria.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/divisibiltyCriteria.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA+FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}

package/lib/exercises/math/calcul/arithmetics/divisibiltyCriteria.js

@@ -2,18 +2,21 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exer
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { primes } from "../../../../math/numbers/integer/primes.js";
 import { random } from "../../../../utils/alea/random.js";
-const getPropositions = (n, { answer, divisor }) => {
+const getPropositions = (n, { answer, divisor, nb }) => {
     const propositions = [];
     addValidProp(propositions, answer);
-    if (divisor !== 6 && divisor !== 10)
+    if (divisor !== 2 && nb % 2 !== 0)
         tryToAddWrongProp(propositions, "2");
-    if (divisor !== 6 && divisor !== 9)
+    if (divisor !== 3 && nb % 3 !== 0)
         tryToAddWrongProp(propositions, "3");
-    if (divisor !== 5)
+    if (divisor !== 5 && nb % 5 !== 0)
         tryToAddWrongProp(propositions, "5");
-    tryToAddWrongProp(propositions, "6");
-    tryToAddWrongProp(propositions, "9");
-    tryToAddWrongProp(propositions, "10");
+    if (divisor !== 6 && nb % 6 !== 0)
+        tryToAddWrongProp(propositions, "6");
+    if (divisor !== 9 && nb % 9 !== 0)
+        tryToAddWrongProp(propositions, "9");
+    if (divisor !== 10 && nb % 10 !== 0)
+        tryToAddWrongProp(propositions, "10");
     return shuffleProps(propositions, n);
 };
 const getAnswer = (identifiers) => {

package/lib/exercises/math/calcul/arithmetics/findLeftoverInContext.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    situation: number;
+    total: number;
+    divisor: number;
+};
+export declare const findLeftoverInContext: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=findLeftoverInContext.d.ts.map

package/lib/exercises/math/calcul/arithmetics/findLeftoverInContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findLeftoverInContext.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/findLeftoverInContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmHF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAkBvD,CAAC"}

package/lib/exercises/math/calcul/arithmetics/findLeftoverInContext.js

@@ -0,0 +1,111 @@
+import { addValidProp, shuffleProps, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { pluralize } from "../../../../utils/strings/pluralize.js";
+import { randomFirstname } from "../../../../utils/strings/randomFirstname.js";
+const getPropositions = (n, { answer, divisor, total }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    tryToAddWrongProp(propositions, Math.floor(total / divisor).frenchify());
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, Math.max(0, (total % divisor) + randint(-3, 3, [0])).frenchify());
+    });
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return (identifiers.total % identifiers.divisor).frenchify();
+};
+const getInstruction = (identifiers) => {
+    const { divisor, situation, total } = identifiers;
+    switch (situation) {
+        case 0:
+            return `J'ai $${total}$ bonbons. Si je les range dans des sachets de $${divisor}$ bonbons, combien de bonbons ne seront pas dans un sachet ?`;
+        case 1:
+            return `Une bibliothèque possède $${total}$ livres à stocker dans des boîtes. Chaque boîte doit contenir $${divisor}$ livres. Combien de livres resteront hors des boîtes ?`;
+        case 2: {
+            const pre = randomFirstname();
+            return `${pre.name} possède $${total}$ billes. ${pre.isFeminine ? "Elle" : "Il"} veux remplir des tubes de $${divisor}$ billes chacun. Combien de billes ne seront pas dans un tube ?`;
+        }
+        case 3:
+            return `Un magasin reçoit $${total}$ cartes promotionnelles. Il veut les regrouper en paquets de $${divisor}$ cartes. Combien de cartes ne seront pas dans un paquet ?`;
+        case 4:
+        default:
+            return `J'ai récolté $${total}$ pommes. Je veux les ranger dans des paniers de $${divisor}$ pommes chacun. Combien de pommes ne seront pas dans un panier ?`;
+    }
+};
+const getHint = (identifiers) => {
+    return `Écris la division euclidienne de $${identifiers.total}$ par $${identifiers.divisor}$.`;
+};
+const getCorrection = (identifiers) => {
+    const { total, divisor, situation } = identifiers;
+    const answer = getAnswer(identifiers);
+    const objectType = ["bonbon", "livre", "bille", "carte", "pomme"][situation];
+    const contentType = ["sachet", "boîte", "tube", "paquet", "panier"][situation];
+    const quotient = Math.floor(total / divisor);
+    const leftover = total % divisor;
+    return `On écrit la division euclidienne de $${identifiers.total}$ par $${identifiers.divisor}$ :
+  
+$$
+${total} = ${divisor} \\times ${quotient} + ${leftover}
+$$
+  
+Le reste est $${answer}$.
+
+On peut donc faire $${quotient}$ ${pluralize(contentType, quotient)} de $${divisor}$ ${pluralize(objectType, divisor)}, et il va rester $${answer}$ ${pluralize(objectType, total % divisor)}.`;
+};
+const getKeys = () => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return numberVEA(ans, answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getFindLeftoverInContextQuestion = () => {
+    let total = 0;
+    let divisor = 0;
+    do {
+        total = randint(30, 100);
+        divisor = randint(3, 20);
+    } while (total % divisor === 0);
+    const identifiers = {
+        situation: randint(0, 5),
+        divisor,
+        total,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+export const findLeftoverInContext = {
+    id: "findLeftoverInContext",
+    connector: "=",
+    label: "Déterminer le reste d'une division euclidienne dans un contexte",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getFindLeftoverInContextQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calcul/arithmetics/index.d.ts

@@ -16,4 +16,5 @@ export * from "./findPrimeInList.js";
 export * from "./findRightPrimeDecomposition.js";
 export * from "./primeNumberIdentification.js";
 export * from "./primeNumbersAffirmations.js";
+export * from "./findLeftoverInContext.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/arithmetics/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC"}

package/lib/exercises/math/calcul/arithmetics/index.js

@@ -16,3 +16,4 @@ export * from "./findPrimeInList.js";
 export * from "./findRightPrimeDecomposition.js";
 export * from "./primeNumberIdentification.js";
 export * from "./primeNumbersAffirmations.js";
+export * from "./findLeftoverInContext.js";

package/lib/exercises/math/calcul/fractions/fractionEquality.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    num1: number;
+    num2: number;
+    denum1: number;
+    denum2: number;
+};
+export declare const fractionEquality: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=fractionEquality.d.ts.map

package/lib/exercises/math/calcul/fractions/fractionEquality.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fractionEquality.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionEquality.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAqHF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionEquality.js

@@ -0,0 +1,123 @@
+import { addValidProp, shuffleProps, tryToAddWrongProp,
+// GeneratorOption,
+// GeneratorOptionTarget,
+// GeneratorOptionType,
+ } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+const getPropositions = (n, { answer, ...identifiers }) => {
+    const propositions = [];
+    const { denum1, denum2, num1, num2 } = identifiers;
+    addValidProp(propositions, num1 * denum2 === num2 * denum1 ? "Oui" : "Non", "raw");
+    tryToAddWrongProp(propositions, "Oui", "raw");
+    tryToAddWrongProp(propositions, "Non", "raw");
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { denum1, denum2, num1, num2 } = identifiers;
+    return num1 * denum2 === num2 * denum1 ? "Oui" : "Non";
+};
+const getInstruction = (identifiers) => {
+    const { denum1, denum2, num1, num2 } = identifiers;
+    return `L'égalité suivante est-elle vraie ?
+  
+$$
+${frac(num1, denum1).toTex()} = ${frac(num2, denum2).toTex()}
+$$`;
+};
+const getHint = () => {
+    return `Deux fractions $\\frac{a}{b}$ et $\\frac{c}{d}$ sont égales si et seulement si : 
+  
+$$
+a\\times d = b\\times c
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { denum1, denum2, num1, num2 } = identifiers;
+    const equal = num1 * denum2 === num2 * denum1;
+    return `Deux fractions $\\frac{a}{b}$ et $\\frac{c}{d}$ sont égales si et seulement si : 
+  
+$$
+a\\times d = b\\times c
+$$
+
+Ici, on a :
+
+- $${multiply(num1, denum2).toSimplificationTex()}$
+
+- $${multiply(num2, denum1).toSimplificationTex()}$
+
+${equal
+        ? `Les deux fractions sont donc bien égales.`
+        : `Les deux fractions ne sont donc pas égales.`}
+`;
+};
+const getFractionEqualityQuestion = () => {
+    const isEqual = coinFlip();
+    let num1 = randint(2, 11);
+    let denum1 = randint(2, 11, [num1]);
+    let num2;
+    let denum2;
+    const ratio = randint(2, 7);
+    if (isEqual) {
+        num2 = num1 * ratio;
+        denum2 = denum1 * ratio;
+    }
+    else {
+        num2 = num1 * ratio + randint(-1, 2, [0]);
+        denum2 = denum1 * ratio + randint(-1, 2, [0]);
+    }
+    if (coinFlip())
+        [num1, denum1, num2, denum2] = [num2, denum2, num1, denum1];
+    const identifiers = {
+        num1,
+        num2,
+        denum1,
+        denum2,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "raw",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+// type Options = {
+//   numberType: string[];
+// };
+// const options: GeneratorOption[] = [
+//   {
+//     id: "numberType",
+//     label: "Type de nombres",
+//     target: GeneratorOptionTarget.generation,
+//     type: GeneratorOptionType.multiselect,
+//     defaultValue: ["Entier", "Décimal"],
+//     values: ["Entier", "Décimal"],
+//   },
+// ];
+export const fractionEquality = {
+    id: "fractionEquality",
+    label: "Vérifier une égalité du type $\\frac{a}{b} = \\frac{c}{d}$",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getFractionEqualityQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+    answerType: "QCU",
+};

package/lib/exercises/math/calcul/fractions/index.d.ts

@@ -18,4 +18,5 @@ export * from "./fractionForbiddenValue.js";
 export * from "./simplifyToFraction.js";
 export * from "./evalFractionExpression.js";
 export * from "./fractionsMix.js";
+export * from "./fractionEquality.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/fractions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC"}

package/lib/exercises/math/calcul/fractions/index.js

@@ -18,3 +18,4 @@ export * from "./fractionForbiddenValue.js";
 export * from "./simplifyToFraction.js";
 export * from "./evalFractionExpression.js";
 export * from "./fractionsMix.js";
+export * from "./fractionEquality.js";

package/lib/exercises/math/calcul/proportionality/isProportionalFromProblem.js

@@ -286,10 +286,10 @@ const getPropositions = (_, { answer, ...identifiers }) => {
     const answerFromIdentifiers = getAnswer(identifiers);
     ["Oui", "Non"].forEach((strProp) => {
         if (strProp === answerFromIdentifiers) {
-            addValidProp(propositions, strProp);
+            addValidProp(propositions, strProp, "raw");
         }
         else {
-            tryToAddWrongProp(propositions, strProp);
+            tryToAddWrongProp(propositions, strProp, "raw");
         }
     });
     return propositions;
@@ -324,7 +324,7 @@ const getQuestionFromIdentifiers = (identifiers) => {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
         keys: [],
-        answerFormat: "tex",
+        answerFormat: "raw",
         identifiers,
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),

package/lib/exercises/math/calcul/proportionality/rectangleSideAfterReduction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rectangleSideAfterReduction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/rectangleSideAfterReduction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CAGnB,CAAC;AAqPF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAoB7D,CAAC"}
+{"version":3,"file":"rectangleSideAfterReduction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/rectangleSideAfterReduction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CAGnB,CAAC;AA4PF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAoB7D,CAAC"}

package/lib/exercises/math/calcul/proportionality/rectangleSideAfterReduction.js

@@ -1,4 +1,7 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile, } from "../../../../exercises/exercise.js";
+import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile,
+// GetHint,
+// GetCorrection,
+ } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { randfloat } from "../../../../math/utils/random/randfloat.js";
@@ -135,6 +138,12 @@ const isAnswerValid = (ans, { answer }) => {
         return handleVEAError(err);
     }
 };
+// const getHint: GetHint<Identifiers> = (identifiers) => {
+//   return ``;
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   return ``;
+// };
 const getRectangleSideAfterReductionQuestion = () => {
     const askedSize = randint(0, 4);
     let a;

package/lib/exercises/math/calculLitteral/equation/equa4.js

@@ -87,7 +87,7 @@ const isAnswerValid = (ans, { a, b, c, d }) => {
 export const equationType4Exercise = {
     id: "equa4",
     connector: "\\iff",
-    label: "Résoudre une équation du type  $ax+b=cx+d$",
+    label: "Résoudre une équation du type $ax+b=cx+d$",
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getEquationType4ExerciseQuestion, nb),
     qcmTimer: 60,

package/lib/exercises/math/calculLitteral/equation/equationFromFrenchDescription.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+};
+export declare const equationFromFrenchDescription: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=equationFromFrenchDescription.d.ts.map

package/lib/exercises/math/calculLitteral/equation/equationFromFrenchDescription.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"equationFromFrenchDescription.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationFromFrenchDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,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;AAiJF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationFromFrenchDescription.js

@@ -0,0 +1,142 @@
+import { addValidProp, shuffleProps, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { equationResolutionTex } from "../../../../tree/nodes/equations/equalNode.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+const getPropositions = (n, { answer, a, b, c, d }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const sol = frac(d - b, a - c).simplify();
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, add(sol, randint(-3, 4, [0]))
+            .simplify()
+            .toTex());
+    });
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    return frac(d - b, a - c)
+        .simplify()
+        .toTex();
+};
+const getInstruction = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    const bWord = b > 0 ? "ajoute" : "soustrait";
+    const bFullWord = b > 0 ? "m'ajoute" : "me soustrait";
+    const dWord = d > 0 ? "ajouté" : "soustrait";
+    const multiplyWords = ["double", "triple", "quadruple"];
+    return `Je suis un nombre.
+  
+${a === 1
+        ? `Si on ${bFullWord} $${Math.abs(b)}$,`
+        : `Si on me multiple par $${a}$, puis qu'on ${bWord} $${Math.abs(b)}$ au résultat,`} on trouve mon ${multiplyWords[c - 2]} auquel on a ${dWord} $${Math.abs(d)}$.
+
+Qui suis-je ?
+`;
+};
+const getHint = () => {
+    return `Note $x$ le nombre recherché, puis écris l'équation correspondant à la situation donnée dans l'énoncé.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    const bWord = b > 0 ? "ajoute" : "soustrait";
+    // const bFullWord = b > 0 ? "m'ajoute" : "me soustrait";
+    const dWord = d > 0 ? "ajouté" : "soustrait";
+    const multiplyWords = ["double", "triple", "quadruple"];
+    return `On note $x$ le nombre recherché.
+  
+
+  ${a === 1
+        ? `Le nombre auquel on ${bWord} $${Math.abs(b)}$`
+        : `Le nombre multiplé par $${a}$, auquel on ${bWord} $${Math.abs(b)}$`} vaut :
+  
+$$
+${add(multiply(a, "x"), b)
+        .simplify({ towardsDistribute: true, forbidFactorize: true })
+        .toTex()}
+$$
+
+Le ${multiplyWords[c - 2]} du nombre auquel on a ${dWord} $${Math.abs(d)}$ vaut :
+
+$$
+${add(multiply(c, "x"), d)
+        .simplify({ towardsDistribute: true, forbidFactorize: true })
+        .toTex()}
+$$
+
+On peut donc écrire l'équation : 
+
+$$
+${add(multiply(a, "x"), b)
+        .simplify({ towardsDistribute: true, forbidFactorize: true })
+        .toTex()} = ${add(multiply(c, "x"), d)
+        .simplify({ towardsDistribute: true, forbidFactorize: true })
+        .toTex()}
+$$
+
+On résout l'équation : 
+
+$$
+${equationResolutionTex(a.toTree(), b.toTree(), c.toTree(), d.toTree())}
+$$
+
+Le nombre recherché est donc $${getAnswer(identifiers)}$.
+`;
+};
+const getKeys = () => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return rationalVEA(ans, answer, {
+            allowDecimal: true,
+            allowNonIrreductible: true,
+        });
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getEquationFromFrenchDescriptionQuestion = () => {
+    // pas 1 pour c
+    //
+    const c = randint(2, 5);
+    const a = randint(1, 6, [c]);
+    const b = randint(-10, 10, [0]);
+    const d = randint(-10, 10, [0]);
+    const identifiers = { a, b, c, d };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+export const equationFromFrenchDescription = {
+    id: "equationFromFrenchDescription",
+    label: "Modéliser et résoudre une équation décrite en français",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getEquationFromFrenchDescriptionQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/equation/equationFromSentenceExercise.js

@@ -22,14 +22,14 @@ const getInstruction = (identifiers) => {
     switch (type) {
         case 1:
             return (instruction +
-                `"${flip ? `Le double` : `La moitié`} du nombre à trouver vaut $${resultNb}$".`);
+                `>${flip ? `Le double` : `La moitié`} du nombre à trouver vaut $${resultNb}$.`);
         case 2:
             return (instruction +
-                `"${flip ? `La somme` : `La différence`} du nombre à trouver et de $${randAdd}$ a pour résultat $${resultNb}$".`);
+                `>${flip ? `La somme` : `La différence`} du nombre à trouver et de $${randAdd}$ a pour résultat $${resultNb}$.`);
         case 3:
         default:
             return (instruction +
-                `"${flip ? `Le double` : `La moitié`} du nombre à trouver ${flip ? op2 : op2 + "e"} de $${randAdd}$ vaut $${resultNb}$".`);
+                `>${flip ? `Le double` : `La moitié`} du nombre à trouver ${flip ? op2 : op2 + "e"} de $${randAdd}$ vaut $${resultNb}$.`);
     }
 };
 const getAnswerNode = (identifiers) => {

package/lib/exercises/math/calculLitteral/equation/equationSimpleSquare.d.ts

@@ -2,6 +2,9 @@ import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     randNbr: number;
 };
-export declare const equationSimpleSquare: Exercise<Identifiers>;
+type Options = {
+    solutionType: string[];
+};
+export declare const equationSimpleSquare: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=equationSimpleSquare.d.ts.map

package/lib/exercises/math/calculLitteral/equation/equationSimpleSquare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAoKF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAgLF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAqBF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgB/D,CAAC"}