math-exercises 3.0.141 → 3.0.142

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/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"}

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

@@ -1,4 +1,4 @@
-import { addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Rational } from "../../../../math/numbers/rationals/rational.js";
 import { SquareRoot } from "../../../../math/numbers/reals/real.js";
@@ -8,11 +8,11 @@ import { OppositeNode } from "../../../../tree/nodes/functions/oppositeNode.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { DiscreteSetNode } from "../../../../tree/nodes/sets/discreteSetNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
-import { diceFlip } from "../../../../utils/alea/diceFlip.js";
 import { isInt } from "../../../../utils/isInt.js";
 import { random } from "../../../../utils/alea/random.js";
 import { discreteSetParser } from "../../../../tree/parsers/discreteSetParser.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { doWhile } from "../../../../utils/doWhile.js";
 const squares = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12].map((el) => el ** 2);
 const higherFactor = (n) => {
     for (let i = Math.floor(Math.sqrt(n)); i > 0; i--)
@@ -73,15 +73,18 @@ Ainsi, $${answer}$.
 `}
     `;
 };
-const getEquationSimpleSquare = () => {
+const getEquationSimpleSquare = (opts) => {
     let randNbr;
-    const rand = diceFlip(10);
-    if (rand === 1)
+    const type = random(opts?.solutionType ?? ["Entiers", "Racines carrées", "Ensemble vide"]);
+    if (type === "Ensemble vide") {
         randNbr = randint(-20, 0);
-    else if (rand < 6)
+    }
+    else if (type === "Racines carrées") {
+        randNbr = doWhile(() => randint(2, 100), (x) => Math.sqrt(x) === Math.floor(Math.sqrt(x)));
+    }
+    else {
         randNbr = random(squares);
-    else
-        randNbr = randint(2, 100);
+    }
     const identifiers = { randNbr };
     return getQuestionFromIdentifiers(identifiers);
 };
@@ -144,12 +147,30 @@ const isAnswerValid = (ans, { answer }) => {
         return handleVEAError(err);
     }
 };
