math-exercises 3.0.69 → 3.0.70

package/lib/exercises/pc/recognizeRefractionOrReflectionAngles.js

@@ -14,39 +14,32 @@ const questionAngle = [
     IsAsking.IncidenceAngle,
     IsAsking.RefractionAngle,
 ];
-const getRecognizeRefractionOrReflectionAnglesQuestion = () => {
-    const exo = generateExercise();
-    const question = {
-        answer: exo.isAsking,
-        instruction: `Un rayon arrive sur la surface de séparation entre deux milieux. Comment appelle-t-on l'angle représenté ci-dessous ?`,
-        keys: [],
-        ggbOptions: exo.ggb.getOptions({
-            coords: exo.coords,
-        }),
-        answerFormat: "raw",
-        identifiers: { commands: exo.commands },
-    };
-    return question;
+const getInstruction = (identifiers) => {
+    return `Un rayon arrive sur la surface de séparation entre deux milieux. Comment appelle-t-on l'angle représenté ci-dessous ?`;
 };
-const getPropositions = (n, { answer }) => {
-    const propositions = [];
-    addValidProp(propositions, answer, "raw");
-    tryToAddWrongProp(propositions, "Angle d'incidence", "raw");
-    tryToAddWrongProp(propositions, "Angle de réfraction", "raw");
-    tryToAddWrongProp(propositions, "Angle de réflexion", "raw");
-    return shuffleProps(propositions, n);
+const getAnswer = (identifiers) => {
+    const { isAsking } = identifiers;
+    return isAsking;
 };
-const generateExercise = () => {
-    const enetringLight = { x1: randint(-20, -10), y1: randint(15, 21) };
-    const reflectionLight = { x2: -enetringLight.x1, y2: enetringLight.y1 };
+const getGGBOptions = (identifiers) => {
+    const { isAsking, enetringLightX, enetringLightY } = identifiers;
+    let angle = "";
+    switch (isAsking) {
+        case IsAsking.RefractionAngle:
+            angle = `Ang = Angle(Vector((0,0), (0,-5)),I)`;
+        case IsAsking.ReflectionAngle:
+            angle = `Ang = Angle(R,Vector((0,0), (0,5)))`;
+        case IsAsking.IncidenceAngle:
+        default:
+            angle = `Ang = Angle(Line((0,0), (0,5)),Line((0,0),(${enetringLightX},${enetringLightY})))`;
+    }
+    const reflectionLight = { x2: -enetringLightX, y2: enetringLightY };
     const refractingLight = {
         x2: reflectionLight.x2 - randint(5, 10),
         y2: -reflectionLight.y2,
     };
-    const isAsking = random(questionAngle);
-    const angle = getAngle(isAsking, enetringLight);
     const commands = [
-        `E = Vector((${enetringLight.x1},${enetringLight.y1}), (0,0))`,
+        `E = Vector((${enetringLightX},${enetringLightY}), (0,0))`,
         `R = Vector((0,0), (${reflectionLight.x2},${reflectionLight.y2}))`,
         `I = Vector((0,0), (${refractingLight.x2},${refractingLight.y2}))`,
         angle,
@@ -55,7 +48,7 @@ const generateExercise = () => {
         `Text("\\tiny \\text{Surface de séparation}", (-12,0),false,true)`,
         `Text("\\tiny \\text{Milieu 1}", (9,2.5),false,true)`,
         `Text("\\tiny \\text{Milieu 2}", (9,0),false,true)`,
-        `YText = Text(RotateText("\\tiny \\text{Rayon incident}",-90°+${getAngle(IsAsking.IncidenceAngle, enetringLight).substring(6)}), (${enetringLight.x1 / 2 - 1.5},${enetringLight.y1 / 2}),false,true)`,
+        `YText = Text(RotateText("\\tiny \\text{Rayon incident}",-90°+${angle}), (${enetringLightX / 2 - 1.5},${enetringLightY / 2}),false,true)`,
         `SetLineStyle(DashedLine,2)`,
         `ShowLabel(Ang,false)`,
         `SetColor(E,"#F78D04")`,
@@ -79,33 +72,40 @@ const generateExercise = () => {
         hideAxes: true,
     });
     const coords = [-10, 10, -10, 10];
-    return {
-        enetringLight,
-        reflectionLight,
-        commands,
-        coords,
-        ggb,
-        isAsking,
+    return ggb.getOptions({
+        coords: coords,
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        ggbOptions: getGGBOptions(identifiers),
+        answerFormat: "raw",
+        identifiers,
     };
+    return question;
 };
-const getAngle = (isAsking, enetringLight = { x1: 0, y1: 0 }) => {
-    switch (isAsking) {
-        case IsAsking.RefractionAngle:
-            return `Ang = Angle(Vector((0,0), (0,-5)),I)`;
-        case IsAsking.ReflectionAngle:
-            return `Ang = Angle(R,Vector((0,0), (0,5)))`;
-        case IsAsking.IncidenceAngle:
-            return `Ang = Angle(Line((0,0), (0,5)),Line((0,0),(${enetringLight.x1},${enetringLight.y1})))`;
-        default:
-            return "";
-    }
+const getRecognizeRefractionOrReflectionAnglesQuestion = () => {
+    const enetringLightX = randint(-20, -10);
+    const enetringLightY = randint(15, 21);
+    const isAsking = random(questionAngle);
+    const identifiers = { isAsking, enetringLightX, enetringLightY };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer, "raw");
+    tryToAddWrongProp(propositions, "Angle d'incidence", "raw");
+    tryToAddWrongProp(propositions, "Angle de réfraction", "raw");
+    tryToAddWrongProp(propositions, "Angle de réflexion", "raw");
+    return shuffleProps(propositions, n);
 };
 export const recognizeRefractionOrReflectionAngles = {
     id: "recognizeRefractionOrReflectionAngles",
     label: "Reconaitre un anlge de reflexion, de refraction ou d'incidence",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Lumière"],
     generator: (nb) => getDistinctQuestions(getRecognizeRefractionOrReflectionAnglesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -113,4 +113,5 @@ export const recognizeRefractionOrReflectionAngles = {
     answerType: "QCU",
     subject: "Physique",
     hasGeogebra: true,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"snellDescartes.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/snellDescartes.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,QAAQ,EACT,MAAM,6BAA6B,CAAC;AA2DrC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC;AA+CF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAchD,CAAC"}
+{"version":3,"file":"snellDescartes.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/snellDescartes.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,QAAQ,EAMT,MAAM,6BAA6B,CAAC;AA2DrC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC;AAuEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAahD,CAAC"}

package/lib/exercises/pc/snellDescartes.js

@@ -56,30 +56,49 @@ const refractionIndex = [
         n: 2.417,
     },
 ];
-const getSnellDescartes = () => {
-    const randomMaterial1 = randint(0, refractionIndex.length - 1);
-    const randomMaterial2 = randint(randomMaterial1 + 1, refractionIndex.length);
+const getInstruction = (identifiers) => {
+    const { randomMaterial1, randomMaterial2, ramdonAngleIncidenceDeg } = identifiers;
     const n1 = refractionIndex[randomMaterial1].n;
     const n2 = refractionIndex[randomMaterial2].n;
-    const ramdonAngleIncidenceDeg = randint(10, 90);
     const instruction = `Un rayon de lumière se propage dans ${refractionIndex[randomMaterial1].Material} ($n1 \\approx ${n1}$) et atteint une surface ${refractionIndex[randomMaterial2].Material2}
-  ($n2 \\approx ${n2}$) sous un angle d'incidence de $${ramdonAngleIncidenceDeg}$ degrés. $\\\\$ Calculer l'angle de
-  réfraction de la lumière à l'intérieur ${refractionIndex[randomMaterial2].Material3} en utilisant la loi de Snell-Descartes.`;
+  ($n2 \\approx ${n2}$) sous un angle d'incidence de $${ramdonAngleIncidenceDeg}$ degrés.
+  
+Calculer l'angle de réfraction de la lumière à l'intérieur ${refractionIndex[randomMaterial2].Material3} en utilisant la loi de Snell-Descartes.`;
+    return instruction;
+};
+const getAnswer = (identifiers) => {
+    const { randomMaterial1, randomMaterial2, ramdonAngleIncidenceDeg } = identifiers;
+    const n1 = refractionIndex[randomMaterial1].n;
+    const n2 = refractionIndex[randomMaterial2].n;
     const angleIncidenceRad = (ramdonAngleIncidenceDeg * Math.PI) / 180;
-    // Calculer l'angle de réfraction en radians
     const angleRefractionRad = Math.asin((n1 / n2) * Math.sin(angleIncidenceRad));
-    // Convertir l'angle de réfraction de radians à degrés
     const angleRefractionDeg = (angleRefractionRad * 180) / Math.PI;
     const answer = `${frenchify(round(angleRefractionDeg, 1))}^{\\circ}`;
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction,
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["sin", "arcsin", "degree"],
         answerFormat: "tex",
-        identifiers: { ramdonAngleIncidenceDeg, randomMaterial1, randomMaterial2 },
+        identifiers,
     };
     return question;
 };
+const getSnellDescartes = () => {
+    const randomMaterial1 = randint(0, refractionIndex.length - 1);
+    const randomMaterial2 = randint(randomMaterial1 + 1, refractionIndex.length);
+    const ramdonAngleIncidenceDeg = randint(10, 90);
+    // Calculer l'angle de réfraction en radians
+    // Convertir l'angle de réfraction de radians à degrés
+    const identifiers = {
+        ramdonAngleIncidenceDeg,
+        randomMaterial1,
+        randomMaterial2,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -95,8 +114,6 @@ export const snellDescartes = {
     id: "snellDescartes",
     connector: "\\iff",
     label: "Utiliser la loi de Snell-Descartes pour calculer un angle de réfraction",
-    levels: ["4ème", "3ème", "2nde"],
-    sections: ["Lumière"],
     subject: "Physique",
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getSnellDescartes, nb),
@@ -104,4 +121,5 @@ export const snellDescartes = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/sound/findPeriodFromGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findPeriodFromGraph.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findPeriodFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;CAC1B,CAAC;AAoEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}
+{"version":3,"file":"findPeriodFromGraph.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findPeriodFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;CAC1B,CAAC;AA0FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/pc/sound/findPeriodFromGraph.js

@@ -5,24 +5,17 @@ import { GeogebraConstructor } from "../../../geogebra/geogebraConstructor.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
-const getFindPeriodFromGraphQuestion = () => {
-    const period = randint(2, 5);
-    const yStart = randint(0, 4);
-    const splinePoints = [[0, yStart]];
-    const isFirstNegative = coinFlip();
-    const quarter = period / 4;
-    splinePoints.push([
-        quarter,
-        yStart + (isFirstNegative ? randfloat(-2, -5) : randfloat(2, 5)),
-    ]);
-    const half = period / 2;
-    splinePoints.push([half, yStart]);
-    const threeQuarter = (3 * period) / 4;
-    splinePoints.push([
-        threeQuarter,
-        yStart + (isFirstNegative ? randfloat(2, 5) : randfloat(-2, -5)),
-    ]);
-    splinePoints.push([period, yStart]);
+const getInstruction = (identifiers) => {
+    return `L'enregistrement d'un signal sonore est donnée ci-dessous. 
+  
+Déterminer la période de ce signal.`;
+};
+const getAnswer = (identifiers) => {
+    const { period } = identifiers;
+    return period.frenchify();
+};
+const getGGBOptions = (identifiers) => {
+    const { period, splinePoints } = identifiers;
     const color = randomColor();
     const commands = [
         `S =Spline(${splinePoints
@@ -40,18 +33,42 @@ const getFindPeriodFromGraphQuestion = () => {
         yAxis: { label: "$\\tiny Tension (V)$" },
         isGridSimple: true,
     });
+    return ggb.getOptions({
+        coords: [0, 20, -8, 8],
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: period + "",
-        instruction: `L'enregistrement d'un signal sonore est donnée ci-dessous. Déterminer la période de ce signal.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { period, splinePoints },
-        ggbOptions: ggb.getOptions({
-            coords: [0, 20, -8, 8],
-        }),
+        identifiers,
+        ggbOptions: getGGBOptions(identifiers),
     };
     return question;
 };
+const getFindPeriodFromGraphQuestion = () => {
+    const period = randint(2, 5);
+    const yStart = randint(0, 4);
+    const splinePoints = [[0, yStart]];
+    const isFirstNegative = coinFlip();
+    const quarter = period / 4;
+    splinePoints.push([
+        quarter,
+        yStart + (isFirstNegative ? randfloat(-2, -5) : randfloat(2, 5)),
+    ]);
+    const half = period / 2;
+    splinePoints.push([half, yStart]);
+    const threeQuarter = (3 * period) / 4;
+    splinePoints.push([
+        threeQuarter,
+        yStart + (isFirstNegative ? randfloat(2, 5) : randfloat(-2, -5)),
+    ]);
+    splinePoints.push([period, yStart]);
+    const identifiers = { period, splinePoints };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, period }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -66,9 +83,7 @@ const isAnswerValid = (ans, { answer }) => {
 export const findPeriodFromGraph = {
     id: "findPeriodFromGraph",
     label: "Lire la période d'un signal sonore",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Son"],
     generator: (nb) => getDistinctQuestions(getFindPeriodFromGraphQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -76,4 +91,5 @@ export const findPeriodFromGraph = {
     isAnswerValid,
     subject: "Physique",
     hasGeogebra: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/sound/findPeriodOrFrequencyFromGraph.d.ts

@@ -3,6 +3,7 @@ type Identifiers = {
     period: number;
     frequency: number;
     splinePoints: number[][];
+    isAsking: "période" | "fréquence";
 };
 export declare const findPeriodOrFrequencyFromGraph: Exercise<Identifiers>;
 export {};

package/lib/exercises/pc/sound/findPeriodOrFrequencyFromGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findPeriodOrFrequencyFromGraph.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findPeriodOrFrequencyFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;CAC1B,CAAC;AAsFF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAchE,CAAC"}
+{"version":3,"file":"findPeriodOrFrequencyFromGraph.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findPeriodOrFrequencyFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;IACzB,QAAQ,EAAE,SAAS,GAAG,WAAW,CAAC;CACnC,CAAC;AAkHF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAahE,CAAC"}

package/lib/exercises/pc/sound/findPeriodOrFrequencyFromGraph.js

@@ -6,24 +6,22 @@ import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
 import { isInt } from "../../../utils/isInt.js";
-const getFindPeriodOrFrequencyFromGraphQuestion = () => {
-    const period = randint(2, 5);
-    const yStart = randint(0, 4);
-    const splinePoints = [[0, yStart]];
-    const isFirstNegative = coinFlip();
-    const quarter = period / 4;
-    splinePoints.push([
-        quarter,
-        yStart + (isFirstNegative ? randfloat(-2, -5) : randfloat(2, 5)),
-    ]);
-    const half = period / 2;
-    splinePoints.push([half, yStart]);
-    const threeQuarter = (3 * period) / 4;
-    splinePoints.push([
-        threeQuarter,
-        yStart + (isFirstNegative ? randfloat(2, 5) : randfloat(-2, -5)),
-    ]);
-    splinePoints.push([period, yStart]);
+const getInstruction = (identifiers) => {
+    const { period, frequency, isAsking } = identifiers;
+    return `L'enregistrement d'un signal sonore est donnée ci-dessous. 
+  
+Déterminer la ${isAsking} de ce signal.`;
+};
+const getAnswer = (identifiers) => {
+    const { period, frequency, isAsking } = identifiers;
+    const scientificFrequence = isInt(frequency)
+        ? (1 / (period * Math.pow(10, -3))).toScientific(0).toTex()
+        : (1 / (period * Math.pow(10, -3))).toScientific(2).toTex();
+    const answer = isAsking === "période" ? period + "" : scientificFrequence;
+    return answer;
+};
+const getGGBOptions = (identifiers) => {
+    const { period, frequency, splinePoints } = identifiers;
     const color = randomColor();
     const commands = [
         `S =Spline(${splinePoints
@@ -40,24 +38,46 @@ const getFindPeriodOrFrequencyFromGraphQuestion = () => {
         xAxis: { label: "$\\tiny Temps (ms)$" },
         yAxis: { label: "$\\tiny Tension (V)$" },
     });
-    const isAsking = coinFlip() ? `période` : `fréquence`;
-    const frequency = (1 / period) * 1000;
-    const scientificFrequence = isInt(frequency)
-        ? (1 / (period * Math.pow(10, -3))).toScientific(0).toTex()
-        : (1 / (period * Math.pow(10, -3))).toScientific(2).toTex();
-    const answer = isAsking === "période" ? period + "" : scientificFrequence;
+    return ggb.getOptions({
+        coords: [0, 20, -8, 8],
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answer,
-        instruction: `L'enregistrement d'un signal sonore est donnée ci-dessous. Déterminer la ${isAsking} de ce signal.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { period, frequency, splinePoints },
-        ggbOptions: ggb.getOptions({
-            coords: [0, 20, -8, 8],
-        }),
+        identifiers,
+        ggbOptions: getGGBOptions(identifiers),
     };
     return question;
 };
+const getFindPeriodOrFrequencyFromGraphQuestion = () => {
+    const period = randint(2, 5);
+    const yStart = randint(0, 4);
+    const splinePoints = [[0, yStart]];
+    const isFirstNegative = coinFlip();
+    const quarter = period / 4;
+    splinePoints.push([
+        quarter,
+        yStart + (isFirstNegative ? randfloat(-2, -5) : randfloat(2, 5)),
+    ]);
+    const half = period / 2;
+    splinePoints.push([half, yStart]);
+    const threeQuarter = (3 * period) / 4;
+    splinePoints.push([
+        threeQuarter,
+        yStart + (isFirstNegative ? randfloat(2, 5) : randfloat(-2, -5)),
+    ]);
+    splinePoints.push([period, yStart]);
+    const isAsking = coinFlip()
+        ? `période`
+        : `fréquence`;
+    const frequency = (1 / period) * 1000;
+    const identifiers = { period, frequency, splinePoints, isAsking };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, period }) => {
     const propositions = [];
     const correctFrequency = 1 / (period * Math.pow(10, -3));
@@ -80,9 +100,7 @@ const isAnswerValid = (ans, { answer }) => {
 export const findPeriodOrFrequencyFromGraph = {
     id: "findPeriodOrFrequencyFromGraph",
     label: "Lire la période ou la fréquence d'un signal sonore",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Son"],
     generator: (nb) => getDistinctQuestions(getFindPeriodOrFrequencyFromGraphQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -90,4 +108,5 @@ export const findPeriodOrFrequencyFromGraph = {
     isAnswerValid,
     subject: "Physique",
     hasGeogebra: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/sound/findSoundFrequencyFromPeriod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findSoundFrequencyFromPeriod.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findSoundFrequencyFromPeriod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAwCF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAa9D,CAAC"}
+{"version":3,"file":"findSoundFrequencyFromPeriod.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findSoundFrequencyFromPeriod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4DF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAY9D,CAAC"}

package/lib/exercises/pc/sound/findSoundFrequencyFromPeriod.js

@@ -3,19 +3,33 @@ import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuesti
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { round } from "../../../math/utils/round.js";
-const getFindSoundFrequencyFromPeriodQuestion = () => {
-    const period = round(randfloat(1, 50), 1);
+const getInstruction = (identifiers) => {
+    const { period } = identifiers;
+    return `Un signal sonore a une période de $${period.frenchify()}\\ \\textrm{ms}$. 
+  
+Calculer la fréquence de ce signal en $\\textrm{Hz}$ (arrondir à l'unité).`;
+};
+const getAnswer = (identifiers) => {
+    const { period } = identifiers;
     const periodInSeconds = period / 1000;
     const answer = `${round(1 / periodInSeconds, 0)}`;
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Un signal sonore a une période de $${period}\\ \\text{ms}$. Calculer la fréquence de ce signal en $\\text{Hz}$ (arrondir à l'unité).`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { period },
+        identifiers,
     };
     return question;
 };
+const getFindSoundFrequencyFromPeriodQuestion = () => {
+    const period = round(randfloat(1, 50), 1);
+    const identifiers = { period };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, period }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -36,13 +50,12 @@ const isAnswerValid = (ans, { answer }) => {
 export const findSoundFrequencyFromPeriod = {
     id: "findSoundFrequencyFromPeriod",
     label: "Calculer la fréquence d'un signal sonore en fonction de la période",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Son"],
     generator: (nb) => getDistinctQuestions(getFindSoundFrequencyFromPeriodQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Physique",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/sound/findSoundPeriodFromFrequency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findSoundPeriodFromFrequency.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findSoundPeriodFromFrequency.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAoDF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAa9D,CAAC"}
+{"version":3,"file":"findSoundPeriodFromFrequency.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/findSoundPeriodFromFrequency.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAuEF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAY9D,CAAC"}

package/lib/exercises/pc/sound/findSoundPeriodFromFrequency.js

@@ -2,20 +2,34 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercis
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Decimal } from "../../../math/numbers/decimals/decimal.js";
 import { randint } from "../../../math/utils/random/randint.js";
-const getFindSoundPeriodFromFrequencyQuestion = () => {
-    const frequency = randint(20, 20000);
+const getInstruction = (identifiers) => {
+    const { frequency } = identifiers;
+    return `Un signal sonore a une fréquence de $${frequency.frenchify()}\\ \\textrm{Hz}$. 
+
+Calculer la période de ce signal en secondes (en écriture scientifique avec $2$ chiffres significatifs).`;
+};
+const getAnswer = (identifiers) => {
+    const { frequency } = identifiers;
     const period = 1 / frequency;
     const periodDecimal = new Decimal(period);
     const answer = periodDecimal.value.toScientific(1).toTex({ scientific: 1 });
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Un signal sonore a une fréquence de $${frequency}\\ \\text{Hz}$. Calculer la période de ce signal en secondes (en écriture scientifique avec 2 chiffres significatifs).`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["timesTenPower"],
         answerFormat: "tex",
-        identifiers: { frequency },
+        identifiers,
     };
     return question;
 };
+const getFindSoundPeriodFromFrequencyQuestion = () => {
+    const frequency = randint(20, 20000);
+    const identifiers = { frequency };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, frequency }) => {
     const propositions = [];
     const period = 1 / frequency;
@@ -43,13 +57,12 @@ const isAnswerValid = (ans, { frequency }) => {
 export const findSoundPeriodFromFrequency = {
     id: "findSoundPeriodFromFrequency",
     label: "Calculer la période d'un signal sonore en fonction de la fréquence",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Son"],
     generator: (nb) => getDistinctQuestions(getFindSoundPeriodFromFrequencyQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Physique",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/pc/sound/frequencyComparison.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frequencyComparison.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/frequencyComparison.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqDF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}
+{"version":3,"file":"frequencyComparison.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/sound/frequencyComparison.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAwEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

package/lib/exercises/pc/sound/frequencyComparison.js

@@ -2,31 +2,43 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercis
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
-const getFrequencyComparisonQuestion = () => {
-    const soundAsked = coinFlip() ? 1 : 2;
+const getInstruction = (identifiers) => {
+    const { frequency1, frequency2, soundAsked } = identifiers;
+    return `La fréquence de deux sons sont $f_1 = ${frequency1}\\ \\text{Hz}$ et $f_2 = ${frequency2}\\ \\text{Hz}$. Le son $${soundAsked}$ est :`;
+};
+const getAnswer = (identifiers) => {
+    const { frequency1, frequency2, soundAsked } = identifiers;
     const soundCompared = soundAsked === 1 ? 2 : 1;
-    const frequency1 = randint(20, 1000);
-    const frequency2 = randint(20, 1000, [frequency1]);
     const highestFrequency = frequency1 > frequency2 ? 1 : 2;
     const answer = soundAsked === highestFrequency
-        ? `Plus aigu que le son ${soundCompared}`
-        : `Plus grave que le son ${soundCompared}`;
+        ? `Plus aigu que le son $${soundCompared}$`
+        : `Plus grave que le son $${soundCompared}$`;
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `La fréquence de deux sons sont $f_1 = ${frequency1}\\ \\text{Hz}$ et $f_2 = ${frequency2}\\ \\text{Hz}$. Le son ${soundAsked} est :`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "raw",
-        identifiers: { frequency1, frequency2, soundAsked },
+        identifiers,
     };
     return question;
 };
+const getFrequencyComparisonQuestion = () => {
+    const soundAsked = coinFlip() ? 1 : 2;
+    const frequency1 = randint(20, 1000);
+    const frequency2 = randint(20, 1000, [frequency1]);
+    const identifiers = { frequency1, frequency2, soundAsked };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, soundAsked }) => {
     const propositions = [];
     const soundCompared = soundAsked === 1 ? 2 : 1;
     addValidProp(propositions, answer, "raw");
-    tryToAddWrongProp(propositions, `Plus aigu que le son ${soundCompared}`, "raw");
-    tryToAddWrongProp(propositions, `Plus grave que le son ${soundCompared}`, "raw");
-    tryToAddWrongProp(propositions, `Aussi aigu que le son ${soundCompared}`, "raw");
+    tryToAddWrongProp(propositions, `Plus aigu que le son $${soundCompared}$`, "raw");
+    tryToAddWrongProp(propositions, `Plus grave que le son $${soundCompared}$`, "raw");
+    tryToAddWrongProp(propositions, `Aussi aigu que le son $${soundCompared}$`, "raw");
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
@@ -35,9 +47,7 @@ const isAnswerValid = (ans, { answer }) => {
 export const frequencyComparison = {
     id: "frequencyComparison",
     label: "Comparer deux fréquences sonores",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Son"],
     generator: (nb) => getDistinctQuestions(getFrequencyComparisonQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -46,4 +56,5 @@ export const frequencyComparison = {
     subject: "Physique",
     answerType: "QCU",
     pdfOptions: { shouldSpreadPropositions: true },
+    getQuestionFromIdentifiers,
 };