math-exercises 3.0.124 → 3.0.126

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

@@ -1,21 +1,62 @@
-import { addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { randint } from "../../../math/utils/random/randint.js";
+import { round } from "../../../math/utils/round.js";
 import { earthGravity } from "../../../pc/constants/gravity.js";
+import { random } from "../../../utils/alea/random.js";
 const g = +earthGravity.measure.significantPart.toFixed(2);
+const optsDefault = {
+    inputType: "sci",
+    nbDigits: 2,
+};
+const options = [
+    {
+        id: "inputType",
+        label: "Format de la réponse",
+        type: GeneratorOptionType.multiselect,
+        target: GeneratorOptionTarget.generation,
+        values: ["decimal", "sci"],
+        defaultValue: [optsDefault.inputType],
+    },
+    {
+        id: "nbDigits",
+        label: "Nombre de décimales",
+        type: GeneratorOptionType.multiselect,
+        target: GeneratorOptionTarget.generation,
+        values: [0, 1, 2],
+        defaultValue: [optsDefault.nbDigits],
+    },
+];
 const getInstruction = (identifiers) => {
-    const { mass } = identifiers;
+    const { mass, optsIdent } = 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}}$. 
   
-Calculer le poids de cet objet.`;
+Calculer le poids de cet objet en Newtons.
+Donner le résultat 
+${(() => {
+        switch (optsIdent.inputType) {
+            case "decimal":
+                return `en écriture décimale`;
+            case "sci":
+                return `en écriture scientifique`;
+        }
+    })()}
+${(() => {
+        switch (optsIdent.nbDigits) {
+            case 0:
+                return `arrondie à l'unité`;
+            case 1:
+                return `arrondie à une décimale`;
+            case 2:
+                return `arrondie à deux décimales`;
+        }
+    })()}.
+`;
     return instruction;
 };
-const getAnswer = (identifiers) => {
-    const { mass } = identifiers;
-    const answer = (mass * g).toScientific(2);
-    return answer.toTex();
-};
 const getHint = () => {
     const hint = `Le poids $P$ se calcule en utilisant la formule :
   
@@ -27,7 +68,7 @@ où
 
 - m est la masse de l'objet (en $\\textrm{kg}$).
 
-- g est l'accélération due à la gravité (en $\\textrm{m} \\cdot \\textrm{s}^${-1}$).`;
+- g est l'accélération due à la gravité (en $\\textrm{m} \\cdot \\textrm{s}^{${-2}}$).`;
     return hint;
 };
 const getCorrection = (identifiers) => {
@@ -42,52 +83,85 @@ $$
 On a : 
 
 $$
-P = ${mass.frenchify()} \\times ${g.frenchify()} \\Rightarrow P=${answer}\\ \\textrm{N}
+P = ${mass.frenchify()} \\times ${g.frenchify()} \\Rightarrow P=${answer}
 $$`;
     return correction;
 };
-const getQuestionFromIdentifiers = (identifiers) => {
+const getAnswer = (identifiers) => {
+    const { mass, optsIdent } = identifiers;
+    switch (optsIdent.inputType) {
+        case "decimal": {
+            const answer = round(mass * g, optsIdent.nbDigits);
+            return `${answer.frenchify()}N`;
+        }
+        case "sci": {
+            const answer = (mass * g).toScientific(optsIdent.nbDigits);
+            return `${answer.toTex()}N`;
+        }
+    }
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+const getPropositions = (n, { answer, mass, optsIdent }) => {
+    const propositions = [];
+    const weight = mass * g;
+    addValidProp(propositions, answer);
+    switch (optsIdent.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`);
+                propWhile(propositions, n, () => {
+                    const random = randfloat(weight - 50, weight + 50, 2, [weight]);
+                    tryToAddWrongProp(propositions, `${round(random, optsIdent.nbDigits).frenchify()}N`);
+                });
+            }
+            break;
+        case "sci":
+            {
+                tryToAddWrongProp(propositions, `${(weight * 10).toScientific(optsIdent.nbDigits).toTex()}N`);
+                tryToAddWrongProp(propositions, `${(randfloat(weight - 100, weight + 100, 2, [weight]) / 10)
+                    .toScientific(optsIdent.nbDigits)
+                    .toTex()}N`);
+                propWhile(propositions, n, () => {
+                    const random = randfloat(weight - 50, weight + 50, 2, [weight]);
+                    tryToAddWrongProp(propositions, `${random.toScientific(optsIdent.nbDigits).toTex()}N`);
+                });
+            }
+            break;
+    }
+    return shuffleProps(propositions, n);
+};
+const getCalculateWeightQuestion = (optsIn) => {
+    const opts = optsIn
+        ? Object.assign(optsDefault, {
+            inputType: random(optsIn.inputType),
+            nbDigits: +random(optsIn.nbDigits),
+        })
+        : optsDefault;
+    const mass = randint(30, 151);
+    const identifiers = { mass: mass, optsIdent: opts };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
-        keys: [],
+        keys: ["N"],
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
         answerFormat: "tex",
         identifiers,
+        options: opts,
     };
     return question;
 };
