math-exercises 3.0.68 → 3.0.70

package/lib/exercises/math/geometry/shapes/basicShapesNaming.js

@@ -1,36 +1,74 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
-import { LineConstructor } from "../../../../math/geometry/line.js";
-import { RayConstructor } from "../../../../math/geometry/ray.js";
-import { SegmentConstructor } from "../../../../math/geometry/segment.js";
+import { LineConstructor, } from "../../../../math/geometry/line.js";
+import { RayConstructor, } from "../../../../math/geometry/ray.js";
+import { SegmentConstructor, } from "../../../../math/geometry/segment.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-//!!Difficile de rendre cet exo non pur QCM car taper la parenthèse ouvre un environnement left/right ce qui empeche de taper des demi droites [AB)
-//!solutions que je vois :
-//! créer une touche parenthèse qui n'ouvre pas left/right (faisable mais relou)
-//! créer des touches [..], (..) et [..) directement (mais il faut déplacer le curseur vers la gauche dans ce cas)
-const getBasicShapesNamingQuestion = () => {
-    let answer = "";
+const buildObj = (identifiers) => {
+    switch (identifiers.type) {
+        case 1: //segment
+            return SegmentConstructor.fromIdentifiers(identifiers.objIds);
+        case 2: //demi-droite
+            return RayConstructor.fromIdentifiers(identifiers.objIds);
+        case 3: //droite
+        default:
+            return LineConstructor.fromIdentifiers(identifiers.objIds);
+    }
+};
+const getInstruction = (identifiers) => {
+    return `Comment se nomme la figure suivante ?`;
+};
+const getAnswer = (identifiers) => {
+    const obj = buildObj(identifiers);
+    const { type } = identifiers;
+    switch (type) {
+        case 1: //segment
+            return obj.name;
+            break;
+        case 2: //demi-droite
+            return obj.name;
+            break;
+        case 3: //droite
+        default:
+            return obj.toTexNoLeftRight();
+            break;
+    }
+};
+const getHint = (identifiers) => {
+    return `On rappelle que : 
+    
+  - Une longueur se note $AB$ ;
+  - Un segment se note $[AB]$ ;
+  - Une demi-droite d'origine $A$ se note $[AB)$ ;
+  - Une droite se note $(AB)$.
+  `;
+};
+const getCorrection = (identifiers) => {
+    const { type } = identifiers;
+    const obj = buildObj(identifiers);
+    return `La figure tracée est ${type === 1
+        ? "un segment"
+        : type === 2
+            ? `une demi-droite d'origine $${obj.startPoint.name}$`
+            : "une droite"}.
+    
+Cette figure se nomme donc $${getAnswer(identifiers)}$.`;
+};
+const getGGBOptions = (identifiers) => {
+    const { type } = identifiers;
     const commands = [];
-    const type = randint(1, 4);
-    let startPointName = "";
+    const obj = buildObj(identifiers);
     switch (type) {
         case 1: //segment
-            const segment = SegmentConstructor.random();
-            commands.push(...segment.toGGBCommands(true));
-            answer = segment.name;
+            commands.push(...obj.toGGBCommands(true));
             break;
         case 2: //demi-droite
-            const ray = RayConstructor.random();
-            commands.push(...ray.toGGBCommands(true));
-            answer = ray.name;
-            startPointName = ray.startPoint.name;
+            commands.push(...obj.toGGBCommands(true));
             break;
         case 3: //droite
         default:
-            const line = LineConstructor.random();
-            commands.push(...line.toGGBCommands(true, { color: "black" }));
-            answer = line.toTexNoLeftRight();
+            commands.push(...obj.toGGBCommands(true, { color: "black" }));
             break;
     }
     const ggb = new GeogebraConstructor({
@@ -38,36 +76,52 @@ const getBasicShapesNamingQuestion = () => {
         hideAxes: true,
         hideGrid: true,
     });
+    return ggb.getOptions({
+        coords: [-15, 15, -15, 15],
+    });
+};
+const getKeys = (identifiers) => {
+    const answer = getAnswer(identifiers);
     const letters = answer.substring(1, answer.length - 1).split("");
+    return ["lbracketNoSpace", "rbracketNoSpace", ...letters];
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Comment se nomme la figure suivante ?`,
-        keys: ["lbracketNoSpace", "rbracketNoSpace", ...letters],
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { type, commands },
-        ggbOptions: ggb.getOptions({
-            coords: [-15, 15, -15, 15],
-        }),
+        identifiers,
+        ggbOptions: getGGBOptions(identifiers),
         keyboardOptions: {
             parenthesisShouldNotProduceLeftRight: true,
         },
-        hint: `On rappelle que : 
-    
-- Une longueur se note $AB$ ;
-- Un segment se note $[AB]$ ;
-- Une demi-droite d'origine $A$ se note $[AB)$ ;
-- Une droite se note $(AB)$.
-`,
-        correction: `La figure tracée est ${type === 1
-            ? "un segment"
-            : type === 2
-                ? `une demi-droite d'origine $${startPointName}$`
-                : "une droite"}.
-    
-Cette figure se nomme donc $${answer}$.`,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
+const getBasicShapesNamingQuestion = () => {
+    const type = randint(1, 4);
+    let objIds;
+    switch (type) {
+        case 1: //segment
+            const segment = SegmentConstructor.random();
+            objIds = segment.toIdentifiers();
+            break;
+        case 2: //demi-droite
+            const ray = RayConstructor.random();
+            objIds = ray.toIdentifiers();
+            break;
+        case 3: //droite
+        default:
+            const line = LineConstructor.random();
+            objIds = line.toIdentifiers();
+            break;
+    }
+    const identifiers = { type, objIds };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -94,9 +148,7 @@ export const basicShapesNaming = {
     id: "basicShapesNaming",
     connector: "=",
     label: "Nommer un segment/une demi-droite/une droite",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getBasicShapesNamingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -105,4 +157,5 @@ export const basicShapesNaming = {
     subject: "Mathématiques",
     hasGeogebra: true,
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/geometry/shapes/basicShapesRecognition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicShapesRecognition.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/shapes/basicShapesRecognition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAmExD,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAgBxD,CAAC"}
+{"version":3,"file":"basicShapesRecognition.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/shapes/basicShapesRecognition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAyFxD,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

package/lib/exercises/math/geometry/shapes/basicShapesRecognition.js

@@ -7,49 +7,69 @@ import { RayConstructor } from "../../../../math/geometry/ray.js";
 import { SegmentConstructor } from "../../../../math/geometry/segment.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { randomLetter } from "../../../../utils/strings/randomLetter.js";
+const getInstruction = (identifiers) => {
+    return `Quel est le type d'objet tracé ci-dessous ?`;
+};
+const getAnswer = (identifiers) => {
+    const { type } = identifiers;
+    switch (type) {
+        case 0: //point
+            return "Un point";
+        case 1: //segment
+            return "Un segment";
+        case 2: //demi-droite
+            return "Une demi-droite";
+        case 3: //droite
+        default:
+            return "Une droite";
+    }
+};
+const getGGBOptions = (identifiers) => {
+    const { commands } = identifiers;
+    const ggb = new GeogebraConstructor({
+        commands,
+        hideAxes: true,
+        hideGrid: true,
+    });
+    return ggb.getOptions({
+        coords: [-15, 15, -15, 15],
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "raw",
+        identifiers,
+        ggbOptions: getGGBOptions(identifiers),
+    };
+    return question;
+};
 const getBasicShapesRecognitionQuestion = () => {
-    let answer = "";
     const commands = [];
     const type = randint(0, 4);
     switch (type) {
         case 0: //point
-            answer = "Un point";
             const point = PointConstructor.random(randomLetter(true));
             commands.push(...point.toGGBCommand());
             break;
         case 1: //segment
-            answer = "Un segment";
             const segment = SegmentConstructor.random();
             commands.push(...segment.toGGBCommands(true));
             break;
         case 2: //demi-droite
-            answer = "Une demi-droite";
             const ray = RayConstructor.random();
             commands.push(...ray.toGGBCommands(true));
             break;
         case 3: //droite
         default:
-            answer = "Une droite";
             const line = LineConstructor.random();
             commands.push(...line.toGGBCommands(true, { color: "black" }));
             break;
     }
-    const ggb = new GeogebraConstructor({
-        commands,
-        hideAxes: true,
-        hideGrid: true,
-    });
-    const question = {
-        answer,
-        instruction: `Quel est le type d'objet tracé ci-dessous ?`,
-        keys: [],
-        answerFormat: "raw",
-        identifiers: { type, commands },
-        ggbOptions: ggb.getOptions({
-            coords: [-15, 15, -15, 15],
-        }),
-    };
-    return question;
+    const identifiers = { type, commands };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -67,9 +87,7 @@ export const basicShapesRecognition = {
     id: "basicShapesRecognition",
     connector: "=",
     label: "Reconnaître un point / un segment / une demi-droite / une droite",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getBasicShapesRecognitionQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -78,4 +96,5 @@ export const basicShapesRecognition = {
     subject: "Mathématiques",
     answerType: "QCU",
     hasGeogebra: true,
+    getQuestionFromIdentifiers,
 };

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,EAqBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAGL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAQnD,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AA8DF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAwBvD,CAAC"}
+{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thalesCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAsBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAGL,mBAAmB,EACpB,MAAM,2CAA2C,CAAC;AAQnD,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAqEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAyBvD,CAAC"}

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

@@ -155,15 +155,18 @@ const getThalesFindSideQuestion = (opts) => {
         isPapillon,
         ratio,
     };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
-        keys: getKeys(identifiers),
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
         identifiers,
         // hint: getHint(identifiers),
         // correction: getCorrection(identifiers),
-        ggbOptions: getGGBOptions(identifiers),
+        ggbOptions: getGGBOptions(identifiers, opts),
     };
     return question;
 };
@@ -190,4 +193,5 @@ export const thalesCalcul = {
             message: "Veuillez choisir un type de figure.",
         };
     },
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"chasles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/chasles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAuDF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAWzC,CAAC"}
+{"version":3,"file":"chasles.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/chasles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqFF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAYzC,CAAC"}

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

