math-exercises 2.2.59 → 2.2.61

package/lib/exercises/math/powers/powersDivision.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.powersOfTenDivision = exports.powersDivision = void 0;
 const power_1 = require("../../../math/numbers/integer/power");
 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 powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
@@ -14,15 +13,21 @@ const alignTex_1 = require("../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../utils/alea/shuffle");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
+const rationalParser_1 = require("../../../tree/parsers/rationalParser");
+const powerParser_1 = require("../../../tree/parsers/powerParser");
 const getPowersDivisionQuestion = (opts) => {
     let a = opts.useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0]);
     const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
-    const statement = new fractionNode_1.FractionNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(c)));
-    const answerTree = new power_1.Power(a, b - c).simplify();
+    const statement = (0, fractionNode_1.frac)((0, powerNode_1.power)(a, b), (0, powerNode_1.power)(a, c));
+    const answerTree = (0, powerNode_1.power)(a, b - c).simplify();
     const answer = answerTree.toTex();
     const statementTex = statement.toTex();
     const question = {
-        instruction: `Simplifier : $${statementTex}$`,
+        instruction: `Simplifier : 
+    
+$$
+${statementTex}
+$$`,
         startStatement: statementTex,
         answer,
         keys: [],
@@ -71,13 +76,16 @@ const getPropositions = (n, { answer, a, b, c }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { a, b, c }) => {
-    const power = new power_1.Power(a, b - c);
-    const answerTree = power.simplify();
-    const texs = answerTree.toAllValidTexs();
-    const rawTex = power.toTree().toTex();
-    if (!texs.includes(rawTex))
-        texs.push(rawTex);
-    return texs.includes(ans);
+    const powerNode = (0, powerNode_1.power)(a, b - c);
+    const answerTree = powerNode.simplify();
+    const ev = answerTree.evaluate();
+    const parsed = (0, rationalParser_1.rationalParser)(ans);
+    if (parsed && Math.abs(parsed.evaluate() - ev) < 0.000001)
+        return true;
+    const powerParsed = (0, powerParser_1.powerParser)(ans);
+    if (powerParsed && Math.abs(powerParsed.evaluate() - ev) < 0.000001)
+        return true;
+    return false;
 };
 exports.powersDivision = {
     id: "powersDivision",

package/lib/exercises/math/powers/powersPower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersPower.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersPower.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACL,QAAQ,EAST,MAAM,gBAAgB,CAAC;AAExB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAyDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CA6BlD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAiB7C,CAAC"}
+{"version":3,"file":"powersPower.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersPower.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,EACL,QAAQ,EAST,MAAM,gBAAgB,CAAC;AAExB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8DF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CA6BlD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAiB7C,CAAC"}

package/lib/exercises/math/powers/powersPower.js

@@ -6,19 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.powersPower = exports.powersOfTenPower = void 0;
 const power_1 = require("../../../math/numbers/integer/power");
 const randint_1 = require("../../../math/utils/random/randint");
-const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
+const powerParser_1 = require("../../../tree/parsers/powerParser");
+const rationalParser_1 = require("../../../tree/parsers/rationalParser");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const getPowersPowerQuestion = (opts) => {
     const a = opts?.useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0, 1]);
     const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
-    const statement = new powerNode_1.PowerNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c));
-    let answerTree = new power_1.Power(a, b * c).simplify();
+    const statement = (0, powerNode_1.power)((0, powerNode_1.power)(a, b), c);
+    let answerTree = (0, powerNode_1.power)(a, b * c).simplify();
     const answer = answerTree.toTex();
     const statementTex = statement.toTex();
     const question = {
-        instruction: `Simplifier : $${statementTex}$`,
+        instruction: `Simplifier : 
+    
+$$
+${statementTex}
+$$`,
         startStatement: statementTex,
         answer,
         keys: [],
@@ -45,13 +50,16 @@ const getPropositions = (n, { answer, a, b, c }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { a, b, c }) => {
-    const power = new power_1.Power(a, b * c);
-    const answerTree = power.simplify();
-    const texs = answerTree.toAllValidTexs();
-    const rawTex = power.toTree().toTex();
-    if (!texs.includes(rawTex))
-        texs.push(rawTex);
-    return texs.includes(ans);
+    const powerNode = (0, powerNode_1.power)(a, b * c);
+    const answerTree = powerNode.simplify();
+    const ev = answerTree.evaluate();
+    const parsed = (0, rationalParser_1.rationalParser)(ans);
+    if (parsed && Math.abs(parsed.evaluate() - ev) < 0.000001)
+        return true;
+    const powerParsed = (0, powerParser_1.powerParser)(ans);
+    if (powerParsed && Math.abs(powerParsed.evaluate() - ev) < 0.000001)
+        return true;
+    return false;
 };
 exports.powersOfTenPower = {
     id: "powersOfTenPower",

package/lib/exercises/math/powers/powersProduct.d.ts

@@ -7,7 +7,10 @@ type Identifiers = {
     b: number;
     c: number;
 };
+type Options = {
+    useOnlyPowersOfTen: boolean;
+};
 export declare const powersOfTenProduct: Exercise<Identifiers>;
-export declare const powersProduct: Exercise<Identifiers>;
+export declare const powersProduct: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=powersProduct.d.ts.map

package/lib/exercises/math/powers/powersProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersProduct.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAIxB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CA8BpD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAkB/C,CAAC"}
+{"version":3,"file":"powersProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersProduct.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,OAAO,EACL,QAAQ,EAaT,MAAM,gBAAgB,CAAC;AAMxB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoIF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CA8BpD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAuBxD,CAAC"}

package/lib/exercises/math/powers/powersProduct.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.powersProduct = exports.powersOfTenProduct = void 0;
 const power_1 = require("../../../math/numbers/integer/power");
 const randint_1 = require("../../../math/utils/random/randint");
-const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
@@ -14,38 +13,72 @@ const alignTex_1 = require("../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../utils/alea/shuffle");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
+const rationalParser_1 = require("../../../tree/parsers/rationalParser");
+const powerParser_1 = require("../../../tree/parsers/powerParser");
+const getInstruction = (identifiers, opts) => {
+    const { a, b, c } = identifiers;
+    const statement = (0, multiplyNode_1.multiply)((0, powerNode_1.power)(a, b), (0, powerNode_1.power)(a, c));
+    const statmentTex = statement.toTex();
+    return `Simplifier : 
+  
+$$
+${statmentTex}
+$$`;
+};
+const getStartStatement = (identifiers, opts) => {
+    const { a, b, c } = identifiers;
+    const statement = (0, multiplyNode_1.multiply)((0, powerNode_1.power)(a, b), (0, powerNode_1.power)(a, c));
+    const statmentTex = statement.toTex();
+    return statmentTex;
+};
+const getHint = (identifiers, opts) => {
+    return `Utilise la propriété :
+  
+$$
+${opts?.useOnlyPowersOfTen
+        ? `10^n \\times 10^m = 10^{n+m}`
+        : `a^n \\times a^m = a^{n+m}`}
+$$
+`;
+};
+const getCorrection = (identifiers, opts) => {
+    const { a, b, c } = identifiers;
+    const addPower = (0, powerNode_1.power)(a, (0, addNode_1.add)(b, c));
+    return `On sait que : 
+  
+$$
+${opts?.useOnlyPowersOfTen
+        ? `10^n \\times 10^m = 10^{n+m}`
+        : `a^n \\times a^m = a^{n+m}`}
+$$
+    
+On a donc : 
+
+${(0, alignTex_1.alignTex)([
+        [(0, multiplyNode_1.multiply)((0, powerNode_1.power)(a, b), (0, powerNode_1.power)(a, c)).toTex(), "=", addPower.toTex()],
+        ["", "=", addPower.simplify().toTex()],
+    ])}
+    `;
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c } = identifiers;
+    const answerTree = (0, powerNode_1.power)(a, b + c, { allowPowerOne: false }).simplify();
+    const answer = answerTree.toTex();
+    return answer;
+};
 const getPowersProductQuestion = (opts) => {
     const a = opts?.useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11, [0]);
     const [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-11, 11));
