math-exercises 2.0.23 → 2.0.25

package/lib/exercises/calcul/arithmetics/paritySumsAndProducts.d.ts

@@ -1,5 +1,7 @@
 import { MathExercise } from "../../../exercises/exercise";
-type Identifiers = {};
+type Identifiers = {
+    type: number;
+};
 export declare const paritySumsAndProducts: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=paritySumsAndProducts.d.ts.map

package/lib/exercises/calcul/arithmetics/paritySumsAndProducts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paritySumsAndProducts.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/paritySumsAndProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,0BAA0B,CAAC;AAyElC,KAAK,WAAW,GAAG,EAAE,CAAC;AAgCtB,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"paritySumsAndProducts.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/paritySumsAndProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,0BAA0B,CAAC;AAyElC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgCF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

package/lib/exercises/calcul/arithmetics/paritySumsAndProducts.js

@@ -66,7 +66,7 @@ const getParitySumsAndProductsQuestion = () => {
         instruction,
         keys: [],
         answerFormat: "raw",
-        identifiers: { answer },
+        identifiers: { type },
     };
     return question;
 };

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.js

@@ -77,7 +77,7 @@ const getPropositions = (n, { answer, randNbr }) => {
             const tempAns = sqrt + (0, randint_1.randint)(-sqrt + 1, 7, [0]);
             (0, exercise_1.tryToAddWrongProp)(propositions, (0, coinFlip_1.coinFlip)()
                 ? `S=\\left\\{-${tempAns};${tempAns}\\right\\}`
-                : `S=\\emptyset`);
+                : `S=\\varnothing`);
         }
     }
     else {
@@ -92,7 +92,7 @@ const getPropositions = (n, { answer, randNbr }) => {
             const tempRadicand = radicand + (0, randint_1.randint)(-radicand + 1, 7, [0]);
             (0, exercise_1.tryToAddWrongProp)(propositions, (0, coinFlip_1.coinFlip)()
                 ? `S=\\left\\{-${tempFactor}\\sqrt{${tempRadicand}};${tempFactor}\\sqrt{${tempRadicand}}\\right\\}`
-                : `S=\\emptyset`);
+                : `S=\\varnothing`);
         }
     }
     return (0, exercise_1.shuffleProps)(propositions, n);

package/lib/exercises/calculLitteral/equation/fractionEquation.js

@@ -18,7 +18,7 @@ const getFractionEquation = () => {
     const polynome1 = new polynomial_1.Polynomial([b, a]);
     const polynome2 = new polynomial_1.Polynomial([d, c]);
     const answer = -d / c === -b / a
-        ? `S=\\emptyset`
+        ? `S=\\varnothing`
         : `S=\\left\\{${new rational_1.Rational(-b, a)
             .simplify()
             .toTree()
@@ -35,7 +35,7 @@ const getFractionEquation = () => {
             "rbrace",
             "semicolon",
             "ou",
-            "emptyset",
+            "varnothing",
         ],
         answerFormat: "tex",
         identifiers: { a, b, c, d },

package/lib/exercises/combinatory/diceCounting.d.ts

@@ -1,6 +1,9 @@
 import { MathExercise } from "../../exercises/exercise";
 type Identifiers = {
     type: number;
+    face1?: number;
+    face2?: number;
+    face3?: number;
 };
 export declare const diceCounting: MathExercise<Identifiers>;
 export {};

package/lib/exercises/combinatory/diceCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgHF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAYlD,CAAC"}
+{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAkHF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAYlD,CAAC"}

package/lib/exercises/combinatory/diceCounting.js

@@ -8,7 +8,9 @@ const getDiceCountingQuestion = () => {
     const type = (0, randint_1.randint)(0, 8);
     let instruction = "";
     let answer = "";
-    let face1, face2, face3;
+    let face1;
+    let face2;
+    let face3;
     switch (type) {
         case 0:
             instruction = `avec exactement deux chiffres identiques`;
@@ -56,7 +58,7 @@ const getDiceCountingQuestion = () => {
         instruction: `On tire 3 fois consécutivement un dé à six faces numérotées de 1 à 6. Combien de tirages ${instruction} sont possibles ?`,
         keys: [],
         answerFormat: "tex",
-        identifiers: { type },
+        identifiers: { type, face1, face2, face3 },
     };
     return question;
 };

package/lib/exercises/complex/argumentFromAlgebraicComplex.d.ts

@@ -1,6 +1,7 @@
 import { MathExercise } from "../../exercises/exercise";
 type Identifiers = {
     arg: number;
+    zTex: string;
 };
 export declare const argumentFromAlgebraicComplex: MathExercise<Identifiers>;
 export {};

package/lib/exercises/complex/argumentFromAlgebraicComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AA4CF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}
+{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA4CF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/complex/argumentFromAlgebraicComplex.js

@@ -30,7 +30,7 @@ const getArgumentFromAlgebraicComplexQuestion = () => {
         instruction: `Soit $z=${zTex}$. Déterminer l'argument principal de $z$.`,
         keys: ["pi"],
         answerFormat: "tex",
-        identifiers: { arg: arg.angle.evaluate({}) },
+        identifiers: { arg: arg.angle.evaluate({}), zTex },
     };
     return question;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAkGF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAsBlE,CAAC"}