@@ -3,6 +3,39 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { randint } from "../../../../math/utils/random/randint.js";
 import { random } from "../../../../utils/alea/random.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    const { randLetters, vectors } = identifiers;
+    let statement = vectors.join("");
+    if (statement[0] === "+")
+        statement = statement.slice(1, statement.length);
+    return `Simplifier : 
+  
+$$
+${statement}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { randLetters, vectors } = identifiers;
+    const answer = `\\overrightarrow{${randLetters[0]}${randLetters[vectors.length]}}`;
+    return answer;
+};
+const getKeys = (identifiers) => {
+    const { randLetters, vectors } = identifiers;
+    return [
+        "overrightarrow",
+        ...randLetters.sort((a, b) => a.localeCompare(b)),
+    ];
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ";
 const invVec = (vec) => {
     return `\\overrightarrow{${vec[1]}${vec[0]}}`;
@@ -14,22 +47,12 @@ const getChaslesQuestion = () => {
     for (let i = 0; i < nbOfVectors; i++) {
         vectors.push(`${randLetters[i]}${randLetters[i + 1]}`);
     }
-    const answer = `\\overrightarrow{${randLetters[0]}${randLetters[nbOfVectors]}}`;
     vectors = shuffle(vectors).map((vec) => Math.random() < 0.4 ? "-" + invVec(vec) : `+\\overrightarrow{${vec}}`);
     let statement = vectors.join("");
     if (statement[0] === "+")
         statement = statement.slice(1, statement.length);
-    const question = {
-        answer: answer,
-        instruction: `Simplifier : $${statement}$`,
-        keys: [
-            "overrightarrow",
-            ...randLetters.sort((a, b) => a.localeCompare(b)),
-        ],
-        answerFormat: "tex",
-        identifiers: { randLetters, vectors },
-    };
-    return question;
+    const identifiers = { randLetters, vectors };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, randLetters }) => {
     const propositions = [];
@@ -56,4 +79,5 @@ export const chasles = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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,6BAA6B,CAAC;AAOrC,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"}
+{"version":3,"file":"coordinatesReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/coordinatesReading.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,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;AAuFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAcpD,CAAC"}

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

@@ -4,15 +4,18 @@ import { randomColor } from "../../../../geogebra/colors.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { IntegerConstructor } from "../../../../math/numbers/integer/integer.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-const getCoordinatesReadingQuestion = () => {
-    const [xA, yA] = IntegerConstructor.randomDifferents(-5, 6, 2);
-    let xB, yB;
-    do {
-        [xB, yB] = IntegerConstructor.randomDifferents(-5, 6, 2);
-    } while (xA === xB && yA === yB);
+const getInstruction = (identifiers) => {
+    return `Lire les coordonnées du vecteur $\\overrightarrow u$ représenté ci-dessous :`;
+};
+const getAnswer = (identifiers) => {
+    const { xA, xB, yA, yB } = identifiers;
     const xDelta = xB - xA;
     const yDelta = yB - yA;
     const answer = `\\left(${xDelta};${yDelta}\\right)`;
+    return answer;
+};
+const getGGBOptions = (identifiers) => {
+    const { xA, xB, yA, yB } = identifiers;
     const commands = [
         `u = Vector((${xA},${yA}), (${xB}, ${yB}))`,
         'SetCaption(u, "$\\overrightarrow u$")',
@@ -27,18 +30,30 @@ const getCoordinatesReadingQuestion = () => {
         commands,
         isGridBold: true,
     });
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answer,
-        instruction: `Lire les coordonnées du vecteur $\\overrightarrow u$ représenté ci-dessous :`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["semicolon", "vectorU"],
         answerFormat: "tex",
-        ggbOptions: ggb.getOptions({
-            coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
-        }),
-        identifiers: { xA, xB, yA, yB },
+        ggbOptions: getGGBOptions(identifiers),
+        identifiers,
     };
     return question;
 };
+const getCoordinatesReadingQuestion = () => {
+    const [xA, yA] = IntegerConstructor.randomDifferents(-5, 6, 2);
+    let xB, yB;
+    do {
+        [xB, yB] = IntegerConstructor.randomDifferents(-5, 6, 2);
+    } while (xA === xB && yA === yB);
+    const identifiers = { xA, xB, yA, yB };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -58,9 +73,7 @@ export const coordinatesReading = {
     id: "coordinatesReading",
     connector: "=",
     label: "Lire les coordonnées d'un vecteur",
-    levels: ["2nde", "1reESM"],
     isSingleStep: true,
-    sections: ["Vecteurs"],
     generator: (nb) => getDistinctQuestions(getCoordinatesReadingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -68,4 +81,5 @@ export const coordinatesReading = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"determinant.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/determinant.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAoDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAa7C,CAAC"}
+{"version":3,"file":"determinant.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/determinant.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAwFF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAY7C,CAAC"}

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

@@ -4,23 +4,38 @@ import { Vector, VectorConstructor } from "../../../../math/geometry/vector.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
-const getDeterminantQuestion = () => {
-    const u = VectorConstructor.random("u");
-    const v = VectorConstructor.random("v");
+const getInstruction = (identifiers) => {
+    const u = new Vector("u", Number(identifiers.uCoords[0]).toTree(), Number(identifiers.uCoords[1]).toTree());
+    const v = new Vector("v", Number(identifiers.uCoords[0]).toTree(), Number(identifiers.uCoords[1]).toTree());
+    return `Soient les vecteurs $${u.toTexWithCoords()}$ et $${v.toTexWithCoords()}$. 
+  
+Calculer le déterminant $\\det(\\overrightarrow u;\\overrightarrow v)$.`;
+};
+const getAnswer = (identifiers) => {
+    const u = new Vector("u", Number(identifiers.uCoords[0]).toTree(), Number(identifiers.uCoords[1]).toTree());
+    const v = new Vector("v", Number(identifiers.uCoords[0]).toTree(), Number(identifiers.uCoords[1]).toTree());
     const answer = u.determinant(v).simplify();
-    const answerTex = answer.toTex();
+    return answer.toTex();
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answerTex,
-        instruction: `Soient les vecteurs $${u.toTexWithCoords()}$ et $${v.toTexWithCoords()}$. Calculer le déterminant $\\det(\\overrightarrow u;\\overrightarrow v)$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            uCoords: [u.x.toTex(), u.y.toTex()],
-            vCoords: [v.x.toTex(), v.y.toTex()],
-        },
+        identifiers,
     };
     return question;
 };
