math-exercises 2.2.4 → 2.2.6

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.d.ts

@@ -2,6 +2,8 @@ import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
     xValues: number[];
     imageValues: number[];
+    isAskingImage: boolean;
+    value: number;
 };
 export declare const inverseImageFunctionTable: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA8GF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"inverseImageFunctionTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgFF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}

package/lib/exercises/math/functions/basics/inverseImageFunctionTable.js

@@ -3,91 +3,71 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inverseImageFunctionTable = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const polynomial_1 = require("../../../../math/polynomials/polynomial");
+const randTupleInt_1 = require("../../../../math/utils/random/randTupleInt");
 const randint_1 = require("../../../../math/utils/random/randint");
+const arrayHasSameElement_1 = require("../../../../utils/arrayHasSameElement");
 const coinFlip_1 = require("../../../../utils/coinFlip");
 const random_1 = require("../../../../utils/random");
 const getInverseImageFunctionTableQuestion = () => {
-    const exercise = generateExercise();
-    const instruction = `Ci-dessous est donné le tableau de valeurs d'une fonction $f$. Déterminer ${exercise.isAskingImage ? `l'image de` : `le ou les antécédents de`} $${exercise.questionValue}$ par $f$
-    ${exercise.exoTable.table}`;
+    const xValues = (0, randTupleInt_1.randTupleInt)(5, {
+        from: -10,
+        to: 10,
+        allDifferent: true,
+    }).sort((a, b) => a - b);
+    const yValues = (0, randTupleInt_1.randTupleInt)(5, { from: -10, to: 10 });
+    let indexAsked = (0, randint_1.randint)(0, 5);
+    const valueAsked = xValues[indexAsked];
+    //on force un meme nombre dans les deux lignes pour complexifier
+    if (!yValues.includes(valueAsked) || yValues[indexAsked] === valueAsked) {
+        yValues[(0, randint_1.randint)(0, 5, [indexAsked])] = valueAsked;
+    }
+    const isAskingImage = (0, coinFlip_1.coinFlip)();
+    const answer = (isAskingImage
+        ? yValues[indexAsked]
+        : xValues
+            .filter((el, index) => yValues[index] === valueAsked)
+            .join("\\text{ et }")) + "";
+    const instruction = `Ci-dessous est donné le tableau de valeurs d'une fonction $f$. Déterminer ${isAskingImage ? `l'image de` : `le ou les antécédents de`} $${valueAsked}$ par $f$.
+
+  |$x$|${xValues.map((value) => `$${value}$`).join("|")}|
+  |-|-|-|-|-|-|
+  |$f(x)$|${yValues.map((value) => `$${value}$`).join("|")}|
+`;
     const question = {
-        answer: `${exercise.answer}`,
+        answer,
         instruction,
-        keys: ["x", "equal"],
+        keys: ["et"],
         answerFormat: "tex",
         style: { tableHasNoHeader: true },
         identifiers: {
-            xValues: exercise.exoTable.xValues,
-            imageValues: exercise.exoTable.imageValues,
+            xValues,
+            imageValues: yValues,
+            isAskingImage,
+            value: valueAsked,
         },
     };
     return question;
 };