+{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAsGF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAsBlE,CAAC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.thirdDegreeFunctionVariation = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
 const infiniteNode_1 = require("../../../tree/nodes/numbers/infiniteNode");
@@ -32,6 +33,11 @@ const getThirdDegreeFunctionVariation = () => {
     const commands = [polynome.toString()];
     const ymax = Math.max(polynome.calculate(racine1), polynome.calculate(racine2));
     const ymin = Math.min(polynome.calculate(racine1), polynome.calculate(racine2));
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        isAxesRatioFixed: false,
+        isGridSimple: true,
+        gridDistance: false,
+    });
     const question = {
         instruction,
         startStatement: "S",
@@ -39,12 +45,13 @@ const getThirdDegreeFunctionVariation = () => {
         keys: ["lbracket", "rbracket", "semicolon", "infty"],
         answerFormat: "tex",
         coords: [
-            racine1 - ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1),
-            racine2 + ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1),
-            ymin - ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10,
-            ymax + ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10,
+            Math.min(racine1 - ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1), -1),
+            Math.max(racine2 + ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1), 1),
+            Math.min(ymin - ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10, -1),
+            Math.max(ymax + ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10, 1),
         ],
-        commands,
+        commands: ggb.commands,
+        options: ggb.getOptions(),
         identifiers: { racine1, racine2, coin, a },
     };
     return question;
@@ -73,7 +80,6 @@ const isAnswerValid = (ans, { racine1, racine2, coin, a }) => {
             new intervalNode_1.IntervalNode(r2, infiniteNode_1.PlusInfinityNode, intervalNode_1.ClosureType.FO),
         ]);
     const texs = answer.toAllValidTexs();
