math-exercises 2.2.15 → 2.2.16

package/lib/exercises/math/geometry/cartesian/cartesianEquationOfLine.js

@@ -24,7 +24,7 @@ const getCartesianEquationOfLineQuestion = () => {
         `ShowLabel(d,true)`,
         `SetFixed(d,true)`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, { isGridSimple: true });
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({ commands });
     const correctAnswer = line.getCartesianEquation();
     const instruction = `Déterminer une équation cartesienne de la droite $d$ représentée ci-dessous :`;
     const aX = a.getXnumber();
@@ -33,13 +33,13 @@ const getCartesianEquationOfLineQuestion = () => {
     const bY = b.getYnumber();
     const question = {
         answer: correctAnswer.toTex(),
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: ggb.getAdaptedCoords({
-            xMin: Math.min(aX, bX) - 5,
-            xMax: Math.max(bX, aX) + 5,
-            yMin: Math.min(aY, bY) - 5,
-            yMax: Math.max(bY, aY) + 5,
+        ggbOptions: ggb.getOptions({
+            coords: ggb.getAdaptedCoords({
+                xMin: Math.min(aX, bX) - 5,
+                xMax: Math.max(bX, aX) + 5,
+                yMin: Math.min(aY, bY) - 5,
+                yMax: Math.max(bY, aY) + 5,
+            }),
         }),
         instruction: instruction,
         keys: ["x", "y", "equal"],

package/lib/exercises/math/geometry/cartesian/directionVector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directionVector.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/directionVector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAyIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"directionVector.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/directionVector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAyIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/geometry/cartesian/directionVector.js

@@ -54,15 +54,15 @@ const getDirectionVectorQuestion = () => {
     const yMin = Math.min(y1, y2);
     const xMax = Math.max(x1, x2);
     const yMax = Math.max(y1, y2);
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
     });
     const question = {
         answer: vector.toInlineCoordsTex(),
         instruction,
-        commands: ggb.commands,
-        coords: [xMin - 10, xMax + 10, yMin - 10, yMax + 10],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [xMin - 10, xMax + 10, yMin - 10, yMax + 10],
+        }),
         keys: ["semicolon", "x", "y"],
         answerFormat: "tex",
         identifiers: { xValue, yValue },
@@ -121,4 +121,5 @@ exports.directionVector = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasGeogebra: true,
 };

package/lib/exercises/math/geometry/cartesian/drawAlineInGGB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawAlineInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/drawAlineInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAwDF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAahD,CAAC"}
+{"version":3,"file":"drawAlineInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/drawAlineInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2DF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAahD,CAAC"}

package/lib/exercises/math/geometry/cartesian/drawAlineInGGB.js

@@ -9,26 +9,27 @@ const point_1 = require("../../../../math/geometry/point");
 const affine_1 = require("../../../../math/polynomials/affine");
 const arrayEqual_1 = require("../../../../utils/arrayEqual");
 const deleteObjectNamesFromAnswer_1 = require("../../../../geogebra/deleteObjectNamesFromAnswer");
+const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
 const getDrawAlineInGgbQuestion = () => {
     const f = affine_1.AffineConstructor.random({ min: -3, max: 3 });
     const yA = f.b;
     const yB = f.a + f.b;
     const yMax = Math.max(yA, yB, 0);
     const yMin = Math.min(yA, yB, 0);
+    const studentGGB = new geogebraConstructor_1.GeogebraConstructor({
+        isGridSimple: true,
+        customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
+            join: true,
+        }),
+    });
     const question = {
         ggbAnswer: [`(0,${yA})`, `(1,${yB})`, `Line[A, B]`],
         instruction: `Tracer la droite $d$ d'équation $y=${f.toTex()}$.`,
         keys: [],
         answerFormat: "tex",
-        studentGgbOptions: {
-            customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
-                join: true,
-            }),
-            xAxisSteps: 1,
-            yAxisSteps: 1,
+        studentGgbOptions: studentGGB.getOptions({
             coords: [-6, 6, yMin - 5, yMax + 5],
-            isGridSimple: true,
-        },
+        }),
         identifiers: { correctA: f.a, correctB: f.b },
     };
     return question;

