math-exercises 3.0.132 → 3.0.133

package/lib/exercises/math/calcul/mentalCaluls/mentalProgramSolve.d.ts

@@ -6,7 +6,7 @@ type Identifiers = {
     progCalcIds: ProgCalcIdentifiers;
 };
 type Options = {
-    numberType: "Integer" | "Decimal";
+    numberType: "Entier" | "Décimal";
     nbSteps: string;
     nbDigits: string;
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalProgramSolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalProgramSolve.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalProgramSolve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAI7C,OAAO,EAGL,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AA4BzC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,eAAe,CAAC;IACvC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAqOF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAiCF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAyB7D,CAAC"}
+{"version":3,"file":"mentalProgramSolve.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalProgramSolve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAI7C,OAAO,EAGL,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AA4BzC,KAAK,WAAW,GAAG;IACjB,qBAAqB,EAAE,eAAe,CAAC;IACvC,WAAW,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAqOF,KAAK,OAAO,GAAG;IACb,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAiCF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAyB7D,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalProgramSolve.js

@@ -88,7 +88,7 @@ const getInstruction = (identifiers, opts) => {
   
 ${str}`);
     const strProgCalc = arrStrProgCalc.reduce((acc, str) => acc + str);
-    const strFinalNumber = opts?.numberType == "Integer"
+    const strFinalNumber = opts?.numberType == "Entier"
         ? nodeFinalNumber.evaluate().frenchify()
         : nodeFinalNumber
             .evaluate()
@@ -159,10 +159,10 @@ const getMentalProgramSolveQuestion = (optsIn) => {
     const opts = optsIn ? Object.assign(optsDefault, optsIn) : optsDefault;
     let nbDigits = 0;
     switch (opts.numberType) {
-        case "Integer":
+        case "Entier":
             nbDigits = 0;
             break;
-        case "Decimal":
+        case "Décimal":
             nbDigits = Number(opts.nbDigits);
             break;
     }
@@ -189,7 +189,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
     };
 };
 const optsDefault = {
-    numberType: "Integer",
+    numberType: "Entier",
     nbSteps: "4",
     nbDigits: "0",
 };
@@ -198,7 +198,7 @@ const options = [
         id: "numberType",
         label: "Type de nombres utilisés",
         defaultValue: optsDefault.numberType,
-        values: ["Integer", "Decimal"],
+        values: ["Entier", "Décimal"],
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.select,
     },

package/lib/exercises/math/calcul/ordering/compareA10N.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compareA10N.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/compareA10N.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,IAAI,GAAG;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AA2TF,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAyCF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBtD,CAAC"}
+{"version":3,"file":"compareA10N.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/compareA10N.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,IAAI,GAAG;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AA+TF,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAyCF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBtD,CAAC"}

package/lib/exercises/math/calcul/ordering/compareA10N.js

@@ -17,15 +17,20 @@ const getTexForA10N = (a10N) => {
 };
 const getSciMultNodeForA10N = (a10N) => {
     const { a, n } = a10N;
-    const sign = Math.sign(a);
-    const sciMultNodeA = getSciMultNodeForA(sign * a);
-    const factor = sign * sciMultNodeA.leftChild.evaluate();
-    const nodePower10 = sciMultNodeA.rightChild;
-    const exponent = nodePower10.rightChild.evaluate() + n;
-    return multiply(factor, power(10, exponent));
+    if (a !== 0) {
+        const sign = Math.sign(a);
+        const sciMultNodeA = getSciMultNodeForA(sign * a);
+        const factor = sign * sciMultNodeA.leftChild.evaluate();
+        const nodePower10 = sciMultNodeA.rightChild;
+        const exponent = nodePower10.rightChild.evaluate() + n;
+        return multiply(factor, power(10, exponent));
+    }
+    else {
+        return multiply(a, power(10, n));
+    }
 };
 const getSciMultNodeForA = (a) => {
-    //a must be positive
+    //a must be strictly positive
     const exponent = Math.floor(Math.log10(a));
     const factor = round(frac(a, power(10, exponent)).evaluate(), 2);
     const sciMultNode = multiply(factor, power(10, exponent));

package/lib/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"estimatePow10NPlusPow10MinusN.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA8EF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}
+{"version":3,"file":"estimatePow10NPlusPow10MinusN.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAiFF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}

package/lib/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.js

@@ -8,7 +8,7 @@ const getInstruction = (identifiers) => {
     const A = varName;
     return `On considère  $${A}=10^{${n}}+10^{-${n}}$. 
   
-À quoi $A$ est-il environ égal ?`;
+À quoi $${A}$ est-il environ égal ?`;
 };
 const getHint = (identifiers) => {
     const { n } = identifiers;
@@ -36,11 +36,13 @@ const getPropositions = (nbProps, { answer, ...identifiers }) => {
     const { n } = identifiers;
     const propositions = [];
     addValidProp(propositions, `10^{${n}}`, "tex");
-    tryToAddWrongProp(propositions, `${(0).frenchify()}`, "tex");
-    tryToAddWrongProp(propositions, `10^0`, "tex");
-    tryToAddWrongProp(propositions, `100^0`, "tex");
-    tryToAddWrongProp(propositions, `20^{-{${n}^2}}`, "tex");
-    tryToAddWrongProp(propositions, `20^{${n}}`, "tex");
+    [
+        `${(0).frenchify()}`,
+        `10^0`,
+        random([`100^0`, `20^{-{${n}^2}}`, `20^{${n}}`]),
+    ].forEach((wrongTex) => {
+        tryToAddWrongProp(propositions, wrongTex, "tex");
+    });
     return shuffleProps(propositions, nbProps);
 };
 const getEstimatePow10NPlusPow10MinusNQuestion = () => {

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/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,CAkBzD,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,8 +105,10 @@ 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} ?
   
@@ -117,8 +119,10 @@ const getHint = (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,7 +170,7 @@ 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,
     isFromSymbol: true,
@@ -174,25 +182,25 @@ const options = [
         type: GeneratorOptionType.multiselect,
         target: GeneratorOptionTarget.generation,
         values: prefixes.map((prefix) => prefix.name),
-        defaultValue: optionsDefault.prefixPool,
+        defaultValue: optsDefault.prefixPool,
     },
     {
         id: "isToPow10",
         label: "Réponse sous forme de puissance de 10 ?",
         type: GeneratorOptionType.checkbox,
         target: GeneratorOptionTarget.generation,
-        defaultValue: optionsDefault.isToPow10,
+        defaultValue: optsDefault.isToPow10,
     },
     {
-        id: "units",
+        id: "isFromSymbol",
         label: "Utiliser le symbole pour la question ?",
         type: GeneratorOptionType.checkbox,
         target: GeneratorOptionTarget.generation,
-        defaultValue: 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++) {
@@ -201,15 +209,11 @@ const getPrefixToNumberQuestion = (optsIn) => {
             }
         })();
         return prefixIndex;
-    }) ?? optionsDefault.prefixPool;
+    });
     const prefixIndex = random(prefixIndexesPool);
