math-exercises 2.2.15 → 2.2.17

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.js

@@ -26,7 +26,8 @@ const getVolumeOfPyramidWithTriangleBaseQuestion = () => {
     const commands = exercise.ggbCommands;
     const baseOfPyramidSides = exercise.baseOfPyramidSides;
     const volume = calculateVolume(baseOfPyramidSides, exercise.h);
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
         is3D: true,
@@ -38,16 +39,16 @@ const getVolumeOfPyramidWithTriangleBaseQuestion = () => {
     Calculer le volume de la pyramide en sachant que $AB=${baseOfPyramidSides.ABSide}$ et $CD=${baseOfPyramidSides.ACSide}$.`,
         keys: [],
         answerFormat: "tex",
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [
-            exercise.originX,
-            maxCoord + 1,
-            -2,
-            maxCoord + 1,
-            -2,
-            exercise.h + 1,
-        ],
+        ggbOptions: ggb.getOptions({
+            coords: [
+                exercise.originX,
+                maxCoord + 1,
+                -2,
+                maxCoord + 1,
+                -2,
+                exercise.h + 1,
+            ],
+        }),
         identifiers: { h: exercise.h, baseOfPyramidSides },
     };
     return question;

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeOfPyramidWithTriangleRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AAQF,KAAK,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA0JxE,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}
+{"version":3,"file":"volumeOfPyramidWithTriangleRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AAQF,KAAK,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA2JxE,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}

package/lib/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleRectBase.js

@@ -27,7 +27,8 @@ const getVolumeOfPyramidWithTriangleRectBase = () => {
     const commands = exercise.commands;
     const baseOfPyramidSides = exercise.baseOfPyramidSides;
     const volume = calculateVolume(baseOfPyramidSides, exercise.h);
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
         is3D: true,
@@ -39,9 +40,9 @@ const getVolumeOfPyramidWithTriangleRectBase = () => {
     Calculer le volume de la pyramide en sachant que : $AB=${baseOfPyramidSides.ABSide}$, $AC=${baseOfPyramidSides.ACSide}$, $BC=${baseOfPyramidSides.BCSide}$ et $(AC)\\perp(AB)$.`,
         keys: [],
         answerFormat: "tex",
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, exercise.h + 1],
+        ggbOptions: ggb.getOptions({
+            coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, exercise.h + 1],
+        }),
         identifiers: { h: exercise.h, baseOfPyramidSides },
     };
     return question;

package/lib/exercises/math/limits/limitReading.js

@@ -72,17 +72,17 @@ const getLimitReadingQuestion = () => {
             break;
     }
     const commands = [`f(x) = ${fct}`, `SetColor(f, "${(0, colors_1.randomColor)()}")`];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isAxesRatioFixed: false,
-        isGridSimple: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
     });
     const question = {
         answer,
         instruction: `Ci-dessous est tracée la courbe représentative d'une fonction $f$. Déterminer la limite: $\\displaystyle ${new limitNode_1.LimitNode(to, new variableNode_1.VariableNode("f(x)"), from).toTex()}$`,
         keys: ["infty"],
-        commands: ggb.commands,
-        coords: [-10, 10, -10, 10],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [-10, 10, -10, 10],
+        }),
         answerFormat: "tex",
         identifiers: { type, to: to.toTex(), from, a },
     };

package/lib/exercises/math/probaStat/probabilityTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probabilityTree.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA8IF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAsBjD,CAAC"}
+{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probabilityTree.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA+IF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAsBjD,CAAC"}

package/lib/exercises/math/probaStat/probabilityTree.js

@@ -88,7 +88,8 @@ const getProbabilityTree = () => {
         'Text("C", (5.5 , -1.1))',
         'Text("D", (5.5 , -3.1))',
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
     });
@@ -97,9 +98,9 @@ const getProbabilityTree = () => {
         startStatement,
         answer: answerTex,
         keys: [],
-        commands,
-        options: ggb.getOptions(),
-        coords: [-2, 8, -5, 5],
+        ggbOptions: ggb.getOptions({
+            coords: [-2, 8, -5, 5],
+        }),
         answerFormat: "tex",
         identifiers: { A, AC, AD, B, BC, BD, type },
     };