-    console.log(texs);
     return texs.includes(ans);
 };
 exports.thirdDegreeFunctionVariation = {

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

@@ -1 +1 @@
-{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AA8EF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}
+{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AAiFF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}

package/lib/exercises/derivation/derivativeNumberReading.js

@@ -32,12 +32,15 @@ const getDerivativeNumberReading = () => {
     const c = penteValue - a * Math.pow(xA, 2) - b * xA;
     const d = yA - (a / 3) * Math.pow(xA, 3) - (b / 2) * Math.pow(xA, 2) - xA * c;
     const polynome = new polynomial_1.Polynomial([d, c, b / 2, a / 3]);
-    const instruction = `Ci-dessous sont tracées la courbe de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer $f'(${xA})$.`;
+    const instruction = `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 commands = [
-        polynome.toString(),
+        `f(x) = ${polynome.toString()}`,
+        `SetCaption(f, "$\\mathcal C_f$")`,
+        `ShowLabel(f, true)`,
         `g(x) = (${penteString}) * x + (${originString})`,
-        `(${xA},${yA})`,
+        `A = (${xA},${yA})`,
     ];
+    // const ggb = new GeogebraConstructor(commands);
     const answer = penteTree.toTex();
     const question = {
         instruction,

package/lib/exercises/exercise.d.ts

@@ -18,7 +18,15 @@ export interface Question<TIdentifiers = {}> {
     keys?: KeyId[];
     commands?: string[];
     coords?: number[];
-    options?: any;
+    options?: {
+        axesRatio?: [number, number] | false;
+        gridDistance?: [number, number] | false;
+        hideGrid?: boolean;
+        hideAxes?: boolean;
+        isGridBold?: boolean;
+        isGridSimple?: boolean;
+        isAxesRatioFixed?: boolean;
+    };
     divisionFormat?: "fraction" | "obelus";
     identifiers: TIdentifiers;
 }

package/lib/exercises/exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAI3C,eAAO,MAAM,YAAY,UAChB,WAAW,EAAE,aACT,MAAM,WACT,KAAK,GAAG,KAAK,SAQtB,CAAC;AACF,eAAO,MAAM,YAAY,UAChB,WAAW,EAAE,aACT,MAAM,WACT,KAAK,GAAG,KAAK,SAQtB,CAAC;AACF,eAAO,MAAM,iBAAiB,UACrB,WAAW,EAAE,aACT,MAAM,WACT,KAAK,GAAG,KAAK,SAUtB,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,WAAW,EAAE,KAAK,MAAM,kBAE3D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,QAAQ,CAAC,YAAY,GAAG,EAAE;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACvC,WAAW,EAAE,YAAY,CAAC;CAC3B;AAED,MAAM,MAAM,YAAY,CAAC,YAAY,IAAI,CACvC,CAAC,EAAE,MAAM,EACT,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,KACpC,WAAW,EAAE,CAAC;AACnB,MAAM,MAAM,GAAG,CAAC,YAAY,IAAI,CAC9B,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,KACpC,OAAO,CAAC;AACb,MAAM,MAAM,iBAAiB,CAAC,YAAY,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,IAAI,CAChE,IAAI,CAAC,EAAE,QAAQ,KACZ,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC5B,MAAM,WAAW,YAAY,CAAC,YAAY,GAAG,EAAE;IAC7C,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACvC,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;IACnD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,YAAY,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAClE,aAAa,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;CACnC;AAED,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,WAAW,GACnB,OAAO,GACP,cAAc,GACd,iBAAiB,GACjB,SAAS,GACT,8BAA8B,GAC9B,aAAa,GACb,YAAY,GACZ,SAAS,GACT,0BAA0B,GAC1B,WAAW,GACX,2BAA2B,GAC3B,eAAe,GACf,eAAe,GACf,kBAAkB,GAClB,WAAW,GACX,mBAAmB,GACnB,wBAAwB,GACxB,WAAW,GACX,uBAAuB,GACvB,uBAAuB,GACvB,aAAa,GACb,aAAa,GACb,SAAS,GACT,qBAAqB,GACrB,oBAAoB,GACpB,mBAAmB,GACnB,YAAY,GACZ,cAAc,GACd,YAAY,GACZ,cAAc,GACd,kBAAkB,GAClB,kBAAkB,GAClB,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,cAAc,GACd,QAAQ,GACR,uBAAuB,GACvB,oBAAoB,GACpB,eAAe,GACf,gBAAgB,GAChB,UAAU,CAAC"}
+{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"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"}

package/lib/exercises/functions/absolute/absoluteValueEquations.js

@@ -18,12 +18,12 @@ const getAbsoluteValueEquationsQuestion = () => {
     const answer = a === 0
         ? `S=\\left\\{${b}\\right\\}`
         : a < 0
-            ? `S=\\emptyset`
+            ? `S=\\varnothing`
             : `S=\\left\\{${b - a};${b + a}\\right\\}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'équation $|${poly.toTree().toTex()}| = ${a}$.`,
-        keys: ["S", "equal", "emptyset", "lbrace", "semicolon", "rbrace"],
+        keys: ["S", "equal", "varnothing", "lbrace", "semicolon", "rbrace"],
         answerFormat: "tex",
         identifiers: { a, b },
     };
@@ -37,7 +37,7 @@ const getPropositions = (n, { answer, a, b }) => {
         (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${b + a}\\right\\}`);
     }
     else if (a === 0) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\emptyset`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\varnothing`);
     }
     else if (a > 0) {
         (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${b + a}\\right\\}`);

package/lib/exercises/functions/absolute/absoluteValueInequations.js

@@ -25,7 +25,7 @@ const getAbsoluteValueInequationsQuestion = () => {
             "lbracket",
             "semicolon",
             "rbracket",
-            "emptyset",
+            "varnothing",
             "x",
             "leq",
             "geq",

package/lib/exercises/functions/affines/affineExpressionReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineExpressionReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/affineExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA2GF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}
+{"version":3,"file":"affineExpressionReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/affineExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA6GF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}

package/lib/exercises/functions/affines/affineExpressionReading.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.affineExpressionReading = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -19,24 +20,22 @@ const getAffineExpressionReadingQuestion = () => {
         .toTree();
     const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("f(x)"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(leadingCoeff, new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(b)).simplify({ forceDistributeFractions: true, forbidFactorize: true })).toTex();
     let xMin = Math.min(0, secondPoint[0]);
-    if (xMin > 0)
-        xMin = -0.5;
     let xMax = Math.max(0, secondPoint[0]);
-    if (xMax < 0)
-        xMax = 0.5;
     let yMin = Math.min(b, secondPoint[1]);
-    if (yMin > 0)
-        yMin = -0.5;
     let yMax = Math.max(b, secondPoint[1]);
-    if (yMax < 0)
-        yMax = 0.5;
-    const coords = [xMin - 1, xMax + 1, yMin - 1, yMax + 1];
+    const commands = [`Line((0, ${b}), (${secondPoint[0]}, ${secondPoint[1]}))`];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        axesRatio: [1, 1],
+        gridDistance: [1, 1],
+        isGridSimple: true,
+    });
     const question = {
         answer,
         instruction: `Ci-dessous est tracée la courbe représentative d'une fonction affine $f$. Déterminer graphiquement l'expression algébrique de $f(x)$.`,
-        keys: ["fx", "equal"],
-        commands: [`Line((0, ${b}), (${secondPoint[0]}, ${secondPoint[1]}))`],
-        coords,
+        keys: ["fx", "equal", "x"],
+        commands: ggb.commands,
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        options: ggb.getOptions(),
         answerFormat: "tex",
         identifiers: { b, secondPoint },
     };

package/lib/exercises/functions/affines/interceptReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interceptReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/interceptReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA+CF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"interceptReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/interceptReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAsDF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAatD,CAAC"}

