math-exercises 3.0.69 → 3.0.70

package/lib/exercises/pc/forces/gravitationalForcePlanets.js

@@ -5,23 +5,19 @@ import { Measure } from "../../../pc/measure/measure.js";
 import { planets } from "../../../pc/constants/mechanics/planets.js";
 import { earthG, sunMass } from "../../../pc/constants/mechanics/gravitational.js";
 const G = earthG.measure;
-const getGravitationalForcePlanetsQuestion = () => {
-    const planetIndex = randint(0, planets.length);
-    const selectedPlanet = planets[planetIndex];
+const getInstruction = (identifiers) => {
+    const { planet, mass, distance } = identifiers;
+    const selectedPlanet = planets.find((p) => p.name === planet);
     const massSun = sunMass.measure;
-    // Convert distance from km to m
-    const distanceInMeters = selectedPlanet.distanceFromSun.convert("m");
-    const force = G.times(selectedPlanet.mass)
-        .times(massSun)
-        .divide(distanceInMeters.times(distanceInMeters))
-        .toSignificant(2);
-    const instruction = `Considérez la planète ${selectedPlanet.name} dans le ${selectedPlanet.system}. 
-  La masse de ${selectedPlanet.name} est de $${selectedPlanet.mass.toTex({
+    const instruction = `On considère la planète ${selectedPlanet.name} dans le ${selectedPlanet.system}. 
+
+La masse de ${selectedPlanet.name} est de $${selectedPlanet.mass.toTex({
         scientific: 2,
     })}$ et la distance entre ${selectedPlanet.name} et le Soleil est de $${selectedPlanet.distanceFromSun.toTex({
         scientific: 2,
     })}$. 
-  Calculez la force gravitationnelle exercée par le Soleil sur ${selectedPlanet.name}.
+
+Calculez la force gravitationnelle exercée par le Soleil sur ${selectedPlanet.name}.
 
 Données:
 - Constante de gravitation universelle: $G = ${G.toTex({
@@ -30,15 +26,49 @@ Données:
 - Masse du Soleil: $m_{\\text{soleil}} = ${massSun.toTex({
         scientific: 2,
     })}$`;
-    const hint = `Utilisez la formule de la force gravitationnelle.`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { planet, mass, distance } = identifiers;
+    const selectedPlanet = planets.find((p) => p.name === planet);
+    const massSun = sunMass.measure;
+    // Convert distance from km to m
+    const distanceInMeters = selectedPlanet.distanceFromSun.convert("m");
+    const force = G.times(selectedPlanet.mass)
+        .times(massSun)
+        .divide(distanceInMeters.times(distanceInMeters))
+        .toSignificant(2);
+    return force.toTex({ scientific: 2 });
+};
+const getHint = (identifiers) => {
+    const hint = `Utilise la formule de la force gravitationnelle.`;
+    return hint;
+};
+const getCorrection = (identifiers) => {
+    const { planet, mass, distance } = identifiers;
+    const selectedPlanet = planets.find((p) => p.name === planet);
+    const massSun = sunMass.measure;
+    // Convert distance from km to m
+    const distanceInMeters = selectedPlanet.distanceFromSun.convert("m");
+    const force = G.times(selectedPlanet.mass)
+        .times(massSun)
+        .divide(distanceInMeters.times(distanceInMeters))
+        .toSignificant(2);
     const correction = `La force gravitationnelle est donnée par la formule vectorielle :
 
-  $$\\vec{F}_{\\text{Soleil/${selectedPlanet.name}}} = -G \\cdot \\frac{m_{\\text{soleil}} \\cdot m_{${selectedPlanet.name.charAt(0)}}}{d^2} \\cdot \\vec{u}_{\\text{Soleil→${selectedPlanet.name}}}$$. \n
-  La formule de la force gravitationnelle en valeur est :
-  $$F_{\\text{Soleil/${selectedPlanet.name}}} = G \\cdot \\frac{m_{\\text{soleil}} \\cdot m_{${selectedPlanet.name.charAt(0)}}}{d^2}$$. \n
-  En utilisant les valeurs fournies :
+$$
+\\overrightarrow{F}_{\\text{Soleil/${selectedPlanet.name}}} = -G \\cdot \\frac{m_{\\text{soleil}} \\cdot m_{${selectedPlanet.name.charAt(0)}}}{d^2} \\cdot \\overrightarrow{u}_{\\text{Soleil→${selectedPlanet.name}}}
+$$ 
+
+La formule de la force gravitationnelle en valeur est :
+$$
+F_{\\text{Soleil/${selectedPlanet.name}}} = G \\cdot \\frac{m_{\\text{soleil}} \\cdot m_{${selectedPlanet.name.charAt(0)}}}{d^2}
+$$
+
+En utilisant les valeurs fournies :
   
-  $$F_{\\text{Soleil/${selectedPlanet.name}}} = ${G.toTex({
+$$
+F_{\\text{Soleil/${selectedPlanet.name}}} = ${G.toTex({
         scientific: 2,
     })} \\cdot \\frac{${selectedPlanet.mass.toTex({
         scientific: 2,
@@ -46,23 +76,34 @@ Données:
         scientific: 2,
     })}}{(${distanceInMeters.toTex({
         scientific: 2,
-    })})^2} = ${force.toTex({ scientific: 2 })}$$. \n
-  Donc, la force gravitationnelle exercée par le Soleil sur ${selectedPlanet.name} est $${force.toTex({ scientific: 2 })}$.`;
+    })})^2} = ${force.toTex({ scientific: 2 })}
+$$
+
+Donc, la force gravitationnelle exercée par le Soleil sur ${selectedPlanet.name} est $${force.toTex({ scientific: 2 })}$.`;
+    return correction;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: force.toTex({ scientific: 2 }),
-        instruction,
-        hint,
-        correction,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         keys: ["N", "timesTenPower"],
         answerFormat: "tex",
-        identifiers: {
-            planet: selectedPlanet.name,
-            mass: selectedPlanet.mass,
-            distance: selectedPlanet.distanceFromSun,
-        },
+        identifiers,
     };
     return question;
 };
+const getGravitationalForcePlanetsQuestion = () => {
+    const planetIndex = randint(0, planets.length);
+    const selectedPlanet = planets[planetIndex];
+    const identifiers = {
+        planet: selectedPlanet.name,
+        mass: selectedPlanet.mass,
+        distance: selectedPlanet.distanceFromSun,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, mass, distance }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -103,9 +144,7 @@ export const gravitationalForcePlanets = {
     id: "gravitationalForcePlanets",
     connector: "=",
     label: "Calculer la force gravitationnelle entre le Soleil et une planète",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Mécanique gravitationnelle"],
     generator: (nb) => getDistinctQuestions(getGravitationalForcePlanetsQuestion, nb, 8),
     qcmTimer: 60,
     freeTimer: 60,
@@ -114,4 +153,5 @@ export const gravitationalForcePlanets = {
     subject: "Physique",
     maxAllowedQuestions: 8,
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/forces/massWeight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"massWeight.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/forces/massWeight.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC;CACjC,CAAC;AAmEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"massWeight.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/forces/massWeight.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC;CACjC,CAAC;AAwGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAYpD,CAAC"}

package/lib/exercises/pc/forces/massWeight.js

@@ -5,39 +5,73 @@ import { round } from "../../../math/utils/round.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
 const g = 9.81;
-const getMassWeightQuestion = () => {
-    const mass = round(randint(1, 1000), 2);
-    const force = round(mass * g, 2);
-    const target = coinFlip() ? "le poids" : "la masse";
-    const instruction = `Un système qui pèse $${mass}\\ kg$ subit une force de $${frenchify(force)}\\ N$ due à la gravité. Quel est ${target} de ce système ?`;
+const getInstruction = (identifiers) => {
+    const { mass, force, target } = identifiers;
+    const instruction = `Un système qui pèse $${mass}\\ \\textrm{kg}$ subit une force de $${frenchify(force)}\\ \\textrm{N}$ due à la gravité. 
+  
+Quel${target === "la masse" ? "le" : ""} est ${target} de ce système ?`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { mass, force, target } = identifiers;
     const answer = target === "le poids"
         ? `${force.toTree().toTex()}`
         : `${mass.toTree().toTex()}`;
+    return answer;
+};
+const getHint = (identifiers) => {
+    const { mass, force, target } = identifiers;
     const hint = target === "le poids"
-        ? `Le poids est la force de gravité qui agit sur un objet. La formule est $P = m \\times g$, où $P$ est le poids en newtons (N), $m$ est la masse en kilogrammes (kg) et $g$ est l'accélération due à la gravité (environ $9.81\\ m/s^2$).`
-        : `La masse est la quantité de matière dans un objet. La formule pour la trouver à partir du poids est $m = \\frac{P}{g}$, où $m$ est la masse en kilogrammes (kg), $P$ est le poids en newtons (N) et $g$ est l'accélération due à la gravité (environ $9.81\\ m/s^2$).`;
+        ? `Le poids est la force de gravité qui agit sur un objet. La formule est : 
+      
+$$
+P = m \\times g
+$$
+
+où $P$ est le poids en newtons ($\\textrm{N}$), $m$ est la masse en kilogrammes ($\\textrm{kg}$) et $g$ est l'accélération due à la gravité (environ $9,81\\ \\textrm{m}/\\textrm{s}^2$).`
+        : `La masse est la quantité de matière dans un objet. La formule pour la trouver à partir du poids est : 
+      
+$$
+m = \\frac{P}{g}
+$$
+
+où $m$ est la masse en kilogrammes ($\\textrm{kg}$), $P$ est le poids en newtons ($\\textrm{N}$) et $g$ est l'accélération due à la gravité (environ $9,81\\ \\textrm{m}/\\textrm{s}^2$).`;
+    return hint;
+};
+const getCorrection = (identifiers) => {
+    const { mass, force, target } = identifiers;
     const correction = target === "le poids"
         ? `Le poids est la force exercée par la gravité sur un objet. Donc ici, le poids est $${force
             .toTree()
-            .toTex()}\\ N$.`
+            .toTex()}\\ \\textrm{N}$.`
         : `La masse est la quantité de matière dans un objet. Donc ici, la masse est $${mass
             .toTree()
-            .toTex()}\\ kg$.`;
+            .toTex()}\\ \\textrm{kg}$.`;
+    return correction;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction,
-        hint,
-        correction,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            mass,
-            force,
-            target,
-        },
+        identifiers,
     };
     return question;
 };
+const getMassWeightQuestion = () => {
+    const mass = round(randint(1, 1000), 2);
+    const force = round(mass * g, 2);
+    const target = coinFlip() ? "le poids" : "la masse";
+    const identifiers = {
+        mass,
+        force,
+        target,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, mass, force, target }) => {
     const propositions = [];
     addValidProp(propositions, answer, "tex");
@@ -52,9 +86,7 @@ const isAnswerValid = (ans, { answer }) => {
 export const MassWeightExercise = {
     id: "massWeight",
     label: "Calculer le poids ou la masse d'un système",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Forces"],
     generator: (nb) => getDistinctQuestions(getMassWeightQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -62,4 +94,5 @@ export const MassWeightExercise = {
     isAnswerValid,
     subject: "Physique",
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/forces/pressingForce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pressingForce.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/forces/pressingForce.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,CAAC,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,CAAC,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD,CAAC;AAuGF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"pressingForce.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/forces/pressingForce.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,CAAC,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,CAAC,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD,CAAC;AA4IF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/pc/forces/pressingForce.js

@@ -3,59 +3,100 @@ import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuesti
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { Measure } from "../../../pc/measure/measure.js";
 import { random } from "../../../utils/alea/random.js";
+const getInstruction = (identifiers) => {
+    const { varAsked, F, P, S } = identifiers;
+    const FMeasure = new Measure(F.significantPart, F.exponent);
+    const PMeasure = new Measure(P.significantPart, P.exponent);
+    const SMeasure = new Measure(S.significantPart, S.exponent);
+    let PInstruction = "";
+    let SInstruction = "";
+    let FInstruction = "";
+    let unit = "";
+    switch (varAsked) {
+        case "F":
+            PInstruction = `P=${PMeasure.toTex({ scientific: 1 })}\\ \\textrm{Pa}`;
+            SInstruction = `S=${SMeasure.toTex({ scientific: 1 })}\\ \\textrm{m}^2`;
+            FInstruction = "F\\ \\textrm{N}";
+            unit = "$\\textrm{N}$";
+            break;
+        case "S":
+            PInstruction = `P=${PMeasure.toTex({ scientific: 1 })}\\ \\textrm{Pa}`;
+            FInstruction = `F=${FMeasure.toTex({ scientific: 1 })}\\ \\textrm{N}`;
+            SInstruction = `S\\ \\textrm{m}^2`;
+            unit = "$\\textrm{m}^2$";
+            break;
+        case "P":
+        default:
+            SInstruction = `S=${SMeasure.toTex({ scientific: 1 })}\\ \\textrm{m}^2`;
+            FInstruction = `F=${FMeasure.toTex({ scientific: 1 })}\\ \\textrm{N}`;
+            PInstruction = `P\\ \\textrm{Pa}`;
+            unit = "$\\textrm{Pa}$";
+            break;
+    }
+    return `Un fluide de pression $${PInstruction}$ exerce une force de valeur $${FInstruction}$ sur une paroi de surface $${SInstruction}$. 
+  
+Calculer $${varAsked}$ (en ${unit}).`;
+};
+const getAnswer = (identifiers) => {
+    const { varAsked, F, P, S } = identifiers;
+    const FMeasure = new Measure(F.significantPart, F.exponent);
+    const PMeasure = new Measure(P.significantPart, P.exponent);
+    const SMeasure = new Measure(S.significantPart, S.exponent);
+    let answer = "";
+    switch (varAsked) {
+        case "F":
+            answer = FMeasure.toSignificant(1).toTex({ scientific: 1 });
+            break;
+        case "S":
+            answer = SMeasure.toSignificant(1).toTex({ scientific: 1 });
+            break;
+        case "P":
+        default:
+            answer = PMeasure.toSignificant(1).toTex({ scientific: 1 });
+            break;
+    }
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["timesTenPower"],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getPressingForceQuestion = () => {
     let F;
     let S;
     let P;
     const varAsked = random(["F", "S", "P"]);
-    let FInstruction = "F";
-    let PInstruction = "P";
-    let SInstruction = "S";
-    let answer = "";
-    let unit = "";
     switch (varAsked) {
         case "F":
             P = new Measure(randfloat(1, 8, 1), 5);
-            PInstruction = `P=${P.toTex({ scientific: 1 })}\\ \\text{Pa}`;
             S = new Measure(randfloat(1, 8, 1), 2);
-            SInstruction = `S=${S.toTex({ scientific: 1 })}\\ \\text{m}^2`;
             F = P.times(S);
-            answer = F.toSignificant(1).toTex({ scientific: 1 });
-            unit = "$\\text{N}$";
             break;
         case "S":
             P = new Measure(randfloat(1, 8, 1), 5);
-            PInstruction = `P=${P.toTex({ scientific: 1 })}\\ \\text{Pa}`;
             F = new Measure(randfloat(1, 8, 1), 7);
-            FInstruction = `F=${F.toTex({ scientific: 1 })}\\ \\text{N}`;
             S = F.divide(P);
-            answer = S.toSignificant(1).toTex({ scientific: 1 });
-            unit = "$\\text{m}^2$";
             break;
         case "P":
         default:
             S = new Measure(randfloat(1, 8, 1), 2);
-            SInstruction = `S=${S.toTex({ scientific: 1 })}\\ \\text{m}^2`;
             F = new Measure(randfloat(1, 8, 1), 7);
-            FInstruction = `F=${F.toTex({ scientific: 1 })}\\ \\text{N}`;
             P = F.divide(S);
-            answer = P.toSignificant(1).toTex({ scientific: 1 });
-            unit = "$\\text{Pa}$";
             break;
     }
-    const question = {
-        answer,
-        instruction: `Un fluide de pression $${PInstruction}$ exerce une force de valeur $${FInstruction}$ sur une paroi de surface $${SInstruction}$. Calculer $${varAsked}$ (en ${unit}).`,
-        keys: ["timesTenPower"],
-        answerFormat: "tex",
-        identifiers: {
-            F: F.toIdentifiers(),
-            P: P.toIdentifiers(),
-            S: S.toIdentifiers(),
-            varAsked,
-        },
+    const identifiers = {
+        F: F.toIdentifiers(),
+        P: P.toIdentifiers(),
+        S: S.toIdentifiers(),
+        varAsked,
     };
-    return question;
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, varAsked }) => {
     const propositions = [];
@@ -82,13 +123,12 @@ export const pressingForce = {
     id: "pressingForce",
     connector: "=",
     label: "Calculer la force pressante",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Forces"],
     generator: (nb) => getDistinctQuestions(getPressingForceQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Physique",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"formulaFromComposition.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/formulaFromComposition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAwFF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"formulaFromComposition.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/formulaFromComposition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AA2HF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAaxD,CAAC"}

package/lib/exercises/pc/formulaFromComposition.js

@@ -5,9 +5,9 @@ import { round } from "../../math/utils/round.js";
 import { atomes } from "../../pc/constants/molecularChemistry/atome.js";
 import { molecules } from "../../pc/constants/molecularChemistry/molecule.js";
 import { shuffle } from "../../utils/alea/shuffle.js";
-const getFormulaFromComposition = () => {
+const getInstruction = (identifiers) => {
+    const randomMoleculeIndex = identifiers.randomMoleculeIndex;
     const moleculesWith2Atoms = molecules.filter((molecule) => molecule.atoms.length === 2 && molecule.state !== "aqueous");
-    const randomMoleculeIndex = Math.floor(Math.random() * moleculesWith2Atoms.length);
     const myRandomMolecule = moleculesWith2Atoms[randomMoleculeIndex];
     const [elementName1, elementName2] = myRandomMolecule.atoms.map((el) => el.atom.symbole);
     const [elementcount1, elementcount2] = myRandomMolecule.atoms.map((el) => el.count);
@@ -19,16 +19,37 @@ const getFormulaFromComposition = () => {
     const percentageElement2 = round(((elementcount2 * elementMolarMass2) /
         (elementcount1 * elementMolarMass1 + elementcount2 * elementMolarMass2)) *
         100, 2);
+    return `Déterminer la formule brute $${elementName1}_x${elementName2}_y$ à partir de la composition centésimale $${elementName1}$ : $${percentageElement1}$ $\\%$ $${elementName2}$ : $${percentageElement2}$ $\\%$.`;
+};
+const getAnswer = (identifiers) => {
+    const randomMoleculeIndex = identifiers.randomMoleculeIndex;
+    const moleculesWith2Atoms = molecules.filter((molecule) => molecule.atoms.length === 2 && molecule.state !== "aqueous");
+    const myRandomMolecule = moleculesWith2Atoms[randomMoleculeIndex];
     const answer = myRandomMolecule.formula;
+    return answer;
+};
+const getKeys = (identifiers) => {
+    const randomMoleculeIndex = identifiers.randomMoleculeIndex;
+    const moleculesWith2Atoms = molecules.filter((molecule) => molecule.atoms.length === 2 && molecule.state !== "aqueous");
+    const myRandomMolecule = moleculesWith2Atoms[randomMoleculeIndex];
+    return [...myRandomMolecule.atoms.map((el) => el.atom.name), "underscore"];
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Déterminer la formule brute $${elementName1}_x${elementName2}_y$ à partir de la composition centésimale $${elementName1}$ : $${percentageElement1}$ $\\%$ $${elementName2}$ : $${percentageElement2}$ $\\%$.`,
-        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 getFormulaFromComposition = () => {
+    const moleculesWith2Atoms = molecules.filter((molecule) => molecule.atoms.length === 2 && molecule.state !== "aqueous");
+    const randomMoleculeIndex = Math.floor(Math.random() * moleculesWith2Atoms.length);
+    const identifiers = { randomMoleculeIndex };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, randomMoleculeIndex }) => {
     const moleculesWith2Atoms = molecules.filter((molecule) => molecule.atoms.length === 2 && molecule.state !== "aqueous");
     const myRandomMolecule = moleculesWith2Atoms[randomMoleculeIndex];
@@ -55,8 +76,6 @@ export const formulaFromComposition = {
     id: "formulaFromComposition",
     connector: "\\iff",
     label: "Déterminer la formule brute à partir de la composition centésimale",
-    levels: ["4ème", "3ème", "2nde"],
-    sections: ["Chimie organique"],
     subject: "Chimie",
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getFormulaFromComposition, nb),
@@ -64,4 +83,5 @@ export const formulaFromComposition = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"identifyAtomicMassOrAtomicNb.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/identifyAtomicMassOrAtomicNb.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4EF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAa9D,CAAC"}
+{"version":3,"file":"identifyAtomicMassOrAtomicNb.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/identifyAtomicMassOrAtomicNb.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAkGF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAY9D,CAAC"}

package/lib/exercises/pc/identifyAtomicMassOrAtomicNb.js

@@ -2,26 +2,46 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../exercises/
 import { getDistinctQuestions } from "../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../math/utils/random/randint.js";
 import { round } from "../../math/utils/round.js";
+import { atomes } from "../../pc/constants/molecularChemistry/atome.js";
 import { coinFlip } from "../../utils/alea/coinFlip.js";
 import { random } from "../../utils/alea/random.js";
 import { requiresApostropheBefore } from "../../utils/strings/requiresApostropheBefore.js";
 import { getAtoms } from "../utils/getAtoms.js";
-const getIdentifyAtomicMassOrAtomicNbQuestion = () => {
-    const exo = generateExercise();
+const getInstruction = (identifiers) => {
+    const { atomicMass, atomicNumber, isAsking, symbol } = identifiers;
+    const atom = atomes.find((a) => a.symbole === symbol);
+    return `À l'aide du tableau périodique simplifié, déterminer ${isAsking} d'un atome ${requiresApostropheBefore(atom.name) ? "d'" : "de "}${atom.name}.
+  
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/xpliveV2/activities/quizzes/generator/periodicTable2.png)`;
+};
+const getAnswer = (identifiers) => {
+    const { atomicMass, atomicNumber, isAsking, symbol } = identifiers;
+    return isAsking == "la masse atomique"
+        ? round(atomicMass, 1).frenchify()
+        : atomicNumber.toTree().toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: exo.answer,
-        instruction: `À l'aide du tableau périodique simplifié, déterminer ${exo.isAsking} d'un atome ${requiresApostropheBefore(exo.atom.name) ? "d'" : "de "}${exo.atom.name}![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/xpliveV2/activities/quizzes/generator/periodicTable2.png)`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            atomicMass: exo.atomicMasss,
-            atomicNumber: exo.atomicNumber,
-            isAsking: exo.isAsking,
-            symbol: exo.atom.symbole,
-        },
+        identifiers,
     };
     return question;
 };
+const getIdentifyAtomicMassOrAtomicNbQuestion = () => {
+    const atoms = getAtoms(3);
+    const atom = random(atoms);
+    const isAsking = coinFlip() ? "la masse atomique" : "le numéro atomique";
+    const identifiers = {
+        atomicMass: atom.masseAtomique,
+        atomicNumber: atom.numeroAtomique,
+        isAsking: isAsking,
+        symbol: atom.symbole,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, atomicMass, atomicNumber }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -59,13 +79,12 @@ const generateExercise = () => {
 export const identifyAtomicMassOrAtomicNb = {
     id: "identifyAtomicMassOrAtomicNb",
     label: "Identifier la masse atomique et le numéro atomique",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Chimie organique"],
     generator: (nb) => getDistinctQuestions(getIdentifyAtomicMassOrAtomicNbQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    getQuestionFromIdentifiers,
 };

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

@@ -1,5 +1,4 @@
-export * from "./chemicalEquations.js";
-export * from "./chemicalReactionsProduct.js";
+export * from "./calibrationCurveOfSolution.js";
 export * from "./delution.js";
 export * from "./formulaFromComposition.js";
 export * from "./kineticEnergy.js";
@@ -10,6 +9,9 @@ export * from "./pH.js";
 export * from "./perceivedFrequency.js";
 export * from "./potentialEnergy.js";
 export * from "./snellDescartes.js";
+export * from "./identifyAtomicMassOrAtomicNb.js";
+export * from "./recognizeRefractionOrReflectionAngles.js";
+export * from "./orderOfMagnitude.js";
 export * from "./sound/index.js";
 export * from "./math/index.js";
 export * from "./weight/index.js";
@@ -23,12 +25,8 @@ export * from "./fluids/index.js";
 export * from "./electricity/index.js";
 export * from "./energy/index.js";
 export * from "./motion/index.js";
-export * from "./calibrationCurveOfSolution.js";
 export * from "./dosage/index.js";
 export * from "./spectral/index.js";
-export * from "./identifyAtomicMassOrAtomicNb.js";
-export * from "./recognizeRefractionOrReflectionAngles.js";
-export * from "./orderOfMagnitude.js";
 export * from "./power/index.js";
 /**exos pris des maths */
 export * from "../math/percent/findProportion.js";

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,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,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,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,iCAAiC,CAAC;AAChD,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AAEjC,yBAAyB;AACzB,cAAc,mCAAmC,CAAC;AAClD,cAAc,wDAAwD,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,cAAc,uCAAuC,CAAC;AACtD,cAAc,gDAAgD,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,kEAAkE,CAAC;AACjF,cAAc,+DAA+D,CAAC;AAC9E,cAAc,gDAAgD,CAAC;AAC/D,cAAc,sDAAsD,CAAC;AACrE,cAAc,mCAAmC,CAAC;AAClD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qDAAqD,CAAC;AACpE,cAAc,0CAA0C,CAAC;AACzD,cAAc,2DAA2D,CAAC;AAC1E,cAAc,uDAAuD,CAAC;AACtE,cAAc,6DAA6D,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mEAAmE,CAAC;AAC1G,OAAO,EAAE,qBAAqB,EAAE,MAAM,mEAAmE,CAAC;AAC1G,OAAO,EAAE,sBAAsB,EAAE,MAAM,oEAAoE,CAAC;AAC5G,cAAc,gDAAgD,CAAC;AAC/D,cAAc,iDAAiD,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;AAEjC,yBAAyB;AACzB,cAAc,mCAAmC,CAAC;AAClD,cAAc,wDAAwD,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,cAAc,uCAAuC,CAAC;AACtD,cAAc,gDAAgD,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,kEAAkE,CAAC;AACjF,cAAc,+DAA+D,CAAC;AAC9E,cAAc,gDAAgD,CAAC;AAC/D,cAAc,sDAAsD,CAAC;AACrE,cAAc,mCAAmC,CAAC;AAClD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qDAAqD,CAAC;AACpE,cAAc,0CAA0C,CAAC;AACzD,cAAc,2DAA2D,CAAC;AAC1E,cAAc,uDAAuD,CAAC;AACtE,cAAc,6DAA6D,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mEAAmE,CAAC;AAC1G,OAAO,EAAE,qBAAqB,EAAE,MAAM,mEAAmE,CAAC;AAC1G,OAAO,EAAE,sBAAsB,EAAE,MAAM,oEAAoE,CAAC;AAC5G,cAAc,gDAAgD,CAAC;AAC/D,cAAc,iDAAiD,CAAC"}

package/lib/exercises/pc/index.js

@@ -1,5 +1,4 @@
-export * from "./chemicalEquations.js";
-export * from "./chemicalReactionsProduct.js";
+export * from "./calibrationCurveOfSolution.js";
 export * from "./delution.js";
 export * from "./formulaFromComposition.js";
 export * from "./kineticEnergy.js";
@@ -10,6 +9,9 @@ export * from "./pH.js";
 export * from "./perceivedFrequency.js";
 export * from "./potentialEnergy.js";
 export * from "./snellDescartes.js";
+export * from "./identifyAtomicMassOrAtomicNb.js";
+export * from "./recognizeRefractionOrReflectionAngles.js";
+export * from "./orderOfMagnitude.js";
 export * from "./sound/index.js";
 export * from "./math/index.js";
 export * from "./weight/index.js";
@@ -23,12 +25,8 @@ export * from "./fluids/index.js";
 export * from "./electricity/index.js";
 export * from "./energy/index.js";
 export * from "./motion/index.js";
-export * from "./calibrationCurveOfSolution.js";
 export * from "./dosage/index.js";
 export * from "./spectral/index.js";
-export * from "./identifyAtomicMassOrAtomicNb.js";
-export * from "./recognizeRefractionOrReflectionAngles.js";
-export * from "./orderOfMagnitude.js";
 export * from "./power/index.js";
 /**exos pris des maths */
 export * from "../math/percent/findProportion.js";

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

@@ -1 +1 @@
-{"version":3,"file":"kineticEnergy.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/kineticEnergy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA6CF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"kineticEnergy.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/kineticEnergy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA6DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}