-const getPropositions = (n, { answer, xValues, imageValues }) => {
+const getPropositions = (n, { answer, xValues, imageValues, isAskingImage, value }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    generatePropositions(xValues, imageValues, answer).forEach((value) => (0, exercise_1.tryToAddWrongProp)(propositions, value));
+    if (isAskingImage) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, xValues[imageValues.indexOf(value)] + "");
+    }
+    else {
+        (0, exercise_1.tryToAddWrongProp)(propositions, imageValues[xValues.indexOf(value)] + "");
+    }
     while (propositions.length < n) {
-        let randProp = (0, randint_1.randint)(+answer - 10, +answer + 11, [+answer]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, randProp + "");
+        (0, exercise_1.tryToAddWrongProp)(propositions, ((0, coinFlip_1.coinFlip)() ? (0, random_1.random)(xValues) : (0, random_1.random)(imageValues)) + "");
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return [ans, ans.split("=")[1]].includes(answer);
-};
-const generateTable = (f) => {
-    const xValues = generateXValues();
-    const imageValues = xValues.map((value) => f.calculate(value));
-    return {
-        xValues,
-        imageValues,
-        table: `
-  |$x$|${xValues
-            .map((value) => `$${value}$`)
-            .reduce((prev, curr) => prev + "|" + curr)}|
-  |-|-|-|-|-|-|
-  |$f(x)$|${imageValues
-            .map((value) => `$${value}$`)
-            .reduce((prev, curr) => prev + "|" + curr)}|
-  `,
-    };
-};
-const generateXValues = () => {
-    const xValues = [];
-    for (let i = 0; i < 5; i++) {
-        let value;
-        do {
-            value = (0, randint_1.randint)(-11, 11);
-        } while (xValues.includes(value));
-        xValues.push(value);
-    }
-    xValues.sort((a, b) => {
-        return a - b;
-    });
-    return xValues;
-};
-const generateExercise = () => {
-    const polynom = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-5, 6, [0])]);
-    const exoTable = generateTable(polynom);
-    const isAskingImage = (0, coinFlip_1.coinFlip)();
-    const questionValue = isAskingImage
-        ? (0, random_1.random)(exoTable.xValues)
-        : (0, random_1.random)(exoTable.imageValues);
-    const answer = isAskingImage
-        ? polynom.calculate(questionValue)
-        : exoTable.xValues.find((value, index) => exoTable.imageValues[index] === questionValue);
-    return { polynom, exoTable, isAskingImage, questionValue, answer };
-};
-const generatePropositions = (xValues, imageValues, answer) => {
-    const filteredXValues = xValues.filter((value) => value !== +answer);
-    const firstProp = (0, random_1.random)(filteredXValues);
-    const secondProp = (0, random_1.random)(filteredXValues
-        .concat(imageValues)
-        .filter((value) => ![firstProp, +answer].includes(value)));
-    const thirdProp = (0, random_1.random)(imageValues.filter((value) => value !== secondProp));
-    return [firstProp + "", secondProp + "", thirdProp + ""];
+const isAnswerValid = (ans, { answer, xValues, imageValues, isAskingImage, value }) => {
+    const numbers = ans.split("\\text{ et }").map((el) => Number(el));
+    if (numbers.some((n) => isNaN(n)))
+        return false;
+    const answerNumbers = answer.split("\\text{ et }").map((el) => Number(el));
+    return ans === answer || (0, arrayHasSameElement_1.arrayHasSameElements)(numbers, answerNumbers);
 };
 exports.inverseImageFunctionTable = {
     id: "inverseImageFunctionTable",

package/lib/exercises/math/functions/logarithm/log10PowerSimplifying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA+CF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}
+{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAuDF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}

package/lib/exercises/math/functions/logarithm/log10PowerSimplifying.js

@@ -7,6 +7,7 @@ const decimal_1 = require("../../../../math/numbers/decimals/decimal");
 const randint_1 = require("../../../../math/utils/random/randint");
 const log10Node_1 = require("../../../../tree/nodes/functions/log10Node");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const getLog10PowerSimplifyingQuestion = () => {
     const tenthPower = (0, randint_1.randint)(-6, 8, [1]);
     console.log("log10 power simp q");
@@ -38,8 +39,16 @@ const getHint = (nb) => {
 };
 const getCorrection = (tenthPower, nb) => {
     const powerTen = new powerNode_1.PowerNode((10).toTree(), tenthPower.toTree());
-    return `1 . On exprime $${nb.toTex()}$ en puissance de $10$ : $${nb.toTex()} = ${powerTen.toTex()}$ \n 
-  2 . On utilise la propriété $\\log(a^{b}) = b\\times \\log(a)$. On a alors $\\log(${nb.toTex()}) = \\log(${powerTen.toTex()}) = ${tenthPower}\\times \\log(10)  = ${tenthPower}$.
+    return `On exprime $${nb.toTex()}$ en puissance de $10$ :
+  ${(0, alignTex_1.alignTex)(`${nb.toTex()} = ${powerTen.toTex()}`)}
+  On utilise la propriété $\\log(a^{b}) = b\\times \\log(a)$.
+
+  On a alors
+  ${(0, alignTex_1.alignTex)([
+        [`\\log(${nb.toTex()})`, `= \\log(${powerTen.toTex()})`],
+        ["", `= ${tenthPower}\\times \\log(10)`],
+        ["", `= ${tenthPower}`],
+    ])}
   `;
 };
 const isAnswerValid = (ans, { answer, tenthPower }) => {
@@ -59,4 +68,5 @@ exports.log10PowerSimplifying = {
     isAnswerValid,
     maxAllowedQuestions: 10,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/trinoms/index.d.ts

@@ -15,4 +15,6 @@ export * from "./summitReading";
 export * from "./summitAbscissFromRoots";
 export * from "./summitAbscissFromDevForm";
 export * from "./trinomialMeanValue";
+export * from "./solveSecondDegreeEquationByFactorisation";
+export * from "./solveSecondDegreeEquationFromCano";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/functions/trinoms/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4CAA4C,CAAC;AAC3D,cAAc,qCAAqC,CAAC"}

package/lib/exercises/math/functions/trinoms/index.js

@@ -31,3 +31,5 @@ __exportStar(require("./summitReading"), exports);
 __exportStar(require("./summitAbscissFromRoots"), exports);
 __exportStar(require("./summitAbscissFromDevForm"), exports);
 __exportStar(require("./trinomialMeanValue"), exports);
+__exportStar(require("./solveSecondDegreeEquationByFactorisation"), exports);
+__exportStar(require("./solveSecondDegreeEquationFromCano"), exports);

package/lib/exercises/math/functions/trinoms/solveEquationByFactorisation.d.ts

@@ -0,0 +1,5 @@
+import { Exercise } from '../../../../exercises/exercise';
+type Identifiers = {};
+export declare const solveEquationByFactorisation: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=solveEquationByFactorisation.d.ts.map

package/lib/exercises/math/functions/trinoms/solveEquationByFactorisation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solveEquationByFactorisation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/solveEquationByFactorisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAGlC,KAAK,WAAW,GAAG,EAClB,CAAC;AA+BF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}

package/lib/exercises/math/functions/trinoms/solveEquationByFactorisation.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.solveEquationByFactorisation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const getSolveEquationByFactorisationQuestion = () => {
+    const question = {
+        answer,
+        instruction: ``,
+        keys: [],
+        answerFormat: 'tex',
+        identifiers: {}
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        throw Error("QCM not implemented");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    throw Error("VEA not implemented");
+};
+const isGGBAnswerValid = (ans, { ggbAnswer }) => {
+    throw Error("GGBVea not implemented");
+};
+exports.solveEquationByFactorisation = {
+    id: 'solveEquationByFactorisation',
+    connector: "",
+    label: "",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSolveEquationByFactorisationQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    isGGBAnswerValid,
+    subject: "Mathématiques"
+};

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.d.ts

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

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solveSecondDegreeEquationByFactorisation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,wCAAwC,EAAE,QAAQ,CAAC,WAAW,CAiB1E,CAAC"}

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.solveSecondDegreeEquationByFactorisation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const trinom_1 = require("../../../../math/polynomials/trinom");
+const randint_1 = require("../../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
+const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+/**
+ * Equation donnée sous forme ax^2 + bx ou bien forme développée d'une identité remarquable
+ * type 1 ax^2 + bx
+ * type 2 (ax+b)^2
+ * type 3 (ax-b)^2
+ * type 4 (ax+b)(ax-b)
+ */
+const getSolveSecondDegreeEquationByFactorisationQuestion = () => {
+    const type = (0, randint_1.randint)(1, 4);
+    let statement = "";
+    let roots = [];
+    let answer = "";
+    let a;
+    let b;
+    switch (type) {
+        case 1:
+            {
+                //ax^2 + bx
+                const trinom = new trinom_1.Trinom((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10), 0);
+                a = trinom.a;
+                b = trinom.b;
+                statement = trinom.toTex();
+                roots = trinom.getRootsNode();
+            }
+            break;
+        case 2:
+            {
+                //(ax+b)^2
+                a = (0, randint_1.randint)(-9, 10, [0]);
+                b = (0, randint_1.randint)(1, 10);
+                statement = new trinom_1.Trinom(a ** 2, 2 * a * b, b ** 2).toTex();
+                roots = [new rational_1.Rational(-b, a).simplify().toTree()];
+            }
+            break;
+        case 3:
+            {
+                //(ax-b)^2
+                a = (0, randint_1.randint)(-9, 10, [0]);
+                b = (0, randint_1.randint)(-9, 0, [0]);
+                statement = new trinom_1.Trinom(a ** 2, -2 * a * b, b ** 2).toTex();
+                roots = [new rational_1.Rational(b, a).simplify().toTree()];
+            }
+            break;
+        case 4:
+        default:
+            {
+                //(ax+b)(ax-b)
+                a = (0, randint_1.randint)(-9, 10, [0]);
+                b = (0, randint_1.randint)(1, 10);
+                statement = new trinom_1.Trinom(a ** 2, 0, -(b ** 2)).toTex();
+                roots = [b, -b].sort((a, b) => a - b).map((x) => x.toTree());
+            }
+            break;
+    }
+    const instruction = `Soit $f(x) = ${statement}$. Résoudre l'équation $f(x) = 0$.`;
+    answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots)).toTex();
+    const question = {
+        answer,
+        instruction,
+        keys: [...equationKeys_1.equationKeys],
+        answerFormat: "tex",
+        identifiers: { a, b, type },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const firstRoot = (0, randint_1.randint)(-10, 10);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode((0, coinFlip_1.coinFlip)()
+            ? [firstRoot.toTree()]
+            : [firstRoot, (0, randint_1.randint)(-10, 10, [firstRoot])]
+                .sort((a, b) => a - b)
+                .map((x) => x.toTree()))).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, type, a, b }) => {
+    let roots = [];
+    switch (type) {
+        case 1:
+            {
+                const trinom = new trinom_1.Trinom(a, b, 0);
+                roots = trinom.getRootsNode();
+            }
+            break;
+        case 2:
+            {
+                roots = [new rational_1.Rational(-b, a).simplify().toTree()];
+            }
+            break;
+        case 3:
+            {
+                roots = [new rational_1.Rational(b, a).simplify().toTree()];
+            }
+            break;
+        case 4:
+            {
+                roots = [b, -b].sort((a, b) => a - b).map((x) => x.toTree());
+            }
+            break;
+    }
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots), {
+        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
+    });
+    return answerTree.toAllValidTexs().includes(ans);
+};
+exports.solveSecondDegreeEquationByFactorisation = {
+    id: "solveSecondDegreeEquationByFactorisation",
+    connector: "\\iff",
+    label: "Résoudre une équation du second degré par factorisation",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSolveSecondDegreeEquationByFactorisationQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationFromCano.d.ts

@@ -0,0 +1,7 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    coeffs: number[];
+};
+export declare const solveSecondDegreeEquationFromCano: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=solveSecondDegreeEquationFromCano.d.ts.map

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationFromCano.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solveSecondDegreeEquationFromCano.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/solveSecondDegreeEquationFromCano.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAkDF,eAAO,MAAM,iCAAiC,EAAE,QAAQ,CAAC,WAAW,CAenE,CAAC"}

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationFromCano.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.solveSecondDegreeEquationFromCano = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
+const trinom_1 = require("../../../../math/polynomials/trinom");
+const randint_1 = require("../../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
+const discreteSetNode_1 = require("../../../../tree/nodes/sets/discreteSetNode");
+const getSolveSecondDegreeEquationFromCanoQuestion = () => {
+    const trinom = trinom_1.TrinomConstructor.randomCanonical();
+    const statement = trinom.getCanonicalForm().toTex();
+    const roots = trinom.getRootsNode();
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots)).toTex();
+    const question = {
+        answer,
+        instruction: `Soit $f(x) = ${statement}$. Résoudre l'équation $f(x) = 0$.`,
+        keys: [...equationKeys_1.equationKeys],
+        answerFormat: "tex",
+        identifiers: { coeffs: trinom.coefficients },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([(0, randint_1.randint)(-9, 0), (0, randint_1.randint)(1, 10)].map((e) => e.toTree()))).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, coeffs }) => {
+    const trinom = trinom_1.TrinomConstructor.fromCoeffs(coeffs);
+    const roots = trinom.getRootsNode();
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots), {
+        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
+    });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
+const isGGBAnswerValid = (ans, { ggbAnswer }) => {
+    throw Error("GGBVea not implemented");
+};
+exports.solveSecondDegreeEquationFromCano = {
+    id: "solveSecondDegreeEquationFromCano",
+    connector: "\\iff",
+    label: "Résoudre une équation du type $a(x-b)^2 + c = 0$",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSolveSecondDegreeEquationFromCanoQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    isGGBAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/geometry/vectors/scalarProductViaCoords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scalarProductViaCoords.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/scalarProductViaCoords.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"scalarProductViaCoords.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/scalarProductViaCoords.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

package/lib/exercises/math/geometry/vectors/scalarProductViaCoords.js

@@ -52,4 +52,5 @@ exports.scalarProductViaCoords = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -15,6 +15,7 @@ export * from "./primitive";
 export * from "./probaStat";
 export * from "./sequences";
 export * from "./sets";
+export * from "./spaceGeometry";
 export * from "./squareRoots";
 export * from "./trigonometry";
 export * from "./python";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/math/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/math/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}

