math-exercises 3.0.97 → 3.0.98

package/lib/exercises/math/functions/variations/varTableExtremaReading.js

@@ -1,7 +1,6 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { addValidProp, shuffleProps, tryToAddWrongProp, GeneratorOptionTarget, GeneratorOptionType, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
-import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { ClosureType } from "../../../../tree/nodes/sets/closure.js";
 import { IntervalNode } from "../../../../tree/nodes/sets/intervalNode.js";
@@ -20,13 +19,57 @@ const getAnswer = (identifiers) => {
     const { isAskingX, isAskingMin, xValues, yValues, intervalXIndexes } = identifiers;
     return (isAskingX ? xValues : yValues)[yValues.indexOf((isAskingMin ? Math.min : Math.max)(...yValues.slice(intervalXIndexes[0], intervalXIndexes[1] + 1)))].frenchify();
 };
+const getTable = (identifiers) => {
+    const { xValues, yValues } = identifiers;
+    const isFirstAscending = yValues[0] < yValues[1];
+    const firstArrow = isFirstAscending ? "\\nearrow" : "\\searrow";
+    const secondArrow = isFirstAscending ? "\\searrow" : "\\nearrow";
+    return [
+        [
+            "x",
+            xValues[0].frenchify(),
+            "\\ ",
+            xValues[1].frenchify(),
+            "\\ ",
+            xValues[2].frenchify(),
+            "\\ ",
+            xValues[3].frenchify(),
+        ],
+        [
+            " ",
+            isFirstAscending ? "\\ " : yValues[0].frenchify(),
+            "\\ ",
+            isFirstAscending ? yValues[1].frenchify() : "\\ ",
+            "\\ ",
+            isFirstAscending ? "\\ " : yValues[2].frenchify(),
+            "\\ ",
+            isFirstAscending ? yValues[3].frenchify() : "\\ ",
+        ],
+        ["f(x)", "\\ ", firstArrow, "\\ ", secondArrow, "\\ ", firstArrow, "\\ "],
+        [
+            " ",
+            !isFirstAscending ? "\\ " : yValues[0].frenchify(),
+            "\\ ",
+            !isFirstAscending ? yValues[1].frenchify() : "\\ ",
+            "\\ ",
+            !isFirstAscending ? "\\ " : yValues[2].frenchify(),
+            "\\ ",
+            !isFirstAscending ? yValues[3].frenchify() : "\\ ",
+        ],
+    ];
+};
 const getInstruction = (identifiers) => {
     const type = identifiers.isAskingMin ? "minimum" : "maximum";
     const interval = new IntervalNode(identifiers.xValues[identifiers.intervalXIndexes[0]].toTree(), identifiers.xValues[identifiers.intervalXIndexes[1]].toTree(), ClosureType.FF);
-    let instruction = `On considère la fonction $f$ dont le tableau de variations est donné ci-dessous.`;
-    instruction += `\n\n${identifiers.isAskingX
+    const table = getTable(identifiers);
+    let instruction = `On considère la fonction $f$ dont le tableau de variations est donné ci-dessous : 
+  
+  <svg id='varTable'>${JSON.stringify(table)}</svg>
+  
+  ${identifiers.isAskingX
         ? `Sur l'intervalle $${interval.toTex()}$, en quelle valeur le ${type} de la fonction $f$ est-il atteint ?`
-        : `Sur l'intervalle $${interval.toTex()}$, quel est le ${type} de la fonction $f$ ?`}`;
+        : `Sur l'intervalle $${interval.toTex()}$, quel est le ${type} de la fonction $f$ ?`}
+  `;
     return instruction;
 };
 const getHint = (identifiers) => {
@@ -49,39 +92,41 @@ ${identifiers.isAskingX
         : `Sur l'intervalle $${interval.toTex()}$, le ${type} de la fonction $f$ est donc $${y}$.`}
 `;
 };
-const getGGBOptions = (identifiers) => {
-    const xValues = identifiers.xValues;
-    const yValues = identifiers.yValues;
-    const isFirstAscending = yValues[0] < yValues[1];
-    const firstArrow = isFirstAscending ? "\\nearrow" : "\\searrow";
-    const secondArrow = isFirstAscending ? "\\searrow" : "\\nearrow";
-    const xLine = `liste1={"x","${xValues[0]}"," ", "${xValues[1]}", " ", "${xValues[2]}", " ", "${xValues[3]}", " "}`;
-    const y0Line = `liste2={" ","${yValues[0]}"," "," "," ","${yValues[2]}"," ", " "}`;
-    const y1Line = `liste4={" "," ", " ", "${yValues[1]}"," "," "," ","${yValues[3]}"}`;
-    const centerLine = `liste3={"f(x)"," ", "${firstArrow}", " ", "${secondArrow}", " ", "${firstArrow}", " "}`;
-    const commands = [
-        xLine,
-        y0Line,
-        y1Line,
-        centerLine,
-        `T = TableText(liste1, ${isFirstAscending ? "liste4" : "liste2"}, liste3, ${isFirstAscending ? "liste2" : "liste4"} , "c|01000000000_01000")`,
-        `SetFixed(T, true)`,
-        // `SetCoords(T, 30, 100)`,
-    ];
-    const ggb = new GeogebraConstructor({
-        commands: commands,
-        hideAxes: true,
-        hideGrid: true,
-        forbidShiftDragZoom: true,
-        fontSize: 12,
-        maxHeight: 80,
-        maxWidth: 300,
-        hideFullScreenButton: true,
-    });
-    return ggb.getOptions({
-        coords: [-10, 10, -10, 10],
-    });
-};
+// const getGGBOptions: GetGGBOptions<Identifiers> = (identifiers) => {
+//   const xValues = identifiers.xValues;
+//   const yValues = identifiers.yValues;
+//   const isFirstAscending = yValues[0] < yValues[1];
+//   const firstArrow = isFirstAscending ? "\\nearrow" : "\\searrow";
+//   const secondArrow = isFirstAscending ? "\\searrow" : "\\nearrow";
+//   const xLine = `liste1={"x","${xValues[0]}"," ", "${xValues[1]}", " ", "${xValues[2]}", " ", "${xValues[3]}", " "}`;
+//   const y0Line = `liste2={" ","${yValues[0]}"," "," "," ","${yValues[2]}"," ", " "}`;
+//   const y1Line = `liste4={" "," ", " ", "${yValues[1]}"," "," "," ","${yValues[3]}"}`;
+//   const centerLine = `liste3={"f(x)"," ", "${firstArrow}", " ", "${secondArrow}", " ", "${firstArrow}", " "}`;
+//   const commands = [
+//     xLine,
+//     y0Line,
+//     y1Line,
+//     centerLine,
+//     `T = TableText(liste1, ${isFirstAscending ? "liste4" : "liste2"}, liste3, ${
+//       isFirstAscending ? "liste2" : "liste4"
+//     } , "c|01000000000_01000")`,
+//     `SetFixed(T, true)`,
+//     // `SetCoords(T, 30, 100)`,
+//   ];
+//   const ggb = new GeogebraConstructor({
+//     commands: commands,
+//     hideAxes: true,
+//     hideGrid: true,
+//     forbidShiftDragZoom: true,
+//     fontSize: 12,
+//     maxHeight: 80,
+//     maxWidth: 300,
+//     hideFullScreenButton: true,
+//   });
+//   return ggb.getOptions({
+//     coords: [-10, 10, -10, 10],
+//   });
+// };
 const getKeys = (identifiers) => {
     return [];
 };
@@ -100,7 +145,17 @@ const getVarTableExtremaReadingQuestion = (opts) => {
     const isFirstAscending = yValues[0] < yValues[1];
     yValues.push(randint(isFirstAscending ? Math.min(yValues[0] - 2, -10) : yValues[1], isFirstAscending ? yValues[1] : Math.max(yValues[0] + 2, -10), [yValues[0], yValues[1]]));
     yValues.push(randint(!isFirstAscending ? Math.min(yValues[1] - 2, -10) : yValues[2], !isFirstAscending ? yValues[2] : Math.max(yValues[1] + 2, -10), [yValues[1], yValues[2]]));
-    const intervalXIndexes = coinFlip() ? [0, 3] : coinFlip() ? [0, 2] : [1, 3];
+    const intervalXIndexes = opts?.extremumType === "Global"
+        ? [0, 3]
+        : opts?.extremumType === "Local"
+            ? coinFlip()
+                ? [0, 2]
+                : [1, 3]
+            : coinFlip()
+                ? [0, 3]
+                : coinFlip()
+                    ? [0, 2]
+                    : [1, 3];
     const identifiers = {
         xValues,
         yValues,
@@ -108,7 +163,7 @@ const getVarTableExtremaReadingQuestion = (opts) => {
         isAskingMin: coinFlip(),
         intervalXIndexes,
     };
-    return getQuestionFromIdentifiers(identifiers);
+    return getQuestionFromIdentifiers(identifiers, opts);
 };
 const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
@@ -119,10 +174,20 @@ const getQuestionFromIdentifiers = (identifiers) => {
         identifiers,
         hint: getHint(identifiers),
         correction: getCorrection(identifiers),
-        ggbOptions: getGGBOptions(identifiers),
+        // ggbOptions: getGGBOptions(identifiers),
     };
     return question;
 };
+const options = [
+    {
+        id: "extremumType",
+        label: "Type d'extremum",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["Local", "Global", "Les deux"],
+        defaultValue: "Les deux",
+    },
+];
 export const varTableExtremaReading = {
     id: "varTableExtremaReading",
     label: "Lire les extremums d'une fonction à partir de son tableau de variations",
@@ -134,6 +199,7 @@ export const varTableExtremaReading = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
-    hasGeogebra: true,
+    // hasGeogebra: true,
     hasHintAndCorrection: true,
+    options,
 };

package/lib/exercises/math/functions/variations/varTableFromSentences.d.ts

@@ -1,2 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
+type Identifiers = {
+    vars: string[];
+    xs: NodeIdentifiers[];
+};
+export declare const varTableFromSentences: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=varTableFromSentences.d.ts.map

package/lib/exercises/math/functions/variations/varTableFromSentences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"varTableFromSentences.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/variations/varTableFromSentences.ts"],"names":[],"mappings":""}
+{"version":3,"file":"varTableFromSentences.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/variations/varTableFromSentences.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,EAAE,EAAE,eAAe,EAAE,CAAC;CACvB,CAAC;AAyKF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAkBvD,CAAC"}

package/lib/exercises/math/functions/variations/varTableFromSentences.js

@@ -1,137 +1,167 @@
-// import {
-//   Exercise,
-//   Proposition,
-//   QCMGenerator,
-//   Question,
-//   QuestionGenerator,
-//   VEA,
-//   addValidProp,
-//   shuffleProps,
-//   GetAnswer,
-//   GetHint,
-//   GetCorrection,
-//   GetInstruction,
-//   GetKeys,
-//   GetQuestionFromIdentifiers,
-//   GetAnswerTable,
-//   TableVEA,
-// } from "../../../../exercises/exercise.js";
-// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
-// import { randTupleInt } from "../../../../math/utils/random/randTupleInt.js";
-// import {
-//   NodeIdentifiers,
-//   reifyAlgebraic,
-// } from "../../../../tree/nodes/nodeConstructor.js";
-// import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
-// import { coinFlip } from "../../../../utils/alea/coinFlip.js";
-// import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
-export {};
-// type Identifiers = {
-//   vars: string[];
-//   xs: NodeIdentifiers[];
-// };
-// /**
-//  *
-//  * xs
-//  * [-10, -4, 3, 10]
-//  * [f(-10), "\\nearrow", f(-4), "\\searrow", "f(3)", "\\nearrow", f(10)]
-//  */
-// const getAnswerTable: GetAnswerTable<Identifiers> = (identifiers) => {
-//   const { vars, xs } = identifiers;
-//   const xsNodes = xs.map((x) => reifyAlgebraic(x));
-//   const secondLine: string[][] = [[], [], []];
-//   for (let i = 0; i < vars.length; i++) {
-//     if (i % 2 === 0) {
-//       let row = 0;
-//       if (i === 0) {
-//         row = vars[1] === "\\nearrow" ? 2 : 0;
-//       } else {
-//         row = vars[i - 1] === "\\nearrow" ? 0 : 2;
-//       }
-//       secondLine[row].push(vars[i]);
-//       secondLine[2 - row].push("\\ ");
-//       secondLine[1].push("\\ ");
-//     } else {
-//       secondLine[1].push(vars[i]);
-//       secondLine[0].push("\\ ");
-//       secondLine[2].push("\\ ");
-//     }
-//   }
-//   return [
-//     ["$x$", ...xsNodes.join("\\ ")],
-//     ["$\\ $", ...secondLine[0]],
-//     ["$f(x)$", ...secondLine[1]],
-//     ["$\\ $", ...secondLine[2]],
-//   ];
-// };
-// const getInstruction: GetInstruction<Identifiers> = (identifiers) => {
-//     const { vars, xs } = identifiers;
-//   const xsNodes = xs.map((x) => reifyAlgebraic(x));
-//   return `La fonction $f$ est définie sur ...
-// Elle est croissante sur ...
-// Elle est décroissante sur ...
-// De plus, on a $f()=...$`;
-// };
-// const getHint: GetHint<Identifiers> = (identifiers) => {
-//   return `La première ligne d'un tableau de variations contient les valeurs de $x$. La deuxième ligne donne les variations de la fonction en fonction des valeurs de $x$ de la premiere ligne.`;
-// };
-// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
-//   return ``;
-// };
-// const getKeys: GetKeys<Identifiers> = (identifiers) => {
-//   return [];
-// };
-// const isAnswerTableValid: TableVEA<Identifiers> = (ans, { answerTable }) => {
-//   try {
-//     return ans.every((row, i) =>
-//       row.every((cell, j) => cell === answerTable[i][j]),
-//     );
-//   } catch (err) {
-//     return handleVEAError(err);
-//   }
-// };
-// const getVarTableFromSentencesQuestion: QuestionGenerator<Identifiers> = (
-//   ops,
-// ) => {
-//   const x = randTupleInt(4, {allDifferent: true, from: -10, to: 11})
-//   const xs = x.sort((a,b)=>a-b);
-//   const sens = coinFlip()
-//   const vars = [];
-//   const identifiers: Identifiers = {
-//     xs: xs.map((e)=>e.toTree().toIdentifiers()),
-//     vars,
-//   };
-//   return getQuestionFromIdentifiers(identifiers);
-// };
-// const getQuestionFromIdentifiers: GetQuestionFromIdentifiers<Identifiers> = (
-//   identifiers,
-// ) => {
-//   return {
-//     answerTable: getAnswerTable(identifiers),
-//     instruction: getInstruction(identifiers),
-//     keys: getKeys(identifiers),
-//     answerFormat: "tex",
-//     identifiers,
-//     hint: getHint(identifiers),
-//     correction: getCorrection(identifiers),
-//   };
-// };
-// export const varTableFromSentences: Exercise<Identifiers> = {
-//   id: "varTableFromSentences",
-//   label:
-//     "Dresser le tableau de variations d'une fonction à partir de phrases descriptives",
-//   isSingleStep: true,
-//   generator: (nb, opts) =>
-//     getDistinctQuestions(() => getVarTableFromSentencesQuestion(opts), nb),
-//   qcmTimer: 60,
-//   freeTimer: 60,
-//   isAnswerTableValid,
-//   subject: "Mathématiques",
-//   getInstruction,
-//   getHint,
-//   getCorrection,
-//   getAnswerTable,
-//   getQuestionFromIdentifiers,
-//   hasHintAndCorrection: true,
-//   answerType: "varTable",
-// };
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { randTupleInt } from "../../../../math/utils/random/randTupleInt.js";
+import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
+import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+/**
+ * xs
+ * [-10, -4, 3, 10]
+ * [f(-10), "\\nearrow", f(-4), "\\searrow", "f(3)", "\\nearrow", f(10)]
+ */
+const getAnswerTable = (identifiers) => {
+    const { vars, xs } = identifiers;
+    const xsNodes = xs.map((x) => reifyAlgebraic(x).toTex());
+    const stringed = [
+        xsNodes[0],
+        "\\ ",
+        xsNodes[1],
+        "\\ ",
+        xsNodes[2],
+        "\\ ",
+        xsNodes[3],
+    ];
+    const secondLine = [[], [], []];
+    for (let i = 0; i < vars.length; i++) {
+        if (i % 2 === 0) {
+            let row = 0;
+            if (i === 0) {
+                row = vars[1] === "\\nearrow" ? 2 : 0;
+            }
+            else {
+                row = vars[i - 1] === "\\nearrow" ? 0 : 2;
+            }
+            secondLine[row].push(vars[i]);
+            secondLine[2 - row].push("\\ ");
+            secondLine[1].push("\\ ");
+        }
+        else {
+            secondLine[1].push(vars[i]);
+            secondLine[0].push("\\ ");
+            secondLine[2].push("\\ ");
+        }
+    }
+    return [
+        ["$x$", ...stringed],
+        ["$\\ $", ...secondLine[0]],
+        ["$f(x)$", ...secondLine[1]],
+        ["$\\ $", ...secondLine[2]],
+    ];
+};
+const getInstruction = (identifiers) => {
+    const { vars, xs } = identifiers;
+    const xsNodes = xs.map((x) => reifyAlgebraic(x));
+    const increases = (vars[3] === "\\nearrow"
+        ? [[1, 2]]
+        : [
+            [0, 1],
+            [2, 3],
+        ]).map((e) => [xsNodes[e[0]].toTex(), xsNodes[e[1]].toTex()]);
+    const decreases = (vars[3] === "\\searrow"
+        ? [[1, 2]]
+        : [
+            [0, 1],
+            [2, 3],
+        ]).map((e) => [xsNodes[e[0]].toTex(), xsNodes[e[1]].toTex()]);
+    return `La fonction $f$ est définie sur $\\left[${xsNodes[0].toTex()}; ${xsNodes[xsNodes.length - 1].toTex()}\\right]$.
+
+Elle est croissante sur $[${increases[0][0]}; ${increases[0][1]}]$ ${increases[1]?.length
+        ? `et sur $[${increases[1][0]}; ${increases[1][1]}]$`
+        : ""}.
+
+Elle est décroissante sur $[${decreases[0][0]}; ${decreases[0][1]}]$ ${decreases[1]?.length
+        ? `et sur $[${decreases[1][0]}; ${decreases[1][1]}]$`
+        : ""}.
+
+De plus, on a $f(${xsNodes[0].toTex()})=${vars[0]}$, $f(${xsNodes[1].toTex()})=${vars[2]}$, $f(${xsNodes[2].toTex()})=${vars[4]}$ et $f(${xsNodes[3].toTex()})=${vars[6]}$.
+
+Dresser le tableau de variations de $f$.`;
+};
+const getHint = (identifiers) => {
+    return `La première ligne d'un tableau de variations contient les valeurs de $x$. La deuxième ligne donne les variations de la fonction en fonction des valeurs de $x$ de la première ligne.`;
+};
+const getCorrection = (identifiers) => {
+    const { vars, xs } = identifiers;
+    const xsNodes = xs.map((x) => reifyAlgebraic(x));
+    return `Dans la première ligne, on met les valeurs de $x$ dans l'ordre croissant : ${xsNodes
+        .map((e) => `$${e.toTex()}$`)
+        .join(" ; ")}.
+    
+Dans la deuxième ligne, on met une flèche croissante sur les intervalles où la fonction est croissante, et une flèche décroissante sur les intervalles où elle est décroissante. 
+
+Puis, on met les images des valeurs de $x$ à l'extrémité des flèches.`;
+};
+const getKeys = (identifiers) => {
+    return ["infty"];
+};
+const isAnswerTableValid = (ans, { answerTable }) => {
+    try {
+        return ans.every((row, i) => row.every((cell, j) => cell === answerTable[i][j]));
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getVarTableFromSentencesQuestion = (ops) => {
+    const x = randTupleInt(4, { allDifferent: true, from: -10, to: 11 });
+    const xs = x.sort((a, b) => a - b);
+    const sens = coinFlip(); // true = down up down, false : up down up
+    const vars = [];
+    if (sens) {
+        let a = randint(-10, 10);
+        vars[0] = a.frenchify();
+        vars[1] = vars[5] = "\\searrow";
+        let b = randint(a - 10, a);
+        vars[2] = b.frenchify();
+        vars[3] = "\\nearrow";
+        let c = randint(b + 1, b + 10);
+        vars[4] = c.frenchify();
+        let d = randint(c - 10, c);
+        vars[6] = d.frenchify();
+    }
+    else {
+        let a = randint(-10, 10);
+        vars[0] = a.frenchify();
+        vars[1] = vars[5] = "\\nearrow";
+        let b = randint(a + 1, a + 10);
+        vars[2] = b.frenchify();
+        vars[3] = "\\searrow";
+        let c = randint(b - 10, b);
+        vars[4] = c.frenchify();
+        let d = randint(c + 1, c + 10);
+        vars[6] = d.frenchify();
+    }
+    const identifiers = {
+        xs: xs.map((e) => e.toTree().toIdentifiers()),
+        vars,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answerTable: getAnswerTable(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+export const varTableFromSentences = {
+    id: "varTableFromSentences",
+    label: "Dresser le tableau de variations d'une fonction à partir de phrases descriptives",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getVarTableFromSentencesQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    isAnswerTableValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswerTable,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+    answerType: "varTable",
+};

package/lib/exercises/math/geometry/areas/triangleArea.js

@@ -20,7 +20,7 @@ const getInstruction = (identifiers) => {
     const heightSegment = SegmentConstructor.fromIdentifiers(heightIdentifiers);
     return `Calculer l'aire du triangle $${triangle.name}$ sachant que $${triangle.sides[1].toLengthTex()} \\ \\textrm{cm}$ et $${heightSegment.toLengthTex()} \\ \\textrm{cm}$. 
     
-Arrondir à $0,1 \\ \\textrm{cm}^2$ près.`;
+Arrondir à $0,1 \\ \\textrm{cm}^2$.`;
 };
 const getAnswer = (identifiers) => {
     const { height, base } = identifiers;

package/lib/exercises/math/probaStat/basicStats/calculateFrequency.js

@@ -53,7 +53,7 @@ const getInstruction = (identifiers, opts) => {
     }
     instruction += `
 
-Quelle est la fréquence d'apparition de ${caracType} ? Arrondir au centième près.`;
+Quelle est la fréquence d'apparition de ${caracType} ? Arrondir au centième.`;
     return instruction;
 };
 const getHint = (identifiers, opts) => {

package/lib/exercises/math/probaStat/binomial/binomialInequation.js

@@ -59,8 +59,8 @@ const getInstruction = (identifiers, opts) => {
     return `Soit $X$ une variable aléatoire qui suit une loi binomiale de paramètres $n = ${identifiers.n}$ et $p = ${pNode.toTex()}$.
   
 ${identifiers.isSentence
-        ? `Quelle est la probabilité d'obtenir ${sentence} succès ? Arrondir à $10^{-2}$ près.`
-        : `Calculer en donnant la réponse à $10^{-2}$ près :
+        ? `Quelle est la probabilité d'obtenir ${sentence} succès ? Arrondir à $10^{-2}$.`
+        : `Calculer en donnant une réponse arrondie à $10^{-2}$ :
   
 $$
 P\\left(${interval.toInequality("X".toTree()).toTex()}\\right)

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

@@ -15,7 +15,7 @@ const getInstruction = (identifiers) => {
     const angle = triangle.angles[randAngle];
     return `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${givenSides[0].toLengthTex()}\\ \\textrm{cm}$ et $${givenSides[1].toLengthTex()}\\ \\textrm{cm}$. 
     
-Calculer l'angle $${angle.toTex()}$ à $1^\\circ$ près.`;
+Calculer l'angle $${angle.toTex()}$ en arrondissant à $1^\\circ$.`;
 };
 const getAnswer = (identifiers) => {
     const { randAngle, hiddenSide, triangleIdentifiers } = identifiers;

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

@@ -14,7 +14,7 @@ const getInstruction = (identifiers) => {
     const angleValue = triangle.angles[givenAngle].evaluate().frenchify();
     return `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${triangle.sides[givenSide].toLengthTex()}\\ \\textrm{cm}$ et $${triangle.angles[givenAngle].toTex()} = ${angleValue}^\\circ$. 
     
-Calculer $${triangle.sides[sideAsked].toInsideName()}$ à $0,1 \\ \\textrm{cm}$ près.`;
+Calculer $${triangle.sides[sideAsked].toInsideName()}$ à $0,1 \\ \\textrm{cm}$.`;
 };
 const getAnswer = (identifiers) => {
     const { givenAngle, givenSide, sideAsked, triangleIdentifiers } = identifiers;

package/lib/geogebra/colors.d.ts

@@ -5,7 +5,6 @@ export declare const pinkLight = "#FF7390";
 export declare const reds: string[];
 export declare const orangeDark = "#BE5F00";
 export declare const orange = "#F6A118";
-export declare const orangeLight = "#FFBE46";
 export declare const oranges: string[];
 export declare const greenLight = "#54B1B7";
 export declare const greenMain = "#168187";

package/lib/geogebra/colors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"colors.d.ts","sourceRoot":"","sources":["../../src/geogebra/colors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,YAAY,CAAC;AAC7B,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,IAAI,UAAuC,CAAC;AAEzD,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,MAAM,YAAY,CAAC;AAChC,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,OAAO,UAAoC,CAAC;AAEzD,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,MAAM,UAAqC,CAAC;AAEzD,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,KAAK,UAAiD,CAAC;AAEpE,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,OAAO,UAAwC,CAAC;AAC7D,eAAO,MAAM,MAAM,UAAyD,CAAC;AAE7E,eAAO,MAAM,WAAW,cAEvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAW,MAAM,WAE9D,CAAC"}
+{"version":3,"file":"colors.d.ts","sourceRoot":"","sources":["../../src/geogebra/colors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,YAAY,CAAC;AAC7B,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,IAAI,UAAuC,CAAC;AAEzD,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,MAAM,YAAY,CAAC;AAEhC,eAAO,MAAM,OAAO,UAAuB,CAAC;AAE5C,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,MAAM,UAAqC,CAAC;AAEzD,eAAO,MAAM,SAAS,YAAY,CAAC;AACnC,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,QAAQ,YAAY,CAAC;AAClC,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,KAAK,UAAiD,CAAC;AAEpE,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,OAAO,UAAwC,CAAC;AAC7D,eAAO,MAAM,MAAM,UAAyD,CAAC;AAE7E,eAAO,MAAM,WAAW,cAEvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAAW,MAAM,WAE9D,CAAC"}

package/lib/geogebra/colors.js

@@ -6,8 +6,8 @@ export const pinkLight = "#FF7390";
 export const reds = [red, pinkDark, pinkLight, pinkMain];
 export const orangeDark = "#BE5F00";
 export const orange = "#F6A118";
-export const orangeLight = "#FFBE46";
-export const oranges = [orange, orangeDark, orangeLight];
+// export const orangeLight = "#FFBE46";
+export const oranges = [orange, orangeDark];
 export const greenLight = "#54B1B7";
 export const greenMain = "#168187";
 export const greenDark = "#00545A";