math-exercises 3.0.37 → 3.0.39

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.d.ts

@@ -5,6 +5,9 @@ type Identifiers = {
     denom1: number;
     denom2: number;
 };
-export declare const fractionsSumsMultiplesDenominators: Exercise<Identifiers>;
+type Options = {
+    allowNonIrreductible?: boolean;
+};
+export declare const fractionsSumsMultiplesDenominators: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=fractionsSumsMultiplesDenominators.d.ts.map

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA2FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAkBpE,CAAC"}
+{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AA2JF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CACvD,WAAW,EACX,OAAO,CAsBR,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.js

@@ -2,10 +2,69 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, GeneratorOptionTarget, G
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Rational, RationalConstructor, } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { round } from "../../../../math/utils/round.js";
+import { add, AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { rationalParser } from "../../../../tree/parsers/rationalParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getInstruction = (identifiers, opts) => {
+    const { num1, num2, denom1, denom2 } = identifiers;
+    const ratio1 = new Rational(num1, denom1);
+    const ratio2 = new Rational(num2, denom2);
+    const statement = new AddNode(ratio1.toTree(), ratio2.toTree()).toTex();
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+    
+$$
+${statement}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { num1, num2, denom1, denom2 } = identifiers;
+    const ratio1 = new Rational(num1, denom1);
+    const ratio2 = new Rational(num2, denom2);
+    const answer = ratio1.add(ratio2).toTree().toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    const { num1, num2, denom1, denom2 } = identifiers;
+    return `Pour additionner deux fractions, il faut les réduire au même dénominateur. Quel est le plus petit multiple commun entre $${denom1}$ et $${denom2}$ ?`;
+};
+const getCorrection = (identifiers) => {
+    const { num1, num2, denom1, denom2 } = identifiers;
+    const orderedDenums = [denom1, denom2].sort((a, b) => a - b);
+    const orderedNums = denom1 > denom2 ? [num2, num1] : [num1, num2];
+    const coeff = round(orderedDenums[1] / orderedDenums[0], 0);
+    return `Pour additionner deux fractions, il faut les réduire au même dénominateur. 
+  
+Puisque $${orderedDenums[0]}\\times ${coeff} = ${orderedDenums[1]}$, on peut mettre la fraction $${frac(orderedNums[0], orderedDenums[0]).toTex()}$ sur $${orderedDenums[1]}$ : 
+
+$$
+${multiply(frac(orderedNums[0], orderedDenums[0]), frac(coeff, coeff)).toTex()} = ${frac(orderedNums[0] * coeff, orderedDenums[1]).toTex()}
+$$
+
+On peut alors additionner les deux fractions : 
+
+${alignTex([
+        ["", add(frac(num1, denom1), frac(num2, denom2)).toTex()],
+        [
+            "=",
+            add(denom1 > denom2
+                ? frac(num1, denom1)
+                : frac(orderedNums[0] * coeff, orderedDenums[1]), denom1 > denom2
+                ? frac(orderedNums[0] * coeff, orderedDenums[1])
+                : frac(num2, denom2)).toTex(),
+        ],
+        [
+            "=",
+            frac(orderedNums[0] * coeff + orderedNums[1], orderedDenums[1]).toSimplificationTex(),
+        ],
+    ])}`;
+};
 const getFractionsSumsMultiplesDenominatorsQuestion = (opts) => {
     let denom1 = randint(2, 10);
     let denom2 = denom1 * randint(2, 10);
@@ -13,22 +72,15 @@ const getFractionsSumsMultiplesDenominatorsQuestion = (opts) => {
         [denom1, denom2] = [denom2, denom1];
     const num1 = randint(1, 10, [denom1]);
     const num2 = randint(1, 10, [denom2]);
-    const ratio1 = new Rational(num1, denom1);
-    const ratio2 = new Rational(num2, denom2);
-    const statement = new AddNode(ratio1.toTree(), ratio2.toTree()).toTex();
-    const answer = ratio1.add(ratio2).toTree().toTex();
+    const identifiers = { num1, num2, denom1, denom2 };
     const question = {
-        answer,
-        instruction: `Calculer ${opts?.allowNonIrreductible
-            ? ""
-            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
-    
-$$
-${statement}
-$$`,
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
         keys: [],
         answerFormat: "tex",
-        identifiers: { num1, num2, denom1, denom2 },
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
     };
     return question;
 };
@@ -74,9 +126,7 @@ export const fractionsSumsMultiplesDenominators = {
     id: "fractionsSumsMultiplesDenominators",
     connector: "=",
     label: "Sommes de fractions (avec dénominateurs multiples l'un de l'autre)",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb, opts) => getDistinctQuestions(() => getFractionsSumsMultiplesDenominatorsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -84,4 +134,9 @@ export const fractionsSumsMultiplesDenominators = {
     isAnswerValid,
     subject: "Mathématiques",
     options,
+    getInstruction,
+    getAnswer,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/fractions/simplifyFraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAWlD,CAAC"}
+{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgGF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAgBlD,CAAC"}

package/lib/exercises/math/calcul/fractions/simplifyFraction.js

@@ -1,7 +1,11 @@
 import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Rational, RationalConstructor, } from "../../../../math/numbers/rationals/rational.js";
+import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const getStatementNode = (identifiers) => {
     const { num, denum } = identifiers;
     const rational = new Rational(num, denum).toTree();
@@ -24,6 +28,32 @@ const getAnswer = (identifiers) => {
     const answer = rational.simplify().toTree().toTex();
     return answer;
 };
+const getHint = (identifiers) => {
+    return `Détermine le plus grand diviseur commun à $${identifiers.num}$ et $${identifiers.denum}$.
+  
+On peut alors simpfier la fraction par ce nombre.`;
+};
+const getCorrection = (identifiers) => {
+    const { num, denum } = identifiers;
+    const pgcd = gcd(num, denum);
+    const numDiv = num / pgcd;
+    const denumDiv = denum / pgcd;
+    return `Le plus grand diviseur commun à $${num}$ et $${denum}$ est $${pgcd}$. 
+
+En effet, on a $${num} = ${numDiv} \\times ${pgcd}$ et $${denum} = ${denumDiv} \\times ${pgcd}$.
+  
+On peut donc simplfier la fraction par $${pgcd}$ : 
+
+${alignTex([
+        [
+            frac(num, denum).toTex(),
+            "=",
+            frac(multiply(numDiv, pgcd.toTree({ toTexOptions: { cancel: true } })), multiply(denumDiv, pgcd.toTree({ toTexOptions: { cancel: true } }))).toTex(),
+        ],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
 const getSimplifyFraction = () => {
     const rational = RationalConstructor.randomSimplifiable(10);
     const identifiers = { num: rational.num, denum: rational.denum };
@@ -34,6 +64,8 @@ const getSimplifyFraction = () => {
         keys: [],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -65,4 +97,9 @@ export const simplifyFraction = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getCorrection,
+    getHint,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/rounding/rounding.d.ts

@@ -1,22 +1,25 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+type Options = {
+    precisionAsked: number;
+};
 type Identifiers = {
     precisionAsked: number;
     decimal: number;
     precision: number;
 };
-export declare const roundToUnit: Exercise<Identifiers>;
+export declare const roundToUnit: Exercise<Identifiers, Options>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToDixieme: Exercise<Identifiers>;
+export declare const roundToDixieme: Exercise<Identifiers, Options>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToCentieme: Exercise<Identifiers>;
+export declare const roundToCentieme: Exercise<Identifiers, Options>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToMillieme: Exercise<Identifiers>;
-export declare const allRoundings: Exercise<Identifiers>;
+export declare const roundToMillieme: Exercise<Identifiers, Options>;
+export declare const allRoundings: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=rounding.d.ts.map

package/lib/exercises/math/calcul/rounding/rounding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AA6ErC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAe7C,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAkB9C,CAAC"}
+{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4HF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBtD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBzD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB1D,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB1D,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBvD,CAAC"}

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

@@ -16,39 +16,61 @@ const instructions = [
     "Arrondir au centième :",
     "Arrondir au millième :",
 ];
-const getRoundQuestions = (opts) => {
-    244.8895;
-    const precisionAsked = opts?.precisionAsked || 0;
-    const precision = randint(precisionAsked + 1, precisionAsked + 5);
-    const dec = DecimalConstructor.random(0, 1000, precision);
+const getInstruction = (identifiers, opts) => {
+    const { precisionAsked } = identifiers;
+    const dec = new Decimal(identifiers.decimal);
     const decTex = dec.toTree().toTex();
+    return `${instructions[precisionAsked]} $${decTex}$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const { precisionAsked } = identifiers;
+    const dec = new Decimal(identifiers.decimal);
     const answer = dec.round(precisionAsked).toTree().toTex();
+    return answer;
+};
+const getHint = (identifiers, opts) => {
+    const { precisionAsked } = identifiers;
+    return `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 ou égal à $5$, on arrondit ${ranksWithAu[precisionAsked]} supérieur.`;
+};
+const getCorrection = (identifiers, opts) => {
+    const { precisionAsked } = identifiers;
+    const dec = new Decimal(identifiers.decimal);
+    const decTex = dec.toTree().toTex();
+    const answer = getAnswer(identifiers, opts);
     const figureToLookAt = dec.getDigitAtRank(-(precisionAsked + 1));
-    const question = {
-        instruction: `${instructions[precisionAsked]} $${decTex}$`,
-        startStatement: decTex,
-        answer,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: {
-            precisionAsked,
-            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}$. 
+    return `Le chiffre des ${ranks[precisionAsked + 1]}s est $${figureToLookAt}$. 
     
 ${figureToLookAt < 5
-            ? `Puisque $${figureToLookAt}$ est inférieur à $5$, on arrondit ${ranksWithAu[precisionAsked]} inférieur. 
+        ? `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. 
+        : `Puisque $${figureToLookAt}$ est supérieur ou égal à $5$, on arrondit ${ranksWithAu[precisionAsked]} supérieur. 
      
 Ainsi, en arrondissant ${ranksWithAu[precisionAsked]}, on a 
 
 $$
 ${decTex} \\approx ${answer}
-$$`}`,
+$$`}`;
+};
+const getRoundQuestions = (opts) => {
+    const precisionAsked = opts?.precisionAsked || 0;
+    const precision = randint(precisionAsked + 1, precisionAsked + 5);
+    const dec = DecimalConstructor.random(0, 1000, precision);
+    const decTex = dec.toTree().toTex();
+    const identifiers = {
+        precisionAsked,
+        decimal: dec.value,
+        precision,
+    };
+    const question = {
+        instruction: getInstruction(identifiers, opts),
+        startStatement: decTex,
+        answer: getAnswer(identifiers, opts),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
     };
     return question;
 };
@@ -82,8 +104,6 @@ export const roundToUnit = {
     id: "roundToUnit",
     connector: "\\approx",
     label: "Arrondir à l'unité",
-    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(() => getRoundQuestions({ precisionAsked: 0 }), nb),
     qcmTimer: 60,
@@ -92,6 +112,10 @@ export const roundToUnit = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
 };
 /**
  * arrondi à l'unité
@@ -100,8 +124,6 @@ export const roundToDixieme = {
     id: "roundToDixieme",
     connector: "\\approx",
     label: "Arrondir au dixième",
-    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(() => getRoundQuestions({ precisionAsked: 1 }), nb),
     qcmTimer: 60,
@@ -110,6 +132,10 @@ export const roundToDixieme = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
 };
 /**
  * arrondi à l'unité
@@ -118,8 +144,6 @@ export const roundToCentieme = {
     id: "roundToCentieme",
     connector: "\\approx",
     label: "Arrondir au centième",
-    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(() => getRoundQuestions({ precisionAsked: 2 }), nb),
     qcmTimer: 60,
@@ -128,6 +152,10 @@ export const roundToCentieme = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
 };
 /**
  * arrondi à l'unité
@@ -136,8 +164,6 @@ export const roundToMillieme = {
     id: "roundToMillieme",
     connector: "\\approx",
     label: "Arrondir au millième",
-    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(() => getRoundQuestions({ precisionAsked: 3 }), nb),
     qcmTimer: 60,
@@ -146,13 +172,15 @@ export const roundToMillieme = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
 };
 export const allRoundings = {
     id: "allRoundings",
     connector: "\\approx",
     label: "Arrondir un nombre décimal",
-    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(() => getRoundQuestions({ precisionAsked: randint(0, 4) }), nb),
     qcmTimer: 60,
@@ -161,4 +189,8 @@ export const allRoundings = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
 };

package/lib/exercises/math/calculLitteral/simplifying/reduceExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IAOjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IAGnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAqNF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}
+{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IAOjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IAGnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAqOF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAkBlD,CAAC"}

package/lib/exercises/math/calculLitteral/simplifying/reduceExpression.js

@@ -6,11 +6,13 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { square } from "../../../../tree/nodes/operators/powerNode.js";
+import { monom } from "../../../../tree/nodes/polynomials/monomNode.js";
 import { polynomialParser } from "../../../../tree/parsers/polynomialParser.js";
 import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
 import { random } from "../../../../utils/alea/random.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const rebuildIdentifiers = (oldids) => {
     if (oldids.variable)
         return oldids;
@@ -38,11 +40,7 @@ const getStatementNode = (identifiers) => {
             return multiply(c, square(variable));
     }));
     const shuffled = order.map((i) => nodes[i]);
-    // const polynome1 = new Polynomial(polynome1Coeffs, variable);
-    // const polynome2 = new Polynomial(polynome2Coeffs, variable);
     return operatorComposition(AddNode, shuffled);
-    // const statement = new AddNode(polynome1.toTree(), polynome2.toTree());
-    // return statement.deepShuffle({ nodeIdsToShuffle: [OperatorIds.add] });
 };
 const getStartStatement = (identifiers) => {
     return getStatementNode(identifiers).toTex();
@@ -63,6 +61,63 @@ $$
 ${getStartStatement(identifiers)}
 $$`;
 };
+const getHint = (identifiers) => {
+    const { coeffs, order, variable } = identifiers;
+    return `Additionne les termes en $${variable}^2$ entre eux, puis les termes en $${variable}$ entre eux, et enfin les nombres entre eux.`;
+};
+const getCorrection = (identifiers) => {
+    const { coeffs, order, variable } = identifiers;
+    const x2Count = coeffs[2].length;
+    const xCount = coeffs[1].length;
+    const nbCount = coeffs[0].length;
+    const xSimp = xCount === 0
+        ? ""
+        : xCount === 1
+            ? `$${monom(coeffs[1][0], 1, {
+                variable,
+            }).toTex()}$ est le seul terme en $${variable}$, on ne peut donc l'additionner avec aucun autre terme.`
+            : `On additionne les $${xCount}$ termes en $${variable}$ :
+  
+$$
+${operatorComposition(AddNode, coeffs[1].map((c) => monom(c, 1, { variable }).toTree())).toSimplificationTex()}
+$$`;
+    const x2Simp = x2Count === 0
+        ? ""
+        : x2Count === 1
+            ? `$${monom(coeffs[2][0], 2, {
+                variable,
+            }).toTex()}$ est le seul terme en $${square(variable).toTex()}$, on ne peut donc l'additionner avec aucun autre terme.`
+            : `On additionne les $${x2Count}$ termes en $${square(variable).toTex()}$ :
+
+$$
+${operatorComposition(AddNode, coeffs[2].map((c) => monom(c, 2, { variable }).toTree())).toSimplificationTex()}
+$$`;
+    const nbSimp = nbCount === 0
+        ? ""
+        : nbCount === 1
+            ? `$${coeffs[0][0]}$ est le seul nombre, on ne peut donc l'additionner avec aucun autre terme.`
+            : `On additionne les $${nbCount}$ nombres entre eux :
+
+$$
+${operatorComposition(AddNode, coeffs[0].map((c) => c.toTree())).toSimplificationTex()}
+$$`;
+    return `On additionne les termes en $${variable}^2$ entre eux, puis les termes en $${variable}$ entre eux, et enfin les nombres entre eux.
+
+${x2Count > 0 ? `- ${x2Simp}` : ""}
+
+${xCount > 0 ? `- ${xSimp}` : ""}
+
+${nbCount > 0 ? `- ${nbSimp}` : ""}
+
+
+Ainsi, on obtient :
+
+${alignTex([
+        ["", getStartStatement(identifiers)],
+        ["=", getAnswer(identifiers)],
+    ])}
+`;
+};
 const getReduceExpression = () => {
     const rand = randint(0, 7);
     let polynome1;
@@ -83,59 +138,8 @@ const getReduceExpression = () => {
         }
     }
     const order = shuffle(Array.from({ length: nbTerms }, (_, i) => i));
-    // switch (rand) {
-    //   case 0: // ax + b + cx + d
-    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
-    //     polynome2 = new Polynomial([randint(-5, 6, [0]), randint(-5, 6, [0])]);
-    //     break;
-    //   case 1: //ax+b + cx
-    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
-    //     polynome2 = new Polynomial([0, randint(-5, 6, [0])]);
-    //     break;
-    //   case 2: //ax+b+c
-    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
-    //     polynome2 = new Polynomial([randint(-5, 6, [0])]);
-    //     break;
-    //   case 3: //ax^2+bx+c + ax^2+bx
-    //     polynome1 = new Polynomial([
-    //       randint(-9, 10),
-    //       randint(-9, 10),
-    //       randint(-9, 10, [0]),
-    //     ]);
-    //     polynome2 = new Polynomial([0, randint(-5, 6), randint(-5, 6, [0])]);
-    //     break;
-    //   case 4: //ax^2+bx+c + ax^2
-    //     polynome1 = new Polynomial([
-    //       randint(-9, 10),
-    //       randint(-9, 10),
-    //       randint(-9, 10, [0]),
-    //     ]);
-    //     polynome2 = new Polynomial([0, 0, randint(-5, 6, [0])]);
-    //     break;
-    //   case 5: //ax^2+bx+c + ax
-    //     polynome1 = new Polynomial([
-    //       randint(-9, 10),
-    //       randint(-9, 10),
-    //       randint(-9, 10, [0]),
-    //     ]);
-    //     polynome2 = new Polynomial([0, randint(-5, 6, [0])]);
-    //     break;
-    //   case 6: //ax^2 +bx+c + c
-    //     polynome1 = new Polynomial([
-    //       randint(-9, 10),
-    //       randint(-9, 10),
-    //       randint(-9, 10, [0]),
-    //     ]);
-    //     polynome2 = new Polynomial([randint(-5, 6, [0])]);
-    //     break;
-    //   default:
-    //     throw Error("something went wrong");
-    // }
     const variable = random(["x", "n", "a", "y", "t"]);
     const identifiers = {
-        // rand,
-        // polynome1Coeffs: polynome1.coefficients,
-        // polynome2Coeffs: polynome2.coefficients,
         coeffs,
         variable,
         order,
@@ -150,6 +154,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [identifiers.variable],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -196,8 +202,6 @@ export const reduceExpression = {
     connector: "=",
     isSingleStep: false,
     label: "Réduire une expression",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro"],
-    sections: ["Calcul littéral"],
     generator: (nb) => getDistinctQuestions(getReduceExpression, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -208,4 +212,7 @@ export const reduceExpression = {
     getAnswer,
     getInstruction,
     getQuestionFromIdentifiers,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/affines/algebricExpressionOfAffine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"algebricExpressionOfAffine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/algebricExpressionOfAffine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6DF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAa5D,CAAC"}
+{"version":3,"file":"algebricExpressionOfAffine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/algebricExpressionOfAffine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqGF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAgB5D,CAAC"}