package/lib/exercises/math/geometry/cartesian/placeAPoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA0B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}
+{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA2B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/math/geometry/cartesian/placeAPoint.js

@@ -6,20 +6,22 @@ const toolBarConstructor_1 = require("../../../../exercises/utils/geogebra/toolB
 const point_1 = require("../../../../math/geometry/point");
 const arrayHasSameElement_1 = require("../../../../utils/arrayHasSameElement");
 const deleteObjectNamesFromAnswer_1 = require("../../../../geogebra/deleteObjectNamesFromAnswer");
+const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
 const getPlaceAPointQuestion = () => {
     const point = point_1.PointConstructor.random("A");
+    const studentGGB = new geogebraConstructor_1.GeogebraConstructor({
+        isGridSimple: true,
+        customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
+            point: true,
+        }),
+    });
     const question = {
         ggbAnswer: [`(${point.getXnumber()},${point.getYnumber()})`],
         instruction: `Placer le point $A$ de coordonnées $${point.toTexWithCoords()}$.`,
         keys: [],
-        studentGgbOptions: {
-            customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
-                point: true,
-            }),
+        studentGgbOptions: studentGGB.getOptions({
             coords: [-11, 11, -11, 11],
-            isGridSimple: true,
-            enableShiftDragZoom: true,
-        },
+        }),
         identifiers: { x: point.x.evaluate({}), y: point.y.evaluate({}) },
     };
     return question;

package/lib/exercises/math/geometry/cartesian/pointCoordinates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pointCoordinates.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinates.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2EF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"pointCoordinates.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/pointCoordinates.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}

package/lib/exercises/math/geometry/cartesian/pointCoordinates.js

@@ -24,17 +24,22 @@ const getPointCoordinatesQuestion = () => {
         `SetFixed(A, true)`,
         `ZoomIn(${xMin}, ${yMin}, ${xMax}, ${yMax})`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isAxesRatioFixed: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
     });
     const A = new point_1.Point("A", x.toTree(), y.toTree());
     const question = {
         answer: A.toCoords(),
-        commands: ggb.commands,
         instruction,
-        options: ggb.getOptions(),
-        coords: [xMin, xMax, yMin, yMax],
+        ggbOptions: ggb.getOptions({
+            coords: ggb.getAdaptedCoords({
+                xMin,
+                xMax,
+                yMin,
+                yMax,
+                forceShowAxes: true,
+            }),
+        }),
         keys: ["x", "y", "semicolon"],
         answerFormat: "tex",
         identifiers: { x, y },
@@ -73,4 +78,5 @@ exports.pointCoordinates = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasGeogebra: true,
 };

package/lib/exercises/math/geometry/convexity/convexityQuadrinomialsGeo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convexityQuadrinomialsGeo.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/convexity/convexityQuadrinomialsGeo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAoBlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AA0LF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAa3D,CAAC"}
+{"version":3,"file":"convexityQuadrinomialsGeo.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/convexity/convexityQuadrinomialsGeo.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAoBlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AA0LF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}

package/lib/exercises/math/geometry/convexity/convexityQuadrinomialsGeo.js

@@ -66,16 +66,16 @@ const getConvexityQuadrinomialsGeoQuestion = () => {
         `SetCaption(f, "$\\mathcal C_f$")`,
         `ShowLabel(f, true)`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isAxesRatioFixed: false,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
     });
     const question = {
         answer: interval,
         instruction,
-        commands: ggb.commands,
-        coords: [xMin, xMax, yMin, yMax],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [xMin, xMax, yMin, yMax],
+        }),
         keys: ["rbracket", "lbracket", "semicolon", "infty", "reals"],
         answerFormat: "tex",
         identifiers: { askConvex, quadcoeffs, inflexionPoint: inflexionPointX },
@@ -124,4 +124,5 @@ exports.convexityQuadrinomialsGeo = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasGeogebra: true,
 };

package/lib/exercises/math/geometry/convexity/convexityTrinomialsGeo.js

@@ -16,17 +16,17 @@ const getConvexityTrinomialsGeoQuestion = () => {
         `SetCaption(f, "$\\mathcal C_f$")`,
         `ShowLabel(f, true)`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isAxesRatioFixed: false,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
     });
     const isConvex = trinom.a > 0 ? "Convexe" : "Concave";
     const question = {
         answer: isConvex,
         instruction,
-        commands: ggb.commands,
-        coords: trinom.getCoords(),
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: trinom.getCoords(),
+        }),
         keys: [],
         answerFormat: "raw",
         identifiers: { trinom: [trinom.a, trinom.b, trinom.c] },

package/lib/exercises/math/geometry/pythagore/pythagore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pythagore.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagore.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA+DF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}
+{"version":3,"file":"pythagore.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagore.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgEF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAc3C,CAAC"}

