math-exercises 2.2.3 → 2.2.5

package/lib/exercises/math/calcul/rounding/rounding.js

@@ -10,6 +10,8 @@ const shuffle_1 = require("../../../../utils/shuffle");
 /**
  * arrondi à l'unité
  */
+const ranks = ["unité", "dixième", "centième", "millième", "dix millième"];
+const ranksWithAu = ["à l'unité", "au dixième", "au centième", "au millième"];
 const instructions = [
     "Arrondir à l'unité :",
     "Arrondir au dixième :",
@@ -22,6 +24,7 @@ const getRoundQuestions = (opts) => {
     const dec = decimal_1.DecimalConstructor.random(0, 1000, precision);
     const decTex = dec.toTree().toTex();
     const answer = dec.round(precisionAsked).toTree().toTex();
+    const figureToLookAt = dec.getDigitAtRank(-(precisionAsked + 1));
     const question = {
         instruction: `${instructions[precisionAsked]} $${decTex}$`,
         startStatement: decTex,
@@ -33,6 +36,16 @@ const getRoundQuestions = (opts) => {
             decimal: dec.value,
             precision,
         },
+        hint: `Pour arrondir ${ranksWithAu[precisionAsked]}, on regarde le chiffre des ${ranks[precisionAsked + 1]}s. S'il est inférieur à $5$, on arrondit ${ranksWithAu[precisionAsked]} inférieur. S'il est supérieur à $5$, on arrondit ${ranksWithAu[precisionAsked]} supérieur.`,
+        correction: `Le chiffre des ${ranks[precisionAsked + 1]}s est $${figureToLookAt}$. 
+    
+${figureToLookAt < 5
+            ? `Puisque ${figureToLookAt} est inférieur à 5, on arrondit ${ranksWithAu[precisionAsked]} inférieur. 
+     
+Ainsi, en arrondissant ${ranksWithAu[precisionAsked]}, on a $${decTex} \\approx ${answer}$`
+            : `Puisque ${figureToLookAt} est supérieur à 5, on arrondit ${ranksWithAu[precisionAsked]} supérieur. 
+     
+Ainsi, en arrondissant ${ranksWithAu[precisionAsked]}, on a $${decTex} \\approx ${answer}$`}`,
     };
     return question;
 };
@@ -78,6 +91,7 @@ exports.roundToUnit = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };
 /**
  * arrondi à l'unité
@@ -95,6 +109,7 @@ exports.roundToDixieme = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };
 /**
  * arrondi à l'unité
@@ -112,6 +127,7 @@ exports.roundToCentieme = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };
 /**
  * arrondi à l'unité
@@ -129,6 +145,7 @@ exports.roundToMillieme = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };
 exports.allRoundings = {
     id: "allRoundings",
@@ -143,4 +160,5 @@ exports.allRoundings = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/distributivity/allIdentities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allIdentities.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/allIdentities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA6DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"allIdentities.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/allIdentities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA6DF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/allIdentities.js

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

package/lib/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.d.ts

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

package/lib/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonicalFormDevelopment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAsDF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canonicalFormDevelopment = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
+const trinom_1 = require("../../../../math/polynomials/trinom");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const getCanonicalFormDevelopmentQuestion = () => {
+    const trinom = trinom_1.TrinomConstructor.randomCanonical();
+    const answer = trinom.toTree().toTex();
+    const cano = trinom.getCanonicalForm();
+    const a = trinom.a;
+    const alpha = trinom.getAlpha();
+    const beta = trinom.getBeta();
+    const question = {
+        answer,
+        instruction: `Développer et réduire : $${cano.toTex()}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { coeffs: trinom.coefficients },
+        hint: "Développe d'abord le terme qui est au carré en te servant d'une identité remarquable.",
+        correction: `
+$${cano.toTex()}$
+
+$= ${new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a.toTree(), new affine_1.Affine(1, -alpha).square().toTree()), beta.toTree()).toTex()}$
+    
+$= ${answer}$
+    `,
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, trinom_1.TrinomConstructor.random({ min: -100, max: 100 }, { min: -100, max: 100 }, { min: -100, max: 100 }).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, coeffs }) => {
+    const trinom = trinom_1.TrinomConstructor.fromCoeffs(coeffs);
+    return trinom.toTree().toAllValidTexs().includes(ans);
+};
+exports.canonicalFormDevelopment = {
+    id: "canonicalFormDevelopment",
+    connector: "=",
+    label: "Développer une forme canonique $a(x-\\alpha)^2 + \\beta$",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCanonicalFormDevelopmentQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA6EF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA0GF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivity.js

@@ -5,7 +5,10 @@ const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const operatorComposition_1 = require("../../../../tree/utilities/operatorComposition");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getDoubleDistributivityQuestion = () => {
     const affines = affine_1.AffineConstructor.differentRandoms(2, undefined, {
@@ -13,8 +16,21 @@ const getDoubleDistributivityQuestion = () => {
     });
     const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].toTree());
     const answer = affines[0].multiply(affines[1]).toTree().toTex();
+    const subTerms = [
+        new multiplyNode_1.MultiplyNode(affines[0].a.toTree(), "x".toTree()),
+        affines[0].b.toTree(),
+        new multiplyNode_1.MultiplyNode(affines[1].a.toTree(), "x".toTree()),
+        affines[1].b.toTree(),
+    ];
+    const subMultiplications = [
+        new multiplyNode_1.MultiplyNode(subTerms[0], subTerms[2], { forceTimesSign: true }),
+        new multiplyNode_1.MultiplyNode(subTerms[0], subTerms[3], { forceTimesSign: true }),
+        new multiplyNode_1.MultiplyNode(subTerms[1], subTerms[2], { forceTimesSign: true }),
+        new multiplyNode_1.MultiplyNode(subTerms[1], subTerms[3], { forceTimesSign: true }),
+    ];
+    const statementTex = statementTree.toTex();
     const question = {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
+        instruction: `Développer et réduire : $${statementTex}$`,
         startStatement: statementTree.toTex(),
         answer,
         keys: ["x"],
@@ -23,6 +39,19 @@ const getDoubleDistributivityQuestion = () => {
             affine1Coeffs: affines[0].coefficients,
             affine2Coeffs: affines[1].coefficients,
         },
+        hint: "Multiplie chaque terme du premier facteur par chaque terme du second facteur, puis regroupe les termes similaires.",
+        correction: `
+${(0, alignTex_1.alignTex)([
+            [statementTex, "=", (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, subMultiplications).toTex()],
+            [
+                "",
+                "=",
+                (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, subMultiplications.map((e) => e.simplify())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+
+    `,
     };
     return question;
 };
@@ -72,4 +101,5 @@ exports.doubleDistributivity = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.d.ts

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

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doubleDistributivityWithCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAuGF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doubleDistributivityWithCoeff = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
+const trinom_1 = require("../../../../math/polynomials/trinom");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const alignTex_1 = require("../../../../utils/alignTex");
+const getDoubleDistributivityWithCoeffQuestion = () => {
+    const coeff = (0, randint_1.randint)(-10, 11, [-1, 0, 1]);
+    const affine1 = affine_1.AffineConstructor.random(undefined, {
+        excludes: [0],
+    });
+    const affine2 = affine_1.AffineConstructor.random(undefined, {
+        excludes: [0],
+    });
+    const statement = new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(coeff.toTree(), affine1.toTree()), affine2.toTree()).toTex();
+    const affine3 = affine1.times(coeff);
+    const answer = affine3.multiply(affine2).toTree().toTex();
+    const question = {
+        answer,
+        instruction: `Développer et réduire : $${statement}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            coeff,
+            affine1: affine1.coefficients,
+            affine2: affine2.coefficients,
+        },
+        hint: `Choisis deux facteurs de ce produit et multiplie les entre eux. Puis, multiplier le résultat obtenu par le troisième terme.`,
+        correction: `On commence par multiplier les deux premiers termes entre eux : 
+    
+${(0, alignTex_1.alignTex)(`${statement} = ${new multiplyNode_1.MultiplyNode(affine1.times(coeff).toTree(), affine2.toTree()).toTex()}`)}
+
+Puis, on utilise la double distributivité : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                new multiplyNode_1.MultiplyNode(affine3.toTree(), affine2.toTree()).toTex(),
+                "=",
+                new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new affine_1.Affine(affine3.a, 0).toTree(), new affine_1.Affine(affine2.a, 0).toTree()), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new affine_1.Affine(affine3.a, 0).toTree(), affine2.b.toTree()), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(affine3.b.toTree(), new affine_1.Affine(affine2.a, 0).toTree()), new multiplyNode_1.MultiplyNode(affine3.b.toTree(), affine2.b.toTree())))).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+    `,
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, trinom_1.TrinomConstructor.random({ min: -100, max: 100 }, { min: -100, max: 100 }, { min: -100, max: 100 })
+            .toTree()
+            .toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, affine1, affine2, coeff }) => {
+    const affine1Obj = affine_1.AffineConstructor.fromCoeffs(affine1);
+    const affine2Obj = affine_1.AffineConstructor.fromCoeffs(affine2);
+    const answerTree = affine1Obj.times(coeff).multiply(affine2Obj).toTree();
+    return answerTree.toAllValidTexs().includes(ans);
+};
+const isGGBAnswerValid = (ans, { ggbAnswer }) => {
+    throw Error("GGBVea not implemented");
+};
+exports.doubleDistributivityWithCoeff = {
+    id: "doubleDistributivityWithCoeff",
+    connector: "=",
+    label: "Développer une expression du type $a(bx+c)(dx+e)$",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDoubleDistributivityWithCoeffQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    isGGBAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/distributivity/firstIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAwBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAKvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAqDnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAKvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/firstIdentity.js

@@ -6,7 +6,10 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
 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");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getFirstIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random({
@@ -18,13 +21,28 @@ const getFirstIdentityQuestion = () => {
     });
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = affine.multiply(affine).toTree().toTex();
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    const statementTex = statementTree.toTex();
     const question = {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Développer et réduire : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: ["x"],
         answerFormat: "tex",
         identifiers: { a: affine.a, b: affine.b },
+        hint: `Utilise l'identité remarquable $(a+b)^2 = a^2 + 2ab+b^2$ en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$`,
+        correction: `
+On utilise l'identité remarquable $(a+b)^2 = a^2 + 2ab+b^2$ en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new addNode_1.AddNode(new addNode_1.AddNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, affine.b.toTree()))), new powerNode_1.SquareNode(affine.b.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+`,
     };
     return question;
 };
@@ -68,4 +86,5 @@ exports.firstIdentity = {
     getPropositions: exports.getFirstIdentityPropositions,
     isAnswerValid: exports.isFirstIdentityAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -4,4 +4,6 @@ export { firstIdentity } from "./firstIdentity";
 export { secondIdentity } from "./secondIdentity";
 export * from "./simpleDistributivity";
 export { thirdIdentity } from "./thirdIdentity";
+export * from "./doubleDistributivityWithCoeff";
+export * from "./canonicalFormDevelopment";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/index.js

@@ -24,3 +24,5 @@ Object.defineProperty(exports, "secondIdentity", { enumerable: true, get: functi
 __exportStar(require("./simpleDistributivity"), exports);
 var thirdIdentity_1 = require("./thirdIdentity");
 Object.defineProperty(exports, "thirdIdentity", { enumerable: true, get: function () { return thirdIdentity_1.thirdIdentity; } });
+__exportStar(require("./doubleDistributivityWithCoeff"), exports);
+__exportStar(require("./canonicalFormDevelopment"), exports);

package/lib/exercises/math/calculLitteral/distributivity/secondIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CAwBpE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAqCnE,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,WAAW,CAQxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAchD,CAAC"}
+{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CAiDpE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAqCnE,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,WAAW,CAQxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/secondIdentity.js

@@ -6,7 +6,11 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
 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");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getSecondIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random({
@@ -18,13 +22,29 @@ const getSecondIdentityQuestion = () => {
     });
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = affine.multiply(affine).toTree().toTex();
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    const bPositive = -affine.b;
+    const statementTex = statementTree.toTex();
     const question = {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Développer et réduire : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: ["x"],
         answerFormat: "tex",
         identifiers: { a: affine.a, b: affine.b },
+        hint: `Utilise l'identité remarquable $(a-b)^2 = a^2 - 2ab+b^2$ en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$`,
+        correction: `
+On utilise l'identité remarquable $(a-b)^2 = a^2 - 2ab+b^2$ en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new addNode_1.AddNode(new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, bPositive.toTree()))), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+`,
     };
     return question;
 };
@@ -70,4 +90,5 @@ exports.secondIdentity = {
     qcmTimer: 60,
     freeTimer: 60,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/distributivity/simpleDistributivity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAmDF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/simpleDistributivity.js

@@ -6,7 +6,9 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 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 alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getSimpleDistributivityQuestion = () => {
     const affine = affine_1.AffineConstructor.random(undefined, {
@@ -15,13 +17,25 @@ const getSimpleDistributivityQuestion = () => {
     const coeff = (0, randint_1.randint)(-10, 11, [-1, 0, 1]);
     const statementTree = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff), affine.toTree());
     const answer = affine.times(coeff).toTree().toTex();
+    const statementTex = statementTree.toTex();
     const question = {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Développer et réduire : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: ["x"],
         answerFormat: "tex",
         identifiers: { a: affine.a, b: affine.b, coeff: coeff },
+        hint: `Multiplie chaque terme dans la parenthèse par $${coeff}$.`,
+        correction: `
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(affine.a), "x".toTree())), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff), new numberNode_1.NumberNode(affine.b))).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+    `,
     };
     return question;
 };
@@ -59,4 +73,5 @@ exports.simpleDistributivity = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/distributivity/thirdIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAkBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAUvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAqCnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAUvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/thirdIdentity.js

@@ -5,15 +5,21 @@ const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const affine_1 = require("../../../../math/polynomials/affine");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getThirdIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random(undefined, { excludes: [0] });
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
     const answer = affine.multiply(affine2).toTree().toTex();
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    const bPositive = Math.abs(affine.b);
+    const statementTex = statementTree.toTex();
     const question = {
-        instruction: `Développer et réduire : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
+        instruction: `Développer et réduire : $${statementTex}$`,
+        startStatement: statementTex,
         answer,
         keys: ["x"],
         answerFormat: "tex",
@@ -21,6 +27,18 @@ const getThirdIdentityQuestion = () => {
             affine1Coeffs: affine.coefficients,
             affine2Coeffs: affine2.coefficients,
         },
+        hint: `Utilise l'identité remarquable $(a-b)(a+b) = a^2 - b^2$ en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$`,
+        correction: `
+On utilise l'identité remarquable $(a-b)(a+b) = a^2 - b^2$ en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}`,
     };
     return question;
 };
@@ -65,4 +83,5 @@ exports.thirdIdentity = {
     qcmTimer: 60,
     freeTimer: 60,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/equation/equationSimpleSquare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AA0BlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA4IF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AA0BlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwKF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationSimpleSquare.js

@@ -23,7 +23,7 @@ const higherFactor = (n) => {
     return 1;
 };
 const getEquationSimpleSquare = () => {
-    let randNbr = (0, randint_1.randint)(-20, 101);
+    let randNbr = (0, randint_1.randint)(-10, 101);
     const rand = (0, diceFlip_1.diceFlip)(3);
     if (rand === 0)
         randNbr = (0, randint_1.randint)(-20, 0);
@@ -34,6 +34,7 @@ const getEquationSimpleSquare = () => {
     const instruction = `Résoudre l'équation : $x^2 = ${randNbr}$`;
     const sqrt = Math.sqrt(randNbr);
     let solutionsSet;
+    let simplifiedRoot;
     if (randNbr < 0) {
         solutionsSet = new discreteSetNode_1.DiscreteSetNode([]);
     }
@@ -57,6 +58,29 @@ const getEquationSimpleSquare = () => {
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
         identifiers: { randNbr },
+        hint: `L'équation $x^2 = k$ : 
+    
+- n'admet pas de solution si $k<0$, 
+- admet une solution si $k=0$, qui est $0$
+- admet deux solutions si $k>0$ : $-\\sqrt{k}$ et $\\sqrt{k}$
+    `,
+        correction: `
+${randNbr < 0
+            ? `L'équation $x^2 = ${randNbr}$ n'admet pas de solution, car $${randNbr}$ est négatif. Ainsi, $${answer}$.`
+            : randNbr === 0
+                ? `L'équation $x^2 = 0$ admet une unique solution : $0$. En effet, $0$ est le seul nombre qui au carré est égal à $0$. Ainsi, $${answer}$.`
+                : `Puisque $${randNbr}>0$, l'équation $x^2 = ${randNbr}$ admet deux solutions : $-\\sqrt{${randNbr}}$ et $\\sqrt{${randNbr}}$. 
+    
+${new real_1.SquareRoot(randNbr).isSimplifiable()
+                    ? `Or, $\\sqrt{${randNbr}}=${new real_1.SquareRoot(randNbr)
+                        .simplify()
+                        .toTree()
+                        .toTex()}$.`
+                    : ""}
+
+Ainsi, $${answer}$.
+`}
+    `,
     };
     return question;
 };
@@ -138,4 +162,5 @@ exports.equationSimpleSquare = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/equation/equationType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4CF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"equationType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAalC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}