package/lib/exercises/functions/affines/interceptReading.js

@@ -3,30 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.interceptReading = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
+const frenchify_1 = require("../../../math/utils/latex/frenchify");
 const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
 const getInterceptReadingQuestion = () => {
     const b = (0, randint_1.randint)(-5, 6);
     const secondPoint = [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6)];
     const answer = b + "";
     let xMin = Math.min(0, secondPoint[0]);
-    if (xMin > 0)
-        xMin = -0.5;
     let xMax = Math.max(0, secondPoint[0]);
-    if (xMax < 0)
-        xMax = 0.5;
     let yMin = Math.min(b, secondPoint[1]);
-    if (yMin > 0)
-        yMin = -0.5;
     let yMax = Math.max(b, secondPoint[1]);
-    if (yMax < 0)
-        yMax = 0.5;
-    const coords = [xMin - 1, xMax + 1, yMin - 1, yMax + 1];
+    const commands = [`Line((0, ${b}), (${secondPoint[0]}, ${secondPoint[1]}))`];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        axesRatio: [1, 1],
+        gridDistance: [1, 1],
+        isGridSimple: true,
+    });
     const question = {
         answer,
         instruction: `Ci-dessous est tracée la courbe représentative d'une fonction affine $f$. Déterminer graphiquement l'ordonnée à l'origine $b$ de la fonction $f$.`,
         keys: [],
         commands: [`Line((0, ${b}), (${secondPoint[0]}, ${secondPoint[1]}))`],
-        coords,
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        options: ggb.getOptions(),
         answerFormat: "tex",
         identifiers: { b, secondPoint },
     };
