math-exercises 3.0.186 → 3.0.188

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

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

@@ -1,4 +1,4 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { addValidProp, shuffleProps, tryToAddWrongProp, GeneratorOptionTarget, GeneratorOptionType, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
@@ -81,21 +81,43 @@ const getCorrection = (identifiers) => {
   
 D'après le tableau de signes, $f(${xNode.toTex()})$ est donc ${ans}.`;
 };
-const getReadSignTableQuestion = () => {
-    const a = randint(-10, 0);
-    const b = randint(0, 10);
-    const xs = [MinusInfinityNode, a.toTree(), b.toTree(), PlusInfinityNode];
+const getReadSignTableQuestion = (opts) => {
+    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 type = opts?.functionType === "Affine"
+        ? 0
+        : opts?.functionType === "Degré $3$"
+            ? 2
+            : 1;
+    const roots = type === 0 ? [x1] : type === 1 ? [sorted[0], sorted[1]] : sorted;
+    const xs = [
+        MinusInfinityNode,
+        ...roots.map((e) => e.toTree()),
+        PlusInfinityNode,
+    ];
     const signs = coinFlip()
-        ? ["+", "0", "-", "0", "+"]
-        : ["-", "0", "+", "0", "-"];
-    const x = randint(-20, 20, [a, b]).toTree();
+        ? ["+", "0", "-", "0", "+", "0", "-"]
+        : ["-", "0", "+", "0", "-", "0", "+"];
+    const x = randint(-20, 20, roots).toTree();
     const identifiers = {
         x: x.toIdentifiers(),
         xs: xs.map((e) => e.toIdentifiers()),
-        signs,
+        signs: type === 0 ? signs.slice(0, 3) : type === 1 ? signs.slice(0, 5) : signs,
     };
     return getQuestionFromIdentifiers(identifiers);
 };
+const options = [
+    {
+        id: "functionType",
+        label: "Type de fonction",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["Affine", "Degré $2$", "Degré $3$"],
+        defaultValue: "Degré $2$",
+    },
+];
 const getQuestionFromIdentifiers = (identifiers) => {
     return {
         answer: getAnswer(identifiers),
@@ -122,4 +144,5 @@ export const readSignTable = {
     getQuestionFromIdentifiers,
     answerType: "QCU",
     hasHintAndCorrection: true,
+    options,
 };

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"signTableFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/signTableFromGraph.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;CACZ,CAAC;AAwIF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAoBpD,CAAC"}
+{"version":3,"file":"signTableFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/sign/signTableFromGraph.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;CACb,CAAC;AA+OF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAWF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqB7D,CAAC"}