math-exercises 3.0.187 → 3.0.188

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

@@ -200,10 +200,15 @@ const getPropositions = (n, { answer, ...identifiers }) => {
     {
         const nodeX = "x".toTree();
         const nodeTWrong = add(multiply(nodeValueDerivative, nodeX), nodeValueImage);
-        const texWrong = `y = ${nodeTWrong
-            .simplify({ towardsDistribute: true, forbidFactorize: true })
-            .toTex()}`;
-        tryToAddWrongProp(propositionsMandatory, texWrong);
+        try {
+            const texWrong = `y = ${nodeTWrong
+                .simplify({ towardsDistribute: true, forbidFactorize: true })
+                .toTex()}`;
+            tryToAddWrongProp(propositionsMandatory, texWrong);
+        }
+        catch (_) {
+            (() => { })();
+        }
     }
     //filler
     const propositionsFiller = [];
@@ -222,10 +227,15 @@ const getPropositions = (n, { answer, ...identifiers }) => {
         ].forEach(([nodeXAskedWrong, nodeValueImageWrong, nodeValueDerivativeWrong]) => {
             const nodeX = "x".toTree();
             const nodeTWrong = add(multiply(nodeValueDerivativeWrong, substract(nodeX, nodeXAskedWrong)), nodeValueImageWrong);
-            const texWrong = `y = ${nodeTWrong
-                .simplify({ towardsDistribute: true, forbidFactorize: true })
-                .toTex()}`;
-            tryToAddWrongProp(propositionsFiller, texWrong);
+            try {
+                const texWrong = `y = ${nodeTWrong
+                    .simplify({ towardsDistribute: true, forbidFactorize: true })
+                    .toTex()}`;
+                tryToAddWrongProp(propositionsFiller, texWrong);
+            }
+            catch (_) {
+                (() => { })();
+            }
         });
     }
     propWhile(propositionsFiller, n, () => {
@@ -288,7 +298,11 @@ const isIdentifiersQCPassed = (identifiers) => {
         }
         return isExploding;
     };
-    return !isExploding(identifiers);
+    const isVEAOk = (identifiers) => {
+        const answer = getAnswer(identifiers);
+        return isAnswerValid(answer, { answer, ...identifiers });
+    };
+    return !isExploding(identifiers) && isVEAOk(identifiers);
 };
 const getTangentEquationFromFunctionExpressionQuestion = (optsIn) => {
     const arrayedOptions = optsIn ?? arrayedOptsDefault;

package/lib/exercises/math/derivation/variations/findAbscissaOfExtremaFromFunctionExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findAbscissaOfExtremaFromFunctionExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/variations/findAbscissaOfExtremaFromFunctionExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AA4R7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA2LF,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyCF,eAAO,MAAM,2CAA2C,EAAE,QAAQ,CAChE,WAAW,EACX,OAAO,CAqBR,CAAC"}
+{"version":3,"file":"findAbscissaOfExtremaFromFunctionExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/variations/findAbscissaOfExtremaFromFunctionExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AA4R7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA2LF,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAoCF,eAAO,MAAM,2CAA2C,EAAE,QAAQ,CAChE,WAAW,EACX,OAAO,CAqBR,CAAC"}

package/lib/exercises/math/derivation/variations/findAbscissaOfExtremaFromFunctionExpression.js

@@ -371,13 +371,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
     };
 };
 const arrayedOptsDefault = {
-    typeF: [
-        "polynôme (degré $2$)",
-        "polynôme (degré $3$)",
-        "$\\frac{ax^2+bx+c}{dx+m}$",
-        "$\\frac{dx+m}{ax^2+bx+c}$",
-    ],
-    typeRoots: ["entières", "rationnelles"],
+    typeF: ["polynôme (degré $2$)", "polynôme (degré $3$)"],
+    typeRoots: ["entières"],
 };
 const options = [
     {

package/lib/exercises/math/derivation/variations/findExtremaFromFunctionExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findExtremaFromFunctionExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/variations/findExtremaFromFunctionExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AA+R7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAwUF,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyCF,eAAO,MAAM,iCAAiC,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqB1E,CAAC"}
+{"version":3,"file":"findExtremaFromFunctionExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/variations/findExtremaFromFunctionExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AA+R7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAwUF,KAAK,OAAO,GAAG;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAoCF,eAAO,MAAM,iCAAiC,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqB1E,CAAC"}

package/lib/exercises/math/derivation/variations/findExtremaFromFunctionExpression.js

@@ -498,13 +498,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
     };
 };
 const arrayedOptsDefault = {
-    typeF: [
-        "polynôme (degré $2$)",
-        "polynôme (degré $3$)",
-        "$\\frac{ax^2+bx+c}{dx+m}$",
-        "$\\frac{dx+m}{ax^2+bx+c}$",
-    ],
-    typeRoots: ["entières", "rationnelles"],
+    typeF: ["polynôme (degré $2$)", "polynôme (degré $3$)"],
+    typeRoots: ["entières"],
 };
 const options = [
     {

package/lib/exercises/math/functions/sign/equationFromSignTable.d.ts

@@ -8,6 +8,7 @@ type Identifiers = {
 };
 type Options = {
     questionType: string;
+    functionType: string;
 };
 export declare const equationFromSignTable: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/functions/sign/equationFromSignTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationFromSignTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/equationFromSignTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAUrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,EAAE,EAAE,eAAe,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAuQF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBhE,CAAC"}
+{"version":3,"file":"equationFromSignTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/equationFromSignTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAUrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,EAAE,EAAE,eAAe,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAwRF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAsBhE,CAAC"}

package/lib/exercises/math/functions/sign/equationFromSignTable.js

@@ -6,7 +6,7 @@ import { EquationSolutionNode } from "../../../../tree/nodes/equations/equationS
 import { InequationSolutionNode } from "../../../../tree/nodes/inequations/inequationSolutionNode.js";
 import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
 import { MinusInfinityNode, PlusInfinityNode, } from "../../../../tree/nodes/numbers/infiniteNode.js";
-import { ClosureType } from "../../../../tree/nodes/sets/closure.js";
+import { Closure } from "../../../../tree/nodes/sets/closure.js";
 import { DiscreteSetNode } from "../../../../tree/nodes/sets/discreteSetNode.js";
 import { IntervalNode } from "../../../../tree/nodes/sets/intervalNode.js";
 import { UnionIntervalNode } from "../../../../tree/nodes/sets/unionIntervalNode.js";
@@ -38,38 +38,32 @@ const getIntervalsSolution = (identifiers) => {
     const xNodes = xs.map((e) => reifyAlgebraic(e));
     const isSup = inequation.isSup;
     const isStrict = inequation.isStrict;
-    if (isSup) {
-        if (signs[0] === "+") {
-            return [
-                new IntervalNode(xNodes[0], xNodes[1], isStrict ? ClosureType.OO : ClosureType.OF),
-                new IntervalNode(xNodes[2], xNodes[3], isStrict ? ClosureType.OO : ClosureType.FO),
-            ];
-        }
-        else {
-            return [
-                new IntervalNode(xNodes[1], xNodes[2], isStrict ? ClosureType.OO : ClosureType.FF),
-            ];
-        }
+    const rawSigns = signs.filter((s) => s !== "0");
+    const rightSignIndexes = [];
+    for (let i = 0; i < rawSigns.length; i++) {
+        if (isSup === (rawSigns[i] === "+"))
+            rightSignIndexes.push(i);
     }
-    else {
-        if (signs[0] === "-") {
-            return [
-                new IntervalNode(xNodes[0], xNodes[1], isStrict ? ClosureType.OO : ClosureType.OF),
-                new IntervalNode(xNodes[2], xNodes[3], isStrict ? ClosureType.OO : ClosureType.FO),
-            ];
-        }
-        else {
-            return [
-                new IntervalNode(xNodes[1], xNodes[2], isStrict ? ClosureType.OO : ClosureType.FF),
-            ];
-        }
+    const intervals = [];
+    for (let i = 0; i < rightSignIndexes.length; i++) {
+        const index = rightSignIndexes[i];
+        const start = xNodes[index];
+        const end = xNodes[index + 1];
+        const leftOpen = index === 0 || isStrict;
+        const rightOpen = index === rawSigns.length - 1 || isStrict;
+        intervals.push(new IntervalNode(start, end, Closure.fromBooleans(!leftOpen, !rightOpen)));
     }
+    return intervals;
 };
 const getAnswerNode = (identifiers) => {
     const { xs, type } = identifiers;
     const xNodes = xs.map((e) => reifyAlgebraic(e));
     if (type === 0) {
-        return new EquationSolutionNode(new DiscreteSetNode([xNodes[1], xNodes[2]]));
+        if (xs.length === 3)
+            return new EquationSolutionNode(new DiscreteSetNode([xNodes[1]]));
+        if (xs.length === 4)
+            return new EquationSolutionNode(new DiscreteSetNode([xNodes[1], xNodes[2]]));
+        return new EquationSolutionNode(new DiscreteSetNode([xNodes[1], xNodes[2], xNodes[3]]));
     }
     else {
         const intervals = getIntervalsSolution(identifiers);
@@ -126,7 +120,12 @@ const getCorrection = (identifiers) => {
     const { xs, type, ineqSymbol } = identifiers;
     const xNodes = xs.map((e) => reifyAlgebraic(e));
     if (type === 0) {
-        return `D'après le tableau de signes de $f$, les antécédents de $0$ par $f$ sont $${xNodes[1].toTex()}$ et $${xNodes[2].toTex()}$.
+        const corr = xNodes.length === 5
+            ? `D'après le tableau de signes de $f$, les antécédents de $0$ par $f$ sont $${xNodes[1].toTex()}$, $${xNodes[2].toTex()}$ et $${xNodes[3].toTex()}$.`
+            : xNodes.length === 4
+                ? `D'après le tableau de signes de $f$, les antécédents de $0$ par $f$ sont $${xNodes[1].toTex()}$ et $${xNodes[2].toTex()}$.`
+                : `D'après le tableau de signes de $f$, l'antécédent de $0$ par $f$ est $${xNodes[1].toTex()}$.`;
+        return `${corr}
     
 L'ensemble des solutions de $f(x)=0$ est donc :
 
@@ -152,12 +151,28 @@ ${getAnswer(identifiers)}
 $$`;
 };
 const getReadSignTableQuestion = (opts) => {
-    const a = randint(-10, 0);
-    const b = randint(0, 10);
-    const xs = [MinusInfinityNode, a.toTree(), b.toTree(), PlusInfinityNode];
+    const x1 = randint(-9, 10);
+    const x2 = randint(-9, 10, [x1]);
+    const x3 = randint(-9, 10, [x1, x2]);
+    const sorted = [x1, x2, x3].sort((a, b) => a - b);
+    const functionType = opts?.functionType === "Affine"
+        ? 0
+        : opts?.functionType === "Degré $3$"
+            ? 2
+            : 1;
+    const roots = functionType === 0
+        ? [x1]
+        : functionType === 1
+            ? [sorted[0], sorted[1]]
+            : sorted;
+    const xs = [
+        MinusInfinityNode,
+        ...roots.map((e) => e.toTree()),
+        PlusInfinityNode,
+    ];
     const signs = coinFlip()
-        ? ["+", "0", "-", "0", "+"]
-        : ["-", "0", "+", "0", "-"];
+        ? ["+", "0", "-", "0", "+", "0", "-"]
+        : ["-", "0", "+", "0", "-", "0", "+"];
     const type = !opts?.questionType || opts.questionType === "Les deux"
         ? randint(0, 2)
         : opts.questionType === "Inéquations"
@@ -168,7 +183,11 @@ const getReadSignTableQuestion = (opts) => {
         type,
         ineqSymbol,
         xs: xs.map((e) => e.toIdentifiers()),
-        signs,
+        signs: functionType === 0
+            ? signs.slice(0, 3)
+            : functionType === 1
+                ? signs.slice(0, 5)
+                : signs,
     };
     return getQuestionFromIdentifiers(identifiers, opts);
 };
@@ -206,6 +225,14 @@ const options = [
         defaultValue: "Les deux",
         values: ["Équation $f(x) = 0$", "Inéquations", "Les deux"],
     },
+    {
+        id: "functionType",
+        label: "Type de fonction",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["Affine", "Degré $2$", "Degré $3$"],
+        defaultValue: "Degré $2$",
+    },
 ];
 const getQuestionFromIdentifiers = (identifiers, opts) => {
     return {

package/lib/exercises/math/functions/sign/partialSignTableFromGraph.d.ts

@@ -1,12 +1,14 @@
 import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
-    initTable: string[][];
     a: number;
     x1: number;
-    x2: number;
-    x3: number;
+    x2?: number;
+    x3?: number;
     lineAsked: number;
 };
-export declare const partialSignTableFromGraph: Exercise<Identifiers>;
+type Options = {
+    functionType: string;
+};
+export declare const partialSignTableFromGraph: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=partialSignTableFromGraph.d.ts.map

package/lib/exercises/math/functions/sign/partialSignTableFromGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"partialSignTableFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/partialSignTableFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmJF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAoB3D,CAAC"}
+{"version":3,"file":"partialSignTableFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/partialSignTableFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAoPF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAWF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqBpE,CAAC"}

package/lib/exercises/math/functions/sign/partialSignTableFromGraph.js

@@ -1,4 +1,6 @@
+import { GeneratorOptionTarget, GeneratorOptionType, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { signTableVEA } from "../../../../exercises/vea/signTableVEA.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { randfloat } from "../../../../math/utils/random/randfloat.js";
 import { randint } from "../../../../math/utils/random/randint.js";
@@ -15,35 +17,73 @@ Repère ensuite les points de la courbe à l'intersection de l'axe des abscisses
 };
 const getCorrection = (identifiers) => {
     const { a, x1, x2, x3 } = identifiers;
-    const signs = a > 0
-        ? ["négatif", "positif", "négatif", "positif"]
-        : ["positif", "négatif", "positif", "négatif"];
-    return `On lit graphiquement que $f(x)$ s'annule pour les valeurs de $x$ suivantes : $${x1}$, $${x2}$ et $${x3}$. 
+    const rootsNb = x2 === undefined ? 1 : x3 === undefined ? 2 : 3;
+    const signs = rootsNb === 1
+        ? a > 0
+            ? ["-", "+"]
+            : ["+", "-"]
+        : rootsNb === 2
+            ? a > 0
+                ? ["+", "-", "+"]
+                : ["-", "+", "-"]
+            : a > 0
+                ? ["-", "+", "-", "+"]
+                : ["+", "-", "+", "-"];
+    const signWords = signs.map((e) => (e === "-" ? "négatif" : "positif"));
+    return rootsNb === 1
+        ? `On lit graphiquement que $f(x)$ s'annule pour $x$ valant $${x1}$.
   
-De plus, $f(x)$ est ${signs[0]} pour $x \\in ]-\\infty;${x1}]$, puis ${signs[1]} pour $x \\in [${x1}, ${x2}]$, puis ${signs[2]} pour $x \\in [${x2}, ${x3}]$, et enfin ${signs[3]} pour $x \\in [${x3}, +\\infty[$.`;
+De plus, $f(x)$ est ${signWords[0]} pour $x \\in ]-\\infty;${x1}]$, puis ${signWords[1]} pour  $x \\in [${x1}, +\\infty[$.`
+        : rootsNb === 2
+            ? `On lit graphiquement que $f(x)$ s'annule pour $x$ valant $${x1}$ et $${x2}$. 
+  
+De plus, $f(x)$ est ${signWords[0]} pour $x \\in ]-\\infty;${x1}]$, puis ${signWords[1]} pour $x \\in [${x1}, ${x2}]$, puis ${signWords[2]} pour $x \\in [${x2}, +\\infty[$.`
+            : `On lit graphiquement que $f(x)$ s'annule pour les valeurs de $x$ suivantes : $${x1}$, $${x2}$ et $${x3}$. 
+  
+De plus, $f(x)$ est ${signWords[0]} pour $x \\in ]-\\infty;${x1}]$, puis ${signWords[1]} pour $x \\in [${x1}, ${x2}]$, puis ${signWords[2]} pour $x \\in [${x2}, ${x3}]$, et enfin ${signWords[3]} pour $x \\in [${x3}, +\\infty[$.`;
 };
 const getGGBOptions = (identifiers) => {
     const { a, x1, x2, x3 } = identifiers;
     const ggb = new GeogebraConstructor({
-        commands: [`f(x) = ${a}*(x-${x1})*(x-${x2})*(x-${x3})`],
+        commands: [
+            x2 === undefined
+                ? `f(x) = ${a}*(x-${x1})`
+                : x3 === undefined
+                    ? `f(x) = ${a}*(x-${x1})*(x-${x2})`
+                    : `f(x) = ${a}*(x-${x1})*(x-${x2})*(x-${x3})`,
+        ],
         lockedAxesRatio: false,
         gridDistance: false,
         xAxis: {
             steps: 1,
         },
     });
-    const func = (x) => a * (x - x1) * (x - x2) * (x - x3);
-    const xMin = Math.min(x1, x2, x3);
-    const xMax = Math.max(x1, x2, x3);
-    const root1 = (2 * (x1 + x2 + x3) -
-        Math.sqrt(4 * (x1 + x2 + x3) ** 2 - 12 * (x1 * x2 + x1 * x3 + x2 * x3))) /
-        6;
-    const root2 = (2 * (x1 + x2 + x3) +
-        Math.sqrt(4 * (x1 + x2 + x3) ** 2 - 12 * (x1 * x2 + x1 * x3 + x2 * x3))) /
-        6;
+    const func = (x) => {
+        if (x2 === undefined)
+            return a * (x - x1);
+        if (x3 === undefined)
+            return a * (x - x1) * (x - x2);
+        return a * (x - x1) * (x - x2) * (x - x3);
+    };
+    const xMin = Math.min(-2, Math.min(x1, x2 ?? x1, x3 ?? x2 ?? x1));
+    const xMax = Math.max(2, Math.max(x1, x2 ?? x1, x3 ?? x2 ?? x1));
+    const root1 = x2 === undefined
+        ? 0
+        : x3 === undefined
+            ? (x1 + x2) / 2
+            : (2 * (x1 + x2 + x3) -
+                Math.sqrt(4 * (x1 + x2 + x3) ** 2 - 12 * (x1 * x2 + x1 * x3 + x2 * x3))) /
+                6;
+    const root2 = x2 === undefined
+        ? 0
+        : x3 === undefined
+            ? (x1 + x2) / 2
+            : (2 * (x1 + x2 + x3) +
+                Math.sqrt(4 * (x1 + x2 + x3) ** 2 - 12 * (x1 * x2 + x1 * x3 + x2 * x3))) /
+                6;
     const [fx1, fx2] = [func(root1), func(root2)];
-    const yMin = Math.min(fx1, fx2);
-    const yMax = Math.max(fx1, fx2);
+    const yMin = Math.min(-2, Math.min(fx1, fx2));
+    const yMax = Math.max(2, Math.max(fx1, fx2));
     return ggb.getOptions({
         coords: [xMin - 2, xMax + 2, yMin - 2, yMax + 2],
     });
@@ -51,72 +91,118 @@ const getGGBOptions = (identifiers) => {
 const getKeys = () => {
     return ["infty"];
 };
-const getFirstLine = (x1, x2, x3) => {
-    return [
-        "$x$",
-        "-\\infty",
-        "\\ ",
-        x1.frenchify(),
-        "\\ ",
-        x2.frenchify(),
-        "\\ ",
-        x3.frenchify(),
-        "\\ ",
-        "+\\infty",
-    ];
+const getFirstLine = (identifiers) => {
+    const { x1, x2, x3 } = identifiers;
+    const firstLine = x2 === undefined
+        ? ["$x$", "-\\infty", "\\ ", x1.frenchify(), "\\ ", "+\\infty"]
+        : x3 === undefined
+            ? [
+                "$x$",
+                "-\\infty",
+                "\\ ",
+                x1.frenchify(),
+                "\\ ",
+                x2.frenchify(),
+                "\\ ",
+                "+\\infty",
+            ]
+            : [
+                "$x$",
+                "-\\infty",
+                "\\ ",
+                x1.frenchify(),
+                "\\ ",
+                x2.frenchify(),
+                "\\ ",
+                x3.frenchify(),
+                "\\ ",
+                "+\\infty",
+            ];
+    return firstLine;
 };
-const getSecondLine = (a) => {
-    const signs = a > 0 ? ["-", "+", "-", "+"] : ["+", "-", "+", "-"];
-    return [
-        "$f(x)$",
-        "\\ ",
-        signs[0],
-        "0",
-        signs[1],
-        "0",
-        signs[2],
-        "0",
-        signs[3],
-        "\\ ",
-    ];
+const getSecondLine = (identifiers) => {
+    const { a, x2, x3 } = identifiers;
+    //affine a>0 ? ["-", "+"] : ["+","-"]
+    //degré 2 a>0 ? ["+", "-", "+"] : ["-", "+", "-"]
+    //degré 3 a > 0 ? ["-", "+", "-", "+"] : ["+", "-", "+", "-"];
+    const rootsNb = x2 === undefined ? 1 : x3 === undefined ? 2 : 3;
+    const signs = rootsNb === 1
+        ? a > 0
+            ? ["-", "+"]
+            : ["+", "-"]
+        : rootsNb === 2
+            ? a > 0
+                ? ["+", "-", "+"]
+                : ["-", "+", "-"]
+            : a > 0
+                ? ["-", "+", "-", "+"]
+                : ["+", "-", "+", "-"];
+    return rootsNb === 1
+        ? ["$f(x)$", "\\ ", signs[0], "0", signs[1], "\\ "]
+        : rootsNb === 2
+            ? ["$f(x)$", "\\ ", signs[0], "0", signs[1], "0", signs[2], "\\ "]
+            : [
+                "$f(x)$",
+                "\\ ",
+                signs[0],
+                "0",
+                signs[1],
+                "0",
+                signs[2],
+                "0",
+                signs[3],
+                "\\ ",
+            ];
 };
 const getAnswerTable = (identifiers) => {
-    return [
-        getFirstLine(identifiers.x1, identifiers.x2, identifiers.x3),
-        getSecondLine(identifiers.a),
-    ];
+    return [getFirstLine(identifiers), getSecondLine(identifiers)];
 };
 const isAnswerTableValid = (ans, { answerTable }) => {
     try {
-        return ans.every((row, i) => row.every((cell, j) => cell === answerTable[i][j]));
+        return signTableVEA(ans, answerTable);
     }
     catch (err) {
         return handleVEAError(err);
     }
 };
-const getSignTableFromGraphQuestion = () => {
+const getSignTableFromGraphQuestion = (opts) => {
     const x1 = randint(-9, 10);
+    const type = opts?.functionType === "Affine"
+        ? 0
+        : opts?.functionType === "Degré $2$"
+            ? 1
+            : 2;
     const x2 = randint(-9, 10, [x1]);
     const x3 = randint(-9, 10, [x1, x2]);
     const sorted = [x1, x2, x3].sort((a, b) => a - b);
-    const a = randfloat(-1, 1, 4, [0]);
+    const a = type === 0 ? randint(-5, 5, [0]) : randfloat(-1, 1, 4, [0]);
     const lineAsked = randint(0, 2);
     const identifiers = {
         a,
         lineAsked,
         x1: sorted[0],
-        x2: sorted[1],
-        x3: sorted[2],
-        initTable: [
-            lineAsked === 0
-                ? ["$x$", "", "\\ ", "", "\\ ", "", "\\ ", "", "\\ ", ""]
-                : getFirstLine(sorted[0], sorted[1], sorted[2]),
-            lineAsked === 1
-                ? ["$f(x)$", "\\ ", "", "", "", "", "", "", "", "\\ "]
-                : getSecondLine(a),
-        ],
+        x2: type < 1 ? undefined : sorted[1],
+        x3: type < 2 ? undefined : sorted[2],
     };
-    return getQuestionFromIdentifiers(identifiers);
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getInitTable = (identifiers) => {
+    const { x2, x3, lineAsked } = identifiers;
+    const rootsNb = x2 === undefined ? 1 : x3 === undefined ? 2 : 3;
+    const firstLine = rootsNb === 1
+        ? ["$x$", "", "\\ ", "", "\\ ", ""]
+        : rootsNb === 2
+            ? ["$x$", "", "\\ ", "", "\\ ", "", "\\ ", ""]
+            : ["$x$", "", "\\ ", "", "\\ ", "", "\\ ", "", "\\ ", ""];
+    const secondLine = rootsNb === 1
+        ? ["$f(x)$", "\\ ", "", "", "", "\\ "]
+        : rootsNb === 2
+            ? ["$f(x)$", "\\ ", "", "", "", "", "", "\\ "]
+            : ["$f(x)$", "\\ ", "", "", "", "", "", "", "", "\\ "];
+    return [
+        lineAsked === 0 ? firstLine : getFirstLine(identifiers),
+        lineAsked === 1 ? secondLine : getSecondLine(identifiers),
+    ];
 };
 const getQuestionFromIdentifiers = (identifiers) => {
     return {
@@ -128,9 +214,19 @@ const getQuestionFromIdentifiers = (identifiers) => {
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
         ggbOptions: getGGBOptions(identifiers),
-        initTable: identifiers.initTable,
+        initTable: getInitTable(identifiers),
     };
 };
+const options = [
+    {
+        id: "functionType",
+        label: "Type de fonction",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["Affine", "Degré $2$", "Degré $3$"],
+        defaultValue: "Degré $3$",
+    },
+];
 export const partialSignTableFromGraph = {
     id: "partialSignTableFromGraph",
     label: "Compléter le tableau de signes d'une fonction à partir de sa représentation graphique",
@@ -149,4 +245,5 @@ export const partialSignTableFromGraph = {
     getQuestionFromIdentifiers,
     answerType: "signTable",
     hasHintAndCorrection: true,
+    options,
 };

package/lib/exercises/math/functions/sign/readSignTable.d.ts

@@ -5,6 +5,9 @@ type Identifiers = {
     xs: NodeIdentifiers[];
     x: NodeIdentifiers;
 };
-export declare const readSignTable: Exercise<Identifiers>;
+type Options = {
+    functionType: string;
+};
+export declare const readSignTable: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=readSignTable.d.ts.map

package/lib/exercises/math/functions/sign/readSignTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readSignTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/readSignTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,EAAE,EAAE,eAAe,EAAE,CAAC;IACtB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AA4GF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAiB/C,CAAC"}
+{"version":3,"file":"readSignTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/readSignTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,EAAE,EAAE,eAAe,EAAE,CAAC;IACtB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AAmHF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAyBF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBxD,CAAC"}