math-exercises 3.0.131 → 3.0.133

package/lib/exercises/math/probaStat/stats1var/medianWithList.js

@@ -1,6 +1,7 @@
 import { randint } from "../../../../math/utils/random/randint.js";
 import { median } from "../../../../math/utils/stats/median.js";
-import { addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercise.js";
+import { random } from "../../../../utils/alea/random.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercise.js";
 import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
 const getInstruction = (identifiers) => {
     const { sortedValues } = identifiers;
@@ -16,15 +17,6 @@ const getAnswer = (identifiers) => {
     const { sortedValues } = identifiers;
     return median(sortedValues).frenchify();
 };
-const getMedianList = () => {
-    const randomValues = [];
-    const length = randint(6, 10);
-    for (let i = 0; i < length; i++)
-        randomValues.push(randint(1, 20));
-    const sortedValues = randomValues.sort((a, b) => a - b);
-    const identifiers = { sortedValues };
-    return getQuestionFromIdentifiers(identifiers);
-};
 const getHint = () => {
     return `La médiane est la valeur centrale de la série : il y a autant de valeur inférieures à la médiane que de valeurs supérieures à la médiane.`;
 };
@@ -40,18 +32,6 @@ Puisque $\\frac{${total}}{2} = ${rank.frenchify()}$, la médiane est ${rank % 1
 
 La médiane est donc $${getAnswer(identifiers)}$.`;
 };
-const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
-        instruction: getInstruction(identifiers),
-        answer: getAnswer(identifiers),
-        keys: [],
-        answerFormat: "tex",
-        identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
-    };
-    return question;
-};
 const getPropositions = (n, { answer, sortedValues }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -64,12 +44,52 @@ const getPropositions = (n, { answer, sortedValues }) => {
 const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
+const getMedianList = (optsIn) => {
+    const arrayedOptions = optsIn ?? optsDefault;
+    const opts = {
+        nbValues: random(arrayedOptions.nbValues),
+    };
+    const randomValues = [];
+    const length = Number(opts.nbValues);
+    for (let i = 0; i < length; i++)
+        randomValues.push(randint(1, 20));
+    const sortedValues = randomValues.sort((a, b) => a - b);
+    const identifiers = { sortedValues };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        options: opts,
+    };
+    return question;
+};
+const optsDefault = {
+    nbValues: ["7", "8"],
+};
+const options = [
+    {
+        id: "nbValues",
+        label: "Nombre de valeurs dans la liste",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.multiselect,
+        values: ["4", "5", "7", "8", "11", "12", "19", "20"],
+        defaultValue: optsDefault.nbValues,
+    },
+];
 export const medianWithList = {
     id: "medianWithList",
     connector: "=",
     label: "Calcul de la médiane d'une liste de valeurs",
     isSingleStep: false,
-    generator: (nb) => getDistinctQuestions(getMedianList, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getMedianList(opts), nb),
+    options,
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

package/lib/exercises/math/probaStat/stats1var/plausibilityOfAverage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plausibilityOfAverage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/plausibilityOfAverage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoKF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAkBvD,CAAC"}
+{"version":3,"file":"plausibilityOfAverage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/plausibilityOfAverage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAiOF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAkBvD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/plausibilityOfAverage.js

@@ -3,7 +3,6 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { randint } from "../../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { random } from "../../../../utils/alea/random.js";
-import { mdTable } from "../../../../utils/markdown/mdTable.js";
 const getInstruction = (identifiers) => {
     const { a, values, isQuestionIsAboveA } = identifiers;
     return `Si on considère la série suivante :
@@ -20,36 +19,84 @@ La proposition suivante est-elle vraie ?
 const getHint = ({ a }) => {
     return `Regarde l'écart des valeurs par rapport à $${a.frenchify()}$.`;
 };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   const { a, values, isAboveA } = identifiers;
+//   const answer = getAnswer(identifiers);
+//   const valuesBelowA = values.filter((v) => v < a);
+//   const valuesAboveA = values.filter((v) => v > a);
+//   return `${answer}, car si l'on regarde les écarts par rapport à $${a.frenchify()}$ :
+// $\\ $
+// ${mdTable(
+//   [
+//     ["\\text{Valeur}", "\\text{Écart}"],
+//     [`\\text{Valeurs inférieures à } ${a.frenchify()}`, "\\text{}"],
+//     ...valuesBelowA.map((v) => [v.frenchify(), (v - a).frenchify()]),
+//     [
+//       "\\text{Total inférieur}",
+//       valuesBelowA
+//         .map((v) => v - a)
+//         .reduce((acc, v) => acc + v, 0)
+//         .frenchify(),
+//     ],
+//     [`\\text{Valeurs supérieures à } ${a.frenchify()}`, "\\text{}"],
+//     ...valuesAboveA.map((v) => [v.frenchify(), `+${(v - a).frenchify()}`]),
+//     [
+//       "\\text{Total supérieur}",
+//       `+${valuesAboveA
+//         .map((v) => v - a)
+//         .reduce((acc, v) => acc + v, 0)
+//         .frenchify()}`,
+//     ],
+//   ],
+//   true,
+// )}
+// $\\ $
+// Le total ${
+//     isAboveA ? `supérieur` : `inférieur`
+//   } est plus grand, en valeur absolue, que le total ${
+//     isAboveA ? `inférieur` : `supérieur`
+//   } donc on peut affirmer que la moyenne de cette série est strictement ${
+//     isAboveA ? `supérieure` : `inférieure`
+//   } à $${a.frenchify()}$.`;
+// };
 const getCorrection = (identifiers) => {
     const { a, values, isAboveA } = identifiers;
     const answer = getAnswer(identifiers);
     const valuesBelowA = values.filter((v) => v < a);
     const valuesAboveA = values.filter((v) => v > a);
-    return `${answer}, car si l'on regarde les écarts par rapport à $${a.frenchify()}$ : 
+    return `${answer}. En effet : 
 
 $\\ $
+  
+Si l'on regarde les valeurs strictement inférieures à $${a.frenchify()}$ : 
+  
+${valuesBelowA
+        .map((v) => `
+    
+$${v.frenchify()}$ est $${(a - v).frenchify()}$ points en dessous de $${a.frenchify()}$
 
-${mdTable([
-        ["\\text{Valeur}", "\\text{Écart}"],
-        [`\\text{Valeurs inférieures à } ${a.frenchify()}`, "\\text{}"],
-        ...valuesBelowA.map((v) => [v.frenchify(), (v - a).frenchify()]),
-        [
-            "\\text{Total inférieur}",
-            valuesBelowA
-                .map((v) => v - a)
-                .reduce((acc, v) => acc + v, 0)
-                .frenchify(),
-        ],
-        [`\\text{Valeurs supérieures à } ${a.frenchify()}`, "\\text{}"],
-        ...valuesAboveA.map((v) => [v.frenchify(), `+${(v - a).frenchify()}`]),
-        [
-            "\\text{Total supérieur}",
-            `+${valuesAboveA
-                .map((v) => v - a)
-                .reduce((acc, v) => acc + v, 0)
-                .frenchify()}`,
-        ],
-    ], true)}
+`)
+        .join("")}
+Ce qui fait en tout $${valuesBelowA
+        .map((v) => a - v)
+        .reduce((acc, v) => acc + v, 0)
+        .frenchify()}$ points en dessous de $${a.frenchify()}$.
+
+$\\ $
+
+Si l'on regarde les valeurs strictement supérieures à $${a.frenchify()}$ : 
+  
+${valuesAboveA
+        .map((v) => `
+    
+$${v.frenchify()}$ est $${(v - a).frenchify()}$ points en dessus de $${a.frenchify()}$
+
+`)
+        .join("")}
+Ce qui fait en tout $${valuesAboveA
+        .map((v) => v - a)
+        .reduce((acc, v) => acc + v, 0)
+        .frenchify()}$ points au dessus de $${a.frenchify()}$.
 
 $\\ $
 

package/lib/exercises/math/probaStat/stats1var/quartilesList.d.ts

@@ -4,7 +4,7 @@ type Identifiers = {
     randomQuartile: number;
 };
 type Options = {
-    nbValues: number;
+    nbValues: string;
 };
 export declare const quartilesList: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/probaStat/stats1var/quartilesList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quartilesList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartilesList.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAyGF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAeF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBxD,CAAC"}
+{"version":3,"file":"quartilesList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartilesList.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AA2GF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAeF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBxD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/quartilesList.js

@@ -61,9 +61,9 @@ const isAnswerValid = (ans, { answer }) => {
 const getQuartiles = (optsIn) => {
     const opts = optsIn ?? optsDefault;
     const randomValues = [];
-    const length = Array.isArray(opts.nbValues)
+    const length = Number(Array.isArray(opts.nbValues)
         ? random(opts.nbValues.map((v) => +v))
-        : opts.nbValues;
+        : opts.nbValues);
     for (let i = 0; i < length; i++)
         randomValues.push(randint(1, 20));
     const randomQuartile = randint(0, 2);
@@ -87,7 +87,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
     return question;
 };
 const optsDefault = {
-    nbValues: 12,
+    nbValues: "12",
 };
 const options = [
     {
@@ -95,7 +95,7 @@ const options = [
         label: "Nombre de valeurs dans la liste",
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
-        values: [4, 5, 7, 8, 11, 12, 19, 20],
+        values: ["4", "5", "7", "8", "11", "12", "19", "20"],
         defaultValue: [optsDefault.nbValues],
     },
 ];

package/lib/exercises/pc/index.d.ts

@@ -28,6 +28,5 @@ export * from "./motion/index.js";
 export * from "./dosage/index.js";
 export * from "./spectral/index.js";
 export * from "./power/index.js";
-export * from "./optics/index.js";
 export * from "./mathExosInPC.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/pc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,SAAS,CAAC;AACxB,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AAEtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,SAAS,CAAC;AACxB,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AAEtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC"}

package/lib/exercises/pc/index.js

@@ -28,5 +28,4 @@ export * from "./motion/index.js";
 export * from "./dosage/index.js";
 export * from "./spectral/index.js";
 export * from "./power/index.js";
-export * from "./optics/index.js";
 export * from "./mathExosInPC.js";

package/lib/exercises/pc/motion/averageSpeed.d.ts

@@ -6,10 +6,8 @@ type Msr = {
 type Identifiers = {
     distance: Msr;
     time: Msr;
-    opts: Options;
 };
 type Options = {
-    acceptedInputType: string;
     unitTex: string;
 };
 export declare const averageSpeed: Exercise<Identifiers, Options>;

package/lib/exercises/pc/motion/averageSpeed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"averageSpeed.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/motion/averageSpeed.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAerC,KAAK,GAAG,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AA0NF,KAAK,OAAO,GAAG;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAsBF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAcvD,CAAC"}
+{"version":3,"file":"averageSpeed.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/motion/averageSpeed.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAerC,KAAK,GAAG,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAkOF,KAAK,OAAO,GAAG;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqBF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAcvD,CAAC"}

package/lib/exercises/pc/motion/averageSpeed.js

@@ -11,20 +11,23 @@ import { VariableNode } from "../../../tree/nodes/variables/variableNode.js";
 import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
 const timeUnits = [TimeUnit.h, TimeUnit.min];
 const distanceUnitValues = [DistanceUnit.km, DistanceUnit.m];
-const getAcceptedInputTypesSentence = (identifiers) => {
-    const { opts } = identifiers;
+const getAcceptedInputTypesSentence = (acceptedInputType) => {
     return `Donner le résultat
 ${(() => {
-        switch (opts.acceptedInputType) {
+        switch (acceptedInputType) {
             case "exact":
                 return "sous forme exacte";
-            case "significant(3)":
+            default:
+            case "arrondi avec 3 chiffres significatifs":
                 return "approché avec $3$ chiffres significatifs";
         }
     })()}.`;
 };
-const getInstruction = (identifiers) => {
-    const { distance, time, opts } = identifiers;
+const getInstruction = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const acceptedInputType = "arrondi avec 3 chiffres significatifs";
+    const { distance, time } = identifiers;
+    const { unitTex } = opts;
     const distanceMeasure = new Measure(distance.value, 0, distanceUnitValues[distance.unitIndex]);
     const timeMeasure = new Measure(time.value, 0, timeUnits[time.unitIndex]);
     const instruction = `Soit un objet parcourant $${distanceMeasure.toTex({
@@ -32,26 +35,30 @@ const getInstruction = (identifiers) => {
     })}$ en $${timeMeasure.toTex({ notScientific: true })}$.
 
 
-Calculer la vitesse moyenne de cet objet en $${opts.unitTex}$.
+Calculer la vitesse moyenne de cet objet en ${unitTex}.
 
-${getAcceptedInputTypesSentence(identifiers)}
+${getAcceptedInputTypesSentence(acceptedInputType)}
   `;
     return instruction;
 };
-const getHint = ({ opts }) => {
+const getHint = (_, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const unlatexUnit = opts.unitTex.substring(1, opts.unitTex.length - 1);
     return `La vitesse moyenne est donnée par : 
   
 $$
-\\frac{\\text{distance}}{\\text{temps}} \\ ${opts.unitTex}
+\\frac{\\text{distance}}{\\text{temps}} \\ ${unlatexUnit}
 $$`;
 };
-const getCorrection = (identifiers) => {
-    const { distance, time, opts } = identifiers;
+const getCorrection = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const { distance, time } = identifiers;
     let correction = ``;
     const distanceMeasure = new Measure(distance.value, 0, distanceUnitValues[distance.unitIndex]).convert("m");
     const timeMeasure = new Measure(time.value, 0, timeUnits[time.unitIndex]).convert("s");
     const calcul = new FractionNode(new VariableNode(distanceMeasure.toTex()), new VariableNode(timeMeasure.toTex()));
     const answer = getAnswer(identifiers);
+    const unlatexUnit = opts.unitTex.substring(1, opts.unitTex.length - 1);
     if (distance.unitIndex === 0)
         correction = `- On convertit les $\\textrm{km}$ en $\\textrm{m}$ : $1\\ \\textrm{km}=1000\\ \\textrm{m}$.
 
@@ -84,7 +91,7 @@ $$
     }
     return `${correction}
 - On applique la règle de calcul pour la vitesse moyenne : $${calcul.toTex()}$
-- On arrondit à la toute fin : $${calcul.toTex()} \\approx ${answer} \\ ${opts.unitTex}$`;
+- On arrondit à la toute fin : $${calcul.toTex()} \\approx ${answer} \\ ${unlatexUnit}$`;
 };
 const getAnswer = (identifiers) => {
     return getAnswerMeasure(identifiers).toTex({ hideUnit: true });
@@ -103,12 +110,14 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
     const answerNode = parseAlgebraic(getAnswerMeasure(identifiers).toTex({ hideUnit: true }));
     return substract(ansNode, answerNode).simplify().evaluate() === 0;
 };
-const getPropositions = (n, { answer, distance, time, opts }) => {
+const getPropositions = (n, { answer, distance, time }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
     const propositions = [];
-    addValidProp(propositions, `${answer} \\ ${opts.unitTex}`);
+    const unlatexUnit = opts.unitTex.substring(1, opts.unitTex.length - 1);
+    addValidProp(propositions, `${answer} \\ ${unlatexUnit}`);
     const distanceMeasure = new Measure(distance.value, 0, distanceUnitValues[distance.unitIndex]);
     const timeMeasure = new Measure(time.value, 0, timeUnits[time.unitIndex]);
-    generatePropositions(distanceMeasure, timeMeasure).forEach((value) => tryToAddWrongProp(propositions, `${value} \\ ${opts.unitTex}`));
+    generatePropositions(distanceMeasure, timeMeasure).forEach((value) => tryToAddWrongProp(propositions, `${value} \\ ${unlatexUnit}`));
     const division = distanceMeasure
         .convert("m")
         .divide(timeMeasure.convert("s"));
@@ -118,7 +127,7 @@ const getPropositions = (n, { answer, distance, time, opts }) => {
         const valueTex = new Measure(random, 0, division.getUnit())
             .toSignificant(2)
             .toTex({ hideUnit: true });
-        tryToAddWrongProp(propositions, `${valueTex} \\ ${opts.unitTex}`);
+        tryToAddWrongProp(propositions, `${valueTex} \\ ${unlatexUnit}`);
     });
     return shuffleProps(propositions, n);
 };
@@ -135,42 +144,28 @@ const generatePropositions = (distance, time) => {
         distance.divide(time).toSignificant(2).toTex({ hideUnit: true }),
     ];
 };
-const getKeys = () => {
-    return [];
-    // return [`\\text{m} \\cdot \\text{s}^{-1}`].map((tex) => {
-    //   return {
-    //     id: "custom",
-    //     label: tex,
-    //     labelType: "raw",
-    //     mathfieldInstructions: {
-    //       method: "write",
-    //       content: tex,
-    //     },
-    //   } as KeyProps;
-    // });
-};
 const getAverageSpeedQuestion = (optsIn) => {
-    const opts = Object.assign(optsDefault, optsIn) ?? optsDefault;
+    const opts = optsIn ?? optsDefault;
     const distance = { value: randint(70, 151), unitIndex: randint(0, 2) };
     const time = { value: randint(10, 61), unitIndex: randint(0, 2) };
-    const identifiers = { distance, time, opts };
-    return getQuestionFromIdentifiers(identifiers);
+    const identifiers = { distance, time };
+    return getQuestionFromIdentifiers(identifiers, opts);
 };
-const getQuestionFromIdentifiers = (identifiers) => {
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
-        keys: getKeys(identifiers),
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: [],
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
         answerFormat: "tex",
         identifiers,
+        options: opts,
     };
     return question;
 };
 const optsDefault = {
-    acceptedInputType: "significant(3)",
-    unitTex: "\\text{m} \\cdot \\text{s}^{-1}",
+    unitTex: "$\\text{m} \\cdot \\text{s}^{-1}$",
 };
 const options = [
     {
@@ -179,9 +174,9 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.select,
         values: [
-            "\\text{m} \\cdot \\text{s}^{-1}",
-            "\\text{m/s}",
-            "\\text{s} \\cdot \\text{m}^{-1}",
+            "$\\text{m} \\cdot \\text{s}^{-1}$",
+            "$\\text{m/s}$",
+            "$\\text{s} \\cdot \\text{m}^{-1}$",
         ],
         defaultValue: optsDefault.unitTex,
     },

package/lib/exercises/pc/optics/lensFormula.d.ts

@@ -9,12 +9,11 @@ type Identifiers = {
 type DistanceType = "distance focale" | "distance image" | "distance objet";
 type ImageType = "réelle finie" | "réelle infinie" | "imaginaire finie" | "imaginaire infinie";
 type UnitType = "cm" | "m";
-type RoundToType = 0 | 1 | 2;
 type Options = {
     typeDistance: DistanceType;
     typeImage: ImageType;
     unit: UnitType;
-    roundTo: RoundToType;
+    roundTo: string;
 };
 export declare const lensFormula: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/pc/optics/lensFormula.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lensFormula.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/optics/lensFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAY7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,EAAE,EAAE,eAAe,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,KAAK,YAAY,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAC5E,KAAK,SAAS,GACV,cAAc,GACd,gBAAgB,GAChB,kBAAkB,GAClB,oBAAoB,CAAC;AACzB,KAAK,QAAQ,GAAG,IAAI,GAAG,GAAG,CAAC;AAC3B,KAAK,WAAW,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAC7B,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC;AAwiBF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqBtD,CAAC"}
+{"version":3,"file":"lensFormula.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/optics/lensFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAY7C,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,eAAe,CAAC;IACzB,EAAE,EAAE,eAAe,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,KAAK,YAAY,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAC5E,KAAK,SAAS,GACV,cAAc,GACd,gBAAgB,GAChB,kBAAkB,GAClB,oBAAoB,CAAC;AACzB,KAAK,QAAQ,GAAG,IAAI,GAAG,GAAG,CAAC;AAE3B,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqiBF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqBtD,CAAC"}

package/lib/exercises/pc/optics/lensFormula.js

@@ -24,7 +24,7 @@ const optsDefault = {
         "imaginaire infinie",
     ],
     unit: ["cm", "m"],
-    roundTo: [0, 1, 2],
+    roundTo: ["0", "1", "2"],
 };
 const options = [
     {
@@ -62,7 +62,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         defaultValue: optsDefault.roundTo,
-        values: [0, 1, 2],
+        values: ["0", "1", "2"],
     },
 ];
 const getLensFormulaEqualNode = () => {
@@ -76,11 +76,11 @@ const getInstruction = (identifiers) => {
     const nodeOAPrime = NodeConstructor.fromIdentifiers(OAPrime);
     const strRounTo = (() => {
         switch (opts.roundTo) {
-            case 0:
+            case "0":
                 return "à l'unité";
-            case 1:
+            case "1":
                 return "au dixième";
-            case 2:
+            case "2":
                 return "au centième";
         }
     })();
@@ -206,7 +206,7 @@ const getAnswer = (identifiers) => {
             case "distance objet":
                 return nodeOA;
         }
-    })().evaluate(), opts.roundTo).frenchify()}${opts.unit}`;
+    })().evaluate(), Number(opts.roundTo)).frenchify()}${opts.unit}`;
 };
 const isAnswerValid = (ans, { answer, ...identifiers }) => {
     const { opts } = identifiers;
@@ -287,11 +287,9 @@ const getLensFormulaQuestion = (optsIn) => {
             unit: optsIn?.unit,
             roundTo: (optsIn?.roundTo)
                 .filter((a) => typeof a === "string")
-                .map((str) => +str),
+                .map((str) => str),
         }
         : undefined;
-    console.log("optsIn", optsIn);
-    console.log("optsInRetyped", optsInRetyped);
     let nodeOFPrime = NaN.toTree();
     let nodeOA = NaN.toTree();
     let nodeOAPrime = NaN.toTree();
@@ -310,7 +308,6 @@ const getLensFormulaQuestion = (optsIn) => {
                 unit: random(optsDefault.unit),
                 roundTo: random(optsDefault.roundTo),
             };
-        console.log("opts", opts);
         //objet réel:    \\overline {OA}  < 0
         //image réelle : \\overline {OA'} > 0
         function factorNodeForTypeImage(typeImage) {

package/lib/exercises/pc/weight/calculateWeight.d.ts

@@ -1,13 +1,11 @@
 import { Exercise } from "../../../exercises/exercise.js";
 type Identifiers = {
     mass: number;
-    optsIdent: Options;
 };
 type InputType = "decimal" | "sci";
-type NbDigitsType = 0 | 1 | 2;
 type Options = {
     inputType: InputType;
-    nbDigits: NbDigitsType;
+    nbDigits: string;
 };
 export declare const calculateWeight: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/pc/weight/calculateWeight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateWeight.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/weight/calculateWeight.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,CAAC;AACnC,KAAK,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE9B,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAuMF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAc1D,CAAC"}
+{"version":3,"file":"calculateWeight.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/weight/calculateWeight.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,CAAC;AAEnC,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAkNF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAc1D,CAAC"}