package/lib/exercises/math/probaStat/stats2var/fineAdjustementExercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fineAdjustementExercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats2var/fineAdjustementExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAqHF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"fineAdjustementExercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats2var/fineAdjustementExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAsHF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}

package/lib/exercises/math/probaStat/stats2var/fineAdjustementExercise.js

@@ -23,7 +23,8 @@ const getFineAdjustementExerciseQuestion = () => {
     commands.push(...cloudPoints.points.map((point) => {
         return `SetFixed(${point.name},true)`;
     }));
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
     });
@@ -34,9 +35,9 @@ const getFineAdjustementExerciseQuestion = () => {
     const question = {
         answer: exercise.correctAnswer,
         instruction: `On considère le nuage de points ci-dessous. Un ajustement affine semble-t-il justifié ? Quelle peut être la valeur du coefficient de détermination ?`,
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        ggbOptions: ggb.getOptions({
+            coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        }),
         keys: [],
         answerFormat: "raw",
         identifiers: { isJustified: exercise.isJustified },

package/lib/exercises/math/sequences/arithmetic/recognizeArithmeticFromGraph.js

@@ -14,19 +14,19 @@ const getRandomFirstNonAriTerms = () => {
         case 0:
             const firstGeoTerm = (0, randint_1.randint)(1, 4);
             const geoReason = (0, random_1.random)([2, 3]);
-            return new Array(5)
+            return new Array(10)
                 .fill(0)
                 .map((el, index) => firstGeoTerm * geoReason ** index);
         case 1:
             const firstBernoulliTerm = (0, randint_1.randint)(1, 10);
             const secondBernoulliTerm = (0, randint_1.randint)(1, 10, [firstBernoulliTerm]);
-            return new Array(5)
+            return new Array(10)
                 .fill(0)
                 .map((el, index) => index % 2 ? firstBernoulliTerm : secondBernoulliTerm);
         case 2:
         default:
             const firstFakeAriTerm = (0, randint_1.randint)(1, 20);
-            const res = new Array(5)
+            const res = new Array(10)
                 .fill(0)
                 .map((el, index) => firstFakeAriTerm + (0, randint_1.randint)(1, 4));
             const disruptionIndex = (0, randint_1.randint)(0, 5);
@@ -39,27 +39,27 @@ const getRecognizeArithmeticFromGraphQuestion = () => {
     const firstAriTerm = (0, randint_1.randint)(-5, 10);
     const reason = (0, randint_1.randint)(-4, 6, [0]);
     const sequence = isAri
-        ? new Array(5).fill(0).map((el, index) => firstAriTerm + reason * index)
+        ? new Array(10).fill(0).map((el, index) => firstAriTerm + reason * index)
         : getRandomFirstNonAriTerms();
     const answer = isAri ? "Oui" : "Non";
     const commands = sequence.flatMap((nb, index) => [
         new point_1.Point(`A_${index}`, index.toTree(), nb.toTree()).toGGBCommand(),
         `SetFixed(A_${index}, true)`,
     ]);
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isAxesRatioFixed: false,
-        isXAxesNatural: true,
-        isGridSimple: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
+        xAxis: { natural: true },
     });
-    const yMin = Math.min(...sequence);
-    const yMax = Math.max(...sequence);
+    const yMin = Math.min(...sequence.slice(0, 5));
+    const yMax = Math.max(...sequence.slice(0, 5));
     const question = {
         answer,
         instruction: `La suite $u$ représentée ci-dessous semble-t-elle arithmétique ?`,
         keys: [],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [-1, 7, Math.min(-1, yMin - 2), Math.max(1, yMax + 2)],
+        ggbOptions: ggb.getOptions({
+            coords: [-1, 7, Math.min(-1, yMin - 2), Math.max(1, yMax + 2)],
+        }),
         answerFormat: "tex",
         identifiers: { sequence, isAri },
     };

package/lib/exercises/math/sequences/arithmetic/recognizeReasonFromGraph.js

@@ -9,28 +9,28 @@ const randint_1 = require("../../../../math/utils/random/randint");
 const getRecognizeReasonFromGraphQuestion = () => {
     const firstTerm = (0, randint_1.randint)(1, 20);
     const reason = (0, randint_1.randint)(-5, 6, [0]);
-    const sequence = new Array(5)
+    const sequence = new Array(10)
         .fill(0)
         .map((el, index) => firstTerm + index * reason);
-    const yMin = Math.min(...sequence);
-    const yMax = Math.max(...sequence);
+    const yMin = Math.min(...sequence.slice(0, 5));
+    const yMax = Math.max(...sequence.slice(0, 5));
     const commands = sequence.flatMap((nb, index) => [
         new point_1.Point(`A_${index}`, index.toTree(), nb.toTree()).toGGBCommand(),
         `SetFixed(A_${index}, true)`,
     ]);
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isXAxesNatural: true,
-        isAxesRatioFixed: false,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        xAxis: { natural: true },
+        lockedAxesRatio: false,
     });
     const answer = reason + "";
     const question = {
         answer,
         instruction: `Déterminer la raison de la suite arithmétique $u$ représentée ci-dessous :`,
         keys: [],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [-1, 7, Math.min(-1, yMin - 2), Math.max(1, yMax + 2)],
+        ggbOptions: ggb.getOptions({
+            coords: [-1, 7, Math.min(-1, yMin - 2), Math.max(1, yMax + 2)],
+        }),
         answerFormat: "tex",
         identifiers: { reason, sequence },
     };

package/lib/exercises/math/sequences/sequencePlot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencePlot.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/sequencePlot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AA2FF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAe9C,CAAC"}
+{"version":3,"file":"sequencePlot.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/sequencePlot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AA0FF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAe9C,CAAC"}

package/lib/exercises/math/sequences/sequencePlot.js

@@ -35,23 +35,21 @@ const getSequencePlotQuestion = () => {
     }), ...points.map((_, index) => {
         return `SetLabelMode(A${index},1)`;
     }));
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        hideAxes: false,
-        hideGrid: false,
-        isXAxesNatural: true,
-        isGridSimple: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        xAxis: { natural: true },
     });
     const answer = u_nValue.toString();
     const question = {
         answer,
         instruction: `Ci-dessous est tracé un nuage de points représentant les valeurs d'une suite $(u_n)$. Quelle est la valeur de $u_{${nValue}}$ ?`,
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: ggb.getAdaptedCoords({
-            xMin: 0,
-            xMax: nMax,
-            yMin: Math.min(...points.map((p) => p[1])) - 2,
-            yMax: Math.max(...points.map((p) => p[1])) + 2,
+        ggbOptions: ggb.getOptions({
+            coords: ggb.getAdaptedCoords({
+                xMin: 0,
+                xMax: nMax,
+                yMin: Math.min(...points.map((p) => p[1])) - 2,
+                yMax: Math.max(...points.map((p) => p[1])) + 2,
+            }),
         }),
         keys: [],
         answerFormat: "raw",

package/lib/exercises/math/trigonometry/trigonometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAqHF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAe9C,CAAC"}
+{"version":3,"file":"trigonometry.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmHF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAe9C,CAAC"}

package/lib/exercises/math/trigonometry/trigonometry.js

@@ -45,7 +45,8 @@ const getTrigonometry = () => {
         default:
             quotient = [""];
     }
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(triangle.generateCommands({ highlightedAngle: angle[randAngle] }), {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands: triangle.generateCommands({ highlightedAngle: angle[randAngle] }),
         hideAxes: true,
         hideGrid: true,
     });
@@ -54,9 +55,9 @@ const getTrigonometry = () => {
         instruction: `À quel quotient est égal ${trigo[randTrigo]} de l'angle $\\widehat{${angle[randAngle]}}$?`,
         answer,
         keys: [...vertices, "equal"],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: triangle.generateCoords(),
+        ggbOptions: ggb.getOptions({
+            coords: triangle.generateCoords(),
+        }),
         answerFormat: "tex",
         identifiers: { sideA, sideB, sideC, randAngle, randTrigo },
     };

package/lib/exercises/math/trigonometry/trigonometryAngleCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA8EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"trigonometryAngleCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometryAngleCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA4EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}

package/lib/exercises/math/trigonometry/trigonometryAngleCalcul.js

@@ -35,7 +35,8 @@ const getTrigonometryAngleCalcul = () => {
         ? Math.round((Math.acos(sideLengths[0] / sideLengths[2]) * 180) / Math.PI)
         : Math.round((Math.acos(sideLengths[1] / sideLengths[2]) * 180) / Math.PI);
     const answerTex = answer + "^{\\circ}";
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(triangle.generateCommands({ highlightedAngle: angle[randAngle] }), {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands: triangle.generateCommands({ highlightedAngle: angle[randAngle] }),
         hideAxes: true,
         hideGrid: true,
     });
@@ -43,9 +44,9 @@ const getTrigonometryAngleCalcul = () => {
         instruction: `Le triangle $${triangle.getTriangleName()}$ rectangle en $${triangle.getRightAngle()}$ est tel que $${sides[randSides[0]]} = ${(sideLengths[randSides[0]] + "").replace(".", ",")}$ cm et $${sides[randSides[1]]} = ${(sideLengths[randSides[1]] + "").replace(".", ",")}$ cm. Calculer $\\widehat{${angle[randAngle]}}$ à $1^\\circ$ près.`,
         answer: answerTex,
         keys: ["degree"],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: triangle.generateCoords(),
+        ggbOptions: ggb.getOptions({
+            coords: triangle.generateCoords(),
+        }),
         answerFormat: "tex",
         identifiers: { randAngle, sideLengths, randSides },
     };

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAuMF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAgBxD,CAAC"}
+{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAwMF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAgBxD,CAAC"}

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.js

@@ -46,7 +46,8 @@ const getTrigonometrySideCalcul = () => {
             highlightedSide: sides[randSideQuestion],
         }),
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
     });
@@ -57,9 +58,9 @@ const getTrigonometrySideCalcul = () => {
         hint: getHint(),
         correction: getCorrection(sides, sideLengths, randSideQuestion, randSide, angle[randAngle], angleValue[randAngle], answer),
         keys: [],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: triangle.generateCoords(),
+        ggbOptions: ggb.getOptions({
+            coords: triangle.generateCoords(),
+        }),
         answerFormat: "tex",
         identifiers: { randAngle, randSide, randSideQuestion, sideLengths },
     };

package/lib/exercises/pc/calibrationCurveOfSolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calibrationCurveOfSolution.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/calibrationCurveOfSolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"calibrationCurveOfSolution.d.ts","sourceRoot":"","sources":["../../../src/exercises/pc/calibrationCurveOfSolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwFF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}

package/lib/exercises/pc/calibrationCurveOfSolution.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calibrationCurveOfSolution = void 0;
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../geogebra/geogebraConstructor");
 const randint_1 = require("../../math/utils/random/randint");
 const molecule_1 = require("../../pc/constants/molecularChemistry/molecule");
 const arrayEqual_1 = require("../../utils/arrayEqual");
@@ -14,6 +15,14 @@ const getCalibrationCurveOfSolutionQuestion = () => {
     const exo = generateExercise();
     const minY = 5 * exo.epsilon * exo.l - 10;
     const maxY = 10 * exo.epsilon * exo.l + 5;
+    const studentGGB = new geogebraConstructor_1.GeogebraConstructor({
+        customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
+            join: true,
+        }),
+        xAxis: { label: "$\\small{C}$" },
+        yAxis: { label: "$\\small{A}$" },
+        lockedAxesRatio: false,
+    });
     const question = {
         ggbAnswer: [
             `(5,${5 * exo.epsilon * exo.l})`,
@@ -22,15 +31,9 @@ const getCalibrationCurveOfSolutionQuestion = () => {
         ],
         instruction: exo.instruction,
         keys: [],
-        studentGgbOptions: {
+        studentGgbOptions: studentGGB.getOptions({
             coords: [-1, 5, -1, 6],
-            isAxesRatioFixed: false,
-            enableShiftDragZoom: true,
-            axisLabels: ["$\\small{C}$", "$\\small{A}$"],
-            customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
-                join: true,
-            }),
-        },
+        }),
         hint: exo.hint,
         correction: exo.correction,
         identifiers: {

package/lib/exercises/pc/electricity/ohmicConductorOrGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ohmicConductorOrGenerator.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/electricity/ohmicConductorOrGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA6FtB,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAgB3D,CAAC"}
+{"version":3,"file":"ohmicConductorOrGenerator.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/electricity/ohmicConductorOrGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG,EAAE,CAAC;AAkGtB,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAiB3D,CAAC"}

package/lib/exercises/pc/electricity/ohmicConductorOrGenerator.js

@@ -11,9 +11,9 @@ const getOhmicConductorOrGeneratorQuestion = () => {
     const question = {
         answer: exo.answer,
         instruction: exo.instruction,
-        commands: exo.ggb.commands,
-        coords: [8, 40, -5, 30],
-        options: exo.ggb.getOptions(),
+        ggbOptions: exo.ggb.getOptions({
+            coords: [8, 40, -5, 30],
+        }),
         keys: [],
         hint: exo.hint,
         correction: exo.correction,
@@ -58,8 +58,18 @@ const getGgb = (type) => {
         points.push(`Point({${x},${y}})`);
     }
     return type === "Générateur"
-        ? new geogebraConstructor_1.GeogebraConstructor([`Function(${Math.pow(10, 15)}/x^10,1,${(0, randint_1.randint)(40, 51)})`].concat(points), { axisLabels: ["$\\tiny I(A)$", "$\\tiny U(V)$"] })
-        : new geogebraConstructor_1.GeogebraConstructor([`Function(0.00000001*x^6,1,${(0, randint_1.randint)(40, 51)})`].concat(points), { axisLabels: ["$\\tiny I(A)$", "$\\tiny U(V)$"] });
+        ? new geogebraConstructor_1.GeogebraConstructor({
+            commands: [
+                `Function(${Math.pow(10, 15)}/x^10,1,${(0, randint_1.randint)(40, 51)})`,
+            ].concat(points),
+            xAxis: { label: "$\\tiny I(A)$" },
+            yAxis: { label: "$\\tiny U(V)$" },
+        })
+        : new geogebraConstructor_1.GeogebraConstructor({
+            commands: [`Function(0.00000001*x^6,1,${(0, randint_1.randint)(40, 51)})`].concat(points),
+            xAxis: { label: "$\\tiny I(A)$" },
+            yAxis: { label: "$\\tiny U(V)$" },
+        });
 };
 const getHint = (type) => {
     return type === "Générateur"
@@ -92,4 +102,5 @@ exports.ohmicConductorOrGenerator = {
     maxAllowedQuestions: 10,
     subject: "Physique",
     hasHintAndCorrection: true,
+    hasGeogebra: true,
 };

package/lib/exercises/pc/forces/calculateNormalOrFrictionForce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateNormalOrFrictionForce.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/forces/calculateNormalOrFrictionForce.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA8FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAgBhE,CAAC"}
+{"version":3,"file":"calculateNormalOrFrictionForce.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/forces/calculateNormalOrFrictionForce.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA6FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAehE,CAAC"}

package/lib/exercises/pc/forces/calculateNormalOrFrictionForce.js

@@ -16,7 +16,6 @@ const getCalculateNormalOrFrictionForceQuestion = () => {
         instruction: exo.instruction,
         hint: exo.hint,
         correction: exo.correction,
-        coords: [-2, 10, -2, 10],
         keys: [],
         answerFormat: "tex",
         identifiers: { mass: exo.mass, isAsking: exo.isAsking },
@@ -96,7 +95,6 @@ exports.calculateNormalOrFrictionForce = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
-    hasGeogebra: true,
     subject: "Physique",
     hasHintAndCorrection: true,
 };

package/lib/exercises/pc/math/proportionnalityCoeffFromLine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proportionnalityCoeffFromLine.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/math/proportionnalityCoeffFromLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,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;AA0EF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAe/D,CAAC"}
+{"version":3,"file":"proportionnalityCoeffFromLine.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/math/proportionnalityCoeffFromLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,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;AA2EF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAe/D,CAAC"}

package/lib/exercises/pc/math/proportionnalityCoeffFromLine.js

@@ -29,18 +29,19 @@ const getProportionnalityCoeffFromLineQuestion = () => {
         `f(x) = (${aString}) * x + (${bString})`,
         `SetColor(f, "${(0, colors_1.randomColor)()}")`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        axisLabels: ["$x$", "$y$"],
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        xAxis: { label: "$x$" },
+        yAxis: { label: "$y$" },
+        commands,
     });
     const answer = aTree.toTex();
     const question = {
         instruction: "Déterminer le coefficient de proportionnalité entre $y$ et $x$ : ",
         answer,
         keys: [],
-        commands: ggb.commands,
-        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+        }),
         answerFormat: "tex",
         identifiers: { xA, xB, yA, yB },
     };

package/lib/exercises/pc/mecanicalWaves/elongationReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"elongationReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mecanicalWaves/elongationReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4FF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAanD,CAAC"}
+{"version":3,"file":"elongationReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mecanicalWaves/elongationReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6FF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAcnD,CAAC"}

package/lib/exercises/pc/mecanicalWaves/elongationReading.js

@@ -19,9 +19,10 @@ const getElongationReadingQuestion = () => {
         `f(x) = If(x>=0, ${amplitude}*cos(x* (2*PI)/${period}))`,
         `SetColor(f, "${(0, colors_1.randomColor)()}")`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        axisLabels: ["$\\tiny \\text{Temps (s)}$", "$\\tiny \\text{y (cm)}$"],
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        xAxis: { label: "$\\tiny \\text{Temps (s)}$" },
+        yAxis: { label: "$\\tiny \\text{y (cm)}$" },
     });
     const frac = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode((2).toTree(), piNode_1.PiNode), period.toTree()).simplify();
     const node = new multiplyNode_1.MultiplyNode(amplitude.toTree(), new cosNode_1.CosNode(new multiplyNode_1.MultiplyNode(frac, new variableNode_1.VariableNode("t"))));