@@ -35,6 +36,11 @@ const getInterceptReadingQuestion = () => {
 const getPropositions = (n, { answer, b, secondPoint }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    const a = (secondPoint[1] - b) / secondPoint[0];
+    if (a !== 0) {
+        const root = -b / a;
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, frenchify_1.frenchify)((0, round_1.round)(root, 2)));
+    }
     while (propositions.length < n) {
         (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-5, 6) + "");
     }

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

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,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;AAgFF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAaxD,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,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;AAoEF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAaxD,CAAC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.leadingCoefficient = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -19,36 +20,22 @@ const getLeadingCoefficientQuestion = () => {
     const bTree = b.toTree();
     const aString = aTree.toMathString();
     const bString = bTree.toMathString();
-    const aValue = a.value;
-    const bValue = b.value;
-    let xmin, xmax, ymin, ymax;
-    if (bValue > 0) {
-        ymax = bValue + 1;
-        ymin = -1;
-    }
-    else {
-        ymin = bValue - 1;
-        ymax = 1;
-    }
-    if (aValue === 0) {
-        xmax = 5;
-        xmin = -5;
-    }
-    else if (-bValue / aValue > 0) {
-        xmax = -bValue / aValue + 1;
-        xmin = -1;
-    }
-    else {
-        xmin = -bValue / aValue - 1;
-        xmax = 1;
-    }
+    const xMin = Math.min(xA, xB);
+    const xMax = Math.max(xA, xB);
+    const yMin = Math.min(yA, yB);
+    const yMax = Math.max(yA, yB);
+    const commands = [`f(x) = (${aString}) * x + (${bString})`];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        isGridSimple: true,
+    });
     const answer = aTree.toTex();
     const question = {
         instruction: "Déterminer le coefficient directeur de la droite représentée ci-dessous : ",
         answer,
         keys: [],
-        commands: [`f(x) = (${aString}) * x + (${bString})`],
-        coords: [xmin, xmax, ymin, ymax],
+        commands: ggb.commands,
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        options: ggb.getOptions(),
         answerFormat: "tex",
         identifiers: { xA, xB, yA, yB },
     };