-    const statement = new multiplyNode_1.MultiplyNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(c)));
-    const answerTree = new power_1.Power(a, b + c).simplify();
-    const answer = answerTree.toTex();
-    const statmentTex = statement.toTex();
+    const identifiers = { a, b, c };
     const question = {
-        instruction: `Calculer : $${statmentTex}$`,
-        startStatement: statmentTex,
-        answer,
+        instruction: getInstruction(identifiers, opts),
+        startStatement: getStartStatement(identifiers, opts),
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { a, b, c },
-        hint: `Utilise la propriété : ${opts?.useOnlyPowersOfTen
-            ? `$10^n \\times 10^m = 10^{n+m}$`
-            : `$a^n \\times a^m = a^{n+m}$`}`,
-        correction: `On sait que ${opts?.useOnlyPowersOfTen
-            ? `$10^n \\times 10^m = 10^{n+m}$`
-            : `$a^n \\times a^m = a^{n+m}$`}.
-    
-On a donc : 
-
-${(0, alignTex_1.alignTex)([
-            [
-                statmentTex,
-                "=",
-                new powerNode_1.PowerNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}
-    `,
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
     };
     return question;
 };
@@ -61,13 +94,24 @@ const getPropositions = (n, { answer, a, b, c }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { a, b, c }) => {
-    const power = new power_1.Power(a, b + c);
-    const answerTree = power.simplify();
-    const texs = answerTree.toAllValidTexs();
-    const rawTex = power.toTree().toTex();
-    if (!texs.includes(rawTex))
-        texs.push(rawTex);
-    return texs.includes(ans);
+    const powerNode = (0, powerNode_1.power)(a, b + c);
+    //version frac ou number
+    //version power absolute
+    //version 1/power
+    const answerTree = powerNode.simplify();
+    const ev = answerTree.evaluate();
+    const parsed = (0, rationalParser_1.rationalParser)(ans);
+    console.log(parsed, ev);
+    if (parsed && Math.abs(parsed.evaluate() - ev) < 0.000001)
+        return true;
+    const powerParsed = (0, powerParser_1.powerParser)(ans);
+    if (powerParsed && Math.abs(powerParsed.evaluate() - ev) < 0.000001)
+        return true;
+    return false;
+    // const texs = answerTree.toAllValidTexs();
+    // const rawTex = powerNode.toTex();
+    // if (!texs.includes(rawTex)) texs.push(rawTex);
+    // return texs.includes(ans);
 };
 exports.powersOfTenProduct = {
     id: "powersOfTenProduct",
@@ -103,11 +147,16 @@ exports.powersProduct = {
     levels: ["4ème", "3ème", "2nde"],
     sections: ["Puissances"],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersProductQuestion({ useOnlyPowersOfTen: false }), nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersProductQuestion({ useOnlyPowersOfTen: false }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getAnswer,
+    getCorrection,
+    getHint,
+    getInstruction,
+    getStartStatement,
 };

package/lib/exercises/math/probaStat/binomial/binomialInequation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binomialInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/binomial/binomialInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAUlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAEL,uBAAuB,EACxB,MAAM,oCAAoC,CAAC;AAK5C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAgKF,KAAK,OAAO,GAAG;IACb,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB7D,CAAC"}
+{"version":3,"file":"binomialInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/binomial/binomialInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAUlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAEL,uBAAuB,EACxB,MAAM,oCAAoC,CAAC;AAK5C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAgKF,KAAK,OAAO,GAAG;IACb,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAuB7D,CAAC"}

package/lib/exercises/math/probaStat/binomial/binomialInequation.js

@@ -157,4 +157,10 @@ exports.binomialInequation = {
     // getCorrection,
     getAnswer,
     options,
+    validateOptions: (opts) => {
+        return {
+            valid: !!opts?.instructionType,
+            message: "Veuillez choisir un type de consigne.",
+        };
+    },
 };

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

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAWlC,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;AAgIF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAsBF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBlE,CAAC"}
+{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAWlC,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;AAoIF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAsBF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBlE,CAAC"}

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

@@ -17,7 +17,9 @@ const getInstruction = ({ aBarreCapB, aBarreCapBBarre, aCapB, aCapBBarre, event,
     const bTotal = aCapB + aBarreCapB;
     const aBarreTotal = aBarreCapB + aBarreCapBBarre;
     const bBarreTotal = aBarreCapBBarre + aCapBBarre;
-    return `On considère deux événements $A$ et $B$. Le tableau suivant donne le nombre d'issues pour chacun des événements $A\\cap B$, $\\overline A\\cap B$, $A\\cap \\overline B$ et $\\overline A \\cap \\overline B$. Calculer la probabilité $${event}$.
+    return `On considère deux événements $A$ et $B$. 
+  
+Le tableau suivant donne le nombre d'issues pour chacun des événements $A\\cap B$, $\\overline A\\cap B$, $A\\cap \\overline B$ et $\\overline A \\cap \\overline B$. 
     
 ${(0, mdTable_1.mdTable)([
         [" ", "$B$", "$\\overline{B}$", "Total"],
@@ -30,6 +32,8 @@ ${(0, mdTable_1.mdTable)([
         ],
         ["Total", (0, dollarize_1.dollarize)(bTotal), (0, dollarize_1.dollarize)(bBarreTotal), (0, dollarize_1.dollarize)(total)],
     ])}
+
+Calculer la probabilité $${event}$.
     `;
 };
 const getProbaFromTableNoContextQuestion = () => {

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,EAWT,MAAM,0BAA0B,CAAC;AAWlC,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;AA2HF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAsBF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBpE,CAAC"}
+{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAWlC,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;AA2IF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAsBF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBpE,CAAC"}

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

@@ -15,9 +15,25 @@ const getInstruction = ({ aBarreCapB, aBarreCapBBarre, aCapB, aCapBBarre, event,
     return `Le tableau suivant donne le nombre de filles et de garçons portant des lunettes dans un lycée : 
 
 ${(0, mdTable_1.mdTable)([
-        [" ", "Porte des lunettes", "Ne porte pas de lunettes"],
-        ["Filles", (0, dollarize_1.dollarize)(aCapB), (0, dollarize_1.dollarize)(aCapBBarre)],
-        ["Garçons", (0, dollarize_1.dollarize)(aBarreCapB), (0, dollarize_1.dollarize)(aBarreCapBBarre)],
+        [" ", "Porte des lunettes", "Ne porte pas de lunettes", "Total"],
+        [
+            "Filles",
+            (0, dollarize_1.dollarize)(aCapB),
+            (0, dollarize_1.dollarize)(aCapBBarre),
+            (0, dollarize_1.dollarize)(aCapB + aCapBBarre),
+        ],
+        [
+            "Garçons",
+            (0, dollarize_1.dollarize)(aBarreCapB),
+            (0, dollarize_1.dollarize)(aBarreCapBBarre),
+            (0, dollarize_1.dollarize)(aBarreCapB + aBarreCapBBarre),
+        ],
+        [
+            "Total",
+            (0, dollarize_1.dollarize)(aCapB + aBarreCapB),
+            (0, dollarize_1.dollarize)(aCapBBarre + aBarreCapBBarre),
+            (0, dollarize_1.dollarize)(aCapB + aCapBBarre + aBarreCapB + aBarreCapBBarre),
+        ],
     ])}
 
 On choisit un élève au hasard. Quelle est la probabilité de tomber sur ${event} ?

package/lib/exercises/math/spaceGeometry/lineAndPlaneRelativePosition.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=lineAndPlaneRelativePosition.d.ts.map

package/lib/exercises/math/spaceGeometry/lineAndPlaneRelativePosition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lineAndPlaneRelativePosition.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/spaceGeometry/lineAndPlaneRelativePosition.ts"],"names":[],"mappings":""}

package/lib/exercises/math/spaceGeometry/lineAndPlaneRelativePosition.js

@@ -0,0 +1,84 @@
+"use strict";
+// import {
+//     Exercise,
+//     Proposition,
+//     QCMGenerator,
+//     Question,
+//     QuestionGenerator,
+//     VEA,
+//     GGBVEA,
+//     addValidProp,
+//     shuffleProps,
+//     tryToAddWrongProp,
+//     GetAnswer,
+//     GetHint,
+//     GetCorrection,
+//     GetInstruction,
+//     GetKeys,
+//     GetGGBOptions,
+//     GetStudentGGBOptions,
+//     GetGGBAnswer,
+//   } from '../../../exercises/exercise';
+//   import { getDistinctQuestions } from '../../../exercises/utils/getDistinctQuestions';
+//   type Identifiers = {
+//     planName: string;
+//     lineName: string;
+//     positionRelative: string;
+//   };
+//   const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
+//     const propositions: Proposition[] = [];
+//     addValidProp(propositions, answer);
+//     while (propositions.length < n) {
+//       throw Error("QCM not implemented")
+//     }
+//     return shuffleProps(propositions, n);
+//   };
+//   const getAnswer : GetAnswer<Identifiers> = (identifiers)=>{
+//     return identifiers.positionRelative
+//   }
+//   const getInstruction : GetInstruction<Identifiers> = (identifiers)=>{
+//   }
+//   const getHint : GetHint<Identifiers> = (identifiers)=>{
+//   }
+//   const getCorrection : GetCorrection<Identifiers> = (identifiers)=>{
+//   }
+//   const getGGBOptions: GetGGBOptions<Identifiers> = (identifiers)=>{
+//   }
+//   const getKeys : GetKeys<Identifiers> = (identifiers)=>{
+//     return []
+//   }
+//   const isAnswerValid: VEA<Identifiers> = (ans, {answer})=>{
+//     throw Error("VEA not implemented")
+//   }
+//   const getLineAndPlaneRelativePositionQuestion: QuestionGenerator<Identifiers>  = (opts)=>{
+//     const identifiers: Identifiers = {}
+//     const question: Question<Identifiers> = {
+//       answer: getAnswer(identifiers),
+//       instruction: getInstruction(identifiers),
+//       keys: getKeys(identifiers),
+//       answerFormat: 'tex',
+//       identifiers,
+//       hint: getHint(identifiers),
+//       correction: getCorrection(identifiers),
+//       ggbOptions: getGGBOptions(identifiers)
+//     };
+//     return question;
+//   }
+//   export const lineAndPlaneRelativePosition: Exercise<Identifiers> = {
+//     id: 'lineAndPlaneRelativePosition',
+//     connector: "=",
+//     label: "Déterminer la position relative d'une droite et d'un plan",
+//     isSingleStep: true,
+//     generator: (nb,opts) => getDistinctQuestions(()=>getLineAndPlaneRelativePositionQuestion(opts), nb),
+//     qcmTimer: 60,
+//     freeTimer: 60,
+//     getPropositions,
+//     isAnswerValid,
+//     subject: "Mathématiques",
+//     getHint,
+//     getCorrection,
+//     getInstruction,
+//     getAnswer,
+//     getGGBOptions,
+//     answerType: "QCU"
+//   };

package/lib/exercises/math/squareRoots/index.d.ts

@@ -4,4 +4,6 @@ export * from "./squareRootIdentities";
 export * from "./squareRootsDistributivity";
 export * from "./squareRootsSum";
 export * from "./squareRootsProducts";
+export * from "./squareRootsFractions";
+export * from "./squareRootsToSquare";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/squareRoots/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC"}

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

@@ -20,3 +20,5 @@ __exportStar(require("./squareRootIdentities"), exports);
 __exportStar(require("./squareRootsDistributivity"), exports);
 __exportStar(require("./squareRootsSum"), exports);
 __exportStar(require("./squareRootsProducts"), exports);
+__exportStar(require("./squareRootsFractions"), exports);
+__exportStar(require("./squareRootsToSquare"), exports);

package/lib/exercises/math/squareRoots/squareRootsFractions.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+};
+export declare const squareRootsFractions: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=squareRootsFractions.d.ts.map

package/lib/exercises/math/squareRoots/squareRootsFractions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"squareRootsFractions.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/squareRootsFractions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8EF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}

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

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.squareRootsFractions = void 0;
+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 sqrtNode_1 = require("../../../tree/nodes/functions/sqrtNode");
+const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const rationalParser_1 = require("../../../tree/parsers/rationalParser");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, rational_1.RationalConstructor.randomIrreductible().toTree().toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    return (0, fractionNode_1.frac)((0, multiplyNode_1.multiply)(a, (0, sqrtNode_1.sqrt)(b)), (0, multiplyNode_1.multiply)(c, (0, sqrtNode_1.sqrt)(d)))
+        .simplify()
+        .toTex();
+};
+const getInstruction = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    return `Simplifier au maximum : 
+  
+$$
+${(0, fractionNode_1.frac)((0, multiplyNode_1.multiply)(a, (0, sqrtNode_1.sqrt)(b)), (0, multiplyNode_1.multiply)(c, (0, sqrtNode_1.sqrt)(d))).toTex()}
+$$`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    const parsed = (0, rationalParser_1.rationalParser)(ans);
+    if (!parsed)
+        return false;
+    return parsed.simplify().toTex() === answer;
+};
+// a/√b + c/√d
+// avec b/d = q^2 ou b/d = 1/q^2
+const getSquareRootsFractionsQuestion = () => {
+    const a = (0, randint_1.randint)(-10, 10, [0]);
+    const c = (0, randint_1.randint)(-10, 10, [0]);
+    const q = (0, randint_1.randint)(2, 10);
+    let b;
+    let d;
+    if ((0, coinFlip_1.coinFlip)()) {
+        d = (0, randint_1.randint)(2, 10);
+        b = d * q ** 2;
+    }
+    else {
+        b = (0, randint_1.randint)(2, 10);
+        d = b * q ** 2;
+    }
+    const identifiers = {
+        a,
+        b,
+        c,
+        d,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.squareRootsFractions = {
+    id: "squareRootsFractions",
+    connector: "=",
+    label: "Fractions de racines carrées",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSquareRootsFractionsQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    // getHint,
+    // getCorrection,
+    getAnswer,
+};

package/lib/exercises/math/squareRoots/squareRootsToSquare.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../exercises/exercise";
+import { NodeIdentifiers } from "../../../tree/nodes/nodeConstructor";
+type Identifiers = {
+    a: number;
+    k: NodeIdentifiers;
+    isSquareInside: boolean;
+};
+export declare const squareRootsToSquare: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=squareRootsToSquare.d.ts.map

package/lib/exercises/math/squareRoots/squareRootsToSquare.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"squareRootsToSquare.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/squareRoots/squareRootsToSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAO1C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,eAAe,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAmHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAgBrD,CAAC"}