math-exercises 2.2.3 → 2.2.5

package/lib/exercises/math/spaceGeometry/vectors/spaceVectorNormCalculation.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spaceVectorNormCalculation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const spaceVector_1 = require("../../../../math/geometry/spaceVector");
+const real_1 = require("../../../../math/numbers/reals/real");
+const sqrtNode_1 = require("../../../../tree/nodes/functions/sqrtNode");
+const getSpaceVectorNormCalculationQuestion = () => {
+    const u = spaceVector_1.SpaceVectorConstructor.random("u", false);
+    const correctAnswer = u.getNorm();
+    const question = {
+        answer: correctAnswer.simplify().toTex(),
+        instruction: `Cacluler la norme du vecteur $${u.toTexWithCoords()}$`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: {
+            x: u.x.evaluate({}),
+            y: u.y.evaluate({}),
+            z: u.z.evaluate({}),
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, x, y, z }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (x + y + z).toTree().toTex());
+    let sqrtRand;
+    while (propositions.length < n) {
+        sqrtRand = real_1.SquareRootConstructor.randomSimplifiable({});
+        (0, exercise_1.tryToAddWrongProp)(propositions, sqrtRand.simplify().toTree().toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { x, y, z }) => {
+    const correctAnswer = new sqrtNode_1.SqrtNode((x ** 2 + y ** 2 + z ** 2).toTree());
+    return correctAnswer
+        .toAllValidTexs({ allowSimplifySqrt: true })
+        .includes(ans);
+};
+exports.spaceVectorNormCalculation = {
+    id: "spaceVectorNormCalculation",
+    label: "Calculer la norme d'un vecteur (dans l'espace)",
+    levels: ["2nde"],
+    isSingleStep: true,
+    sections: ["Vecteurs"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSpaceVectorNormCalculationQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/squareRoots/squareRootIdentities.js

@@ -16,12 +16,12 @@ const shuffle_1 = require("../../../utils/shuffle");
 const getAnswer = (type, firstTerm, secondTerm) => {
     switch (type) {
         case 1: //(a+b)^2
-            return new addNode_1.AddNode(new powerNode_1.SquareNode(firstTerm), new addNode_1.AddNode(new powerNode_1.SquareNode(secondTerm), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(2), new multiplyNode_1.MultiplyNode(firstTerm, secondTerm)))).simplify();
+            return new addNode_1.AddNode(new powerNode_1.SquareNode(firstTerm), new addNode_1.AddNode(new powerNode_1.SquareNode(secondTerm), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(2), new multiplyNode_1.MultiplyNode(firstTerm, secondTerm)))).simplify({ keepPowers: false });
         case 2:
-            return new addNode_1.AddNode(new powerNode_1.SquareNode(firstTerm), new substractNode_1.SubstractNode(new powerNode_1.SquareNode(secondTerm), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(2), new multiplyNode_1.MultiplyNode(firstTerm, secondTerm)))).simplify();
+            return new addNode_1.AddNode(new powerNode_1.SquareNode(firstTerm), new substractNode_1.SubstractNode(new powerNode_1.SquareNode(secondTerm), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(2), new multiplyNode_1.MultiplyNode(firstTerm, secondTerm)))).simplify({ keepPowers: false });
         case 3:
         default:
-            return new substractNode_1.SubstractNode(new powerNode_1.SquareNode(firstTerm), new powerNode_1.SquareNode(secondTerm)).simplify();
+            return new substractNode_1.SubstractNode(new powerNode_1.SquareNode(firstTerm), new powerNode_1.SquareNode(secondTerm)).simplify({ keepPowers: false });
     }
 };
 //(x sqrt(a) +- [y || y*sqrt(b)])^2

package/lib/exercises/math/suites/sequencePlot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencePlot.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/suites/sequencePlot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAsFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}
+{"version":3,"file":"sequencePlot.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/suites/sequencePlot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAqFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/suites/sequencePlot.js

@@ -41,10 +41,9 @@ const getSequencePlotQuestion = () => {
         isXAxesNatural: true,
         isGridSimple: true,
     });