-    const isFromSymbol = optsIn?.isFromSymbol ?? optionsDefault.isFromSymbol;
-    const isToPow10 = optsIn?.isToPow10 ?? optionsDefault.isToPow10;
     const identifiers = {
         prefixIndexesPool,
         prefixIndex,
-        isFromSymbol,
-        isToPow10,
     };
     return getQuestionFromIdentifiers(identifiers, optsIn);
 };
@@ -220,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;
 };
@@ -230,7 +235,7 @@ export const prefixToNumber = {
     connector: "=",
     label: "Convertir un préfixe en nombre",
     isSingleStep: true,
-    generator: (nb, opts) => getDistinctQuestions(() => getPrefixToNumberQuestion(opts), nb, 10),
+    generator: (nb, opts) => getDistinctQuestions(() => getPrefixToNumberQuestion(opts), nb, 10, () => false),
     maxAllowedQuestions: 10,
     qcmTimer: 60,
     freeTimer: 60,

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

@@ -1 +1 @@
-{"version":3,"file":"drawAffineFromPointAndLeadingCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/drawAffineFromPointAndLeadingCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAI7C,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,YAAY,EAAE,eAAe,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAoJF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA4FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAqBR,CAAC"}
+{"version":3,"file":"drawAffineFromPointAndLeadingCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/drawAffineFromPointAndLeadingCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAI7C,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,YAAY,EAAE,eAAe,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA4FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAqBR,CAAC"}

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

@@ -51,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/geometry/cartesian/index.d.ts

@@ -11,6 +11,7 @@ export * from "./readAbscissOnLine.js";
 export * from "./readAbscissOnSemiLine.js";
 export * from "./placeAbscissOnLine.js";
 export * from "./placeAbscissOnSemiLine.js";
+export * from "./placeAbscissOnSemiLineV2.js";
 export * from "./cartesianFromVectorAndPoint.js";
 export * from "./cartesianFromTwoPoints.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/geometry/cartesian/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,eAAe,CAAC;AAC9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oCAAoC,CAAC;AAEnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,eAAe,CAAC;AAC9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oCAAoC,CAAC;AAEnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC"}

package/lib/exercises/math/geometry/cartesian/index.js

@@ -12,5 +12,6 @@ export * from "./readAbscissOnLine.js";
 export * from "./readAbscissOnSemiLine.js";
 export * from "./placeAbscissOnLine.js";
 export * from "./placeAbscissOnSemiLine.js";
+export * from "./placeAbscissOnSemiLineV2.js";
 export * from "./cartesianFromVectorAndPoint.js";
 export * from "./cartesianFromTwoPoints.js";

package/lib/exercises/math/geometry/cartesian/placeAbscissOnSemiLine.d.ts

@@ -1,16 +1,13 @@
 import { Exercise } from "../../../../exercises/exercise.js";
 import { NumberType } from "../../../../math/numbers/nombre.js";
-import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
     abscissType: NumberType;
-    axisUnit: NodeIdentifiers;
-    absciss1: NodeIdentifiers;
-    absciss2: NodeIdentifiers;
+    axisUnit: number;
+    oneUnitTex: string;
+    absciss: number;
+    abscissTex: string;
+    coeff: number;
 };
-type Options = {
-    questionType: "standard" | "éviter le comptage";
-    numberType: "Entiers" | "Rationnels" | "Décimaux";
-};
-export declare const placeAbscissOnSemiLine: Exercise<Identifiers, Options>;
+export declare const placeAbscissOnSemiLine: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=placeAbscissOnSemiLine.d.ts.map

package/lib/exercises/math/geometry/cartesian/placeAbscissOnSemiLine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeAbscissOnSemiLine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAbscissOnSemiLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK1D,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAK7C,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;CAC3B,CAAC;AAkOF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,UAAU,GAAG,oBAAoB,CAAC;IAChD,UAAU,EAAE,SAAS,GAAG,YAAY,GAAG,UAAU,CAAC;CACnD,CAAC;AA6BF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAYjE,CAAC"}
+{"version":3,"file":"placeAbscissOnSemiLine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAbscissOnSemiLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAQ1D,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6IF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAWxD,CAAC"}