+const options = [
+    {
+        id: "solutionType",
+        label: "Type de solutions",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.multiselect,
+        defaultValue: ["Entiers", "Racines carrées", "Ensemble vide"],
+        values: ["Entiers", "Racines carrées", "Ensemble vide"],
+    },
+];
+const validateOptions = (opts) => {
+    if (opts?.solutionType?.length === 0)
+        return {
+            valid: false,
+            message: "Veuillez choisir au moins un type de solution.",
+        };
+    return { valid: true, message: "" };
+};
 export const equationSimpleSquare = {
     id: "equationSimpleSquare",
     connector: "=",
     label: "Résoudre une équation du second degré du type $x^2 = a$",
     isSingleStep: false,
-    generator: (nb) => getDistinctQuestions(getEquationSimpleSquare, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getEquationSimpleSquare(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -157,4 +178,6 @@ export const equationSimpleSquare = {
     subject: "Mathématiques",
     hasHintAndCorrection: true,
     getQuestionFromIdentifiers,
+    options,
+    validateOptions,
 };

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

@@ -16,4 +16,6 @@ export * from "./choseOperationToSolveEquation.js";
 export * from "./factorizeEquation.js";
 export * from "./equationFromProblem.js";
 export * from "./isEqualityTrue.js";
+export * from "./proportionEquation.js";
+export * from "./solveByFactorizingWithIdRmq3.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC"}

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

@@ -16,3 +16,5 @@ export * from "./choseOperationToSolveEquation.js";
 export * from "./factorizeEquation.js";
 export * from "./equationFromProblem.js";
 export * from "./isEqualityTrue.js";
+export * from "./proportionEquation.js";
+export * from "./solveByFactorizingWithIdRmq3.js";

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

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
+type Identifiers = {
+    aIds: NodeIdentifiers;
+    bIds: NodeIdentifiers;
+    cIds: NodeIdentifiers;
+    dIds: NodeIdentifiers;
+};
+export declare const proportionEquation: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=proportionEquation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"proportionEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/proportionEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAY7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AA6JF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAmBpD,CAAC"}

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

@@ -0,0 +1,152 @@
+import { addValidProp, shuffleProps, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
+import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { isVariableNode, VariableNode, } from "../../../../tree/nodes/variables/variableNode.js";
+import { arrayRotation } from "../../../../utils/arrays/rotation.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getPropositions = (n, { answer, aIds, bIds, cIds, dIds }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const ids = [aIds, bIds, cIds, dIds];
+    for (let i = 0; i < 3; i++) {
+        const rotated = arrayRotation(ids, i + 1);
+        tryToAddWrongProp(propositions, getAnswerNode({
+            aIds: rotated[0],
+            bIds: rotated[1],
+            cIds: rotated[2],
+            dIds: rotated[3],
+        }).toTex());
+    }
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTree().toTex());
+    });
+    return shuffleProps(propositions, n);
+};
+const getAnswerNode = (identifiers) => {
+    const { aIds, bIds, cIds, dIds } = identifiers;
+    const values = [aIds, bIds, cIds, dIds].map((e) => reifyAlgebraic(e));
+    //a/b=c/d
+    //a=cb/d, b=ad/c, c=ad/b, d=cb/a
+    const xIndex = values.findIndex((x) => isVariableNode(x));
+    return frac(multiply(values[(xIndex + 2) % 4], values[xIndex % 2 === 0 ? xIndex + 1 : xIndex - 1]), values[3 - xIndex]).simplify();
+};
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    const { aIds, bIds, cIds, dIds } = identifiers;
+    const [a, b, c, d] = [aIds, bIds, cIds, dIds].map((e) => reifyAlgebraic(e).toTex());
+    return `Déterminer la valeur de $x$ solution de l'équation suivante :
+  
+$$
+\\frac{${a}}{${b}}=\\frac{${c}}{${d}}
+$$`;
+};
+const getHint = () => {
+    return `Si deux fractions sont égales : 
+  
+$$
+\\frac{a}{b}=\\frac{c}{d}
+$$
+
+alors on a : 
+
+$$
+a\\times d = b\\times c
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { aIds, bIds, cIds, dIds } = identifiers;
+    const values = [aIds, bIds, cIds, dIds].map((e) => reifyAlgebraic(e));
+    const xIndex = values.findIndex((x) => isVariableNode(x));
+    const answerRaw = frac(multiply(values[(xIndex + 2) % 4], values[xIndex % 2 === 0 ? xIndex + 1 : xIndex - 1]), values[3 - xIndex]);
+    return `Puisque : 
+  
+$$
+\\frac{${values[0].toTex()}}{${values[1].toTex()}}=\\frac{${values[2].toTex()}}{${values[3].toTex()}}
+$$
+
+alors :
+
+$$
+${multiply(values[0], values[3]).toTex()}= ${multiply(values[1], values[2]).toTex()}
+$$
+
+On a donc : 
+
+${alignTex([
+        ["x", "=", answerRaw.toTex()],
+        ["", "=", answerRaw.simplify().toTex()],
+    ])}
+`;
+};
+const getKeys = () => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return rationalVEA(ans, answer, {
+            allowNonIrreductible: true,
+            allowDecimal: true,
+        });
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getProportionEquationQuestion = () => {
+    const x = new VariableNode("x");
+    const values = [];
+    const numbers = [];
+    const xIndex = randint(0, 4);
+    for (let i = 0; i < 4; i++) {
+        if (i === xIndex)
+            values[i] = x.toIdentifiers();
+        else {
+            numbers[i] = randint(1, 12, i % 2 !== 0 ? [1, numbers[i - 1]] : []);
+            values[i] = numbers[i].toTree().toIdentifiers();
+        }
+    }
+    const identifiers = {
+        aIds: values[0],
+        bIds: values[1],
+        cIds: values[2],
+        dIds: values[3],
+    };
+    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 proportionEquation = {
+    id: "proportionEquation",
+    connector: "=",
+    label: "Résoudre une équation de proportionnalité du type $\\frac ab = \\frac xc$",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getProportionEquationQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

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

@@ -0,0 +1,12 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
+type Identifiers = {
+    aIds: NodeIdentifiers;
+    bIds: NodeIdentifiers;
+};
+type Options = {
+    useSetAsAnswer: boolean;
+};
+export declare const solveByFactorizingWithIdRmq3: Exercise<Identifiers, Options>;
+export {};
+//# sourceMappingURL=solveByFactorizingWithIdRmq3.d.ts.map