package/lib/exercises/math/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./primitive"), exports);
 __exportStar(require("./probaStat"), exports);
 __exportStar(require("./sequences"), exports);
 __exportStar(require("./sets"), exports);
+__exportStar(require("./spaceGeometry"), exports);
 __exportStar(require("./squareRoots"), exports);
 __exportStar(require("./trigonometry"), exports);
 __exportStar(require("./python"), exports);

package/lib/exercises/math/percent/applyPercent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAsDF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAuB9C,CAAC"}
+{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AA6EF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}

package/lib/exercises/math/percent/applyPercent.js

@@ -14,14 +14,17 @@ const getApplyPercentQuestion = () => {
     let instruction = "";
     let ans = "";
     let ansNb = 0;
+    let cm = 0;
     const isUp = (0, coinFlip_1.coinFlip)();
     if (isUp) {
-        ansNb = (0, round_1.round)(randNbr * (1 + randPercent / 100), 2);
+        cm = 1 + randPercent / 100;
+        ansNb = (0, round_1.round)(randNbr * cm, 2);
         ans = (ansNb + "").replace(".", ",");
         instruction = `Appliquer une hausse de $${randPercent}\\%$ à $${randNbr}$.`;
     }
     else {
-        ansNb = (0, round_1.round)(randNbr * (1 - randPercent / 100), 2);
+        cm = 1 - randPercent / 100;
+        ansNb = (0, round_1.round)(randNbr * cm, 2);
         ans = (ansNb + "").replace(".", ",");
         instruction = `Appliquer une baisse de $${randPercent}\\%$ à $${randNbr}$.`;
     }
@@ -31,6 +34,20 @@ const getApplyPercentQuestion = () => {
         answer,
         keys: ["percent"],
         answerFormat: "tex",
+        hint: isUp
+            ? `Augmenter un nombre de $x\\%$ revient à le multiplier par $1 + \\frac{x}{100}$.`
+            : `Baisser un nombre de $x\\%$ revient à le multiplier par $1 - \\frac{x}{100}$.`,
+        correction: isUp
+            ? `Augmenter un nombre de $${randPercent}\\%$ revient à le multiplier par $1 + \\frac{${randPercent}}{100}$, c'est à dire par $${(0, round_1.round)(cm, 2).frenchify()}$.
+    
+On a donc $${randNbr}\\times ${(0, round_1.round)(cm, 2).frenchify()} = ${answer}$.
+
+    `
+            : `Baisser un nombre de $${randPercent}\\%$ revient à le multiplier par $1 - \\frac{${randPercent}}{100}$, c'est à dire par $${(0, round_1.round)(cm, 2).frenchify()}$.
+    
+On a donc $${randNbr}\\times ${(0, round_1.round)(cm, 2).frenchify()} = ${answer}$.
+
+    `,
         identifiers: { isUp, randNbr, randPercent },
     };
     return question;
@@ -76,4 +93,5 @@ exports.applyPercent = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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,EAST,MAAM,0BAA0B,CAAC;AAOlC,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;AAkHF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"probaFromTableNoContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableNoContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,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;AAmHF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}

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

@@ -62,10 +62,11 @@ const getProbaFromTableNoContextQuestion = () => {
         answer,
         instruction: `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}$.
     
-| | $B$ | $\\overline{B}$|
-|-|-|-|
-|$A$|${aCapB}|${aCapBBarre}|
-|$\\overline{A}$|${aBarreCapB}|${aBarreCapBBarre}|
+| | $B$ | $\\overline{B}$| Total
+|-|-|-|-|
+|$A$|${aCapB}|${aCapBBarre}|${aTotal}|
+|$\\overline{A}$|${aBarreCapB}|${aBarreCapBBarre}|${aBarreTotal}|
+|Total|${bTotal}|${bBarreTotal}|${total}|
     
     `,
         keys: [],

package/lib/exercises/math/sequences/arithmetic/arithmeticFindRandomTermFromTwoTerms.d.ts

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    rank1: number;
+    value1: number;
+    rank2: number;
+    value2: number;
+    rankAsked: number;
+};
+export declare const arithmeticFindRandomTermFromTwoTerms: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=arithmeticFindRandomTermFromTwoTerms.d.ts.map

package/lib/exercises/math/sequences/arithmetic/arithmeticFindRandomTermFromTwoTerms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arithmeticFindRandomTermFromTwoTerms.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/arithmeticFindRandomTermFromTwoTerms.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAqCF,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CAAC,WAAW,CAetE,CAAC"}