math-exercises 3.0.131 → 3.0.133

package/lib/exercises/pc/weight/calculateWeight.js

@@ -8,7 +8,7 @@ import { random } from "../../../utils/alea/random.js";
 const g = +earthGravity.measure.significantPart.toFixed(2);
 const optsDefault = {
     inputType: "sci",
-    nbDigits: 2,
+    nbDigits: "2",
 };
 const options = [
     {
@@ -24,12 +24,13 @@ const options = [
         label: "Nombre de décimales",
         type: GeneratorOptionType.multiselect,
         target: GeneratorOptionTarget.generation,
-        values: [0, 1, 2],
+        values: ["0", "1", "2"],
         defaultValue: [optsDefault.nbDigits],
     },
 ];
-const getInstruction = (identifiers) => {
-    const { mass, optsIdent } = identifiers;
+const getInstruction = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { mass } = identifiers;
     const instruction = `Soit un objet avec une masse de $${mass}\\ \\textrm{kg}$.
 
 L'accélération due à la gravité vaut $${g.frenchify()}$ $\\textrm{m} \\cdot \\textrm{s}^{${-2}}$. 
@@ -37,7 +38,7 @@ L'accélération due à la gravité vaut $${g.frenchify()}$ $\\textrm{m} \\cdot
 Calculer le poids de cet objet en Newtons.
 Donner le résultat 
 ${(() => {
-        switch (optsIdent.inputType) {
+        switch (opts.inputType) {
             case "decimal":
                 return `en écriture décimale`;
             case "sci":
@@ -45,12 +46,12 @@ ${(() => {
         }
     })()}
 ${(() => {
-        switch (optsIdent.nbDigits) {
-            case 0:
+        switch (opts.nbDigits) {
+            case "0":
                 return `arrondie à l'unité`;
-            case 1:
+            case "1":
                 return `arrondie à une décimale`;
-            case 2:
+            case "2":
                 return `arrondie à deux décimales`;
         }
     })()}.
@@ -77,25 +78,30 @@ const getCorrection = (identifiers) => {
     const correction = `Pour calculer le poids de l'objet, on utilise la formule : 
   
 $$
-P=m \\cdot g
+P = m \\cdot g
 $$
 
 On a : 
 
 $$
-P = ${mass.frenchify()} \\times ${g.frenchify()} \\Rightarrow P=${answer}
+P = ${mass.frenchify()} \\times ${g.frenchify()}
+$$
+
+$$
+P \\approx ${answer}
 $$`;
     return correction;
 };
-const getAnswer = (identifiers) => {
-    const { mass, optsIdent } = identifiers;
-    switch (optsIdent.inputType) {
+const getAnswer = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { mass } = identifiers;
+    switch (opts.inputType) {
         case "decimal": {
-            const answer = round(mass * g, optsIdent.nbDigits);
+            const answer = round(mass * g, Number(opts.nbDigits));
             return `${answer.frenchify()}N`;
         }
         case "sci": {
-            const answer = (mass * g).toScientific(optsIdent.nbDigits);
+            const answer = (mass * g).toScientific(Number(opts.nbDigits));
             return `${answer.toTex()}N`;
         }
     }
@@ -103,30 +109,32 @@ const getAnswer = (identifiers) => {
 const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
-const getPropositions = (n, { answer, mass, optsIdent }) => {
+const getPropositions = (n, { answer, mass }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
     const propositions = [];
     const weight = mass * g;
     addValidProp(propositions, answer);
-    switch (optsIdent.inputType) {
+    const nbDigits = Number(opts.nbDigits);
+    switch (opts.inputType) {
         case "decimal":
             {
-                tryToAddWrongProp(propositions, `${round(weight * 10, optsIdent.nbDigits).frenchify()}N`);
-                tryToAddWrongProp(propositions, `${round(randfloat(weight - 100, weight + 100, 2, [weight]) / 10, optsIdent.nbDigits).frenchify()}N`);
+                tryToAddWrongProp(propositions, `${round(weight * 10, nbDigits).frenchify()}N`);
+                tryToAddWrongProp(propositions, `${round(randfloat(weight - 100, weight + 100, 2, [weight]) / 10, nbDigits).frenchify()}N`);
                 propWhile(propositions, n, () => {
                     const random = randfloat(weight - 50, weight + 50, 2, [weight]);
-                    tryToAddWrongProp(propositions, `${round(random, optsIdent.nbDigits).frenchify()}N`);
+                    tryToAddWrongProp(propositions, `${round(random, nbDigits).frenchify()}N`);
                 });
             }
             break;
         case "sci":
             {
-                tryToAddWrongProp(propositions, `${(weight * 10).toScientific(optsIdent.nbDigits).toTex()}N`);
+                tryToAddWrongProp(propositions, `${(weight * 10).toScientific(nbDigits).toTex()}N`);
                 tryToAddWrongProp(propositions, `${(randfloat(weight - 100, weight + 100, 2, [weight]) / 10)
-                    .toScientific(optsIdent.nbDigits)
+                    .toScientific(nbDigits)
                     .toTex()}N`);
                 propWhile(propositions, n, () => {
                     const random = randfloat(weight - 50, weight + 50, 2, [weight]);
-                    tryToAddWrongProp(propositions, `${random.toScientific(optsIdent.nbDigits).toTex()}N`);
+                    tryToAddWrongProp(propositions, `${random.toScientific(nbDigits).toTex()}N`);
                 });
             }
             break;
@@ -137,20 +145,20 @@ const getCalculateWeightQuestion = (optsIn) => {
     const opts = optsIn
         ? Object.assign(optsDefault, {
             inputType: random(optsIn.inputType),
-            nbDigits: +random(optsIn.nbDigits),
+            nbDigits: random(optsIn.nbDigits),
         })
         : optsDefault;
     const mass = randint(30, 151);
-    const identifiers = { mass: mass, optsIdent: opts };
+    const identifiers = { mass: mass };
     return getQuestionFromIdentifiers(identifiers, opts);
 };
 const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
         keys: ["N"],
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
         answerFormat: "tex",
         identifiers,
         options: opts,