math-exercises 3.0.132 → 3.0.133

package/lib/exercises/math/probaStat/probaAsSumOfProbas.js

@@ -216,8 +216,7 @@ class FiniteProbDistr {
         const dictPToArrayOfIndexes = {};
         for (let i = 0; i < arrProba.length; i++) {
             const p = arrProba[i];
-            console.log("will simplify", p);
-            const tex = p.simplify().toTex();
+            const tex = p.toTex();
             if (dictPToArrayOfIndexes[tex] === undefined) {
                 dictPToArrayOfIndexes[tex] = [];
             }
@@ -233,7 +232,7 @@ class FiniteProbDistr {
         return p;
     }
     getArrIndexForP(p) {
-        return this.dictPToArrayOfIndexes[p.simplify().toTex()];
+        return this.dictPToArrayOfIndexes[p.toTex()];
     }
     getArrFrenchStrings(isDisplayingValue) {
         return Object.entries(this.dictPToArrayOfIndexes)
@@ -273,12 +272,15 @@ const getAnswerValueNode = (identifiers) => {
     const { eventIds, arrProba } = identifiers;
     const evUnion = EventConstructor.fromIdentifiers(eventIds);
     const finiteProbDistr = FiniteProbDistrConstructor.fromArrProba(arrProba.map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds)));
-    const nodeSumSimplified = operatorComposition(AddNode, evUnion
+    const arrFrac = evUnion
         .getArrElem()
-        .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))).simplify({
-    //!TODO Sebastien : ne doit pas être nécessaire, à fix
-    //nbMaxSteps: 100,
-    });
+        .map((evElem) => finiteProbDistr.getPForIndex(evElem.index));
+    const nodeSumSimplified = (() => {
+        const den = arrFrac[0].rightChild.evaluate();
+        return frac(arrFrac
+            .map((fNode) => fNode.leftChild.evaluate())
+            .reduce((acc, x) => acc + x, 0), den);
+    })();
     return nodeSumSimplified;
 };
 const getAnswerNode = (identifiers) => {
@@ -320,11 +322,7 @@ $$
 p_{${evElem.id}} = ${finiteProbDistr.getPForIndex(evElem.index).toTex()}
 $$`).join(`
 `)}`;
-        const nodeSumSimplified = operatorComposition(AddNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))).simplify({
-        //nbMaxSteps: 100,
-        });
+        const nodeSumSimplified = getAnswerNode(identifiers);
         strCorrection += `
 Donc: 
 
@@ -344,7 +342,6 @@ $$`;
 const optsDefault = {
     nbElem: ["4", "6", "10", "12"],
     unionLength: ["2", "3", "4", "5"],
-    isProbasAreNumbers: true,
 };
 const options = [
     {
@@ -363,13 +360,6 @@ const options = [
         values: ["2", "3", "4", "5", "6"],
         defaultValue: optsDefault.unionLength,
     },
-    // {
-    //   id: "isProbasAreNumbers",
-    //   label: "Probabilités sous forme de nombres ?",
-    //   type: GeneratorOptionType.checkbox,
-    //   target: GeneratorOptionTarget.generation,
-    //   defaultValue: optsDefault.isProbasAreNumbers,
-    // },
 ];
 const getKeys = () => {
     return [];
@@ -382,39 +372,41 @@ const getPropositions = (n, { answer, ...identifiers }) => {
     addValidProp(propositions, answer);
     if (isProbasAreNumbers) {
         const finiteProbDistr = FiniteProbDistrConstructor.fromArrProba(arrProba.map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds)));
-        tryToAddWrongProp(propositions, operatorComposition(MultiplyNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index)))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
-        tryToAddWrongProp(propositions, substract(1, operatorComposition(MultiplyNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
-        tryToAddWrongProp(propositions, substract(1, operatorComposition(AddNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))).simplify({
-        //nbMaxSteps: 100,
-        })).toTex());
-        tryToAddWrongProp(propositions, operatorComposition(AddNode, evUnion
+        const arrFrac = evUnion
             .getArrElem()
-            .map((evElem) => multiply(evElem.index, finiteProbDistr.getPForIndex(evElem.index))))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
-        tryToAddWrongProp(propositions, multiply(frac(1, evUnion.getArrElem().length), operatorComposition(AddNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
+            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index));
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(arrFrac
+                .map((fNode) => fNode.leftChild.evaluate())
+                .reduce((acc, x) => acc * x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(den -
+                arrFrac
+                    .map((fNode) => fNode.leftChild.evaluate())
+                    .reduce((acc, x) => acc * x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(den -
+                arrFrac
+                    .map((fNode) => fNode.leftChild.evaluate())
+                    .reduce((acc, x) => acc + x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(arrFrac
+                .map((fNode, i) => fNode.leftChild.evaluate() * i)
+                .reduce((acc, x) => acc + x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(arrFrac
+                .map((fNode) => fNode.leftChild.evaluate())
+                .reduce((acc, x) => acc + x, 0), den * evUnion.getArrElem().length);
+        })().toTex());
     }
     else {
         tryToAddWrongProp(propositions, operatorComposition(MultiplyNode, evUnion.getArrElem().map((evElem) => evElem.p))
@@ -451,10 +443,13 @@ const getValueNode = (tex, arrProba) => {
             return parseInt(texVar.substring(texVar.indexOf("E_{") + 3, texVar.indexOf("}}")));
         }
     });
-    const arrayOfNodes = arrayOfIndexes.map((i) => finiteProbDistr.getPForIndex(i));
-    return operatorComposition(AddNode, arrayOfNodes).simplify({
-    //nbMaxSteps: 100,
-    });
+    const arrFrac = arrayOfIndexes.map((i) => finiteProbDistr.getPForIndex(i));
+    return (() => {
+        const den = arrFrac[0].rightChild.evaluate();
+        return frac(arrFrac
+            .map((fNode) => fNode.leftChild.evaluate())
+            .reduce((acc, x) => acc + x, 0), den);
+    })();
 };
 const isAnswerValid = (ans, { answer, ...identifiers }) => {
     const { arrProba } = identifiers;
@@ -481,12 +476,10 @@ const getProbaAsSumOfProbasQuestion = (optsIn) => {
     const eventIds = evUnion.toIdentifiers();
     const nbUnique = Math.min(randint(3, 7), situation.allElem.length - 1);
     const finiteProbDistr = FiniteProbDistrConstructor.randomDistr(situation.allElem.length, nbUnique);
-    const isProbasAreNumbers = opts.isProbasAreNumbers;
     const identifiers = {
         indexSituation,
         eventIds,
         arrProba: finiteProbDistr.arrProba.map((node) => node.toIdentifiers()),
-        isProbasAreNumbers,
     };
     return getQuestionFromIdentifiers(identifiers, opts);
 };

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/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;AA8NF,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,13 +35,14 @@ 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 : 
   
@@ -46,8 +50,9 @@ $$
 \\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");
@@ -105,7 +110,8 @@ 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 = [];
     const unlatexUnit = opts.unitTex.substring(1, opts.unitTex.length - 1);
     addValidProp(propositions, `${answer} \\ ${unlatexUnit}`);
@@ -138,41 +144,27 @@ 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}$",
 };
 const options = [

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

@@ -1,7 +1,6 @@
 import { Exercise } from "../../../exercises/exercise.js";
 type Identifiers = {
     mass: number;
-    optsIdent: Options;
 };
 type InputType = "decimal" | "sci";
 type Options = {

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;AAEnC,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB,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"}

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

@@ -28,8 +28,9 @@ const options = [
         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,7 +46,7 @@ ${(() => {
         }
     })()}
 ${(() => {
-        switch (optsIdent.nbDigits) {
+        switch (opts.nbDigits) {
             case "0":
                 return `arrondie à l'unité`;
             case "1":
@@ -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, Number(optsIdent.nbDigits));
+            const answer = round(mass * g, Number(opts.nbDigits));
             return `${answer.frenchify()}N`;
         }
         case "sci": {
-            const answer = (mass * g).toScientific(Number(optsIdent.nbDigits));
+            const answer = (mass * g).toScientific(Number(opts.nbDigits));
             return `${answer.toTex()}N`;
         }
     }
@@ -103,12 +109,13 @@ 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);
-    const nbDigits = Number(optsIdent.nbDigits);
-    switch (optsIdent.inputType) {
+    const nbDigits = Number(opts.nbDigits);
+    switch (opts.inputType) {
         case "decimal":
             {
                 tryToAddWrongProp(propositions, `${round(weight * 10, nbDigits).frenchify()}N`);
@@ -142,16 +149,16 @@ const getCalculateWeightQuestion = (optsIn) => {
         })
         : 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,