math-exercises 3.0.131 → 3.0.133

package/lib/exercises/math/probaStat/conditionalProbaWriteFromFrench.js

@@ -57,12 +57,12 @@ const situations = [
     {
         context: "Dans une émission TV, le présentateur demande son prénom à quelqu'un dans le public.",
         strA: "Le prénom est Jean-Michel.",
-        strB: 'Le prénom commence par la lettre "A".',
+        strB: "La personne est un adulte.",
         "(A)": "que le prénom soit Jean-Michel",
-        "(B)": 'que le prénom commence par la lettre "J"',
-        "(A \\cap B)": 'que le prénom soit Jean-Michel et qu\'il commence par un "A"',
-        "_A(B)": 'que le prénom commence par un "A", sachant que c\'est Jean-Michel',
-        "_B(A)": 'que le prénom soit Jean-Michel, sachant qu\'il commence par un "A"',
+        "(B)": "que la personne soit un adulte",
+        "(A \\cap B)": "que le prénom soit Jean-Michel et que la personne soit un adulte",
+        "_A(B)": "que la personne soit un adulte, sachant que son prénom est Jean-Michel",
+        "_B(A)": "que le prénom soit Jean-Michel, sachant que la personne est un adulte",
     },
     {
         context: "Il est $14$h$37$. Yohann et Sarah sont assis en classe. C'est un cours sur les probabilités.",
@@ -119,7 +119,7 @@ Soit $B$ l'évenement :
 
 Écris en langage mathématique : 
 
-La probabilité ${situation[pType]}.`;
+> La probabilité ${situation[pType]}.`;
     return instruction;
 };
 const getAnswer = (identifiers) => {
@@ -207,7 +207,7 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
 export const conditionalProbaWriteFromFrench = {
     id: "conditionalProbaWriteFromFrench",
     connector: "=",
-    label: "Ecrire une probabilité en langage mathématique",
+    label: "Écrire une probabilité en langage mathématique",
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getConditionalProbaWriteFromFrenchQuestion, nb),
     qcmTimer: 60,

package/lib/exercises/math/probaStat/probaAsSumOfProbas.d.ts

@@ -20,9 +20,8 @@ type EventIdentifiers = {
     isTailoredStr: boolean;
 };
 type Options = {
-    nbElem: number[];
-    unionLength: number[];
-    isProbasAreNumbers: boolean[];
+    nbElem: string[];
+    unionLength: string[];
 };
 export declare const probaAsSumOfProbas: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/probaStat/probaAsSumOfProbas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaAsSumOfProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaAsSumOfProbas.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAkBT,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAEF,KAAK,gBAAgB,GACjB;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,eAAe,CAAC;CACpB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,eAAe,CAAC;IACnB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AA4eN,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,kBAAkB,EAAE,OAAO,EAAE,CAAC;CAC/B,CAAC;AAyTF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe7D,CAAC"}
+{"version":3,"file":"probaAsSumOfProbas.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaAsSumOfProbas.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAkBT,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAa7C,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAEF,KAAK,gBAAgB,GACjB;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,eAAe,CAAC;CACpB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,eAAe,CAAC;IACnB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AA0eN,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAsQF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe7D,CAAC"}

package/lib/exercises/math/probaStat/probaAsSumOfProbas.js

@@ -112,7 +112,7 @@ class SituationConstructor {
         const str = `On lance un dé à $${nbSides}$ faces numérotées de $1$ à $${nbSides}$. 
     Le dé n'est pas équilibré.`;
         const strElem = `Pour $i$ allant de $1$ à $${nbSides}$, on note $E_i$ l'évènement:
-"Le résultat est $i$.".`;
+"Le résultat est $i$".`;
         const nbPickSomeElem = Math.min(nbSides, 6);
         const allIndexesElem = [...Array(nbSides).keys()].map((i) => i + 1);
         const dictAllElem = Object.fromEntries(allIndexesElem.map((index) => [
@@ -216,8 +216,7 @@ class FiniteProbDistr {
         const dictPToArrayOfIndexes = {};
         for (let i = 0; i < arrProba.length; i++) {
             const p = arrProba[i];
-            console.log("will simplify", p);
-            const tex = p.simplify().toTex();
+            const tex = p.toTex();
             if (dictPToArrayOfIndexes[tex] === undefined) {
                 dictPToArrayOfIndexes[tex] = [];
             }
@@ -233,7 +232,7 @@ class FiniteProbDistr {
         return p;
     }
     getArrIndexForP(p) {
-        return this.dictPToArrayOfIndexes[p.simplify().toTex()];
+        return this.dictPToArrayOfIndexes[p.toTex()];
     }
     getArrFrenchStrings(isDisplayingValue) {
         return Object.entries(this.dictPToArrayOfIndexes)
@@ -273,12 +272,15 @@ const getAnswerValueNode = (identifiers) => {
     const { eventIds, arrProba } = identifiers;
     const evUnion = EventConstructor.fromIdentifiers(eventIds);
     const finiteProbDistr = FiniteProbDistrConstructor.fromArrProba(arrProba.map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds)));
-    const nodeSumSimplified = operatorComposition(AddNode, evUnion
+    const arrFrac = evUnion
         .getArrElem()
-        .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))).simplify({
-    //!TODO Sebastien : ne doit pas être nécessaire, à fix
-    //nbMaxSteps: 100,
-    });
+        .map((evElem) => finiteProbDistr.getPForIndex(evElem.index));
+    const nodeSumSimplified = (() => {
+        const den = arrFrac[0].rightChild.evaluate();
+        return frac(arrFrac
+            .map((fNode) => fNode.leftChild.evaluate())
+            .reduce((acc, x) => acc + x, 0), den);
+    })();
     return nodeSumSimplified;
 };
 const getAnswerNode = (identifiers) => {
@@ -320,11 +322,7 @@ $$
 p_{${evElem.id}} = ${finiteProbDistr.getPForIndex(evElem.index).toTex()}
 $$`).join(`
 `)}`;
-        const nodeSumSimplified = operatorComposition(AddNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))).simplify({
-        //nbMaxSteps: 100,
-        });
+        const nodeSumSimplified = getAnswerNode(identifiers);
         strCorrection += `
 Donc: 
 
@@ -342,9 +340,8 @@ $$`;
     return strCorrection;
 };
 const optsDefault = {
-    nbElem: [4, 6, 10, 12],
-    unionLength: [2, 3, 4, 5],
-    isProbasAreNumbers: [true, false],
+    nbElem: ["4", "6", "10", "12"],
+    unionLength: ["2", "3", "4", "5"],
 };
 const options = [
     {
@@ -352,7 +349,7 @@ const options = [
         label: "Nombre d'évènements élémentaires",
         type: GeneratorOptionType.multiselect,
         target: GeneratorOptionTarget.generation,
-        values: [4, 6, 10, 12],
+        values: ["4", "6", "10", "12"],
         defaultValue: optsDefault.nbElem,
     },
     {
@@ -360,47 +357,12 @@ const options = [
         label: "Longueur de l'union",
         type: GeneratorOptionType.multiselect,
         target: GeneratorOptionTarget.generation,
-        values: [2, 3, 4, 5, 6],
+        values: ["2", "3", "4", "5", "6"],
         defaultValue: optsDefault.unionLength,
     },
-    {
-        id: "isProbasAreNumbers",
-        label: "Probabilités sous forme de nombres ?",
-        type: GeneratorOptionType.multiselect,
-        target: GeneratorOptionTarget.generation,
-        values: [true, false],
-        defaultValue: optsDefault.isProbasAreNumbers,
-    },
 ];
-const getKeys = (identifiers) => {
-    const { indexSituation, arrProba } = identifiers;
-    const isProbasAreNumbers = true;
-    const situation = arrayOfSituations[indexSituation];
-    return [
-        ...[
-            ...new Set(situation.someElem
-                .map((event) => {
-                if (isProbasAreNumbers) {
-                    const finiteProbDistr = FiniteProbDistrConstructor.fromArrProba(arrProba.map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds)));
-                    return finiteProbDistr.getPForIndex(event.index).simplify();
-                }
-                else {
-                    return event.p;
-                }
-            })
-                .map((node) => node.toTex())),
-        ].map((tex) => {
-            return {
-                id: "custom",
-                label: tex,
-                labelType: "tex",
-                mathfieldInstructions: {
-                    method: "write",
-                    content: tex,
-                },
-            };
-        }),
-    ];
+const getKeys = () => {
+    return [];
 };
 const getPropositions = (n, { answer, ...identifiers }) => {
     const { eventIds, arrProba } = identifiers;
@@ -410,39 +372,41 @@ const getPropositions = (n, { answer, ...identifiers }) => {
     addValidProp(propositions, answer);
     if (isProbasAreNumbers) {
         const finiteProbDistr = FiniteProbDistrConstructor.fromArrProba(arrProba.map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds)));
-        tryToAddWrongProp(propositions, operatorComposition(MultiplyNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index)))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
-        tryToAddWrongProp(propositions, substract(1, operatorComposition(MultiplyNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
-        tryToAddWrongProp(propositions, substract(1, operatorComposition(AddNode, evUnion
-            .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))).simplify({
-        //nbMaxSteps: 100,
-        })).toTex());
-        tryToAddWrongProp(propositions, operatorComposition(AddNode, evUnion
-            .getArrElem()
-            .map((evElem) => multiply(evElem.index, finiteProbDistr.getPForIndex(evElem.index))))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
-        tryToAddWrongProp(propositions, multiply(frac(1, evUnion.getArrElem().length), operatorComposition(AddNode, evUnion
+        const arrFrac = evUnion
             .getArrElem()
-            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index))))
-            .simplify({
-        //nbMaxSteps: 100,
-        })
-            .toTex());
+            .map((evElem) => finiteProbDistr.getPForIndex(evElem.index));
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(arrFrac
+                .map((fNode) => fNode.leftChild.evaluate())
+                .reduce((acc, x) => acc * x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(den -
+                arrFrac
+                    .map((fNode) => fNode.leftChild.evaluate())
+                    .reduce((acc, x) => acc * x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(den -
+                arrFrac
+                    .map((fNode) => fNode.leftChild.evaluate())
+                    .reduce((acc, x) => acc + x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(arrFrac
+                .map((fNode, i) => fNode.leftChild.evaluate() * i)
+                .reduce((acc, x) => acc + x, 0), den);
+        })().toTex());
+        tryToAddWrongProp(propositions, (() => {
+            const den = arrFrac[0].rightChild.evaluate();
+            return frac(arrFrac
+                .map((fNode) => fNode.leftChild.evaluate())
+                .reduce((acc, x) => acc + x, 0), den * evUnion.getArrElem().length);
+        })().toTex());
     }
     else {
         tryToAddWrongProp(propositions, operatorComposition(MultiplyNode, evUnion.getArrElem().map((evElem) => evElem.p))
@@ -479,10 +443,13 @@ const getValueNode = (tex, arrProba) => {
             return parseInt(texVar.substring(texVar.indexOf("E_{") + 3, texVar.indexOf("}}")));
         }
     });
-    const arrayOfNodes = arrayOfIndexes.map((i) => finiteProbDistr.getPForIndex(i));
-    return operatorComposition(AddNode, arrayOfNodes).simplify({
-    //nbMaxSteps: 100,
-    });
+    const arrFrac = arrayOfIndexes.map((i) => finiteProbDistr.getPForIndex(i));
+    return (() => {
+        const den = arrFrac[0].rightChild.evaluate();
+        return frac(arrFrac
+            .map((fNode) => fNode.leftChild.evaluate())
+            .reduce((acc, x) => acc + x, 0), den);
+    })();
 };
 const isAnswerValid = (ans, { answer, ...identifiers }) => {
     const { arrProba } = identifiers;
@@ -499,7 +466,7 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
 };
 const getProbaAsSumOfProbasQuestion = (optsIn) => {
     const opts = Object.assign(optsDefault, optsIn) ?? optsDefault;
-    const unionLength = random(opts.unionLength);
+    const unionLength = Number(random(opts.unionLength));
     const indexSituation = random([...Array(arrayOfSituations.length).keys()].filter((indexSituation) => {
         const situation = arrayOfSituations[indexSituation];
         return situation.someElem.length >= unionLength;
@@ -509,12 +476,10 @@ const getProbaAsSumOfProbasQuestion = (optsIn) => {
     const eventIds = evUnion.toIdentifiers();
     const nbUnique = Math.min(randint(3, 7), situation.allElem.length - 1);
     const finiteProbDistr = FiniteProbDistrConstructor.randomDistr(situation.allElem.length, nbUnique);
-    const isProbasAreNumbers = random(opts.isProbasAreNumbers);
     const identifiers = {
         indexSituation,
         eventIds,
         arrProba: finiteProbDistr.arrProba.map((node) => node.toIdentifiers()),
-        isProbasAreNumbers,
     };
     return getQuestionFromIdentifiers(identifiers, opts);
 };

package/lib/exercises/math/probaStat/probaFromTableWithContext.d.ts

@@ -1,13 +1,20 @@
 import { Exercise } from "../../../exercises/exercise.js";
 type Identifiers = {
-    aCapB: number;
-    aCapBBarre: number;
-    aBarreCapB: number;
-    aBarreCapBBarre: number;
+    indexSituation: number;
+    values: {
+        "A \\cap B": number;
+        "A \\cap \\overline{B}": number;
+        "\\overline{A} \\cap B": number;
+        "\\overline{A} \\cap \\overline{B}": number;
+    };
     event: string;
     type: string;
     probaFrac: number[];
+    allowedAnsType: string[];
 };
-export declare const probaFromTableWithContext: Exercise<Identifiers>;
+type Options = {
+    allowedAnsType: string[];
+};
+export declare const probaFromTableWithContext: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=probaFromTableWithContext.d.ts.map

package/lib/exercises/math/probaStat/probaFromTableWithContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAyRF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAkB3D,CAAC"}
+{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,uBAAuB,EAAE,MAAM,CAAC;QAChC,uBAAuB,EAAE,MAAM,CAAC;QAChC,mCAAmC,EAAE,MAAM,CAAC;KAC7C,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAqpBF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAsBF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBpE,CAAC"}