package/lib/exercises/functions/basics/graphicEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphicEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/graphicEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;CAClC,CAAC;AAiGF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAarD,CAAC"}
+{"version":3,"file":"graphicEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/graphicEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;CAClC,CAAC;AAiGF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/functions/basics/graphicEquation.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.graphicEquation = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
+const discreteSetKeys_1 = require("../../../exercises/utils/keys/discreteSetKeys");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
 const randint_1 = require("../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
@@ -49,23 +50,23 @@ const getGraphicEquationQuestion = () => {
     const yMin = Math.min(...splinePoints.map((point) => point[1]));
     const xMax = Math.max(...splinePoints.map((point) => point[0]));
     const yMax = Math.max(...splinePoints.map((point) => point[1]));
+    const commands = [
+        `S = Spline(${splinePoints
+            .map((point) => `(${point[0]},${point[1]})`)
+            .join(",")})`,
+        "SetFixed(S, true)",
+    ];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        isGridSimple: true,
+    });
     const question = {
         answer,
         instruction: `Déterminer graphiquement les solutions de l'équation $f(x) = ${yValue}$ où $f$ est la fonction représentée ci-dessous.`,
-        keys: equationKeys_1.equationKeys,
+        keys: discreteSetKeys_1.discreteSetKeys,
         answerFormat: "tex",
-        commands: [
-            `Spline(${splinePoints
-                .map((point) => `(${point[0]},${point[1]})`)
-                .join(",")})`,
-            ...splinePoints.map((point) => `(${point[0]},${point[1]})`),
-        ],
-        coords: [
-            Math.min(xMin - 1, -1),
-            Math.max(xMax + 1, 1),
-            Math.min(yMin - 1, -1),
-            Math.max(yMax + 1, 1),
-        ],
+        commands: ggb.commands,
+        options: ggb.getOptions(),
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
         identifiers: { yValue, splinePoints },
     };
     return question;
@@ -73,7 +74,7 @@ const getGraphicEquationQuestion = () => {
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\emptyset`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\varnothing`);
     while (propositions.length < n) {
         const nbs = [];
         const nbSol = (0, randint_1.randint)(2, 4);

package/lib/exercises/functions/basics/graphicInequation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphicInequation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/graphicInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,WAAW,EAAgB,MAAM,oCAAoC,CAAC;AAI/E,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AA6JF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAavD,CAAC"}
+{"version":3,"file":"graphicInequation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/graphicInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,WAAW,EAAgB,MAAM,oCAAoC,CAAC;AAI/E,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;CAC7D,CAAC;AA+JF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAavD,CAAC"}

package/lib/exercises/functions/basics/graphicInequation.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.graphicInequation = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
 const randint_1 = require("../../../math/utils/random/randint");
 const inequationSolutionNode_1 = require("../../../tree/nodes/inequations/inequationSolutionNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
@@ -75,6 +76,15 @@ const getGraphicInequationQuestion = () => {
     const answer = intervalsNodes.length === 1
         ? `S=${intervalsNodes[0].toTex()}`
         : `S=${new unionIntervalNode_1.UnionIntervalNode(intervalsNodes).toTex()}`;
+    const commands = [
+        `S =Spline(${splinePoints
+            .map((point) => `(${point[0]},${point[1]})`)
+            .join(",")})`,
+        "SetFixed(S, true)",
+    ];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        isGridSimple: true,
+    });
     const question = {
         answer,
         instruction: `Déterminer graphiquement les solutions de l'inéquation $f(x)${isAskingSup ? (isStrict ? ">" : "\\geq") : isStrict ? "<" : "\\leq"}${yValue}$ où $f$ est la fonction représentée ci-dessous.`,
@@ -89,18 +99,9 @@ const getGraphicInequationQuestion = () => {
             "rbrace",
         ],
         answerFormat: "tex",
-        commands: [
-            `Spline(${splinePoints
-                .map((point) => `(${point[0]},${point[1]})`)
-                .join(",")})`,
-            ...splinePoints.map((point) => `(${point[0]},${point[1]})`),
-        ],
-        coords: [
-            Math.min(xMin - 1, -1),
-            Math.max(xMax + 1, 1),
-            Math.min(yMin - 1, -1),
-            Math.max(yMax + 1, 1),
-        ],
+        commands: ggb.commands,
+        options: ggb.getOptions(),
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
         identifiers: {
             yValue,
             splinePoints,
@@ -114,7 +115,7 @@ const getGraphicInequationQuestion = () => {
 const getPropositions = (n, { answer, intervals, splinePoints, yValue }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\emptyset`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\varnothing`);
     (0, exercise_1.tryToAddWrongProp)(propositions, `S=${new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(splinePoints[0][0]), new numberNode_1.NumberNode(yValue), intervalNode_1.ClosureType.FF).toTex()}`);
     while (propositions.length < n) {
         const a = (0, randint_1.randint)(-9, 3);

package/lib/exercises/functions/basics/imageFunctionGeogebra.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/imageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmFF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}
+{"version":3,"file":"imageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/imageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAwEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}

package/lib/exercises/functions/basics/imageFunctionGeogebra.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageFunctionGeogebra = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../geogebra/geogebraConstructor");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../utils/coinFlip");
@@ -28,32 +29,21 @@ const getImageFunctionGeogebra = () => {
     const answer = rand
         ? polynome1.calculate(xValue)
         : polynome2.calculate(xValue);
-    let xmin, xmax, ymin, ymax;
-    if (answer > 0) {
-        ymax = answer + 1;
-        ymin = -1;
-    }
-    else {
-        ymin = answer - 1;
-        ymax = 1;
-    }
-    if (xValue > 0) {
-        xmax = xValue + 1;
-        xmin = -1;
-    }
-    else {
-        xmin = xValue - 1;
-        xmax = 1;
-    }
+    const xMin = xValue;
+    const xMax = xValue;
+    const yMin = answer;
+    const yMax = answer;
     const commands = [rand ? polynome1.toString() : polynome2.toString()];
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, { isGridSimple: true });
     const answerTex = answer + "";
     const question = {
         instruction: statement,
         startStatement: `f(${xValue})`,
         answer: answerTex,
         keys: [],
-        commands,
-        coords: [xmin, xmax, ymin, ymax],
+        commands: ggb.commands,
+        options: ggb.getOptions(),
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
         answerFormat: "tex",
         identifiers: {
             poly1: polynome1.coefficients,

package/lib/exercises/functions/basics/inverseImageFunctionGeogebra.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAgLF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}
+{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAyIF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}