math-exercises 3.0.68 → 3.0.70

package/lib/exercises/pc/mole/concentrationReading.js

@@ -3,9 +3,18 @@ import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuesti
 import { randomColor } from "../../../geogebra/colors.js";
 import { GeogebraConstructor } from "../../../geogebra/geogebraConstructor.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
-const getConcentrationReadingQuestion = () => {
-    const absorbtion = randfloat(0.5, 5);
-    const concentration = randfloat(0.1, 2);
+const getInstruction = (identifiers) => {
+    const { concentration, absorbtion } = identifiers;
+    return `On trace la courbe d'étalonnage ci-dessous. L'absorbance d'ue solution est $A = ${absorbtion.frenchify()}$. 
+  
+Quelle est la concentration en espèce colorée de cette solution ?`;
+};
+const getAnswer = (identifiers) => {
+    const { concentration, absorbtion } = identifiers;
+    return concentration.frenchify();
+};
+const getGGBOptions = (identifiers) => {
+    const { concentration, absorbtion } = identifiers;
     const commands = [
         `L = Line[(0,0), (${concentration}, ${absorbtion})]`,
         `SetFixed(L, true)`,
@@ -18,18 +27,27 @@ const getConcentrationReadingQuestion = () => {
         xAxis: { label: "$\\tiny C (\\text{mol}\\cdot \\text{L}^{-1})$" },
         yAxis: { label: "$\\tiny A$" },
     });
+    return ggb.getOptions({
+        coords: [-1, concentration + 2, -1, absorbtion + 2],
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: concentration + "",
-        instruction: `On trace la courbe d'étalonnage ci-dessous. L'absorbance d'ue solution est $A = ${absorbtion}$. Quelle est la concentration en espèce colorée de cette solution ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { absorbtion, concentration },
-        ggbOptions: ggb.getOptions({
-            coords: [-1, concentration + 2, -1, absorbtion + 2],
-        }),
+        identifiers,
+        ggbOptions: getGGBOptions(identifiers),
     };
     return question;
 };
+const getConcentrationReadingQuestion = () => {
+    const absorbtion = randfloat(0.5, 5);
+    const concentration = randfloat(0.1, 2);
+    const identifiers = { absorbtion, concentration };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -44,7 +62,6 @@ const isAnswerValid = (ans, { answer }) => {
 export const concentrationReading = {
     id: "concentrationReading",
     label: "",
-    levels: ["1reSpé"],
     isSingleStep: true,
     sections: [],
     generator: (nb) => getDistinctQuestions(getConcentrationReadingQuestion, nb),
@@ -53,4 +70,5 @@ export const concentrationReading = {
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/mole/molFromMass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"molFromMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/molFromMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmCF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"molFromMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/molFromMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAsDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAY7C,CAAC"}

package/lib/exercises/pc/mole/molFromMass.js

@@ -2,19 +2,33 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercis
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { roundSignificant } from "../../../math/utils/round.js";
-const getMolFromMassQuestion = () => {
-    const mass = randfloat(5, 100, 1);
-    const molarMass = randfloat(5, 50, 1);
+const getInstruction = (identifiers) => {
+    const { mass, molarMass } = identifiers;
+    return `On prélève $${roundSignificant(mass, 1)}\\ \\textrm{g}$ d'une espèce chimique de masse molaire $${roundSignificant(molarMass, 1)}\\ \\textrm{g}\\cdot \\textrm{mol}^{-1}$. 
+  
+Quelle est la quantité de matière prélevée, en $\\textrm{mol}$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { mass, molarMass } = identifiers;
     const answer = roundSignificant(mass / molarMass, 1);
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `On prélève $${roundSignificant(mass, 1)}\\ \\text{g}$ d'une espèce chimique de masse molaire $${roundSignificant(molarMass, 1)}\\ \\text{g}\\cdot \\text{mol}^{-1}$. Quelle est la quantité de matière prélevée, en $\\text{mol}$ ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { mass, molarMass },
+        identifiers,
     };
     return question;
 };
+const getMolFromMassQuestion = () => {
+    const mass = randfloat(5, 100, 1);
+    const molarMass = randfloat(5, 50, 1);
+    const identifiers = { mass, molarMass };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -30,13 +44,12 @@ export const molFromMass = {
     id: "molFromMass",
     connector: "=",
     label: "Calculer une quantité de matière en fonction de la masse",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Mol"],
     generator: (nb) => getDistinctQuestions(getMolFromMassQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/mole/molFromMolarMass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"molFromMolarMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/molFromMolarMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmCF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"molFromMolarMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/molFromMolarMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAsDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/pc/mole/molFromMolarMass.js

@@ -2,19 +2,33 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercis
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { roundSignificant } from "../../../math/utils/round.js";
-const getMolFromMolarMassQuestion = () => {
-    const mol = randfloat(1.1, 4, 1);
-    const molarMass = randfloat(10, 50, 1);
+const getInstruction = (identifiers) => {
+    const { mol, molarMass } = identifiers;
+    return `On souhaite prélever $${roundSignificant(mol, 1)} \\ \\textrm{mol}$ d'une espèce chimique de masse molaire $M = ${roundSignificant(molarMass, 1)}\\ \\textrm{g}\\cdot \\textrm{mol}^{-1}$. 
+  
+Quelle est la masse $m$ à prélever, en $\\textrm{g}$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { mol, molarMass } = identifiers;
     const answer = roundSignificant(mol * molarMass, 1);
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `On souhaite prélever $${roundSignificant(mol, 1)} \\ \\text{mol}$ d'une espèce chimique de masse molaire $M = ${roundSignificant(molarMass, 1)}\\ \\text{g}\\cdot \\text{mol}^{-1}$. Quelle est la masse $m$ à prélever, en $\\text{g}$ ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { mol, molarMass },
+        identifiers,
     };
     return question;
 };
+const getMolFromMolarMassQuestion = () => {
+    const mol = randfloat(1.1, 4, 1);
+    const molarMass = randfloat(10, 50, 1);
+    const identifiers = { mol, molarMass };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -30,13 +44,12 @@ export const molFromMolarMass = {
     id: "molFromMolarMass",
     connector: "=",
     label: "Calculer une masse en fonction de la quantité de matière",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Mol"],
     generator: (nb) => getDistinctQuestions(getMolFromMolarMassQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/mole/molarMass.d.ts

@@ -1,5 +1,7 @@
 import { Exercise } from "../../../exercises/exercise.js";
-type Identifiers = {};
+type Identifiers = {
+    molecule: string;
+};
 export declare const molarMass: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=molarMass.d.ts.map

package/lib/exercises/pc/mole/molarMass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"molarMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/molarMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG,EAAE,CAAC;AAoCtB,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAa3C,CAAC"}
+{"version":3,"file":"molarMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/molarMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAwDF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAY3C,CAAC"}

package/lib/exercises/pc/mole/molarMass.js

@@ -5,19 +5,33 @@ import { round, roundSignificant } from "../../../math/utils/round.js";
 import { molecules } from "../../../pc/constants/molecularChemistry/molecule.js";
 import { random } from "../../../utils/alea/random.js";
 import { requiresApostropheBefore } from "../../../utils/strings/requiresApostropheBefore.js";
-const getMolarMassQuestion = () => {
-    const molecule = random(molecules.slice(0, 50).filter((m) => m.atoms.length > 1));
-    const article = requiresApostropheBefore(molecule.name) ? "de l'" : "du ";
-    const weight = molecule.atoms.reduce((acc, curr) => acc + curr.count * round(curr.atom.masseAtomique, 1), 0);
+const getInstruction = (identifiers) => {
+    const { molecule } = identifiers;
+    const mol = molecules.find((m) => m.formula === molecule);
+    const article = requiresApostropheBefore(mol.name) ? "de l'" : "du ";
+    return `Calculer la masse molaire ${article}${mol.name.toLocaleLowerCase()} $${mol.formula}$.`;
+};
+const getAnswer = (identifiers) => {
+    const { molecule } = identifiers;
+    const mol = molecules.find((m) => m.formula === molecule);
+    const weight = mol.atoms.reduce((acc, curr) => acc + curr.count * round(curr.atom.masseAtomique, 1), 0);
+    return roundSignificant(weight, 1);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: roundSignificant(weight, 1),
-        instruction: `Calculer la masse molaire ${article}${molecule.name.toLocaleLowerCase()} $${molecule.formula}$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { molecule: molecule.formula },
+        identifiers,
     };
     return question;
 };
+const getMolarMassQuestion = () => {
+    const molecule = random(molecules.slice(0, 50).filter((m) => m.atoms.length > 1));
+    const identifiers = { molecule: molecule.formula };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -33,13 +47,12 @@ export const molarMass = {
     id: "molarMass",
     connector: "=",
     label: "Calculer une masse molaire",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Mol"],
     generator: (nb) => getDistinctQuestions(getMolarMassQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/mole/moleculeCountFromMassAndAvogadro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moleculeCountFromMassAndAvogadro.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/moleculeCountFromMassAndAvogadro.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAiFF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAalE,CAAC"}
+{"version":3,"file":"moleculeCountFromMassAndAvogadro.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/moleculeCountFromMassAndAvogadro.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmGF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAYlE,CAAC"}

package/lib/exercises/pc/mole/moleculeCountFromMassAndAvogadro.js

@@ -7,23 +7,38 @@ import { random } from "../../../utils/alea/random.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { avogadroConstant } from "../../../pc/constants/molecularChemistry/atoms.js";
 import { requiresApostropheBefore } from "../../../utils/strings/requiresApostropheBefore.js";
-const getMoleculeCountFromMassAndAvogadroQuestion = () => {
-    const molecule = random(molecules);
-    const sampleMass = randfloat(0.1, 2, 2); // Sample mass in grams
-    const molarMass = molecule.weight; // Molar mass in g/mol
+const getInstruction = (identifiers) => {
+    const { moleculeName, sampleMass, molarMass } = identifiers;
+    const instruction = `Un échantillon a une masse $m = ${frenchify(sampleMass)}\\ \\textrm{g}$ de ${requiresApostropheBefore(moleculeName) ? "d'" : "de "}${moleculeName}. 
+  
+La masse molaire ${requiresApostropheBefore(moleculeName) ? "d'" : "de "}${moleculeName} est de $${molarMass}\\ \\textrm{g}/\\textrm{mol}$.
+
+Déterminer le nombre de molécules ${requiresApostropheBefore(moleculeName) ? "d'" : "de "}${moleculeName}.`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { sampleMass, molarMass } = identifiers;
     const Na = avogadroConstant.value.toSignificant(2);
     const entitiesNumber = Na.times(sampleMass / molarMass).toSignificant(2);
-    const instruction = `Un échantillon a une masse $m = ${frenchify(sampleMass)}\\ g$ de ${requiresApostropheBefore(molecule.name) ? "d'" : "de "}${molecule.name}. La masse molaire ${requiresApostropheBefore(molecule.name) ? "d'" : "de "}${molecule.name} est de $${molarMass}\\ g/mol$.
-  Déterminer le nombre de molécules ${requiresApostropheBefore(molecule.name) ? "d'" : "de "}${molecule.name}.`;
+    return entitiesNumber.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: entitiesNumber.toTex(),
-        instruction,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["mol", "timesTenPower"],
         answerFormat: "tex",
-        identifiers: { moleculeName: molecule.name, sampleMass, molarMass },
+        identifiers,
     };
     return question;
 };
+const getMoleculeCountFromMassAndAvogadroQuestion = () => {
+    const molecule = random(molecules);
+    const sampleMass = randfloat(0.1, 2, 2); // Sample mass in grams
+    const molarMass = molecule.weight; // Molar mass in g/mol
+    const identifiers = { moleculeName: molecule.name, sampleMass, molarMass };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, moleculeName, sampleMass }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -60,13 +75,12 @@ const isAnswerValid = (ans, { answer, sampleMass, molarMass }) => {
 export const MoleculeCountFromMassAndAvogadro = {
     id: "moleculeCountFromMassAndAvogadro",
     label: "Déterminer le nombre de molécules dans un échantillon",
-    levels: ["2nde", "1reSpé"],
     isSingleStep: true,
-    sections: ["Chimie organique"],
     generator: (nb) => getDistinctQuestions(getMoleculeCountFromMassAndAvogadroQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/mole/moleculeCountFromMol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moleculeCountFromMol.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/moleculeCountFromMol.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AA8DxC,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"moleculeCountFromMol.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/moleculeCountFromMol.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AA+ExC,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAYtD,CAAC"}

package/lib/exercises/pc/mole/moleculeCountFromMol.js

@@ -2,20 +2,32 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercis
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { avogadroConstant } from "../../../pc/constants/molecularChemistry/atoms.js";
-const getMoleculeCountFromMolQuestion = () => {
-    const quantity = randfloat(0.01, 100, 2); // Quantité de matière en moles, entre 0.01 et 10 moles
+const getInstruction = (identifiers) => {
+    const { quantity } = identifiers;
+    return `Calculer le nombre de molécules dans un échantillon contenant $${quantity.frenchify()} \\ mol$ de substance.`;
+};
+const getAnswer = (identifiers) => {
+    const { quantity } = identifiers;
     const numberOfMolecules = avogadroConstant.value
         .times(quantity)
         .toSignificant(2);
+    return numberOfMolecules.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: numberOfMolecules.toTex(),
-        instruction: `Calculer le nombre de molécules dans un échantillon contenant $${quantity.frenchify()} \\ mol$ de substance.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["mol", "timesTenPower"],
         answerFormat: "tex",
-        identifiers: { quantity },
+        identifiers,
     };
     return question;
 };
+const getMoleculeCountFromMolQuestion = () => {
+    const quantity = randfloat(0.01, 100, 2); // Quantité de matière en moles, entre 0.01 et 10 moles
+    const identifiers = { quantity };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, quantity }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -51,13 +63,12 @@ const isAnswerValid = (ans, { answer, quantity }) => {
 export const moleculeCountFromMol = {
     id: "moleculeCountFromMol",
     label: "Calculer le nombre de molécules dans un échantillon",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Chimie organique"],
     generator: (nb) => getDistinctQuestions(getMoleculeCountFromMolQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"moleculeFormula.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/moleculeFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,QAAQ,EACT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAkDF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}
+{"version":3,"file":"moleculeFormula.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/moleculeFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,QAAQ,EAKT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAmFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/pc/moleculeFormula.js

@@ -2,22 +2,44 @@ import { addValidProp, tryToAddWrongProp, } from "../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../exercises/utils/getDistinctQuestions.js";
 import { molecules } from "../../pc/constants/molecularChemistry/molecule.js";
 import { shuffle } from "../../utils/alea/shuffle.js";
-const getMoleculeNFormula = () => {
+const getInstruction = (identifiers) => {
+    const { randomMoleculeIndex } = identifiers;
     const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.iupact);
-    const randomMoleculeIndex = Math.floor(Math.random() * organicMolecule.length);
     const myRandomMolecule = organicMolecule[randomMoleculeIndex];
     const instruction = `Donner la formule brute de la molécule suivante : 
-  $\\\\$ ![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/xpliveV2/scienceAssets/molecules/${myRandomMolecule.formula}.png)`;
+
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/xpliveV2/scienceAssets/molecules/${myRandomMolecule.formula}.png)`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { randomMoleculeIndex } = identifiers;
+    const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.iupact);
+    const myRandomMolecule = organicMolecule[randomMoleculeIndex];
     const answer = myRandomMolecule.formula;
+    return answer;
+};
+const getKeys = (identifiers) => {
+    const { randomMoleculeIndex } = identifiers;
+    const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.iupact);
+    const myRandomMolecule = organicMolecule[randomMoleculeIndex];
+    return [...myRandomMolecule.atoms.map((el) => el.atom.name), "underscore"];
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction,
-        answer,
-        keys: [...myRandomMolecule.atoms.map((el) => el.atom.name), "underscore"],
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { randomMoleculeIndex },
+        identifiers,
     };
     return question;
 };
+const getMoleculeNFormula = () => {
+    const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.iupact);
+    const randomMoleculeIndex = Math.floor(Math.random() * organicMolecule.length);
+    const identifiers = { randomMoleculeIndex };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, randomMoleculeIndex }) => {
     const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.iupact);
     const propositions = [];
@@ -36,8 +58,6 @@ export const moleculeFormula = {
     id: "moleculeFormula",
     connector: "\\iff",
     label: "Donner la formule brute d'une molécule à partir de sa formule développée",
-    levels: ["4ème", "3ème", "2nde"],
-    sections: ["Chimie organique"],
     subject: "Chimie",
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getMoleculeNFormula, nb, 20),
@@ -46,4 +66,5 @@ export const moleculeFormula = {
     getPropositions,
     isAnswerValid,
     maxAllowedQuestions: 20,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"moleculeNomenclature.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/moleculeNomenclature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AA6CF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}
+{"version":3,"file":"moleculeNomenclature.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/moleculeNomenclature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAuEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/pc/moleculeNomenclature.js

@@ -2,21 +2,37 @@ import { addValidProp, tryToAddWrongProp, } from "../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../exercises/utils/getDistinctQuestions.js";
 import { molecules } from "../../pc/constants/molecularChemistry/molecule.js";
 import { shuffle } from "../../utils/alea/shuffle.js";
-const getMoleculeNomenclature = () => {
+const getInstruction = (identifiers) => {
+    const { randomMoleculeIndex } = identifiers;
     const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.type);
-    const randomMoleculeIndex = Math.floor(Math.random() * organicMolecule.length);
     const myRandomMolecule = organicMolecule[randomMoleculeIndex];
     const instruction = `Donner le nom de la molécule suivante : 
-  $\\\\$ ![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/xpliveV2/scienceAssets/molecules/${myRandomMolecule.formula}.png)`;
+
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/xpliveV2/scienceAssets/molecules/${myRandomMolecule.formula}.png)`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { randomMoleculeIndex } = identifiers;
+    const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.type);
+    const myRandomMolecule = organicMolecule[randomMoleculeIndex];
+    return myRandomMolecule.iupact;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction,
-        answer: myRandomMolecule.iupact,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "raw",
-        identifiers: { randomMoleculeIndex },
+        identifiers,
     };
     return question;
 };
+const getMoleculeNomenclature = () => {
+    const organicMolecule = molecules.filter((molecule) => molecule.isOrganic && molecule.type);
+    const randomMoleculeIndex = Math.floor(Math.random() * organicMolecule.length);
+    const identifiers = { randomMoleculeIndex };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer, "raw");
@@ -35,8 +51,6 @@ export const moleculeNomenclature = {
     id: "moleculeNomenclature",
     connector: "\\iff",
     label: "Donner le nom d'une molécule à partir de sa formule développée",
-    levels: ["4ème", "3ème", "2nde"],
-    sections: ["Chimie organique"],
     subject: "Chimie",
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getMoleculeNomenclature, nb, 20),
@@ -45,4 +59,5 @@ export const moleculeNomenclature = {
     getPropositions,
     isAnswerValid,
     maxAllowedQuestions: 20,
+    getQuestionFromIdentifiers,
 };

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,EAST,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,KAAK,OAAO,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAoJpD,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"averageSpeed.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/motion/averageSpeed.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,KAAK,OAAO,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAwKpD,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAY9C,CAAC"}