math-exercises 3.0.37 → 3.0.38

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]).toSimplificationString(),
+        ],
+    ])}`;
+};
 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/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;AAiBrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IAOjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IAGnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAqKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

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

@@ -38,11 +38,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 +59,17 @@ $$
 ${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: GetCorrection<Identifiers> = (identifiers) => {
+//   const { coeffs, order, variable } = identifiers;
+//   return `On additionne les termes en $${variable}^2$ entre eux, puis les termes en $${variable}$ entre eux, et enfin les nombres entre eux.
+// - ${coeffs[2].length<2 ? `` : ``}
+// -
+// - `
+// };
 const getReduceExpression = () => {
     const rand = randint(0, 7);
     let polynome1;
@@ -83,59 +90,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,
@@ -196,8 +152,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,

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"}

package/lib/exercises/math/functions/affines/algebricExpressionOfAffine.js

@@ -4,16 +4,56 @@ import { Affine, AffineConstructor } from "../../../../math/polynomials/affine.j
 import { randint } from "../../../../math/utils/random/randint.js";
 import { polynomialParser } from "../../../../tree/parsers/polynomialParser.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    return `Soit une fonction affine $f$ dont le coefficient directeur vaut $${a}$ et l'ordonnée à l'origine vaut $${b}$. 
+  
+Écrire l'expression algébrique de $f(x)$.`;
+};
+const getAnswer = (identifiers) => {
+    const f = new Affine(identifiers.a, identifiers.b);
+    return f.toTex();
+};
+const getHint = (identifiers) => {
+    return `L'expression algébrique d'une fonction affine est : 
+  
+$$
+f(x) = ax+b
+$$
+
+où $a$ est le coefficient directeur et $b$ l'ordonnée à l'origine.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b } = identifiers;
+    return `L'expression algébrique d'une fonction affine est : 
+  
+$$
+f(x) = ax+b
+$$
+
+où $a$ est le coefficient directeur et $b$ l'ordonnée à l'origine.
+  
+Ici, $a = ${a}$ et $b = ${b}$.
+
+Donc, l'expression algébrique de $f$ est : 
+
+$$
+f(x)=${getAnswer(identifiers)}
+$$`;
+};
 const getAlgebricExpressionOfAffineQuestion = () => {
     const f = AffineConstructor.random();
     const a = f.a;
     const b = f.b;
+    const identifiers = { a, b };
     const question = {
-        answer: f.toTex(),
-        instruction: `Soit une fonction affine $f$ dont le coefficient directeur vaut $${a}$ et l'ordonnée à l'origine vaut $${b}$. Écrire l'expression algébrique de $f(x)$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: { a, b },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -52,13 +92,16 @@ const generatePropositions = (a, b) => {
 export const algebricExpressionOfAffine = {
     id: "algebricExpressionOfAffine",
     label: "Écrire l'expression algébrique d'une fonction affine",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Fonctions affines"],
     generator: (nb) => getDistinctQuestions(getAlgebricExpressionOfAffineQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/integral/integralAffines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralAffines.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralAffines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAiFF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"integralAffines.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralAffines.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA6FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/functions/integral/integralAffines.js

@@ -1,31 +1,47 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { Trinom, TrinomConstructor } from "../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { IntegralNode } from "../../../../tree/nodes/functions/integralNode.js";
+const getInstruction = (identifiers) => {
+    const { lowerBound, upperBound, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const affine = trinom.derivate();
+    const integral = new IntegralNode(affine.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
+    return `Calculer : 
+  
+$$
+${integral}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBound, upperBound, trinomial } = identifiers;
+    const trinom = new Trinom(trinomial[0], trinomial[1], trinomial[2]);
+    const answer = (trinom.calculate(upperBound) - trinom.calculate(lowerBound))
+        .toTree()
+        .toTex();
+    return answer;
+};
 const getIntegralAffinesQuestion = () => {
     const trinomial = TrinomConstructor.random();
-    const affine = trinomial.derivate();
     let lowerBound = randint(-5, 5);
     let upperBound = randint(-5, 5);
     while (lowerBound >= upperBound) {
         lowerBound = randint(-5, 5);
         upperBound = randint(-5, 5);
     }
-    const integral = new IntegralNode(affine.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
-    const answer = (trinomial.calculate(upperBound) - trinomial.calculate(lowerBound))
-        .toTree()
-        .toTex();
+    const identifiers = {
+        lowerBound,
+        upperBound,
+        trinomial: [trinomial.a, trinomial.b, trinomial.c],
+    };
     const question = {
-        answer: answer,
-        instruction: `Calculer : $${integral}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            lowerBound,
-            upperBound,
-            trinomial: [trinomial.a, trinomial.b, trinomial.c],
-        },
+        identifiers,
     };
     return question;
 };
@@ -52,18 +68,18 @@ const getPropositions = (n, { answer, lowerBound, upperBound, trinomial }) => {
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    return numberVEA(ans, answer);
 };
 export const integralAffines = {
     id: "integralAffines",
     label: "Calcul d'intégrales de fonctions affines",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralAffinesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/functions/integral/integralTrinomials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integralTrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralTrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAuFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"integralTrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/integral/integralTrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAoGF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/math/functions/integral/integralTrinomials.js

@@ -1,8 +1,28 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { Polynomial, } from "../../../../math/polynomials/polynomial.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { IntegralNode } from "../../../../tree/nodes/functions/integralNode.js";
+const getInstruction = (identifiers) => {
+    const { lowerBound, upperBound, quadrinomial } = identifiers;
+    const quadrinomial1 = new Polynomial(quadrinomial);
+    const trinomial = quadrinomial1.derivate();
+    const integral = new IntegralNode(trinomial.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
+    return `Calculer : 
+
+$$
+${integral}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { lowerBound, upperBound, quadrinomial } = identifiers;
+    const quadrinomial1 = new Polynomial(quadrinomial);
+    const answer = (quadrinomial1.calculate(upperBound) - quadrinomial1.calculate(lowerBound))
+        .toTree()
+        .toTex();
+    return answer;
+};
 const getIntegralTrinomialsQuestion = () => {
     const quadCoeffs = [
         randint(-5, 5),
@@ -10,28 +30,23 @@ const getIntegralTrinomialsQuestion = () => {
         randint(-2, 3),
         randint(-5, 5, [0]),
     ];
-    const quadrinomial = new Polynomial(quadCoeffs);
-    const trinomial = quadrinomial.derivate();
     let lowerBound = randint(-3, 4);
     let upperBound = randint(-3, 4);
     while (lowerBound >= upperBound) {
         lowerBound = randint(-3, 4);
         upperBound = randint(-3, 4);
     }
-    const integral = new IntegralNode(trinomial.toTree(), lowerBound.toTree(), upperBound.toTree(), "x").toTex();
-    const answer = (quadrinomial.calculate(upperBound) - quadrinomial.calculate(lowerBound))
-        .toTree()
-        .toTex();
+    const identifiers = {
+        lowerBound,
+        upperBound,
+        quadrinomial: quadCoeffs,
+    };
     const question = {
-        answer: answer,
-        instruction: `Calculer : $${integral}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            lowerBound,
-            upperBound,
-            quadrinomial: quadrinomial.coefficients,
-        },
+        identifiers,
     };
     return question;
 };
@@ -58,18 +73,18 @@ const getPropositions = (n, { answer, lowerBound, upperBound, quadrinomial }) =>
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    return numberVEA(ans, answer);
 };
 export const integralTrinomials = {
     id: "integralTrinomials",
     label: "Calcul d'intégrales de fonctions trinômes",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Intégration"],
     generator: (nb) => getDistinctQuestions(getIntegralTrinomialsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAsKF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAiB1D,CAAC"}

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.js

@@ -4,25 +4,70 @@ import { Point } from "../../../../math/geometry/point.js";
 import { SquareRoot, } from "../../../../math/numbers/reals/real.js";
 import { distinctRandTupleInt } from "../../../../math/utils/random/randTupleInt.js";
 import { round } from "../../../../math/utils/round.js";
-import { SqrtNode } from "../../../../tree/nodes/functions/sqrtNode.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
-const getDistanceBetweenTwoPoints = () => {
-    const [coords1, coords2] = distinctRandTupleInt(2, 2, { from: -9, to: 10 });
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getInstruction = (identifiers) => {
+    const { coords1, coords2 } = identifiers;
+    let A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
+    let B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
+    return `Dans un repère orthonormé, soit deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. 
+    
+Calculer la distance $AB$.`;
+};
+const getAnswer = (identifiers) => {
+    const { coords1, coords2 } = identifiers;
     let A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
     let B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
     const answer = new SquareRoot(round(A.distanceTo(B) ** 2, 0))
         .simplify()
         .toTree()
         .toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    const A = new Point("A", "x_A".toTree(), "y_A".toTree());
+    const B = new Point("B", "x_B".toTree(), "y_B".toTree());
+    return `Dans un repère orthonormé, la distance entre deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$ est : 
+  
+$$
+AB = ${A.distanceToNode(B).toTex()}
+$$
+`;
+};
+const getCorrection = (identifiers) => {
+    const { coords1, coords2 } = identifiers;
+    let A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
+    let B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
+    const Ax = new Point("A", "x_A".toTree(), "y_A".toTree());
+    const Bx = new Point("B", "x_B".toTree(), "y_B".toTree());
+    return `Dans un repère orthonormé, la distance entre deux points $${Ax.toTexWithCoords()}$ et $${Bx.toTexWithCoords()}$ est : 
+  
+$$
+AB = ${Ax.distanceToNode(Bx).toTex()}
+$$
+
+Ici, on a donc : 
+
+${alignTex([
+        ["AB", "=", A.distanceToNode(B).toTex()],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
+const getDistanceBetweenTwoPoints = () => {
+    const [coords1, coords2] = distinctRandTupleInt(2, 2, { from: -9, to: 10 });
+    const identifiers = { coords1, coords2 };
     const question = {
-        instruction: `Dans un repère orthonormé, soit deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. 
-    
-Calculer la distance $AB$.`,
+        instruction: getInstruction(identifiers),
         startStatement: "AB",
-        answer,
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { coords1, coords2 },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -69,21 +114,19 @@ const getPropositions = (n, { answer, coords1, coords2 }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { coords1, coords2 }) => {
-    const A = new Point("A", new NumberNode(coords1[0]), new NumberNode(coords1[1]));
-    const B = new Point("B", new NumberNode(coords2[0]), new NumberNode(coords2[1]));
-    const answer = new SqrtNode(new NumberNode(round(A.distanceTo(B) ** 2, 0)), {
-        allowSimplifySqrt: true,
-    });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, coords1, coords2 }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const distanceBetweenTwoPoints = {
     id: "distanceBetweenTwoPoints",
     connector: "=",
     label: "Distance entre deux points",
-    levels: ["2nde", "1reESM"],
-    sections: ["Géométrie cartésienne"],
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getDistanceBetweenTwoPoints, nb),
     qcmTimer: 60,
@@ -91,4 +134,9 @@ export const distanceBetweenTwoPoints = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
+    getCorrection,
+    getHint,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/cartesian/midpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmFF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}
+{"version":3,"file":"midpoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/midpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA2IF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAgB1C,CAAC"}