math-exercises 3.0.71 → 3.0.72

package/lib/exercises/math/probaStat/stats1var/median.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/median.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAWT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AA8FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/median.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAWT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAmFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/median.js

@@ -1,4 +1,5 @@
 import { randint } from "../../../../math/utils/random/randint.js";
+import { median } from "../../../../math/utils/stats/median.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { dollarize } from "../../../../utils/latex/dollarize.js";
 import { mdTable } from "../../../../utils/markdown/mdTable.js";
@@ -16,17 +17,7 @@ Calculer la médiane de cette série de valeurs.`;
 };
 const getAnswer = (identifiers) => {
     const { randomEffectives, randomValues } = identifiers;
-    const n = randomEffectives.reduce((sum, value) => sum + value, 0);
-    const middleIndex = Math.floor(n / 2);
-    let median;
-    if (n % 2 === 0) {
-        median = (randomValues[middleIndex - 1] + randomValues[middleIndex]) / 2;
-    }
-    else {
-        median = randomValues[middleIndex];
-    }
-    const answer = (median + "").replace(".", ",");
-    return answer;
+    return median(randomValues, randomEffectives).frenchify();
 };
 const getMedianWithTable = () => {
     const getRandomUniqueValues = (count, min, max) => {

package/lib/exercises/math/probaStat/stats1var/medianList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"medianList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianList.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAYT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAuEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAYhD,CAAC"}
+{"version":3,"file":"medianList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianList.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAYT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA+DF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAYhD,CAAC"}

package/lib/exercises/math/probaStat/stats1var/medianList.js

@@ -1,4 +1,5 @@
 import { randint } from "../../../../math/utils/random/randint.js";
+import { median } from "../../../../math/utils/stats/median.js";
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercise.js";
 import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
 const getInstruction = (identifiers) => {
@@ -13,16 +14,7 @@ Calculer la médiane de cette liste de valeurs.`;
 };
 const getAnswer = (identifiers) => {
     const { sortedValues } = identifiers;
-    const middleIndex = Math.floor(sortedValues.length / 2);
-    let median;
-    if (sortedValues.length % 2 === 0) {
-        median = (sortedValues[middleIndex - 1] + sortedValues[middleIndex]) / 2;
-    }
-    else {
-        median = sortedValues[middleIndex];
-    }
-    const answer = (median + "").replace(".", ",");
-    return answer;
+    return median(sortedValues).frenchify();
 };
 const getMedianList = () => {
     let randomValues = [];

package/lib/exercises/math/probaStat/stats1var/quartilesList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quartilesList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartilesList.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAYT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAiFF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}
+{"version":3,"file":"quartilesList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/quartilesList.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAYT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAuEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/math/probaStat/stats1var/quartilesList.js

@@ -1,4 +1,5 @@
 import { randint } from "../../../../math/utils/random/randint.js";
+import { firstQuartile, thirdQuartile, } from "../../../../math/utils/stats/quartiles.js";
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercise.js";
 import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
 const getInstruction = ({ randomQuartile, randomValues, }) => {
@@ -16,17 +17,10 @@ Calculer le ${quartileToString} de cette série de valeurs.`;
 };
 const getAnswer = (identifiers) => {
     const { randomValues, randomQuartile } = identifiers;
-    const firstQuartileIndex = Math.round(randomValues.length / 4 + 0.49);
-    const thirdQuartileIndex = Math.round((3 * randomValues.length) / 4 + 0.49);
-    const firstQuartile = randomValues[firstQuartileIndex - 1];
-    const thirdQuartile = randomValues[thirdQuartileIndex - 1];
-    let choosenQuartile;
     if (randomQuartile === 0)
-        choosenQuartile = firstQuartile;
+        return firstQuartile(randomValues).frenchify();
     else
-        choosenQuartile = thirdQuartile;
-    const answer = choosenQuartile + "";
-    return answer;
+        return thirdQuartile(randomValues).frenchify();
 };
 const getQuartiles = () => {
     let randomValues = [];

package/lib/math/utils/stats/median.d.ts

@@ -0,0 +1,2 @@
+export declare const median: (sortedValues: number[], effectifs?: number[]) => number;
+//# sourceMappingURL=median.d.ts.map

package/lib/math/utils/stats/median.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/stats/median.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,MAAM,iBAAkB,MAAM,EAAE,cAAc,MAAM,EAAE,WAgClE,CAAC"}

package/lib/math/utils/stats/median.js

@@ -0,0 +1,39 @@
+//! values must be sorted
+export const median = (sortedValues, effectifs) => {
+    if (!sortedValues.length)
+        throw Error("Malformed data in median");
+    if (!effectifs?.length) {
+        const N = sortedValues.length;
+        if (N % 2 === 0) {
+            return (sortedValues[N / 2 - 1] + sortedValues[N / 2]) / 2;
+        }
+        else {
+            return sortedValues[Math.floor(N / 2)];
+        }
+    }
+    else {
+        const N = effectifs.reduce((acc, curr) => acc + curr, 0);
+        if (N % 2 === 0) {
+            let s = 0;
+            for (let i = 0; i < effectifs.length; i++) {
+                s += effectifs[i];
+                if (N / 2 < s) {
+                    return sortedValues[i];
+                }
+                if (N / 2 === s)
+                    return (sortedValues[i] + sortedValues[i + 1]) / 2;
+            }
+            return (sortedValues[N / 2 - 1] + sortedValues[N / 2]) / 2;
+        }
+        else {
+            let s = 0;
+            for (let i = 0; i < effectifs.length; i++) {
+                s += effectifs[i];
+                if (N / 2 <= s) {
+                    return sortedValues[i];
+                }
+            }
+        }
+    }
+    return 0;
+};

package/lib/playground.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,UAAU,YAMtB,CAAC"}
+{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,UAAU,YAMtB,CAAC"}

package/lib/playground.js

@@ -1,8 +1,9 @@
 import { Decimal } from "./math/numbers/decimals/decimal.js";
+import { median } from "./math/utils/stats/median.js";
 export const playground = () => {
     const dec = new Decimal(0.0001);
     const answer = dec
         .toScientificNotation()
         .toTex({ forceNoSimplification: true });
-    console.log(answer);
+    console.log(median([1, 2, 3, 4], [1, 2, 10, 2]));
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.71",
+  "version": "3.0.72",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [