math-exercises 2.0.0 → 2.0.2

package/lib/exercises/probaStat/cardBasicProbas.js

@@ -8,33 +8,31 @@ const randint_1 = require("../../math/utils/random/randint");
 const probaLawFlip_1 = require("../../utils/probaLawFlip");
 const cardsData_1 = require("../utils/cardsData");
 const randomEnumValue_1 = require("../../utils/randomEnumValue");
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const getCardBasicProbasQuestion = () => {
-    //carte précise (as de coeur)
-    //carte valeur (as)
-    //car couleur (pique)
-    //
     const questionType = (0, probaLawFlip_1.probaLawFlip)([
-        ['oneCard', 0.33],
-        ['valueCard', 0.33],
-        ['colorCard', 0.33],
+        ["oneCard", 0.33],
+        ["valueCard", 0.33],
+        ["colorCard", 0.33],
     ]);
-    let answer = '';
-    let target = '';
+    let answer = "";
+    let target = "";
     let value;
     let color;
     switch (questionType) {
-        case 'oneCard':
+        case "oneCard":
             value = (0, randomEnumValue_1.randomEnumValue)(cardsData_1.CardsValues);
             color = (0, randomEnumValue_1.randomEnumValue)(cardsData_1.CardsColor);
-            target = `${value === 'dame' ? 'une' : 'un'} ${value} de ${color}`;
+            target = `${value === "dame" ? "une" : "un"} ${value} de ${color}`;
             answer = `\\frac{1}{52}`;
             break;
-        case 'valueCard':
+        case "valueCard":
             value = (0, randomEnumValue_1.randomEnumValue)(cardsData_1.CardsValues);
-            target = `${value === 'dame' ? 'une' : 'un'} ${value}`;
-            answer = '\\frac{1}{13}';
+            target = `${value === "dame" ? "une" : "un"} ${value}`;
+            answer = "\\frac{1}{13}";
             break;
-        case 'colorCard':
+        case "colorCard":
             color = (0, randomEnumValue_1.randomEnumValue)(cardsData_1.CardsColor);
             target = `un ${color}`;
             answer = `\\frac{1}{4}`;
@@ -44,8 +42,8 @@ const getCardBasicProbasQuestion = () => {
         answer,
         instruction: `On tire une carte dans un jeu de 52 cartes. Quelle est la probabilité d'obtenir ${target} ?`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, questionType },
+        answerFormat: "tex",
+        identifiers: { questionType },
     };
     return question;
 };
@@ -53,14 +51,14 @@ const getPropositions = (n, { answer, questionType }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     switch (questionType) {
-        case 'colorCard':
-            (0, exercise_1.tryToAddWrongProp)(propositions, '13');
+        case "colorCard":
+            (0, exercise_1.tryToAddWrongProp)(propositions, "13");
             break;
-        case 'oneCard':
-            (0, exercise_1.tryToAddWrongProp)(propositions, '1');
+        case "oneCard":
+            (0, exercise_1.tryToAddWrongProp)(propositions, "1");
             break;
-        case 'valueCard':
-            (0, exercise_1.tryToAddWrongProp)(propositions, '4');
+        case "valueCard":
+            (0, exercise_1.tryToAddWrongProp)(propositions, "4");
             break;
     }
     while (propositions.length < n) {
@@ -69,15 +67,38 @@ const getPropositions = (n, { answer, questionType }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { questionType }) => {
+    let denum;
+    switch (questionType) {
+        case "oneCard":
+            denum = 52;
+            break;
+        case "valueCard":
+            denum = 13;
+            break;
+        case "colorCard":
+            denum = 4;
+            break;
+        default:
+            throw Error("wrong questionType in card Basic Probas");
+    }
+    const answer = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(1), new numberNode_1.NumberNode(denum), {
+        allowFractionToDecimal: true,
+    });
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.cardBasicProbas = {
-    id: 'cardBasicProbas',
-    connector: '=',
-    label: 'Calcul de probabilité simple avec un jeu de cartes',
-    levels: ['5ème', '4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    id: "cardBasicProbas",
+    connector: "=",
+    label: "Calcul de probabilité simple avec un jeu de cartes",
+    levels: ["5ème", "4ème", "3ème", "2ndPro", "2nde", "CAP"],
     isSingleStep: true,
-    sections: ['Probabilités'],
+    sections: ["Probabilités"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCardBasicProbasQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/probaStat/conditionalProbability.d.ts

@@ -1,8 +1,10 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
+    flip: number;
+    pA: number;
+    pB: number;
+    pAB: number;
 };
-type VEAProps = {};
-export declare const conditionalProbability: MathExercise<QCMProps, VEAProps>;
+export declare const conditionalProbability: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=conditionalProbability.d.ts.map

package/lib/exercises/probaStat/conditionalProbability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8FnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}
+{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAIrB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAuHF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAa5D,CAAC"}

package/lib/exercises/probaStat/conditionalProbability.js

@@ -13,54 +13,55 @@ const getConditionalProbability = () => {
     const pA_B = (0, round_1.round)(pAB / pB, 2);
     const pB_A = (0, round_1.round)(pAB / pA, 2);
     const flip = (0, randint_1.randint)(1, 7);
-    let instruction = `On considère deux événements A et B tels que `;
-    let startStatement = '';
-    let answer = '';
+    let instruction = `On considère deux événements $A$ et $B$ tels que `;
+    let startStatement = "";
+    let answer = "";
     switch (flip) {
         case 1: {
-            instruction += `$P(A) = ${(pA / 100 + '').replace('.', ',')}\\ $ et $\\ P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}$.$\\\\$Déterminer $P_A(B)$.`;
+            instruction += `$P(A) = ${(pA / 100 + "").replace(".", ",")}\\ $ et $\\ P(A \\cap B) = ${(pAB / 100 + "").replace(".", ",")}$.$\\\\$Déterminer $P_A(B)$.`;
             startStatement = `P_A(B)`;
             answer = `${pB_A}`;
             break;
         }
         case 2: {
-            instruction += `$P(B) = ${(pB / 100 + '').replace('.', ',')}\\ $ et $\\ P(B \\cap A) = ${(pAB / 100 + '').replace('.', ',')}$.$\\\\$Déterminer $P_B(A)$.`;
+            instruction += `$P(B) = ${(pB / 100 + "").replace(".", ",")}\\ $ et $\\ P(B \\cap A) = ${(pAB / 100 + "").replace(".", ",")}$.$\\\\$Déterminer $P_B(A)$.`;
             startStatement = `P_B(A)`;
             answer = `${pA_B}`;
             break;
         }
         case 3: {
-            instruction += `$P(A) = ${(pA / 100 + '').replace('.', ',')}\\ $ et $\\ P_A(B) = ${(pB_A + '').replace('.', ',')}$.$\\\\$Déterminer $P(A \\cap B)$.`;
+            instruction += `$P(A) = ${(pA / 100 + "").replace(".", ",")}\\ $ et $\\ P_A(B) = ${(pB_A + "").replace(".", ",")}$.$\\\\$Déterminer $P(A \\cap B)$.`;
             startStatement = `P(A \\cap B)`;
             answer = `${pAB / 100}`;
             break;
         }
         case 4: {
-            instruction += `$P(B) = ${(pB / 100 + '').replace('.', ',')}\\ $ et $\\ P_B(A) = ${(pA_B + '').replace('.', ',')}$.$\\\\$Déterminer $P(A \\cap B)$.`;
+            instruction += `$P(B) = ${(pB / 100 + "").replace(".", ",")}\\ $ et $\\ P_B(A) = ${(pA_B + "").replace(".", ",")}$.$\\\\$Déterminer $P(A \\cap B)$.`;
             startStatement = `P(A \\cap B)`;
             answer = `${pAB / 100}`;
             break;
         }
         case 5: {
-            instruction += `$P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}\\ $ et $\\ P_B(A) = ${(pA_B + '').replace('.', ',')}$.$\\\\$Déterminer $P(B)$.`;
+            instruction += `$P(A \\cap B) = ${(pAB / 100 + "").replace(".", ",")}\\ $ et $\\ P_B(A) = ${(pA_B + "").replace(".", ",")}$.$\\\\$Déterminer $P(B)$.`;
             startStatement = `P(B)`;
             answer = `${pB / 100}`;
             break;
         }
         case 6: {
-            instruction += `$P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}\\ $ et $\\ P_A(B) = ${(pB_A + '').replace('.', ',')}$.$\\\\$Déterminer $P(A)$.`;
+            instruction += `$P(A \\cap B) = ${(pAB / 100 + "").replace(".", ",")}\\ $ et $\\ P_A(B) = ${(pB_A + "").replace(".", ",")}$.$\\\\$Déterminer $P(A)$.`;
             startStatement = `P(A)`;
             answer = `${pA / 100}`;
             break;
         }
     }
+    answer = answer.replace(".", ",");
     const question = {
         instruction,
         startStatement,
-        answer: answer.replace('.', ','),
-        keys: ['p', 'cap', 'underscore'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answer,
+        keys: ["p", "cap", "underscore"],
+        answerFormat: "tex",
+        identifiers: { flip, pA, pAB, pB },
     };
     return question;
 };
@@ -68,19 +69,23 @@ const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, Math.floor(Math.random() * 100) / 100 + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, (Math.floor(Math.random() * 100) / 100 + "").replace(".", ","));
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.conditionalProbability = {
-    id: 'conditionalProbability',
-    connector: '=',
-    label: 'Calcul de probabilité conditionnelle avec la formule de Bayes',
-    levels: ['1reESM', '1reSpé', '1reTech', 'TermTech', '1rePro', 'TermPro'],
+    id: "conditionalProbability",
+    connector: "=",
+    label: "Calcul de probabilité conditionnelle avec la formule de Bayes",
+    levels: ["1reESM", "1reSpé", "1reTech", "TermTech", "1rePro", "TermPro"],
     isSingleStep: false,
-    sections: ['Probabilités'],
+    sections: ["Probabilités"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getConditionalProbability, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/probaStat/diceBasicProbas.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     isParityQuestion: boolean;
     isEvenQuestion: boolean;
     nbFaces: number;
 };
-type VEAProps = {};
-export declare const diceBasicProbas: MathExercise<QCMProps, VEAProps>;
+export declare const diceBasicProbas: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=diceBasicProbas.d.ts.map

package/lib/exercises/probaStat/diceBasicProbas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diceBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/diceBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"diceBasicProbas.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/diceBasicProbas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA6EF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/probaStat/diceBasicProbas.js

@@ -5,6 +5,8 @@ const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../math/numbers/rationals/rational");
 const randint_1 = require("../../math/utils/random/randint");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const coinFlip_1 = require("../../utils/coinFlip");
 const probaFlip_1 = require("../../utils/probaFlip");
 const getDiceBasicProbasQuestion = () => {
@@ -12,7 +14,9 @@ const getDiceBasicProbasQuestion = () => {
     const isParityQuestion = (0, probaFlip_1.probaFlip)(0.3);
     const isEvenQuestion = (0, coinFlip_1.coinFlip)();
     const faceAsked = (0, randint_1.randint)(1, nbFaces + 1);
-    const target = isParityQuestion ? `un nombre ${isEvenQuestion ? 'pair' : 'impair'}` : `la face ${faceAsked}`;
+    const target = isParityQuestion
+        ? `un nombre ${isEvenQuestion ? "pair" : "impair"}`
+        : `la face ${faceAsked}`;
     const answer = isParityQuestion
         ? isEvenQuestion
             ? new rational_1.Rational(Math.floor(nbFaces / 2), nbFaces).simplify().tex
@@ -22,8 +26,8 @@ const getDiceBasicProbasQuestion = () => {
         answer,
         instruction: `On lance un dé à ${nbFaces} faces. Quelle est la probabilité d'obtenir ${target} ?`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, isParityQuestion, isEvenQuestion, nbFaces },
+        answerFormat: "tex",
+        identifiers: { isParityQuestion, isEvenQuestion, nbFaces },
     };
     return question;
 };
@@ -31,15 +35,15 @@ const getPropositions = (n, { answer, isParityQuestion, isEvenQuestion, nbFaces
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     if (isParityQuestion) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, '\\frac{1}{2}');
+        (0, exercise_1.tryToAddWrongProp)(propositions, "\\frac{1}{2}");
         if (isEvenQuestion)
             (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(Math.ceil(nbFaces / 2), nbFaces).simplify().tex);
         else
             (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(Math.floor(nbFaces / 2), nbFaces).simplify().tex);
     }
     else {
-        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '\\frac{1}{6}');
+        (0, exercise_1.tryToAddWrongProp)(propositions, "1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "\\frac{1}{6}");
     }
     while (propositions.length < n) {
         const wrongAnswer = new rational_1.Rational((0, randint_1.randint)(1, nbFaces + 1), nbFaces).simplify().tex;
@@ -47,15 +51,27 @@ const getPropositions = (n, { answer, isParityQuestion, isEvenQuestion, nbFaces
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { isParityQuestion, isEvenQuestion, nbFaces }) => {
+    const opts = { allowFractionToDecimal: true };
+    const answer = isParityQuestion
+        ? isEvenQuestion
+            ? new rational_1.Rational(Math.floor(nbFaces / 2), nbFaces).simplify().toTree(opts)
+            : new rational_1.Rational(Math.ceil(nbFaces / 2), nbFaces).simplify().toTree(opts)
+        : new fractionNode_1.FractionNode(new numberNode_1.NumberNode(1), new numberNode_1.NumberNode(nbFaces), opts);
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.diceBasicProbas = {
-    id: 'diceBasicProbas',
-    connector: '=',
-    label: 'Calcul de probabilité simple avec un dé',
-    levels: ['5ème', '4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    id: "diceBasicProbas",
+    connector: "=",
+    label: "Calcul de probabilité simple avec un dé",
+    levels: ["5ème", "4ème", "3ème", "2ndPro", "2nde", "CAP"],
     isSingleStep: true,
-    sections: ['Probabilités'],
+    sections: ["Probabilités"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDiceBasicProbasQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,8 @@
+export * from "./ballsBasicProbas";
+export * from "./cardBasicProbas";
+export * from "./conditionalProbability";
+export * from "./diceBasicProbas";
+export * from "./probabilityTree";
+export * from "./stats1var";
+export * from "./stats2var";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/probaStat/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}

package/lib/exercises/probaStat/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ballsBasicProbas"), exports);
+__exportStar(require("./cardBasicProbas"), exports);
+__exportStar(require("./conditionalProbability"), exports);
+__exportStar(require("./diceBasicProbas"), exports);
+__exportStar(require("./probabilityTree"), exports);
+__exportStar(require("./stats1var"), exports);
+__exportStar(require("./stats2var"), exports);

package/lib/exercises/probaStat/probabilityTree.d.ts

@@ -1,5 +1,5 @@
-import { MathExercise } from '../exercise';
-type GetAnswerNodeProps = {
+import { MathExercise } from "../exercise";
+type Identifiers = {
     type: number;
     A: number;
     B: number;
@@ -8,10 +8,6 @@ type GetAnswerNodeProps = {
     BC: number;
     BD: number;
 };
-type QCMProps = {
-    answer: string;
-} & GetAnswerNodeProps;
-type VEAProps = {};
-export declare const probabilityTree: MathExercise<QCMProps, VEAProps>;
+export declare const probabilityTree: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=probabilityTree.d.ts.map

package/lib/exercises/probaStat/probabilityTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/probabilityTree.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAQrB,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,kBAAkB,CAAC;AA0GvB,KAAK,QAAQ,GAAG,EAAE,CAAC;AAYnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../src/exercises/probaStat/probabilityTree.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA2IF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAoBrD,CAAC"}

package/lib/exercises/probaStat/probabilityTree.js

@@ -1,35 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.probabilityTree = void 0;
+const integer_1 = require("../../math/numbers/integer/integer");
+const rational_1 = require("../../math/numbers/rationals/rational");
+const gcd_1 = require("../../math/utils/arithmetic/gcd");
 const randint_1 = require("../../math/utils/random/randint");
-const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
-const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
-const simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
-function pgcd(a, b) {
-    while (b)
-        [a, b] = [b, a % b];
-    return a;
-}
 const getAnswerNode = ({ type, A, B, AC, AD, BC, BD }) => {
-    const pA = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(A / (A + B)));
-    const pB = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(B / (A + B)));
-    const pA_C = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(AC / (AC + AD)));
-    const pA_D = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(AD / (AC + AD)));
-    const pB_C = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(BC / (BC + BD)));
-    const pB_D = (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(BD / (BC + BD)));
+    const pA = new rational_1.Rational(A, A + B).simplify();
+    const pB = new rational_1.Rational(B, A + B).simplify();
+    const pA_C = new rational_1.Rational(AC, AC + AD).simplify();
+    const pA_D = new rational_1.Rational(AD, AC + AD).simplify();
+    const pB_C = new rational_1.Rational(BC, BC + BD).simplify();
+    const pB_D = new rational_1.Rational(BD, BC + BD).simplify();
     switch (type) {
         case 1:
-            return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pA, pA_C));
+            return pA.multiply(pA_C);
         case 2:
-            return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pA, pA_D));
+            return pA.multiply(pA_D);
         case 3:
-            return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pB, pB_C));
+            return pB.multiply(pB_C);
         case 4:
         default:
-            return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(pB, pB_D));
+            return pB.multiply(pB_D);
     }
 };
 const getProbabilityTree = () => {
@@ -40,53 +35,53 @@ const getProbabilityTree = () => {
     const BC = (0, randint_1.randint)(2, 9);
     const BD = (0, randint_1.randint)(2, 10 - BC);
     let instruction = `En utilisant l'arbre de probabilité suivant, `;
-    let startStatement = '';
+    let startStatement = "";
     const type = (0, randint_1.randint)(1, 5);
     const answer = getAnswerNode({ type, A, AC, AD, B, BC, BD });
-    const answerTex = answer.toTex();
+    const answerTex = answer.toTree().toTex();
     switch (type) {
         case 1: {
-            instruction += `$\\\\$ Calculer $P(A \\cap C)$`;
+            instruction += `calculer $P(A \\cap C)$.`;
             startStatement = `P(A \\cap C)`;
             break;
         }
         case 2: {
-            instruction += `$\\\\$ Calculer $P(A \\cap D)$`;
+            instruction += `calculer $P(A \\cap D)$.`;
             startStatement = `P(A \\cap D)`;
             break;
         }
         case 3: {
-            instruction += `$\\\\$ Calculer $P(B \\cap C)$`;
+            instruction += `calculer $P(B \\cap C)$.`;
             startStatement = `P(B \\cap C)`;
             break;
         }
         case 4: {
-            instruction += `$\\\\$ Calculer $P(B \\cap D)$`;
+            instruction += `calculer $P(B \\cap D)$.`;
             startStatement = `P(B \\cap D)`;
             break;
         }
     }
     let commands = [
-        'A = Point({2,2})',
-        'B = Point({2,-2})',
-        'AC = Point({5,3})',
-        'AD = Point({5,1})',
-        'BC = Point({5,-1})',
-        'BD = Point({5,-3})',
-        'Segment(Point({0,0}),A)',
-        'Segment(A,AC)',
-        'Segment(A,AD)',
-        'Segment(Point({0,0}),B)',
-        'Segment(B,BC)',
-        'Segment(B,BD)',
-        'ShowAxes(false)',
-        'ShowGrid(false)',
-        `Text("\\scriptsize ${A / pgcd(A, A + B)}/${(A + B) / pgcd(A, A + B)}", (0.3, 2.1), true, true)`,
-        `Text("\\scriptsize ${AC / pgcd(AC, AC + AD)}/${(AC + AD) / pgcd(AC, AC + AD)}", (2.8, 3.5), true, true)`,
-        `Text("\\scriptsize ${AD / pgcd(AD, AC + AD)}/${(AC + AD) / pgcd(AD, AC + AD)}", (2.8, 1.4), true, true)`,
-        `Text("\\scriptsize ${B / pgcd(B, A + B)}/${(A + B) / pgcd(B, A + B)}", (0.3, -1.2), true, true)`,
-        `Text("\\scriptsize ${BC / pgcd(BC, BC + BD)}/${(BC + BD) / pgcd(BC, BC + BD)}", (2.8, -0.6), true, true)`,
-        `Text("\\scriptsize ${BD / pgcd(BD, BC + BD)}/${(BC + BD) / pgcd(BD, BC + BD)}", (2.8, -2.5), true, true)`,
+        "A = Point({2,2})",
+        "B = Point({2,-2})",
+        "AC = Point({5,3})",
+        "AD = Point({5,1})",
+        "BC = Point({5,-1})",
+        "BD = Point({5,-3})",
+        "Segment(Point({0,0}),A)",
+        "Segment(A,AC)",
+        "Segment(A,AD)",
+        "Segment(Point({0,0}),B)",
+        "Segment(B,BC)",
+        "Segment(B,BD)",
+        "ShowAxes(false)",
+        "ShowGrid(false)",
+        `Text("\\scriptsize ${A / (0, gcd_1.gcd)(A, A + B)}/${(A + B) / (0, gcd_1.gcd)(A, A + B)}", (0.3, 2.1), true, true)`,
+        `Text("\\scriptsize ${AC / (0, gcd_1.gcd)(AC, AC + AD)}/${(AC + AD) / (0, gcd_1.gcd)(AC, AC + AD)}", (2.8, 3.5), true, true)`,
+        `Text("\\scriptsize ${AD / (0, gcd_1.gcd)(AD, AC + AD)}/${(AC + AD) / (0, gcd_1.gcd)(AD, AC + AD)}", (2.8, 1.4), true, true)`,
+        `Text("\\scriptsize ${B / (0, gcd_1.gcd)(B, A + B)}/${(A + B) / (0, gcd_1.gcd)(B, A + B)}", (0.3, -1.2), true, true)`,
+        `Text("\\scriptsize ${BC / (0, gcd_1.gcd)(BC, BC + BD)}/${(BC + BD) / (0, gcd_1.gcd)(BC, BC + BD)}", (2.8, -0.6), true, true)`,
+        `Text("\\scriptsize ${BD / (0, gcd_1.gcd)(BD, BC + BD)}/${(BC + BD) / (0, gcd_1.gcd)(BD, BC + BD)}", (2.8, -2.5), true, true)`,
         'Text("A", (1.85 , 2.5))',
         'Text("B", (1.85 , -2.8))',
         'Text("C", (5.5 , 2.85))',
@@ -101,8 +96,8 @@ const getProbabilityTree = () => {
         keys: [],
         commands,
         coords: [-2, 8, -5, 5],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer: answerTex, A, AC, AD, B, BC, BD, type },
+        answerFormat: "tex",
+        identifiers: { A, AC, AD, B, BC, BD, type },
     };
     return question;
 };
@@ -111,19 +106,35 @@ const getPropositions = (n, { answer, A, AC, AD, B, BC, BD, type }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     const answerNode = getAnswerNode({ A, AC, AD, B, BC, BD, type });
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(answerNode, new numberNode_1.NumberNode((0, randint_1.randint)(2, 11)))).toTex());
+        const wrongAnswer = answerNode.multiply(new integer_1.Integer((0, randint_1.randint)(2, 11)));
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTree().toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { A, AC, AD, B, BC, BD, type }) => {
+    const answer = getAnswerNode({ type, A, AC, AD, B, BC, BD });
+    const texs = answer.toTree({ allowFractionToDecimal: true }).toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.probabilityTree = {
-    id: 'probabilityTree',
-    connector: '=',
+    id: "probabilityTree",
+    connector: "=",
     label: "Calculs de probabilités à l'aide d'un arbre pondéré",
-    levels: ['2nde', '1reESM', '1reSpé', '1reTech', '1rePro', 'TermPro', 'TermTech'],
+    levels: [
+        "2nde",
+        "1reESM",
+        "1reSpé",
+        "1reTech",
+        "1rePro",
+        "TermPro",
+        "TermTech",
+    ],
     isSingleStep: false,
-    sections: ['Probabilités'],
+    sections: ["Probabilités"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProbabilityTree, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/probaStat/stats1var/averageWithTable.d.ts

@@ -0,0 +1,8 @@
+import { MathExercise } from "../../exercise";
+type Identifiers = {
+    randomValues: number[];
+    randomEffectives: number[];
+};
+export declare const averageWithTable: MathExercise<Identifiers>;
+export {};
+//# sourceMappingURL=averageWithTable.d.ts.map

package/lib/exercises/probaStat/stats1var/averageWithTable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"averageWithTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/probaStat/stats1var/averageWithTable.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAQb,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAwEF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAatD,CAAC"}