package/lib/exercises/math/geometry/pythagore/pythagore.js

@@ -23,7 +23,8 @@ const getPythagore = () => {
     const sideA = triangle.getSideAName();
     const sideB = triangle.getSideBName();
     const sideC = triangle.getSideCName();
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(triangle.generateCommands({}), {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands: triangle.generateCommands({}),
         hideAxes: true,
         hideGrid: true,
     });
@@ -32,9 +33,9 @@ const getPythagore = () => {
         instruction: "Écrire l'égalité de Pythagore pour le triangle rectangle suivant : ",
         answer,
         keys: [...vertices, "equal"],
-        commands: ggb.commands,
-        coords: triangle.generateCoords(),
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: triangle.generateCoords(),
+        }),
         answerFormat: "tex",
         identifiers: { sideA, sideB, sideC },
     };

package/lib/exercises/math/geometry/pythagore/pythagoreCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pythagoreCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagoreCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAkGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}
+{"version":3,"file":"pythagoreCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/pythagore/pythagoreCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAmGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/geometry/pythagore/pythagoreCalcul.js

@@ -54,7 +54,8 @@ const getPythagoreCalcul = () => {
             highlightedSide: sides[randoms[2]],
         }),
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
     });
@@ -63,9 +64,9 @@ const getPythagoreCalcul = () => {
         instruction: `Dans le triangle $${triangle.getTriangleName()}$ rectangle en $${triangle.getRightAngle()}$, on sait que $${sides[randoms[0]]} = ${sideLengths[randoms[0]]}$ et que $${sides[randoms[1]]} = ${sideLengths[randoms[1]]}$. Calculer la longueur exacte $${sides[randoms[2]]}$.`,
         answer,
         keys: [...vertices, "equal"],
-        commands: ggb.commands,
-        coords: triangle.generateCoords(),
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: triangle.generateCoords(),
+        }),
         answerFormat: "tex",
         identifiers: { square, sideLengths },
     };

package/lib/exercises/math/geometry/thales/thales.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thales.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thales.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AA0IF,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,WAAW,CAcxC,CAAC"}
+{"version":3,"file":"thales.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thales.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AA2IF,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,WAAW,CAcxC,CAAC"}

package/lib/exercises/math/geometry/thales/thales.js

@@ -59,7 +59,8 @@ const getThales = () => {
         `ShowLabel(${vertices[4]}, true)`,
     ];
     const answer = `\\frac{${vertices[0]}${vertices[3]}}{${vertices[0]}${vertices[1]}}=\\frac{${vertices[0]}${vertices[4]}}{${vertices[0]}${vertices[2]}}=\\frac{${vertices[3]}${vertices[4]}}{${vertices[1]}${vertices[2]}}`;
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
     });
@@ -67,9 +68,9 @@ const getThales = () => {
         instruction: `En utilisant le théoreme de Thalès, écrire l'égalité des quotients sachant que  $(${vertices[3]}${vertices[4]})//(${vertices[1]}${vertices[2]})$.`,
         answer,
         keys: [...vertices, "equal"],
-        commands: ggb.commands,
-        coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],
+        }),
         answerFormat: "tex",
         identifiers: { vertices },
     };

package/lib/exercises/math/geometry/thales/thalesCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thalesCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAkLF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}
+{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thalesCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAmLF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAc9C,CAAC"}

package/lib/exercises/math/geometry/thales/thalesCalcul.js

@@ -94,7 +94,8 @@ const getThales = () => {
         `ShowLabel(${vertices[3]}, true)`,
         `ShowLabel(${vertices[4]}, true)`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
     });
@@ -104,9 +105,9 @@ const getThales = () => {
         startStatement,
         answer,
         keys: [],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],
+        ggbOptions: ggb.getOptions({
+            coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],
+        }),
         answerFormat: "tex",
         identifiers: { isAskingC, rand, rand2, sideLengths },
     };

package/lib/exercises/math/geometry/vectors/coordinatesReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coordinatesReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/coordinatesReading.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAOlC,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;AAqEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}
+{"version":3,"file":"coordinatesReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/coordinatesReading.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAOlC,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,QAAQ,CAAC,WAAW,CAepD,CAAC"}

package/lib/exercises/math/geometry/vectors/coordinatesReading.js

