math-exercises 3.0.32 → 3.0.34

package/lib/exercises/math/conversion/hoursToSecond.js

@@ -0,0 +1,94 @@
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../exercises/vea/numberVEA.js";
+import { randint } from "../../../math/utils/random/randint.js";
+const getPropositions = (n, { answer, ...identifiers }) => {
+    const propositions = [];
+    const { hours, mins, seconds } = identifiers;
+    addValidProp(propositions, answer);
+    tryToAddWrongProp(propositions, hours * 60 + 60 * mins + seconds + "");
+    tryToAddWrongProp(propositions, seconds + "");
+    while (propositions.length < n) {
+        tryToAddWrongProp(propositions, randint(5000, 100000) + "");
+    }
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { hours, mins, seconds } = identifiers;
+    return hours * 3600 + 60 * mins + seconds + "";
+};
+const getInstruction = (identifiers) => {
+    const { hours, mins, seconds } = identifiers;
+    return `Combien y a-t-il de secondes dans $${hours}\\text{h } ${mins} \\text{min } ${seconds}\\text{s }$ ?`;
+};
+const getHint = (identifiers) => {
+    return `Dans une minute, il y a $60$ secondes. Dans une heure, il y a $60$ minutes.`;
+};
+const getCorrection = (identifiers) => {
+    const { hours, mins, seconds } = identifiers;
+    return `Dans une minute, il y a $60$ secondes. Donc, le nombre de secondes dans $${mins}$ minutes est :
+  
+$$
+60\\times ${mins} = ${60 * mins}
+$$
+
+Puis, dans une heure, il y a $60$ minutes, qui chacune compte $60$ secondes. Ainsi, dans une heure, il y a $60\\times 60 = 3600$ secondes. 
+
+Le nombre de secondes dans $${hours}$ heures est donc :
+  
+$$
+3600\\times ${hours} = ${3600 * hours}
+$$
+
+Au final, dans $${hours}\\text{h } ${mins} \\text{min } ${seconds}\\text{s }$, il y a donc : 
+
+$$
+${3600 * hours}+ ${60 * mins} + ${seconds} = ${getAnswer(identifiers)}
+$$
+
+secondes.
+`;
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return numberVEA(ans, answer);
+};
+const getHoursToSecondQuestion = (ops) => {
+    const hours = randint(1, 24);
+    const mins = randint(1, 60);
+    const seconds = randint(1, 60);
+    const identifiers = {
+        hours,
+        mins,
+        seconds,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+export const hoursToSecond = {
+    id: "hoursToSecond",
+    connector: "=",
+    label: "Convertir une durée en 'h min s' en secondes",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getHoursToSecondQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    hasHintAndCorrection: true,
+};

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

@@ -5,4 +5,5 @@ export * from "./massConversion.js";
 export * from "./volumeCapacityConversion.js";
 export * from "./volumeConversion.js";
 export * from "./hoursToDecimal.js";
+export * from "./hoursToSecond.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}

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

@@ -5,3 +5,4 @@ export * from "./massConversion.js";
 export * from "./volumeCapacityConversion.js";
 export * from "./volumeConversion.js";
 export * from "./hoursToDecimal.js";
+export * from "./hoursToSecond.js";

package/lib/exercises/math/dataRepresentations/pieChartReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pieChartReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/pieChartReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAuBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAuLF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAkBjD,CAAC"}
+{"version":3,"file":"pieChartReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/pieChartReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAyBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAgMF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAkBjD,CAAC"}

package/lib/exercises/math/dataRepresentations/pieChartReading.js

@@ -7,6 +7,7 @@ import { Point } from "../../../math/geometry/point.js";
 import { randfloat } from "../../../math/utils/random/randfloat.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { round } from "../../../math/utils/round.js";
+import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
 import { percentParser } from "../../../tree/parsers/percentParser.js";
 import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 import { getLetter } from "../../../utils/strings/getLetter.js";
@@ -37,7 +38,7 @@ const getInstruction = (identifiers) => {
   
 Quelle proportion des communications effectuées, les communications audio représentent-elles ?
   
-Arrondir au centième.`;
+Arrondir au centième de pourcentage.`;
 };
 // const getHint: GetHint<Identifiers> = (identifiers) => {};
 // const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
@@ -100,8 +101,18 @@ const getKeys = (identifiers) => {
 };
 const isAnswerValid = (ans, { answer }) => {
     try {
-        const parsed = percentParser(ans, true);
-        return parsed === answer;
+        //!à factoriser
+        //!pb est que parseAlgebraic ne gère pas encore les %
+        let parsed;
+        if (ans.includes("%")) {
+            parsed = percentParser(ans);
+            return parsed === answer;
+        }
+        else {
+            parsed = parseAlgebraic(ans);
+            const nbAns = answer.replace("\\%", "").unfrenchify();
+            return Math.abs(parsed.evaluate() - nbAns / 100) < 0.0001;
+        }
     }
     catch (err) {
         return handleVEAError(err);

package/lib/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAoBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAsIF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAiB9D,CAAC"}
+{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAoBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwKF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAmB9D,CAAC"}

package/lib/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.js

@@ -23,20 +23,48 @@ const rebuildIdentifiers = (oldIds) => {
 };
 const getInstruction = (identifiers) => {
     const { a, coin, racine1, racine2 } = identifiers;
-    return (`Soit $f$ la fonction représentée ci-dessous. Sur quel intervalle la dérivée de $f$ est-elle ` +
-        (coin < 0 ? "négative ?" : "positive ?"));
+    return `Soit $f$ la fonction représentée ci-dessous. 
+    
+Sur quel(s) intervalle(s) la fonction dérivée $f'$ de $f$ est-elle ${coin < 0 ? "négative" : "positive"} ?`;
 };
-const getAnswer = (identifiers) => {
+const getHint = (identifiers) => {
+    return `Si la fonction $f$ est croissante sur un intervalle, alors sa fonction dérivée $f'$ sera positive sur cet intervalle.
+  
+À l'inverse, si la fonction $f$ est décroissante sur un intervalle, alors sa fonction dérivée $f'$ sera négative sur cet intervalle.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, coin, racine1, racine2 } = identifiers;
+    const variation = coin < 0 ? "décroissante" : "croissante";
+    const sign = coin < 0 ? "négative" : "positive";
+    const intervals = getIntervalsSolution(identifiers);
+    return `Si la fonction $f$ est ${variation} sur un intervalle, alors sa fonction dérivée $f'$ sera ${sign} sur cet intervalle. 
+  
+Ici, on lit graphiquement que $f$ est ${variation} sur $${intervals[0].toTex()}$${intervals[1] ? ` et sur $${intervals[1].toTex()}$` : ""}.
+
+On en déduit que $f'$ est donc ${sign} sur : 
+
+$$
+${getAnswer(identifiers)}
+$$`;
+};
+const getIntervalsSolution = (identifiers) => {
     const { a, coin, racine1, racine2 } = identifiers;
     const racine1Tree = new NumberNode(racine1);
     const racine2Tree = new NumberNode(racine2);
-    const answer = coin * a < 0
-        ? new IntervalNode(racine1Tree, racine2Tree, ClosureType.FF).toTex()
-        : new UnionIntervalNode([
+    const intervals = coin * a < 0
+        ? [new IntervalNode(racine1Tree, racine2Tree, ClosureType.FF)]
+        : [
             new IntervalNode(MinusInfinityNode, racine1Tree, ClosureType.OF),
             new IntervalNode(racine2Tree, PlusInfinityNode, ClosureType.FO),
-        ]).toTex();
-    return answer;
+        ];
+    return intervals;
+};
+const getAnswer = (identifiers) => {
+    const intervals = getIntervalsSolution(identifiers);
+    if (intervals.length === 1)
+        return intervals[0].toTex();
+    else
+        return new UnionIntervalNode(intervals).toTex();
 };
 const getGGBOptions = (identifiers) => {
     const { a, coin, racine1, racine2, c } = identifiers;
@@ -81,6 +109,8 @@ const getThirdDegreeFunctionVariation = () => {
         answerFormat: "tex",
         ggbOptions: getGGBOptions(identifiers),
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -132,4 +162,7 @@ export const thirdDegreeFunctionVariation = {
     getAnswer,
     getGGBOptions,
     rebuildIdentifiers,
+    hasHintAndCorrection: true,
+    getHint,
+    getCorrection,
 };

package/lib/exercises/math/derivation/tangent/derivativeNumberReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/tangent/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAgJF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAmBzD,CAAC"}
+{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/tangent/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAkJF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAmBzD,CAAC"}

package/lib/exercises/math/derivation/tangent/derivativeNumberReading.js

@@ -36,7 +36,9 @@ const getInstruction = (identifiers) => {
     const xB = B[0];
     const yA = A[1];
     const yB = B[1];
-    return `Ci-dessous sont tracées la courbe $\\mathcal C_f$ de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer $f'(${xA})$.`;
+    return `Ci-dessous sont tracées la courbe $\\mathcal C_f$ de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.
+  
+Déterminer $f'(${xA})$.`;
 };
 const getAnswer = (identifiers) => {
     const { A, B } = identifiers;

package/lib/exercises/math/derivation/tangent/derivativeTangentEquationReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derivativeTangentEquationReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/tangent/derivativeTangentEquationReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,GAAG,CAAC;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA+PF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAmBlE,CAAC;;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG"}
+{"version":3,"file":"derivativeTangentEquationReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/tangent/derivativeTangentEquationReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAwBrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,GAAG,CAAC;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAiQF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAmBlE,CAAC;;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG"}

package/lib/exercises/math/derivation/tangent/derivativeTangentEquationReading.js

@@ -75,7 +75,9 @@ const getAnswer = ({ trinomCoeffs, xA, yA, yPrimeA, }) => {
     return new EqualNode("y".toTree(), getAnswerTree({ xA, yA, yPrimeA, trinomCoeffs })).toTex();
 };
 const getInstruction = ({ xA }) => {
-    return `Ci-dessous sont tracées la courbe $\\mathcal C_f$ de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer l'équation de cette tangente.`;
+    return `Ci-dessous sont tracées la courbe $\\mathcal C_f$ de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.
+  
+Déterminer l'équation de cette tangente.`;
 };
 const getHint = (identifiers) => {
     return `L'équation de la tangente à la courbe de $f$ au point d'abscisse $a$ est :

package/lib/exercises/math/derivation/tangent/tangentEquations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tangentEquations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/tangent/tangentEquations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAyEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"tangentEquations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/tangent/tangentEquations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

package/lib/exercises/math/derivation/tangent/tangentEquations.js

@@ -3,27 +3,85 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { Trinom, TrinomConstructor } from "../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
-import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
-import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { multiply, MultiplyNode, } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { substract, SubstractNode, } from "../../../../tree/nodes/operators/substractNode.js";
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
-const getTangentEquationQuestion = () => {
-    const trinome = TrinomConstructor.random();
-    const abscisse = randint(-10, 10);
-    const image = trinome.calculate(abscisse);
-    const derivee = trinome.derivate();
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getHint = (identifiers) => {
+    return `Si $f$ est une fonction dérivable en $a$, alors l'équation de la tangente à la courbe de $f$ au point d'abscisse $a$ est donné par: 
+  
+$$
+y = f'(a)(x-a)+f(a)
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { abscisse, trinome } = identifiers;
+    const trinom = new Trinom(trinome[0], trinome[1], trinome[2]);
+    const derivee = trinom.derivate();
     const imagederivee = derivee.calculate(abscisse);
+    const image = trinom.calculate(abscisse);
+    return `L'équation de la tangente à la courbe de $f$ au point d'abscisse $a$ est donné par: 
+  
+$$
+y = f'(a)(x-a)+f(a)
+$$
+
+Ici, on a $f'(x) = ${derivee
+        .toTree()
+        .toTex()}$, donc $f'(${abscisse}) = ${imagederivee}$. 
+
+D'autre part, $f(${abscisse}) = ${image}$.
+
+
+L'équation de la tangente en $${abscisse}$ est donc : 
+
+${alignTex([
+        [
+            "y",
+            "=",
+            add(multiply(imagederivee, substract("x", abscisse)), image).toTex(),
+        ],
+        ["", "=", getAnswer(identifiers).split("=")[1]],
+    ])}
+`;
+};
+const getAnswer = (identifiers) => {
+    const { abscisse, trinome } = identifiers;
+    const trinom = new Trinom(trinome[0], trinome[1], trinome[2]);
+    const derivee = trinom.derivate();
+    const imagederivee = derivee.calculate(abscisse);
+    const image = trinom.calculate(abscisse);
     const k = abscisse * imagederivee;
     const constante = k - image;
     const equation = new EqualNode(new VariableNode("y"), new SubstractNode(new MultiplyNode(imagederivee.toTree(), new VariableNode("x")), constante.toTree()).simplify());
-    const ans = equation.toTex();
+    return equation.toTex();
+};
+const getInstruction = (identifiers) => {
+    const { abscisse, trinome } = identifiers;
+    const trinom = new Trinom(trinome[0], trinome[1], trinome[2]);
+    return `Soit $f$ la fonction définie par : 
+  
+$$
+f(x) = ${trinom.toTree().toTex()}
+$$
+
+Déterminer l'équation de la tangente à la courbe de $f$ au point d'abscisse $${abscisse}$.`;
+};
+const getTangentEquationQuestion = () => {
+    const trinome = TrinomConstructor.random();
+    const abscisse = randint(-10, 10);
+    const identifiers = { abscisse, trinome: [trinome.a, trinome.b, trinome.c] };
     const question = {
-        answer: ans,
-        instruction: `Soit $f(x) = ${trinome
-            .toTree()
-            .toTex()}$. Déterminer l'équation de la tangente à la courbe de $f$ au point d'abscisse $${abscisse}$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["y", "x", "equal"],
         answerFormat: "tex",
-        identifiers: { abscisse, trinome: [trinome.a, trinome.b, trinome.c] },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -40,28 +98,39 @@ const getPropositions = (n, { answer }) => {
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer, abscisse, trinome }) => {
-    const trinome1 = new Trinom(trinome[0], trinome[1], trinome[2]);
-    const image1 = trinome1.calculate(abscisse);
-    const derivee1 = trinome1.derivate();
-    const imagederivee1 = derivee1.calculate(abscisse);
-    const k = abscisse * imagederivee1;
-    const constante = k - image1;
-    const equation1 = new EqualNode(new VariableNode("y"), new SubstractNode(new MultiplyNode(imagederivee1.toTree(), new VariableNode("x")), constante.toTree()).simplify());
-    const latexs = equation1.toAllValidTexs({
-        allowRawRightChildAsSolution: true,
-    });
-    return latexs.includes(ans);
+    try {
+        let valueAns = "";
+        const formated = ans.split("=");
+        if (formated.length === 1)
+            valueAns = formated[0];
+        else
+            valueAns = formated[1];
+        if (!valueAns)
+            return false;
+        const parsed = parseAlgebraic(valueAns);
+        return ("y=" +
+            parsed
+                .simplify({ towardsDistribute: true, forbidFactorize: true })
+                .toTex() ===
+            answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const tangentEquations = {
     id: "tangentEquations",
     label: "Déterminer l'équation d'une tangente",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Dérivation"],
     generator: (nb) => getDistinctQuestions(getTangentEquationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/affines/leadingCoefficient.d.ts

@@ -5,6 +5,9 @@ type Identifiers = {
     xB: number;
     yB: number;
 };
-export declare const leadingCoefficient: Exercise<Identifiers>;
+type Options = {
+    functionType?: string;
+};
+export declare const leadingCoefficient: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=leadingCoefficient.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA4EF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAiFF,KAAK,OAAO,GAAG;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAYF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB7D,CAAC"}

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

@@ -1,4 +1,4 @@
-import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
 import { randomColor } from "../../../../geogebra/colors.js";
@@ -35,9 +35,14 @@ const getGGBOptions = (identifiers) => {
         coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
     });
 };
-const getLeadingCoefficientQuestion = () => {
+const getLeadingCoefficientQuestion = (opts) => {
     let xA, yA, xB, yB;
-    [xA, yA] = [1, 2].map((el) => randint(-5, 6));
+    if (opts?.functionType === "Linéaires") {
+        xA = 0;
+        yA = 0;
+    }
+    else
+        [xA, yA] = [1, 2].map((el) => randint(-5, 6));
     xB = xA > 0 ? randint(xA - 4, 6, [xA]) : randint(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
     yB = yA > 0 ? randint(yA - 4, 6) : randint(-4, yA + 5);
     const identifiers = { xA, xB, yA, yB };
@@ -65,14 +70,22 @@ const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
 const isAnswerValid = (ans, { answer, xA, xB, yA, yB }) => {
     return rationalVEA(ans, answer);
 };
+const options = [
+    {
+        id: "functionType",
+        label: "Type de fonctions",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["Affines", "Linéaires", "Les deux"],
+        defaultValue: ["Les deux"],
+    },
+];
 export const leadingCoefficient = {
     id: "leadingCoefficient",
     connector: "=",
-    label: "Lire le coefficient directeur",
-    levels: ["3ème", "2nde", "1reESM", "2ndPro", "1rePro", "1reTech"],
+    label: "Lire le coefficient directeur d'une droite",
     isSingleStep: false,
-    sections: ["Droites", "Fonctions affines"],
-    generator: (nb) => getDistinctQuestions(getLeadingCoefficientQuestion, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getLeadingCoefficientQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -82,4 +95,5 @@ export const leadingCoefficient = {
     getAnswer,
     getInstruction,
     getGGBOptions,
+    options,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficientCalculV1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgDF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"leadingCoefficientCalculV1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficientCalculV1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA0GF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAe5D,CAAC"}

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

@@ -1,24 +1,56 @@
-import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
 import { Rational } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getLeadingCoefficientCalculV1Question = () => {
-    const [xA, yA] = [1, 2].map((el) => randint(-9, 10));
+const getInstruction = (identifiers, opts) => {
+    const { xA, yA, xB, yB } = identifiers;
+    const usePoints = opts?.usePoints;
+    const useLinear = opts?.useLinear;
+    const fctTex = `Soit $f$ une fonction ${useLinear ? "linéaire" : "affine"}`;
+    // const values = usePoints ?
+    const pointA = usePoints
+        ? `$A\\left(${xA};${yA}\\right)$`
+        : `$f\\left(${xA}\\right) = ${yA}$`;
+    const pointB = usePoints
+        ? `$B\\left(${xB};${yB}\\right)$`
+        : `$f\\left(${xB}\\right) = ${yB}$`;
+    if (opts?.useLinear) {
+        return `${fctTex} telle que ${usePoints
+            ? `le point ${pointB} appartient à la droite représentant $f$`
+            : pointB}.
+    
+Quel est le coefficient directeur de $f$ ?`;
+    }
+    return `${fctTex} telle que ${usePoints
+        ? `les points ${pointA} et ${pointB} appartiennent à la droite représentant $f$`
+        : `${pointA} et ${pointB}`}.
+  
+Quel est le coefficient directeur de $f$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { xA, yA, xB, yB } = identifiers;
+    const answer = new Rational(yB - yA, xB - xA).simplify().toTree().toTex();
+    return answer;
+};
+const getLeadingCoefficientCalculV1Question = (opts) => {
+    const useLinear = opts?.useLinear;
+    const [xA, yA] = useLinear ? [0, 0] : [1, 2].map((el) => randint(-9, 10));
     const xB = randint(-9, 10, [xA]);
     const yB = randint(-9, 10);
-    const answer = new Rational(yB - yA, xB - xA).simplify().toTree().toTex();
+    const identifiers = { xA, xB, yA, yB };
     const question = {
-        instruction: `Soit $f$ une fonction affine telle que $f(${xA})$ = $${yA}$ et $f(${xB})$ = $${yB}$.$\\\\$Quel est le coefficient directeur de $f$ ?`,
+        instruction: getInstruction(identifiers, opts),
         startStatement: "a",
-        answer,
+        answer: getAnswer(identifiers, opts),
         answerFormat: "tex",
         keys: [],
-        identifiers: { xA, xB, yA, yB },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+const getPropositions = (n, { answer, xA, xB, yA, yB }, opts) => {
     const propositions = [];
     addValidProp(propositions, answer);
     while (propositions.length < n) {
@@ -30,24 +62,37 @@ const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
-    const answer = new Rational(yB - yA, xB - xA)
-        .simplify()
-        .toTree({ allowFractionToDecimal: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, xA, xB, yA, yB }) => {
+    return rationalVEA(ans, answer);
 };
+const options = [
+    {
+        id: "useLinear",
+        label: "Utiliser des fonctions linéaires",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.checkbox,
+        defaultValue: false,
+    },
+    {
+        id: "usePoints",
+        label: "Utiliser des points plutôt que des images",
+        target: GeneratorOptionTarget.instruction,
+        type: GeneratorOptionType.checkbox,
+        defaultValue: false,
+    },
+];
 export const leadingCoefficientCalculV1 = {
     id: "leadingCoefficientCalculV1",
     connector: "=",
-    label: "Calculer le coefficient directeur d'une fonction affine",
-    levels: ["3ème", "2nde", "2ndPro", "1rePro", "1reTech"],
+    label: "Calculer le coefficient directeur à l'aide d'images/de points",
     isSingleStep: true,
-    sections: ["Fonctions affines", "Droites"],
-    generator: (nb) => getDistinctQuestions(getLeadingCoefficientCalculV1Question, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getLeadingCoefficientCalculV1Question(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    options,
+    getInstruction,
+    getAnswer,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgDF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgDF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAe5D,CAAC"}

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

@@ -39,7 +39,7 @@ const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
 export const leadingCoefficientCalculV2 = {
     id: "leadingCoefficientCalculV2",
     connector: "=",
-    label: "Coefficient directeur à l'aide de deux points",
+    label: "Calculer le coefficient directeur d'une fonction affine à l'aide de deux points",
     levels: ["3ème", "2nde", "2ndPro", "1rePro", "1reTech"],
     isSingleStep: false,
     sections: ["Droites", "Fonctions affines"],

package/lib/exercises/math/functions/parity/parityFromGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parityFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/parity/parityFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4GF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}
+{"version":3,"file":"parityFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/parity/parityFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAyGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}