@@ -31,9 +32,9 @@ const getElongationReadingQuestion = () => {
         keys: ["y", "t", "pi", "cos", "equal"],
         answerFormat: "tex",
         identifiers: { amplitude, period },
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [-1, 20, -10, 10],
+        ggbOptions: ggb.getOptions({
+            coords: [-1, 20, -10, 10],
+        }),
     };
     return question;
 };
@@ -68,4 +69,5 @@ exports.elongationReading = {
     getPropositions,
     isAnswerValid,
     subject: "Physique",
+    hasGeogebra: true,
 };

package/lib/exercises/pc/mole/concentrationReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"concentrationReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/concentrationReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA0CtB,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"concentrationReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/mole/concentrationReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG,EAAE,CAAC;AA4CtB,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}

package/lib/exercises/pc/mole/concentrationReading.js

@@ -14,10 +14,12 @@ const getConcentrationReadingQuestion = () => {
         `SetFixed(L, true)`,
         `SetColor(L, "${(0, colors_1.randomColor)()}")`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         isGridSimple: false,
-        isAxesRatioFixed: false,
-        axisLabels: ["$\\tiny C (\\text{mol}\\cdot \\text{L}^{-1})$", "$\\tiny A$"],
+        lockedAxesRatio: false,
+        xAxis: { label: "$\\tiny C (\\text{mol}\\cdot \\text{L}^{-1})$" },
+        yAxis: { label: "$\\tiny A$" },
     });
     const question = {
         answer: concentration + "",
@@ -25,9 +27,9 @@ const getConcentrationReadingQuestion = () => {
         keys: [],
         answerFormat: "tex",
         identifiers: {},
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [-1, concentration + 2, -1, absorbtion + 2],
+        ggbOptions: ggb.getOptions({
+            coords: [-1, concentration + 2, -1, absorbtion + 2],
+        }),
     };
     return question;
 };

package/lib/exercises/pc/motion/characteristicsOfVelocityVector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristicsOfVelocityVector.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/motion/characteristicsOfVelocityVector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAqFF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"characteristicsOfVelocityVector.d.ts","sourceRoot":"","sources":["../../../../src/exercises/pc/motion/characteristicsOfVelocityVector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAoFF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}