math-exercises 3.0.131 → 3.0.133

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

@@ -1 +1 @@
-{"version":3,"file":"equationFromProblem.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationFromProblem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AActE,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACzE,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,YAAY,EAAE,eAAe,CAAC;CAC/B,CAAC;AAmrBF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}
+{"version":3,"file":"equationFromProblem.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationFromProblem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAatE,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACzE,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,YAAY,EAAE,eAAe,CAAC;CAC/B,CAAC;AAsrBF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

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

@@ -10,7 +10,6 @@ import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { substract } from "../../../../tree/nodes/operators/substractNode.js";
 import { random, randomMany } from "../../../../utils/alea/random.js";
 import { isOperatorNode, OperatorIds, } from "../../../../tree/nodes/operators/operatorNode.js";
-import { alignTex } from "../../../../utils/latex/alignTex.js";
 class ProblemConstructor {
     static byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays) {
         const shuffleFuncs = shuffleArrays.map((shuffleArray) => {
@@ -71,14 +70,14 @@ class Problem {
         });
     }
     getExplanationString() {
-        const arrArr = Object.values(this.groups).map((group) => [
-            `\\text{${group.getScalarString(this.mysteryVar).replaceAll("$", "")}}`,
-            `:`,
-            `${group
-                .getNode(this.mysteryVar, this.groups, this.shuffleFuncs)
-                .toTex()}`,
-        ]);
-        return alignTex(arrArr, false);
+        const arrArr = Object.values(this.groups).map((group) => `\n - ${group.getScalarString(this.mysteryVar)}` +
+            ` : ` +
+            `\n 
+$$
+${group.getNode(this.mysteryVar, this.groups, this.shuffleFuncs).toTex()}
+$$ 
+\n `);
+        return arrArr.join("");
     }
 }
 class ProblemVarGroup {

package/lib/exercises/math/calculLitteral/simplifying/compareATimes0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compareATimes0.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/compareATimes0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAqGF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}
+{"version":3,"file":"compareATimes0.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/compareATimes0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAwGF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}

package/lib/exercises/math/calculLitteral/simplifying/compareATimes0.js

@@ -45,9 +45,9 @@ const getCompareATimes0Question = () => {
     const nbInvalid = nbTotal - nbValid;
     const validItems = [
         `0 \\times a`,
-        `a \\times 0`,
         `\\frac{0}{a}`,
         `a + (-a)`,
+        `a \\times 0`,
     ].map((tex) => {
         return {
             tex,
@@ -55,8 +55,8 @@ const getCompareATimes0Question = () => {
         };
     });
     const invalidItems = [
+        `\\frac{a}{0}`,
         `a \\times (-a)`,
-        `(-a) \\times a`,
         `\\frac{a}{a}`,
         `\\frac{a}{-a}`,
         `a - (-a)`,
@@ -68,8 +68,8 @@ const getCompareATimes0Question = () => {
         };
     });
     const items = shuffle([
-        ...shuffle(validItems).slice(0, nbValid),
-        ...shuffle(invalidItems).slice(0, nbInvalid),
+        ...shuffle(validItems.slice(0, Math.max(2, nbValid))).slice(0, nbValid),
+        ...shuffle([...invalidItems.slice(0, 1), ...invalidItems.slice(1)]).slice(0, nbInvalid),
     ]);
     return getQuestionFromIdentifiers({ items });
 };

package/lib/exercises/math/calculLitteral/writing/writeLitExpFromFrenchExp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeLitExpFromFrenchExp.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/writing/writeLitExpFromFrenchExp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAmCrC,KAAK,QAAQ,GACT,UAAU,GACV,SAAS,GACT,KAAK,GACL,UAAU,GACV,UAAU,GACV,QAAQ,CAAC;AAoEb,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,QAAQ,CAAC;IACvB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAAC;AAuRF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAkBxD,CAAC"}
+{"version":3,"file":"writeLitExpFromFrenchExp.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/writing/writeLitExpFromFrenchExp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAmCrC,KAAK,QAAQ,GACT,UAAU,GACV,SAAS,GACT,KAAK,GACL,UAAU,GACV,UAAU,GACV,QAAQ,CAAC;AAoEb,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,QAAQ,CAAC;IACvB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAAC;AAyNF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAkBxD,CAAC"}

package/lib/exercises/math/calculLitteral/writing/writeLitExpFromFrenchExp.js

@@ -157,77 +157,32 @@ const getHint = (identifiers) => {
         case "opposite":
             return `La somme d'un nombre et de son opposé donne $0$.`;
         case "inverse":
-            return `L'inverse de $8$ est $0,25$.`;
+            return `L'inverse de $8$ est $0.25$.`;
         case "add":
-            return `La somme de $8$ et de $6$ est $14$.`;
+            return `La somme de $8457$ et de $6567$ est $${8457 + 6567}$.`;
         case "subtract":
-            return `La différence entre $8$ et $6$ est $2$.`;
-        case "multiply": {
-            const statementString = ExpressionConstructor.fromIdentifiers(identifiers).strFrench;
-            if (!statementString.includes("produit")) {
-                const bHint = randint(2, 10, typeof identifiers.b === "number" ? [identifiers.b] : []);
-                const exprHint1 = ExpressionConstructor.fromIdentifiers(Object.assign({}, identifiers, {
-                    b: "" + bHint,
-                }));
-                const exprHint2 = ExpressionConstructor.fromIdentifiers(Object.assign({}, identifiers, {
-                    b: bHint,
-                }));
-                return `${capitalize(exprHint1.strFrench)} est $${exprHint2.node
-                    .simplify()
-                    .toTex()}$.`;
-            }
-            else {
-                return `Le produit de $8$ par $6$ est $48$.`;
-            }
-        }
-        case "divide": {
-            const statementString = ExpressionConstructor.fromIdentifiers(identifiers).strFrench;
-            if (!statementString.includes("quotient")) {
-                const aHint = randint(2, 10, typeof identifiers.a === "number" ? [identifiers.a] : []);
-                const exprHint1 = ExpressionConstructor.fromIdentifiers(Object.assign({}, identifiers, {
-                    a: "" + aHint,
-                }));
-                const exprHint2 = ExpressionConstructor.fromIdentifiers(Object.assign({}, identifiers, {
-                    a: aHint,
-                }));
-                return `${capitalize(exprHint1.strFrench)} est $${exprHint2.node.toTex()}$.`;
-            }
-            else {
-                return `Le quotient de $200$ par $8$ est $25$.`;
-            }
-        }
+            return `La différence entre $8457$ est $6567$ est $${8457 - 6567}$.`;
+        case "multiply":
+            return `Le produit de $8457$ par $6567$ est $${8457 * 6567}$ .`;
+        case "divide":
+            return `Le quotient de $200$ par $8$ est $25$.`;
     }
 };
 const getCorrection = (identifiers) => {
-    const { a, operatorName, b } = identifiers;
     const expression = ExpressionConstructor.fromIdentifiers(identifiers);
     const statementString = expression.strFrench;
+    let outString = `${capitalize(statementString)} est $ ${getAnswer(identifiers)} $.`;
     //explain rewriting if needed
     const nodeRaw = expression.node;
     const nodeRefined = nodeRaw.simplify();
-    let texRaw;
-    switch (operatorName) {
-        case "add":
-            {
-                const [texA, texB] = [a, b].map((c) => parseAlgebraic("" + c).toTex());
-                const isWrapWithParenthesis = ("" + b).startsWith("-");
-                texRaw = `${texA}+${isWrapWithParenthesis ? `(${texB})` : `${texB}`}`;
-            }
-            break;
-        default:
-            {
-                texRaw = nodeRaw.toTex({
-                    allowDoubleMinus: true,
-                    forceTimesSign: true,
-                    forceParenthesis: true,
-                    forceNoSimplification: true,
-                    allowMinusAnywhereInFraction: true,
-                });
-            }
-            break;
-    }
+    const texRaw = nodeRaw.toTex({
+        allowDoubleMinus: true,
+        forceTimesSign: true,
+        forceParenthesis: true,
+        forceNoSimplification: true,
+        allowMinusAnywhereInFraction: true,
+    });
     const texRefined = nodeRefined.toTex();
-    let outString = `${capitalize(statementString)} est $ ${texRefined} $.`;
     if (texRaw !== texRefined) {
         outString += `
 

package/lib/exercises/math/conversion/kmPerMinToKmPerHourConversion.js

@@ -12,14 +12,15 @@ const getInstruction = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
     const { unitTex } = opts;
     return `Si on parcourt $${distance.frenchify()} \\ \\textrm{km}$ en $${minutes.frenchify()} \\ \\textrm{min}$, 
-quelle est la vitesse moyenne en $${unitTex}$ ?`;
+quelle est la vitesse moyenne en ${unitTex} ?`;
 };
 const getAnswer = (identifiers, optsIn) => {
     const { distance, minutes } = identifiers;
     const opts = optsIn ?? optsDefault;
     const { unitTex } = opts;
+    const unlatexedUnit = unitTex.substring(1, unitTex.length - 1);
     const nodeAnswer = multiply(distance, frac(60, minutes));
-    return `${nodeAnswer.simplify().toTex()} \\ ${unitTex}`;
+    return `${nodeAnswer.simplify().toTex()} \\ ${unlatexedUnit}`;
 };
 const isAnswerValid = (ans, { distance, minutes }) => {
     const nodeAnswer = multiply(distance, frac(60, minutes));
@@ -33,21 +34,23 @@ const getCorrection = (identifiers, optsIn) => {
     const { distance, minutes } = identifiers;
     const opts = optsIn ?? optsDefault;
     const { unitTex } = opts;
+    const unlatexedUnit = unitTex.substring(1, unitTex.length - 1);
     return `En $60$ minutes, on parcourt $${multiply(distance, frac(60, minutes)).toTex()} \\ \\textrm{km}$ 
 donc la vitesse est de $${multiply(distance, frac(60, minutes).simplify()).toTex()} = ${multiply(distance, frac(60, minutes))
         .simplify()
-        .toTex()} \\ ${unitTex}$`;
+        .toTex()} \\ ${unlatexedUnit}$`;
 };
 const getPropositions = (n, { answer, distance, minutes }, optsIn) => {
     const opts = optsIn ?? optsDefault;
     const { unitTex } = opts;
+    const unlatexedUnit = unitTex.substring(1, unitTex.length - 1);
     const propositions = [];
     addValidProp(propositions, answer);
-    tryToAddWrongProp(propositions, `${multiply(60, minutes).simplify().toTex()} \\ ${unitTex}`);
-    tryToAddWrongProp(propositions, `${frac(distance, minutes).simplify().toTex()} \\ ${unitTex}`);
+    tryToAddWrongProp(propositions, `${multiply(60, minutes).simplify().toTex()} \\ ${unlatexedUnit}`);
+    tryToAddWrongProp(propositions, `${frac(distance, minutes).simplify().toTex()} \\ ${unlatexedUnit}`);
     tryToAddWrongProp(propositions, `${multiply(3.6, frac(distance, minutes))
         .simplify()
-        .toTex()} \\ ${unitTex}`);
+        .toTex()} \\ ${unlatexedUnit}`);
     return shuffleProps(propositions, n);
 };
 const getKmPerMinToKmPerHourConversionQuestion = (optsIn) => {
@@ -62,17 +65,18 @@ const getKmPerMinToKmPerHourConversionQuestion = (optsIn) => {
 };
 const getQuestionFromIdentifiers = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
+    const unlatexedUnit = opts.unitTex.substring(1, opts.unitTex.length - 1);
     const question = {
         answer: getAnswer(identifiers, opts),
         instruction: getInstruction(identifiers, opts),
         keys: [
             {
                 id: "custom",
-                label: opts.unitTex,
+                label: unlatexedUnit,
                 labelType: "tex",
                 mathfieldInstructions: {
                     method: "write",
-                    content: opts.unitTex,
+                    content: unlatexedUnit,
                 },
             },
         ],
@@ -85,7 +89,7 @@ const getQuestionFromIdentifiers = (identifiers, optsIn) => {
     return question;
 };
 const optsDefault = {
-    unitTex: "\\textrm{km/h}",
+    unitTex: "$\\textrm{km/h}$",
 };
 const options = [
     {
@@ -93,7 +97,7 @@ const options = [
         label: "Unité affichée",
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.select,
-        values: ["\\textrm{km/h}", "\\textrm{km}.\\textrm{h}^{-1}"],
+        values: ["$\\textrm{km/h}$", "$\\textrm{km}\\cdot \\textrm{h}^{-1}$"],
         defaultValue: optsDefault.unitTex,
     },
 ];

package/lib/exercises/math/conversion/lengthConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/lengthConversion.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,QAAQ,EAiBT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAuKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkB3D,CAAC"}
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/lengthConversion.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,QAAQ,EAiBT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAwKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkB3D,CAAC"}

package/lib/exercises/math/conversion/lengthConversion.js

@@ -126,6 +126,7 @@ const options = [
         type: GeneratorOptionType.multiselect,
         target: GeneratorOptionTarget.generation,
         values: units,
+        defaultValue: units,
     },
 ];
 const validateOptions = (opts) => {

package/lib/exercises/math/conversion/prefixToNumber.d.ts

@@ -2,8 +2,6 @@ import { Exercise } from "../../exercise.js";
 type Identifiers = {
     prefixIndexesPool: number[];
     prefixIndex: number;
-    isToPow10: boolean;
-    isFromSymbol: boolean;
 };
 type Options = {
     prefixPool: string[];

package/lib/exercises/math/conversion/prefixToNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefixToNumber.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/prefixToNumber.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAiBT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAoMF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AA+EF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBzD,CAAC"}
+{"version":3,"file":"prefixToNumber.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/prefixToNumber.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAiBT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAyNF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AA0EF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAuBzD,CAAC"}

package/lib/exercises/math/conversion/prefixToNumber.js

@@ -105,20 +105,24 @@ const getMdTable = (prefixes, indexBold = -1) => {
         ].map((str) => (i === indexBold ? boldify(str) : str))),
     ]);
 };
-const getInstruction = (identifiers) => {
-    const { prefixIndex, isFromSymbol, isToPow10 } = identifiers;
+const getInstruction = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { prefixIndex } = identifiers;
+    const { isFromSymbol, isToPow10 } = opts;
     const prefix = prefixes[prefixIndex];
     return `Quelle est la valeur du préfixe ${isFromSymbol ? `$${prefix.symbol}$` : prefix.name} ?
   
-Ecrire la réponse sous la forme ${isToPow10 ? `d'une puissance de $10$` : `d'un nombre décimal`}.`;
+Écrire la réponse sous la forme ${isToPow10 ? `d'une puissance de $10$` : `d'un nombre décimal`}.`;
 };
 const getHint = (identifiers) => {
     const { prefixIndexesPool } = identifiers;
     const prefixPool = prefixIndexesPool.map((i) => prefixes[i]);
     return getMdTable(prefixPool);
 };
-const getCorrection = (identifiers) => {
-    const { prefixIndexesPool, prefixIndex, isToPow10 } = identifiers;
+const getCorrection = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { prefixIndexesPool, prefixIndex } = identifiers;
+    const { isToPow10 } = opts;
     const prefix = prefixes[prefixIndex];
     const prefixPool = prefixIndexesPool.map((i) => prefixes[i]);
     const indexBold = (() => {
@@ -135,13 +139,17 @@ ${!isToPow10
         ? `$${prefix.texPow10}$ correspond à l'écriture décimale $${prefix.texValue}$.`
         : ``}`;
 };
-const getAnswer = (identifiers) => {
-    const { prefixIndex, isToPow10 } = identifiers;
+const getAnswer = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { prefixIndex } = identifiers;
+    const { isToPow10 } = opts;
     const prefix = prefixes[prefixIndex];
     return isToPow10 ? prefix.texPow10 : prefix.texValue;
 };
-const getPropositions = (n, { answer, ...identifiers }) => {
-    const { prefixIndexesPool, prefixIndex, isToPow10 } = identifiers;
+const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { prefixIndexesPool, prefixIndex } = identifiers;
+    const { isToPow10 } = opts;
     const propositions = [];
     addValidProp(propositions, answer);
     const wrongIndexesPool = prefixIndexesPool.filter((i) => i !== prefixIndex);
@@ -162,10 +170,10 @@ const isAnswerValid = (ans, { answer }) => {
     const nodeAnswer = parseAlgebraic(answer);
     return substract(nodeAns, nodeAnswer).evaluate() === 0;
 };
-const optionsDefault = {
+const optsDefault = {
     prefixPool: prefixes.map((prefix) => prefix.name),
-    isToPow10: [true, false],
-    isFromSymbol: [true, false],
+    isToPow10: true,
+    isFromSymbol: true,
 };
 const options = [
     {
@@ -174,24 +182,25 @@ const options = [
         type: GeneratorOptionType.multiselect,
         target: GeneratorOptionTarget.generation,
         values: prefixes.map((prefix) => prefix.name),
+        defaultValue: optsDefault.prefixPool,
     },
     {
         id: "isToPow10",
         label: "Réponse sous forme de puissance de 10 ?",
         type: GeneratorOptionType.checkbox,
         target: GeneratorOptionTarget.generation,
-        values: optionsDefault.isToPow10,
+        defaultValue: optsDefault.isToPow10,
     },
     {
-        id: "units",
+        id: "isFromSymbol",
         label: "Utiliser le symbole pour la question ?",
         type: GeneratorOptionType.checkbox,
         target: GeneratorOptionTarget.generation,
-        values: optionsDefault.isFromSymbol,
+        defaultValue: optsDefault.isFromSymbol,
     },
 ];
 const getPrefixToNumberQuestion = (optsIn) => {
-    const opts = optsIn ? Object.assign(optionsDefault, optsIn) : optionsDefault;
+    const opts = optsIn ?? optsDefault;
     const prefixIndexesPool = opts.prefixPool.map((prefixName) => {
         const prefixIndex = (() => {
             for (let i = 0; i < prefixes.length; i++) {
@@ -200,15 +209,11 @@ const getPrefixToNumberQuestion = (optsIn) => {
             }
         })();
         return prefixIndex;
-    }) ?? optionsDefault.prefixPool;
+    });
     const prefixIndex = random(prefixIndexesPool);
-    const isFromSymbol = optsIn?.isFromSymbol ?? random(optionsDefault.isFromSymbol);
-    const isToPow10 = optsIn?.isToPow10 ?? random(optionsDefault.isToPow10);
     const identifiers = {
         prefixIndexesPool,
         prefixIndex,
-        isFromSymbol,
-        isToPow10,
     };
     return getQuestionFromIdentifiers(identifiers, optsIn);
 };
@@ -219,8 +224,9 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
+        options: opts,
     };
     return question;
 };
@@ -229,7 +235,8 @@ export const prefixToNumber = {
     connector: "=",
     label: "Convertir un préfixe en nombre",
     isSingleStep: true,
-    generator: (nb, opts) => getDistinctQuestions(() => getPrefixToNumberQuestion(opts), nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getPrefixToNumberQuestion(opts), nb, 10, () => false),
+    maxAllowedQuestions: 10,
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

package/lib/exercises/math/conversion/secondsToHours.js

@@ -102,7 +102,7 @@ const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
-        keys: ["hours", "minutes"],
+        keys: ["hours", "seconds"],
         answerFormat: "tex",
         identifiers,
         hint: getHint(identifiers),

package/lib/exercises/math/functions/affines/drawAffineFromPointAndLeadingCoeff.js

@@ -14,6 +14,7 @@ import { add } from "../../../../tree/nodes/operators/addNode.js";
 const getHint = () => {
     return `Si $f$ est une fonction telle que $f(x) = y$, 
 alors la droite représentative de f passe par le point de coordonnées $(x;y)$.
+
 Si le coefficient directeur vaut $\\frac{v}{h}$ alors le point de coordonnées $(x+h;y+v)$
 appartient aussi à la droite représentative de $f$.`;
 };
@@ -50,8 +51,7 @@ const getInstruction = (identifiers) => {
     const pointA = PointConstructor.fromIdentifiers(pointIdsA);
     const coeff = NodeConstructor.fromIdentifiers(leadingCoeff);
     const texCoeff = numberType === "Fraction" ? coeff.toTex() : coeff.evaluate().frenchify();
-    return `La fonction $${funcName}$ est telle que $f(x)=${texCoeff}x+b$ avec b un nombre réel et 
-$ ${funcName}(${pointA.x.toTex()}) = ${pointA.y.toTex()} $.
+    return `La fonction affine $${funcName}$ a pour représentation graphique une droite de  coefficient directeur $${texCoeff}$ et qui passe par le point de coordonnées $\\left(${pointA.x.toTex()}; ${pointA.y.toTex()}\\right)$.
 
 Dans le repère, tracer la représentation graphique de la fonction $${funcName}$.`;
 };

package/lib/exercises/math/functions/affines/drawAffineFromProgCalc.d.ts

@@ -5,7 +5,7 @@ type Identifiers = {
     funcName: string;
 };
 type Options = {
-    nbSteps: Exclude<number, 0>;
+    nbSteps: string;
     isSingleUseOperators: boolean;
 };
 export declare const drawAffineFromProgCalc: Exercise<Identifiers, Options>;

package/lib/exercises/math/functions/affines/drawAffineFromProgCalc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawAffineFromProgCalc.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/drawAffineFromProgCalc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAEL,mBAAmB,EAEpB,MAAM,iCAAiC,CAAC;AAOzC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,mBAAmB,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAkOF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAwBF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmBjE,CAAC"}
+{"version":3,"file":"drawAffineFromProgCalc.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/drawAffineFromProgCalc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAEL,mBAAmB,EAEpB,MAAM,iCAAiC,CAAC;AAOzC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,mBAAmB,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAkOF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAuBF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmBjE,CAAC"}

package/lib/exercises/math/functions/affines/drawAffineFromProgCalc.js

@@ -164,7 +164,7 @@ const getDrawAffineFromProgCalcQuestion = (opts) => {
     const opGenConfigAddsub = random(arrOpGenAddsub);
     const opGenConfigMuldiv = random(arrOpGenMuldiv);
     const arrOpGenConfigMandatory = [opGenConfigAddsub, opGenConfigMuldiv];
-    const progCalc = ProgCalcConstructor.randomWithMandatory(nbSteps, isSingleUseOperators, arrOpGenConfigMandatory, arrOpGenConfigAll);
+    const progCalc = ProgCalcConstructor.randomWithMandatory(Number(nbSteps), isSingleUseOperators, arrOpGenConfigMandatory, arrOpGenConfigAll);
     const identifiers = {
         progCalcIds: progCalc.toIdentifiers(),
         funcName: random(["f", "g", "h"]),
@@ -182,7 +182,7 @@ const getQuestionFromIdentifiers = (identifiers) => {
     };
 };
 const optsDefault = {
-    nbSteps: 2,
+    nbSteps: "2",
     isSingleUseOperators: true,
 };
 const options = [
@@ -190,7 +190,7 @@ const options = [
         id: "nbSteps",
         label: "Nombre d'étapes de transformation",
         defaultValue: optsDefault.nbSteps,
-        values: [2, 3, 4, 5],
+        values: ["2", "3", "4", "5"],
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.select,
     },
@@ -198,9 +198,8 @@ const options = [
         id: "isSingleUseOperators",
         label: "Opérateurs à usage unique",
         defaultValue: optsDefault.isSingleUseOperators,
-        values: [true, false],
         target: GeneratorOptionTarget.generation,
-        type: GeneratorOptionType.select,
+        type: GeneratorOptionType.checkbox,
     },
 ];
 export const drawAffineFromProgCalc = {

package/lib/exercises/math/functions/affines/leadingCoefficient.js

@@ -121,7 +121,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.select,
         values: ["Affines", "Linéaires", "Les deux"],
-        defaultValue: ["Les deux"],
+        defaultValue: "Les deux",
     },
 ];
 export const leadingCoefficient = {

package/lib/exercises/math/geometry/angles/anglesUsingIsParallel.d.ts

@@ -16,7 +16,7 @@ type Identifiers = {
 type Options = {
     angleTypes: ("alternes-internes" | "correspondants" | "alternes-externes" | "autres")[];
     isFakeDisplay: boolean;
-    nbDigits: 0 | 1 | 2;
+    nbDigits: "0" | "1" | "2";
 };
 export declare const anglesUsingIsParallel: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/geometry/angles/anglesUsingIsParallel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anglesUsingIsParallel.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/angles/anglesUsingIsParallel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAuItC,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AA6HF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EACL,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CAAC;IAGb,kBAAkB,EAAE,eAAe,EAAE,CAAC;IACtC,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACxC,CAAC;AAwMF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,CACR,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CACX,EAAE,CAAC;IACJ,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;CACrB,CAAC;AA2NF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBhE,CAAC"}
+{"version":3,"file":"anglesUsingIsParallel.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/angles/anglesUsingIsParallel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAuItC,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AA6HF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EACL,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CAAC;IAGb,kBAAkB,EAAE,eAAe,EAAE,CAAC;IACtC,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACxC,CAAC;AAwMF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,CACR,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CACX,EAAE,CAAC;IACJ,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;CAC3B,CAAC;AAsNF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBhE,CAAC"}

package/lib/exercises/math/geometry/angles/anglesUsingIsParallel.js

@@ -152,7 +152,7 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     tryToAddWrongProp(propositions, substract(180, arrAngleUsed[0]).toTex(), "tex");
     const arrAngleGeom = getGeomAngles(identifiers);
     //l'élève fait une mesure sur la figure
-    tryToAddWrongProp(propositions, round(arrAngleGeom[1].evaluate(), opts.nbDigits).frenchify(), "tex");
+    tryToAddWrongProp(propositions, round(arrAngleGeom[1].evaluate(), Number(opts.nbDigits)).frenchify(), "tex");
     tryToAddWrongProp(propositions, "\\text{On ne peut pas savoir.}", "tex");
     return shuffleProps(propositions, n);
 };
@@ -241,7 +241,7 @@ const getGGBOptions = (identifiers, opts) => {
         `ShowLabel(${a.name}, false)`,
         ...a.getFitCaptionCommands({
             text: [
-                round(arrAngleForLabel ? arrAngleForLabel[i] : a.evaluate(), nbDigits).frenchify(),
+                round(arrAngleForLabel ? arrAngleForLabel[i] : a.evaluate(), Number(nbDigits)).frenchify(),
                 "?",
             ][i],
             size: "small",
@@ -285,7 +285,7 @@ const isAnswerValid = (ans, { answer }) => {
 const optsDefault = {
     angleTypes: ["alternes-internes"],
     isFakeDisplay: true,
-    nbDigits: 0,
+    nbDigits: "0",
 };
 const options = [
     {
@@ -313,7 +313,7 @@ const options = [
         label: "Nombre de décimales",
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.select,
-        values: [0, 1, 2],
+        values: ["0", "1", "2"],
         defaultValue: optsDefault.nbDigits,
     },
 ];
@@ -325,11 +325,11 @@ const getAnglesUsingIsParallelQuestion = (optsIn) => {
     function createConfigGeom(isParallelInGeom, isLookingParallel) {
         const deviation = isLookingParallel ? 1 : 5;
         const cAngleInDegreesMin = 30;
-        const cAngleInDegreesTop = randfloat(cAngleInDegreesMin, 180 - cAngleInDegreesMin, opts.nbDigits);
+        const cAngleInDegreesTop = randfloat(cAngleInDegreesMin, 180 - cAngleInDegreesMin, Number(opts.nbDigits));
         const cAngleInDegreesBottom = isParallelInGeom
             ? cAngleInDegreesTop
             : cAngleInDegreesTop +
-                randfloat(-deviation, deviation, opts.nbDigits, [0]);
+                randfloat(-deviation, deviation, Number(opts.nbDigits), [0]);
         return {
             cAngleInDegreesTop,
             cAngleInDegreesBottom,
@@ -391,19 +391,18 @@ const getAnglesUsingIsParallelQuestion = (optsIn) => {
         }
     }
     const arrAngleIndex = randomArrAngleIndex(angleType);
+    const nbDigits = Number(opts.nbDigits);
     //this is the fake display part:
     let arrAngleForLabel;
     if (opts.isFakeDisplay) {
         const angleInDegreesMin = 25;
-        const cAngleInDegreesTop = round(randfloat(angleInDegreesMin, 180 - angleInDegreesMin, opts.nbDigits), opts.nbDigits);
+        const cAngleInDegreesTop = round(randfloat(angleInDegreesMin, 180 - angleInDegreesMin, nbDigits), nbDigits);
         const cAngleInDegreesBottom = isParallel
             ? cAngleInDegreesTop
-            : round(cAngleInDegreesTop + randfloat(-25, 50, opts.nbDigits, [0]), opts.nbDigits);
+            : round(cAngleInDegreesTop + randfloat(-25, 50, nbDigits, [0]), nbDigits);
         //angles at angleIndexes 0 and 2 have same value. Same for angleIndexes 1 and 3.
         arrAngleForLabel = [cAngleInDegreesTop, cAngleInDegreesBottom].map((angle, i) => {
-            return arrAngleIndex[i] % 2 == 0
-                ? angle
-                : round(180 - angle, opts.nbDigits);
+            return arrAngleIndex[i] % 2 == 0 ? angle : round(180 - angle, nbDigits);
         });
     }
     const identifiers = {

package/lib/exercises/math/geometry/angles/isParallelUsingAngles.d.ts

@@ -16,7 +16,7 @@ type Identifiers = {
 type Options = {
     angleTypes: ("alternes-internes" | "correspondants" | "alternes-externes" | "autres")[];
     isFakeDisplay: boolean;
-    nbDigits: 0 | 1 | 2;
+    nbDigits: "0" | "1" | "2";
 };
 export declare const isParallelUsingAngles: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/geometry/angles/isParallelUsingAngles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isParallelUsingAngles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/angles/isParallelUsingAngles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAuItC,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AA6HF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EACL,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CAAC;IAGb,kBAAkB,EAAE,eAAe,EAAE,CAAC;IACtC,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACxC,CAAC;AAuIF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,CACR,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CACX,EAAE,CAAC;IACJ,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;CACrB,CAAC;AAuNF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmBhE,CAAC"}
+{"version":3,"file":"isParallelUsingAngles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/angles/isParallelUsingAngles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAuItC,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AA6HF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EACL,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CAAC;IAGb,kBAAkB,EAAE,eAAe,EAAE,CAAC;IACtC,aAAa,EAAE,MAAM,EAAE,CAAC;IAGxB,gBAAgB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACxC,CAAC;AAuIF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,CACR,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,CACX,EAAE,CAAC;IACJ,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;CAC3B,CAAC;AAuNF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmBhE,CAAC"}