-    const sequenceType = isArithmetic ? "arithmétique" : "géométrique";
     const question = {
         answer: u_nValue.toString(),
-        instruction: `Ci-dessous est tracé un nuage de points représentant les valeurs d'une suite ${sequenceType} $(u_n)$. Quelle est la valeur de $u_{${nValue}}$ ?`,
+        instruction: `Ci-dessous est tracé un nuage de points représentant les valeurs d'une suite $(u_n)$. Quelle est la valeur de $u_{${nValue}}$ ?`,
         commands: ggb.commands,
         options: ggb.getOptions(),
         coords: ggb.getAdaptedCoords({

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAuMF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}
+{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAuMF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAgBxD,CAAC"}

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.js

@@ -156,4 +156,5 @@ exports.trigonometrySideCalcul = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"calibrationCurveOfSolution.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/calibrationCurveOfSolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAa5D,CAAC"}
+{"version":3,"file":"calibrationCurveOfSolution.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/calibrationCurveOfSolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}

package/lib/exercises/pc/calibrationCurveOfSolution.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.calibrationCurveOfSolution = void 0;
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
-const molecule_1 = require("../../pc/molecularChemistry/molecule");
+const molecule_1 = require("../../pc/constants/molecularChemistry/molecule");
 const arrayEqual_1 = require("../../utils/arrayEqual");
 const random_1 = require("../../utils/random");
 const requiresApostropheBefore_1 = require("../../utils/requiresApostropheBefore");
@@ -89,4 +89,5 @@ exports.calibrationCurveOfSolution = {
     isGGBAnswerValid,
     answerType: "GGB",
     subject: "Physique",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/pc/chemicalElements/atomicStructureOfNucleus.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type Identifiers = {
     atomSymbol: AtomSymbols;
 };

package/lib/exercises/pc/chemicalElements/atomicStructureOfNucleus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atomicStructureOfNucleus.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/atomicStructureOfNucleus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAKtE,KAAK,WAAW,GAAG;IAAE,UAAU,EAAE,WAAW,CAAA;CAAE,CAAC;AAoE/C,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"atomicStructureOfNucleus.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/atomicStructureOfNucleus.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAKhF,KAAK,WAAW,GAAG;IAAE,UAAU,EAAE,WAAW,CAAA;CAAE,CAAC;AAoE/C,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}

package/lib/exercises/pc/chemicalElements/atomicStructureOfNucleus.js

@@ -5,7 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
 const getAtomicStructureOfNucleusQuestion = () => {

package/lib/exercises/pc/chemicalElements/calculateProtonsNumberFromMass.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type Identifiers = {
     atomSymbol: AtomSymbols;
 };

package/lib/exercises/pc/chemicalElements/calculateProtonsNumberFromMass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateProtonsNumberFromMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/calculateProtonsNumberFromMass.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAOtE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AA+DF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAahE,CAAC"}
+{"version":3,"file":"calculateProtonsNumberFromMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/calculateProtonsNumberFromMass.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAQhF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AA+DF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAahE,CAAC"}

package/lib/exercises/pc/chemicalElements/calculateProtonsNumberFromMass.js

@@ -5,8 +5,8 @@ const coinFlip_1 = require("./../../../utils/coinFlip");
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const round_1 = require("../../../math/utils/round");
-const atoms_1 = require("../../../pc/constants/atoms");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atoms_1 = require("../../../pc/constants/molecularChemistry/atoms");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -15,7 +15,7 @@ const getCalculateProtonsNumberFromMassQuestion = () => {
     const atomNucleusMass = atoms_1.nucleonMass.value.times(atom.masseAtomique);
     const instruction = `Le noyau d'un atome ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(atom.name) ? "d'" : "de "}${atom.name} a pour masse $m = ${atomNucleusMass.toTex({
         scientific: 2,
-    })} kg$ et possède $${(0, round_1.round)(atom.masseAtomique, 0) - atom.numeroAtomique}$ neutrons. Déterminer le nombre de protons de cet atome.`;
+    })}$ et possède $${(0, round_1.round)(atom.masseAtomique, 0) - atom.numeroAtomique}$ neutrons. Déterminer le nombre de protons de cet atome.`;
     // const help = ` $m_{\\text{nucléon}} = ${nucleonMass.value.toTex({
     //   scientific: 2,
     // })}\\ ${nucleonMass.unit}$`;

package/lib/exercises/pc/chemicalElements/calculateVolumetricMass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateVolumetricMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/calculateVolumetricMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA8DtB,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"calculateVolumetricMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/calculateVolumetricMass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG,EAAE,CAAC;AAoFtB,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}

package/lib/exercises/pc/chemicalElements/calculateVolumetricMass.js

@@ -6,36 +6,61 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const randfloat_1 = require("../../../math/utils/random/randfloat");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
+const measure_1 = require("../../../pc/measure/measure");
+const divideUnit_1 = require("../../../pc/units/divideUnit");
+const massUnits_1 = require("../../../pc/units/massUnits");
+const volumeUnit_1 = require("../../../pc/units/volumeUnit");
 // m = t*v où t = concentration
 const getCalculateVolumetricMassQuestion = () => {
     const type = (0, randint_1.randint)(1, 4);
     let m = 0;
     let t = 0;
     let v = 0;
+    let mMeasure;
+    let tMeasure;
+    let vMeasure;
     let instruction = "";
     let answer = "";
+    const tUnit = new divideUnit_1.DivideUnit(massUnits_1.MassUnit.g, volumeUnit_1.VolumeUnit.mL);
     switch (type) {
         case 1:
             //find t
             m = (0, randfloat_1.randfloat)(50, 400, 1);
             v = (0, randfloat_1.randfloat)(50, 400, 1);
+            mMeasure = new measure_1.Measure(m, 0, massUnits_1.MassUnit.g);
+            vMeasure = new measure_1.Measure(v, 0, volumeUnit_1.VolumeUnit.mL);
             answer = (0, round_1.round)(m / v, 1).frenchify();
-            instruction = `Un liquide de volume $${v.frenchify()}\\ \\text{mL}$ a une masse de $${m.frenchify()}\\ \\text{g}$. Quel est la masse volumique de ce liquide, en $\\text{g}\\cdot\\text{mL}^{-1}$ ?`;
+            instruction = `Un liquide de volume $${vMeasure.toTex({
+                notScientific: true,
+            })}$ a une masse de $${mMeasure.toTex({
+                notScientific: true,
+            })}$. Quel est la masse volumique de ce liquide, en $${tUnit.toTex()}$ ?`;
             break;
         case 2:
             //find m
             t = (0, randfloat_1.randfloat)(1, 20, 1);
             v = (0, randfloat_1.randfloat)(50, 400, 1);
+            tMeasure = new measure_1.Measure(t, 0, tUnit);
+            vMeasure = new measure_1.Measure(v, 0, volumeUnit_1.VolumeUnit.mL);
             answer = (0, round_1.round)(t * v, 1).frenchify();
-            instruction = `Un liquide de volume $${v.frenchify()}\\ \\text{mL}$ a une masse volumique de $${t.frenchify()}\\ \\text{g}\\cdot\\text{mL}^{-1}$. Quel est la masse de ce liquide, en $\\text{g}$ ?`;
+            instruction = `Un liquide de volume $${vMeasure.toTex({
+                notScientific: true,
+            })}$ a une masse volumique de $${tMeasure.toTex({
+                notScientific: true,
+            })}$. Quel est la masse de ce liquide, en $${massUnits_1.MassUnit.g.toTex()}$ ?`;
             break;
         case 3:
             //find v
             t = (0, randfloat_1.randfloat)(1, 20, 1);
             m = (0, randfloat_1.randfloat)(50, 400, 1);
+            tMeasure = new measure_1.Measure(t, 0, tUnit);
+            mMeasure = new measure_1.Measure(m, 0, massUnits_1.MassUnit.g);
             answer = (0, round_1.round)(m / t, 1).frenchify();
-            instruction = `Un liquide de masse $${m.frenchify()}\\ \\text{g}$ a une masse volumique de $${t.frenchify()}\\ \\text{g}\\cdot\\text{mL}^{-1}$. Quel est le volume de ce liquide, en $\\text{mL}$ ?`;
-            break;
+            instruction = `Un liquide de masse $${mMeasure.toTex({
+                notScientific: true,
+            })}$ a une masse volumique de $${tMeasure.toTex({
+                notScientific: true,
+            })}$. Quel est le volume de ce liquide, en $${volumeUnit_1.VolumeUnit.mL.toTex()}$ ?`;
             break;
     }
     //un lique de volume v a une masse volumique de t, calculer m

package/lib/exercises/pc/chemicalElements/findAtomEntitiesNumberFromMass.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type Identifiers = {
     atomSymbol: AtomSymbols;
     sampleMass: number;

package/lib/exercises/pc/chemicalElements/findAtomEntitiesNumberFromMass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findAtomEntitiesNumberFromMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findAtomEntitiesNumberFromMass.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAKtE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAyEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAahE,CAAC"}
+{"version":3,"file":"findAtomEntitiesNumberFromMass.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findAtomEntitiesNumberFromMass.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAMhF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAuEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAahE,CAAC"}

package/lib/exercises/pc/chemicalElements/findAtomEntitiesNumberFromMass.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAtomEntitiesNumberFromMass = void 0;
-const frenchify_1 = require("../../../math/utils/latex/frenchify");
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randfloat_1 = require("../../../math/utils/random/randfloat");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
-const atoms_1 = require("../../../pc/constants/atoms");
+const atoms_1 = require("../../../pc/constants/molecularChemistry/atoms");
 const measure_1 = require("../../../pc/measure/measure");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
+const massUnits_1 = require("../../../pc/units/massUnits");
 const getFindAtomEntitiesNumberFromMassQuestion = () => {
     const atom = (0, random_1.random)(atome_1.atomes.slice(5, 30));
     const sampleMass = (0, round_1.round)((0, randfloat_1.randfloat)(0.1, 2), 2);
-    const sampleMassMeasure = new measure_1.Measure(sampleMass, 0);
+    const sampleMassMeasure = new measure_1.Measure(sampleMass, 0, massUnits_1.MassUnit.kg);
     const atomMass = atoms_1.nucleonMass.value.times(atom.masseAtomique).toSignificant(2);
     const entitiesNumber = sampleMassMeasure.divide(atomMass).toSignificant(2);
     console.log("entitiesNumber", entitiesNumber);
-    const instruction = `Un échantillon a une masse $m = ${(0, frenchify_1.frenchify)(sampleMass)}\\ kg$ ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(atom.name) ? "d'" : "de "}${atom.name}. La masse d'un atome ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(atom.name) ? "d'" : "de "}${atom.name} est de $${atomMass.toTex({ scientific: 2 })}\\ kg$.
+    const instruction = `Un échantillon a une masse $m = ${sampleMassMeasure.toTex()}$ ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(atom.name) ? "d'" : "de "}${atom.name}. La masse d'un atome ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(atom.name) ? "d'" : "de "}${atom.name} est de $${atomMass.toTex({ scientific: 2 })}$.
   Déterminer le nombre d'atomes ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(atom.name) ? "d'" : "de "}${atom.name} composant l'échantillon.`;
     const question = {
         answer: `${entitiesNumber.toSignificant(2).toTex()}`,
@@ -44,7 +44,7 @@ const getPropositions = (n, { answer, atomSymbol, sampleMass }) => {
     while (propositions.length < n) {
         const wrongPower = entitiesNumber
             .times(new measure_1.Measure(1, (0, randint_1.randint)(-2, 2, [0])))
-            .toTex({ scientific: 0 });
+            .toTex({ scientific: 0, hideUnit: true });
         (0, exercise_1.tryToAddWrongProp)(propositions, `${wrongPower}`);
     }
     return (0, exercise_1.shuffleProps)(propositions, n);

package/lib/exercises/pc/chemicalElements/findAtomicStructureElement.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type AtomicStructureElement = "proton" | "neutron" | "electron";
 type Identifiers = {
     atomSymbol: AtomSymbols;

package/lib/exercises/pc/chemicalElements/findAtomicStructureElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findAtomicStructureElement.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findAtomicStructureElement.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAKtE,KAAK,sBAAsB,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAQhE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,aAAa,EAAE,sBAAsB,CAAC;CACvC,CAAC;AAoFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAa5D,CAAC"}
+{"version":3,"file":"findAtomicStructureElement.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findAtomicStructureElement.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAKhF,KAAK,sBAAsB,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAQhE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,aAAa,EAAE,sBAAsB,CAAC;CACvC,CAAC;AAoFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}

package/lib/exercises/pc/chemicalElements/findAtomicStructureElement.js

@@ -5,7 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
 const possibleElements = [
@@ -77,4 +77,5 @@ exports.findAtomicStructureElement = {
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/pc/chemicalElements/findValenceElectronsNumberFromElectronicConfiguration.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type Identifiers = {
     atomSymbol: AtomSymbols;
 };

package/lib/exercises/pc/chemicalElements/findValenceElectronsNumberFromElectronicConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findValenceElectronsNumberFromElectronicConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findValenceElectronsNumberFromElectronicConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAKtE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AAyDF,eAAO,MAAM,qDAAqD,EAAE,QAAQ,CAAC,WAAW,CAoBrF,CAAC"}
+{"version":3,"file":"findValenceElectronsNumberFromElectronicConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findValenceElectronsNumberFromElectronicConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAKhF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AAyDF,eAAO,MAAM,qDAAqD,EAAE,QAAQ,CAAC,WAAW,CAoBrF,CAAC"}

package/lib/exercises/pc/chemicalElements/findValenceElectronsNumberFromElectronicConfiguration.js

@@ -6,7 +6,7 @@ const getAtoms_1 = require("../../../exercises/utils/getAtoms");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const getElectronicConfigurationFromShells_1 = require("../../../exercises/utils/getElectronicConfigurationFromShells");
 const randint_1 = require("../../../math/utils/random/randint");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
 const getFindValenceElectronsNumberFromElectronicConfigurationQuestion = () => {

package/lib/exercises/pc/chemicalElements/findValenceElectronsNumberFromTable.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type Identifiers = {
     atomSymbol: AtomSymbols;
 };

package/lib/exercises/pc/chemicalElements/findValenceElectronsNumberFromTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findValenceElectronsNumberFromTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findValenceElectronsNumberFromTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAKtE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AAwDF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAkBrE,CAAC"}
+{"version":3,"file":"findValenceElectronsNumberFromTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/findValenceElectronsNumberFromTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAKhF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AAwDF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAkBrE,CAAC"}

package/lib/exercises/pc/chemicalElements/findValenceElectronsNumberFromTable.js

@@ -5,7 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getAtoms_1 = require("../../../exercises/utils/getAtoms");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
 const getFindValenceElectronsNumberFromTableQuestion = () => {

package/lib/exercises/pc/chemicalElements/identifyRightElectronicConfiguration.d.ts

@@ -1,5 +1,5 @@
 import { Exercise } from "../../../exercises/exercise";
-import { AtomSymbols } from "../../../pc/molecularChemistry/atomSymbols";
+import { AtomSymbols } from "../../../pc/constants/molecularChemistry/atomSymbols";
 type Identifiers = {
     atomSymbol: AtomSymbols;
 };

package/lib/exercises/pc/chemicalElements/identifyRightElectronicConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identifyRightElectronicConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/identifyRightElectronicConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAKtE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AA8GF,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CAAC,WAAW,CAmBtE,CAAC"}
+{"version":3,"file":"identifyRightElectronicConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/identifyRightElectronicConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAKhF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;CACzB,CAAC;AA8GF,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CAAC,WAAW,CAmBtE,CAAC"}

package/lib/exercises/pc/chemicalElements/identifyRightElectronicConfiguration.js

@@ -5,7 +5,7 @@ const exercise_1 = require("../../../exercises/exercise");
 const getAtoms_1 = require("../../../exercises/utils/getAtoms");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const getElectronicConfigurationFromShells_1 = require("../../../exercises/utils/getElectronicConfigurationFromShells");
-const atome_1 = require("../../../pc/molecularChemistry/atome");
+const atome_1 = require("../../../pc/constants/molecularChemistry/atome");
 const random_1 = require("../../../utils/random");
 const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
 const getIdentifyRightElectronicConfigurationQuestion = () => {

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

@@ -7,4 +7,5 @@ export * from "./calculateVolumetricMass";
 export * from "./findValenceElectronsNumberFromElectronicConfiguration";
 export * from "./identifyRightElectronicConfiguration";
 export * from "./findAtomEntitiesNumberFromMass";
+export * from "./massOrVolumeProportion";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yDAAyD,CAAC;AACxE,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/index.ts"],"names":[],"mappings":"AAEA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yDAAyD,CAAC;AACxE,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,0BAA0B,CAAC"}

package/lib/exercises/pc/chemicalElements/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./calculateVolumetricMass"), exports);
 __exportStar(require("./findValenceElectronsNumberFromElectronicConfiguration"), exports);
 __exportStar(require("./identifyRightElectronicConfiguration"), exports);
 __exportStar(require("./findAtomEntitiesNumberFromMass"), exports);
+__exportStar(require("./massOrVolumeProportion"), exports);

package/lib/exercises/pc/chemicalElements/massOrVolumeProportion.d.ts

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    totalMass: number;
+    totalVolume: number;
+    elementMass: number;
+    elementVolume: number;
+    targetProportion: "massique" | "volumique";
+};
+export declare const MassOrVolumeProportionExercise: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=massOrVolumeProportion.d.ts.map

package/lib/exercises/pc/chemicalElements/massOrVolumeProportion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"massOrVolumeProportion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalElements/massOrVolumeProportion.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,UAAU,GAAG,WAAW,CAAC;CAC5C,CAAC;AAsIF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAehE,CAAC"}

package/lib/exercises/pc/chemicalElements/massOrVolumeProportion.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MassOrVolumeProportionExercise = void 0;
+const frenchify_1 = require("../../../math/utils/latex/frenchify");
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const random_1 = require("../../../utils/random");
+const molecule_1 = require("../../../pc/constants/molecularChemistry/molecule");
+const randfloat_1 = require("../../../math/utils/random/randfloat");
+const requiresApostropheBefore_1 = require("../../../utils/requiresApostropheBefore");
+const coinFlip_1 = require("../../../utils/coinFlip");
+const round_1 = require("../../../math/utils/round");
+const getMassOrVolumeProportionQuestion = () => {
+    const molecule = (0, random_1.random)(molecule_1.molecules);
+    const elementName = molecule.name;
+    const totalMass = (0, randfloat_1.randfloat)(50, 500, 2); // Total mass in grams
+    const totalVolume = (0, randfloat_1.randfloat)(100, 1000, 2); // Total volume in milliliters
+    const elementMass = (0, randfloat_1.randfloat)(10, 50, 2); // Element mass in grams
+    const elementVolume = (0, randfloat_1.randfloat)(20, 100, 2); // Element volume in milliliters
+    const massProportion = elementMass / totalMass;
+    const volumeProportion = elementVolume / totalVolume;
+    const targetProportion = (0, coinFlip_1.coinFlip)() ? "massique" : "volumique";
+    const proportion = targetProportion === "massique" ? massProportion : volumeProportion;
+    const instruction = `Vous travaillez dans un laboratoire et vous avez préparé une solution contenant ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(elementName) ? "de l'" : "du "}${elementName}. Voici les données que vous avez mesurées : \n
+  - Masse totale de la solution : $${(0, frenchify_1.frenchify)(totalMass)}\\ g$, \n
+  - Volume total de la solution : $${(0, frenchify_1.frenchify)(totalVolume)}\\ mL$, \n
+  - Masse ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(elementName) ? "d'" : "de "}${elementName} dans la solution : $${(0, frenchify_1.frenchify)(elementMass)}\\ g$, \n
+  - Volume de ${elementName} dans la solution : $${(0, frenchify_1.frenchify)(elementVolume)}\\ mL$. \n
+  Calculez la proportion ${targetProportion} ${(0, requiresApostropheBefore_1.requiresApostropheBefore)(elementName) ? "d'" : "de "}${elementName} dans la solution.`;
+    const hint = `${targetProportion === "massique"
+        ? `La proportion ${targetProportion} est donnée par le rapport entre la masse de l'élément et la masse totale de la solution.`
+        : `La proportion ${targetProportion} est donnée par le rapport entre le volume de l'élément et le volume totale de la solution.`}`;
+    const correction = `Pour calculer la proportion ${targetProportion}, on utilise la formule : 
+  $${targetProportion === "massique"
+        ? `\\text{Proportion massique} = \\frac{\\text{Masse de l'élément}}{\\text{Masse totale}} = \\frac{${elementMass
+            .toScientific(2)
+            .toTex()}}{${totalMass.toScientific(2).toTex()}} = ${(0, frenchify_1.frenchify)(proportion.toScientific(2).toTex())}`
+        : `\\text{Proportion volumique} = \\frac{\\text{Volume de l'élément}}{\\text{Volume total}} = \\frac{${elementVolume
+            .toScientific(2)
+            .toTex()}}{${totalVolume.toScientific(2).toTex()}} = ${(0, frenchify_1.frenchify)(proportion.toScientific(2).toTex())}`}$`;
+    const question = {
+        answer: proportion.toScientific(2).toTex(),
+        instruction,
+        hint,
+        correction,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: {
+            totalMass,
+            totalVolume,
+            elementMass,
+            elementVolume,
+            targetProportion,
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, elementMass, elementVolume, totalMass, totalVolume, targetProportion, }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const w1 = (elementMass / totalVolume).toScientific(2).toTex();
+    const w2 = (elementVolume / totalMass).toScientific(2).toTex();
+    const w3 = targetProportion === "massique"
+        ? (elementMass * totalMass).toScientific(2).toTex()
+        : (elementVolume * totalVolume).toScientific(2).toTex();
+    (0, exercise_1.tryToAddWrongProp)(propositions, w1);
+    (0, exercise_1.tryToAddWrongProp)(propositions, w2);
+    (0, exercise_1.tryToAddWrongProp)(propositions, w3);
+    while (propositions.length < n) {
+        const wrongProportion = (0, randfloat_1.randfloat)(0.01, 0.1, 2).toScientific(2).toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongProportion);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, totalMass, totalVolume, elementMass, elementVolume, targetProportion, }) => {
+    const massProportion = elementMass / totalMass;
+    const volumeProportion = elementVolume / totalVolume;
+    const proportion = targetProportion === "massique" ? massProportion : volumeProportion;
+    const validAnswer1 = proportion.toScientific(2).toTex();
+    const validAnswer2 = (0, round_1.round)(proportion, 2).toTree().toTex();
+    const validAnswer3 = proportion.toScientific(3).toTex();
+    const validAnswer4 = proportion.toScientific(1).toTex();
+    let latexs = [];
+    latexs.push(validAnswer1, validAnswer2, validAnswer3, validAnswer4);
+    return latexs.includes(ans);
+};
+exports.MassOrVolumeProportionExercise = {
+    id: "massOrVolumeProportion",
+    label: "Calculer la proportion massique ou volumique d'un élément dans une solution",
+    levels: ["2nde"],
+    isSingleStep: true,
+    sections: ["Chimie des solutions"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMassOrVolumeProportionQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Chimie",
+    hasHintAndCorrection: true,
+};

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

@@ -1,5 +1,5 @@
 import { Exercise } from "../../exercises/exercise";
-import { ReactionSpecies } from "../../pc/molecularChemistry/reaction";
+import { ReactionSpecies } from "../../pc/constants/molecularChemistry/reaction";
 type Identifiers = {
     reactionArray: ReactionSpecies[];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"chemicalEquations.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/chemicalEquations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAG9C,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,eAAe,EAAE,CAAC;CAClC,CAAC;AAkCF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}
+{"version":3,"file":"chemicalEquations.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/chemicalEquations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,eAAe,EAChB,MAAM,gDAAgD,CAAC;AAGxD,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,eAAe,EAAE,CAAC;CAClC,CAAC;AAkCF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}

package/lib/exercises/pc/chemicalEquations.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.chemicalEquations = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
-const reaction_1 = require("../../pc/molecularChemistry/reaction");
+const reaction_1 = require("../../pc/constants/molecularChemistry/reaction");
 const shuffle_1 = require("../../utils/shuffle");
 const getChemicalEquations = () => {
     const reaction = reaction_1.ReactionConstructor.randomReaction();

package/lib/exercises/pc/chemicalReactions/calculateSynthesisEfficiency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateSynthesisEfficiency.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalReactions/calculateSynthesisEfficiency.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AA6EF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAa9D,CAAC"}
+{"version":3,"file":"calculateSynthesisEfficiency.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/chemicalReactions/calculateSynthesisEfficiency.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AA6EF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}

package/lib/exercises/pc/chemicalReactions/calculateSynthesisEfficiency.js

@@ -56,4 +56,5 @@ exports.calculateSynthesisEfficiency = {
     getPropositions,
     isAnswerValid,
     subject: "Chimie",
+    hasHintAndCorrection: true,
 };

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

@@ -2,4 +2,6 @@ export * from "./calculateSynthesisEfficiency";
 export * from "./calculateCombustionEnergy";
 export * from "./identifyLimitingReagent";
 export * from "./identifyStoichiometricMixture";
+export * from "./stoichiometricReaction";
+export * from "./titrationEquivalenceRelation";
 //# sourceMappingURL=index.d.ts.map