-const getCalculateWeightQuestion = () => {
-    const mass = randint(30, 151);
-    const identifiers = { mass: mass };
-    return getQuestionFromIdentifiers(identifiers);
-};
-const getPropositions = (n, { answer, mass }) => {
-    const propositions = [];
-    const weight = mass * g;
-    addValidProp(propositions, answer);
-    generatePropositions(mass).forEach((value) => tryToAddWrongProp(propositions, value));
-    propWhile(propositions, n, () => {
-        const random = randfloat(weight - 50, weight + 50, 2, [weight]);
-        tryToAddWrongProp(propositions, random.toScientific(2).toTex());
-    });
-    return shuffleProps(propositions, n);
-};
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
-const generatePropositions = (mass) => {
-    const weight = mass * g;
-    const first = (weight * 10).toScientific(2);
-    const second = (randfloat(weight - 100, weight + 100, 2, [weight]) / 10).toScientific(2);
-    return [first.toTex(), second.toTex()];
-};
 export const calculateWeight = {
     id: "calculateWeight",
     label: "Calculer le poids d'un objet",
     isSingleStep: true,
-    generator: (nb) => getDistinctQuestions(getCalculateWeightQuestion, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getCalculateWeightQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -95,4 +169,5 @@ export const calculateWeight = {
     subject: "Physique",
     hasHintAndCorrection: true,
     getQuestionFromIdentifiers,
+    options,
 };

package/lib/exercises/utils/geogebra/toolBarConstructor.d.ts

@@ -10,5 +10,6 @@ export declare const toolBarConstructor: (options: {
     segment?: boolean;
     segmentFixed?: boolean;
     polygon?: boolean;
+    erase?: boolean;
 }) => string;
 //# sourceMappingURL=toolBarConstructor.d.ts.map

package/lib/exercises/utils/geogebra/toolBarConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolBarConstructor.d.ts","sourceRoot":"","sources":["../../../../src/exercises/utils/geogebra/toolBarConstructor.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,GAAI,SAAS;IAC1C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,WAcA,CAAC"}
+{"version":3,"file":"toolBarConstructor.d.ts","sourceRoot":"","sources":["../../../../src/exercises/utils/geogebra/toolBarConstructor.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,GAAI,SAAS;IAC1C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,WAgBA,CAAC"}

package/lib/exercises/utils/geogebra/toolBarConstructor.js

@@ -1,5 +1,7 @@
 export const toolBarConstructor = (options) => {
-    let customToolBar = "0||6";
+    let customToolBar = "0";
+    if (options.erase !== false)
+        customToolBar += "||6";
     if (options.point)
         customToolBar += "||1";
     if (options.intersect)

package/lib/geogebra/parsers/geogebraParser.d.ts

@@ -3,5 +3,9 @@ export declare class GeogebraParser {
     constructor(studentCommands: string[]);
     pointCoords(name: string): number[] | undefined;
     vectors(): number[][];
+    objectDict(): {
+        [k: string]: string;
+    };
+    static pointNamesForLineObj(lineObj: string): string[];
 }
 //# sourceMappingURL=geogebraParser.d.ts.map

package/lib/geogebra/parsers/geogebraParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geogebraParser.d.ts","sourceRoot":"","sources":["../../../src/geogebra/parsers/geogebraParser.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;gBACP,eAAe,EAAE,MAAM,EAAE;IAIrC,WAAW,CAAC,IAAI,EAAE,MAAM;IAWxB,OAAO;CAwCR"}
+{"version":3,"file":"geogebraParser.d.ts","sourceRoot":"","sources":["../../../src/geogebra/parsers/geogebraParser.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;gBACP,eAAe,EAAE,MAAM,EAAE;IAIrC,WAAW,CAAC,IAAI,EAAE,MAAM;IAWxB,OAAO;IAyCP,UAAU;;;IAWV,MAAM,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM;CAS5C"}

package/lib/geogebra/parsers/geogebraParser.js

@@ -56,4 +56,21 @@ export class GeogebraParser {
         }
         return res;
     }
+    objectDict() {
+        return Object.fromEntries(this.commands
+            .filter((command) => command.includes("="))
+            .map((definitionCommand) => {
+            const [name, obj] = definitionCommand.split("=");
+            return [name, obj];
+        }));
+    }
+    static pointNamesForLineObj(lineObj) {
+        const reLine = /^Line\[\s*([^,\]]+)\s*,\s*([^,\]]+)\s*\]$/;
+        const match = lineObj.match(reLine);
+        if (!match) {
+            return [];
+        }
+        const [, nameA, nameB] = match;
+        return [nameA, nameB];
+    }
 }