@@ -26,9 +26,8 @@ const getCoordinatesReadingQuestion = () => {
     const yMin = Math.min(yA, yB);
     const xMax = Math.max(xA, xB);
     const yMax = Math.max(yA, yB);
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        gridDistance: [1, 1],
-        isGridSimple: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         isGridBold: true,
     });
     const question = {
@@ -36,9 +35,9 @@ const getCoordinatesReadingQuestion = () => {
         instruction: `Lire les coordonnées du vecteur $\\overrightarrow u$ représenté ci-dessous :`,
         keys: ["semicolon", "vectorU"],
         answerFormat: "tex",
-        commands: ggb.commands,
-        coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
+        }),
         identifiers: { xA, xB, yA, yB },
     };
     return question;

package/lib/exercises/math/geometry/vectors/drawAVectorInGGB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawAVectorInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/drawAVectorInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"drawAVectorInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/drawAVectorInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/math/geometry/vectors/drawAVectorInGGB.js

@@ -5,22 +5,24 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const toolBarConstructor_1 = require("../../../../exercises/utils/geogebra/toolBarConstructor");
 const vector_1 = require("../../../../math/geometry/vector");
 const randint_1 = require("../../../../math/utils/random/randint");
+const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
 const getDrawAVectorInGgbQuestion = () => {
     const x = (0, randint_1.randint)(-3, 3);
     const y = x === 0 ? (0, randint_1.randint)(-3, 3, [0]) : (0, randint_1.randint)(-3, 3);
     const vector = new vector_1.Vector("u", x.toTree(), y.toTree());
+    const studentGGB = new geogebraConstructor_1.GeogebraConstructor({
+        isGridSimple: true,
+        customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
+            vector: true,
+        }),
+    });
     const question = {
-        ggbAnswer: [`Vector[(-2, -2), (${-2 + x}, ${-2 + y})]`],
+        ggbAnswer: [`Vector[(0, 0), (${x}, ${y})]`],
         instruction: `Tracer le vecteur $${vector.toTex()}${vector.toInlineCoordsTex()}$`,
         keys: [],
-        studentGgbOptions: {
-            customToolBar: (0, toolBarConstructor_1.toolBarConstructor)({
-                vector: true,
-            }),
-            isGridSimple: true,
+        studentGgbOptions: studentGGB.getOptions({
             coords: [-5, 5, -6, 6],
-            enableShiftDragZoom: true,
-        },
+        }),
         answerFormat: "tex",
         identifiers: { x, y },
     };

package/lib/exercises/math/geometry/vectors/equalCaracteristicFromGraph.js

@@ -151,8 +151,8 @@ const getEqualCaracteristicFromGraphQuestion = () => {
         "ShowLabel(u, true)",
         "ShowLabel(v,true)",
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
     });
     const answer = isTrue ? "Oui" : "Non";
@@ -160,9 +160,9 @@ const getEqualCaracteristicFromGraphQuestion = () => {
         answer,
         instruction: `Les vecteurs $\\overrightarrow{u}$ et $\\overrightarrow{v}$ suivants semblent-ils ${instruction} ?`,
         keys: [],
-        commands: ggb.commands,
-        options: ggb.getOptions(),
-        coords: [-8, 8, -4, 4],
+        ggbOptions: ggb.getOptions({
+            coords: [-8, 8, -4, 4],
+        }),
         answerFormat: "raw",
         identifiers: { caracAsked, uPoints, vPoints },
     };

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