+const getDeterminantQuestion = () => {
+    const u = VectorConstructor.random("u");
+    const v = VectorConstructor.random("v");
+    const identifiers = {
+        uCoords: [u.x.toTex(), u.y.toTex()],
+        vCoords: [v.x.toTex(), v.y.toTex()],
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, uCoords, vCoords }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -40,13 +55,12 @@ export const determinant = {
     id: "determinant",
     connector: "=",
     label: "Calculer le déterminant de deux vecteurs",
-    levels: ["2nde", "1reESM", "1reSpé"],
     isSingleStep: true,
-    sections: ["Vecteurs"],
     generator: (nb) => getDistinctQuestions(getDeterminantQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

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,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkCF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAYlD,CAAC"}
+{"version":3,"file":"drawAVectorInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/drawAVectorInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAyDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAWlD,CAAC"}

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

@@ -5,28 +5,43 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { GeogebraParser } from "../../../../geogebra/parsers/geogebraParser.js";
 import { approxEqual } from "../../../../geogebra/parsers/approxEqual.js";
-const getDrawAVectorInGgbQuestion = () => {
-    const x = randint(-3, 3);
-    const y = x === 0 ? randint(-3, 3, [0]) : randint(-3, 3);
+const getInstruction = (identifiers) => {
+    const { x, y } = identifiers;
     const vector = new Vector("u", x.toTree(), y.toTree());
+    return `Tracer le vecteur $${vector.toTex()}${vector.toInlineCoordsTex()}$`;
+};
+const getGGBAnswer = (identifiers) => {
+    const { x, y } = identifiers;
+    return [`Vector[(0, 0), (${x}, ${y})]`];
+};
+const getStudentGGBOptions = (identifiers) => {
     const studentGGB = new GeogebraConstructor({
         isGridSimple: true,
         customToolBar: toolBarConstructor({
             vector: true,
         }),
     });
+    return studentGGB.getOptions({
+        coords: [-5, 5, -6, 6],
+    });
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        ggbAnswer: [`Vector[(0, 0), (${x}, ${y})]`],
-        instruction: `Tracer le vecteur $${vector.toTex()}${vector.toInlineCoordsTex()}$`,
+        ggbAnswer: getGGBAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
-        studentGgbOptions: studentGGB.getOptions({
-            coords: [-5, 5, -6, 6],
-        }),
+        studentGgbOptions: getStudentGGBOptions(identifiers),
         answerFormat: "tex",
-        identifiers: { x, y },
+        identifiers,
     };
     return question;
 };
+const getDrawAVectorInGgbQuestion = () => {
+    const x = randint(-3, 3);
+    const y = x === 0 ? randint(-3, 3, [0]) : randint(-3, 3);
+    const identifiers = { x, y };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const isGGBAnswerValid = (ans, { ggbAnswer, x, y }) => {
     const parser = new GeogebraParser(ans);
     const vectors = parser.vectors();
@@ -38,12 +53,11 @@ const isGGBAnswerValid = (ans, { ggbAnswer, x, y }) => {
 export const drawAVectorInGGB = {
     id: "drawAVectorInGGB",
     label: "Tracer un vecteur",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Géométrie cartésienne"],
     generator: (nb) => getDistinctQuestions(getDrawAVectorInGgbQuestion, nb),
     ggbTimer: 60,
     answerType: "GGB",
     isGGBAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/geometry/vectors/equalCaracteristicFromGraph.d.ts

@@ -3,6 +3,7 @@ type Identifiers = {
     caracAsked: string;
     uPoints: number[][];
     vPoints: number[][];
+    isTrue: boolean;
 };
 export declare const equalCaracteristicFromGraph: Exercise<Identifiers>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"equalCaracteristicFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/equalCaracteristicFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;CACrB,CAAC;AAuLF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAe7D,CAAC"}
+{"version":3,"file":"equalCaracteristicFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/equalCaracteristicFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAuNF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}