@@ -29,9 +29,9 @@ const getConeVolumeQuestion = () => {
         `SetVisibleInView(B, -1, false)`,
         `Cone(A, B, ${radius})`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isAxesRatioFixed: false,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
         hideAxes: true,
         hideGrid: true,
         is3D: true,
@@ -39,9 +39,9 @@ const getConeVolumeQuestion = () => {
     const question = {
         answer: volume,
         instruction: `Le cône ci-dessous a une base de rayon $${radius}$ et une hauteur de $${height}$. Calculer son volume (arrondir au centième).`,
-        commands: ggb.commands,
-        coords: [xMin, xMax, yMin, yMax, 0, zMax],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [xMin, xMax, yMin, yMax, 0, zMax],
+        }),
         keys: [],
         answerFormat: "tex",
         identifiers: { radius, height },

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

@@ -64,9 +64,9 @@ const getParallelepipedVolumeQuestion = () => {
         `SetFixed(H, true)`,
         `ZoomIn(${xMin}, ${yMin}, ${xMax}, ${yMax}, ${zMin}, ${zMax})`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isAxesRatioFixed: false,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
         is3D: true,
         hideAxes: true,
         hideGrid: true,
@@ -74,9 +74,9 @@ const getParallelepipedVolumeQuestion = () => {
     const question = {
         answer: volume,
         instruction: `Le parallélépipède $ABCDEFGH$ ci-dessous a une longueur de $${length.frenchify()}$, une largeur de $${width.frenchify()}$, et une hauteur de $${height.frenchify()}$. Calculer son volume (arrondir au centième).`,
-        commands: ggb.commands,
-        coords: [xMin, xMax, yMin, yMax, zMin, zMax],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [xMin, xMax, yMin, yMax, zMin, zMax],
+        }),
         keys: [],
         answerFormat: "tex",
         identifiers: { length, width, height, angle },

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

@@ -23,9 +23,9 @@ const getSphereVolumeQuestion = () => {
         `SetFixed(A, true)`,
         `SetVisibleInView(A, -1, false)`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
-        isGridSimple: true,
-        isAxesRatioFixed: false,
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
+        lockedAxesRatio: false,
         is3D: true,
         hideAxes: true,
         hideGrid: true,
@@ -33,9 +33,9 @@ const getSphereVolumeQuestion = () => {
     const question = {
         answer: volume,
         instruction: `La sphère ci-dessous a un rayon de $${radius.frenchify()}$. Calculer son volume (arrondir au centième).`,
-        commands: ggb.commands,
-        coords: [xMin, xMax, yMin, yMax, zMin, zMax],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [xMin, xMax, yMin, yMax, zMin, zMax],
+        }),
         keys: [],
         answerFormat: "tex",
         identifiers: { radius },

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

@@ -1 +1 @@
-{"version":3,"file":"volumeOfCube.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfCube.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAoEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAgB9C,CAAC"}
+{"version":3,"file":"volumeOfCube.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfCube.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAqEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAgB9C,CAAC"}

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

@@ -17,7 +17,8 @@ const getVolumeOfCubeQuestion = () => {
         `ShowLabel(C,true)`,
         `P=Cube(A,B,C)`,
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         is3D: true,
         hideAxes: true,
         hideGrid: true,
@@ -28,13 +29,13 @@ const getVolumeOfCubeQuestion = () => {
         instruction: `$ABCDEFGH$ est un cube d'arête $${cubeSide}$. Calculer son volume.`,
         keys: [],
         answerFormat: "tex",
-        commands: ggb.commands,
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [0, cubeSide + 1, 0, cubeSide + 1, 0, cubeSide + 1],
+        }),
         hint: "Le volume d'un cube est donné par $V = a^3$, où $a$ est l'arête du cube.",
         correction: `Le volume d'un cube est donné par $V = a^3$, où $a$ est l'arête du cube. Ici, le volume de $ABCDEFGH$ est donc :
     
 $V = ${cubeSide}^3 = ${answer}.$`,
-        coords: [0, cubeSide + 1, 0, cubeSide + 1, 0, cubeSide + 1],
         identifiers: { cubeSide },
     };
     return question;

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

@@ -1 +1 @@
-{"version":3,"file":"volumeOfPyramidWithSquareOrRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA0JF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}
+{"version":3,"file":"volumeOfPyramidWithSquareOrRectBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithSquareOrRectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAQF,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AA2JF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}

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

@@ -15,7 +15,8 @@ const getVolumeOfPyramidWithSquareOrRectBaseQuestion = () => {
     const exercise = generateExercise();
     const baseOfPyramid = exercise.baseOfPyramid;
     const commands = exercise.ggbCommands;
-    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands,
         hideAxes: true,
         hideGrid: true,
         is3D: true,
@@ -31,9 +32,9 @@ const getVolumeOfPyramidWithSquareOrRectBaseQuestion = () => {
         instruction: instruction,
         keys: [],
         answerFormat: "tex",
-        commands: ggb.commands,
-        coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, exercise.h + 1],
-        options: ggb.getOptions(),
+        ggbOptions: ggb.getOptions({
+            coords: [-2, maxCoord + 1, -2, maxCoord + 1, -2, exercise.h + 1],
+        }),
         identifiers: { h, baseOfPyramid },
     };
     return question;

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

@@ -1 +1 @@
-{"version":3,"file":"volumeOfPyramidWithTriangleBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AASF,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiKF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"volumeOfPyramidWithTriangleBase.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/volumes/volumeOfPyramidWithTriangleBase.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,kBAAkB,EAAE,aAAa,CAAC;CACnC,CAAC;AASF,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmKF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}