math-exercises 3.0.156 → 3.0.158

package/lib/exercises/math/sequences/arithmetic/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC;AAEpD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gDAAgD,CAAC;AAE/D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kDAAkD,CAAC;AACjE,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC;AAEpD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gDAAgD,CAAC;AAE/D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mDAAmD,CAAC;AAClE,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC"}

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

@@ -11,7 +11,7 @@ export * from "./recognizeReasonFromFirstTerms.js";
 export * from "./recognizeReasonFromGraph.js";
 export * from "./recognizeArithmeticFromGraph.js";
 export * from "./arithmeticFirstTermsSum.js";
-export * from "./arithmeticFindExplictFormulaFirstTermRandom.js";
+export * from "./arithmeticFindExplicitFormulaFirstTermRandom.js";
 export * from "./arithmeticFindReasonRandomRange.js";
 export * from "./arithmeticFindRandomTermFromTwoTerms.js";
 export * from "./arithmeticFindTerm.js";

package/lib/exercises/math/sequences/arithmetic/recognizeArithmeticFromGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recognizeArithmeticFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/recognizeArithmeticFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAiGF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAa9D,CAAC"}
+{"version":3,"file":"recognizeArithmeticFromGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/recognizeArithmeticFromGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AA6GF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}

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

@@ -28,14 +28,23 @@ const getGGBOptions = (identifiers) => {
         coords: [-1, 7, Math.min(-1, yMin - 2), Math.max(1, yMax + 2)],
     });
 };
+// const getHint: GetHint<Identifiers> = () => {
+//   return `Une suite est arithmétique si, pour passer d'un terme au suivant, on ajoute toujours le même nombre (appelé la raison de la suite).
+// Sur le graphique, les points `;
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   return ``;
+// };
 const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
         keys: [],
         ggbOptions: getGGBOptions(identifiers),
-        answerFormat: "tex",
+        answerFormat: "raw",
         identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -97,4 +106,5 @@ export const recognizeArithmeticFromGraph = {
     hasGeogebra: true,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    // hasHintAndCorrection: true,
 };

package/lib/exercises/math/sequences/geometric/geometricFindExplicitFormulaFirstRankOne.js

@@ -26,10 +26,10 @@ const getHint = () => {
     return `Utilise la formule générale d'une suite géométrique : 
     
 $$
-u_n = u_1 \\times r^{n-1}
+u_n = u_1 \\times q^{n-1}
 $$
 
-où $u_1$ est le premier terme et $r$ la raison.`;
+où $u_1$ est le premier terme et $q$ la raison.`;
 };
 const getCorrection = (identifiers) => {
     const { firstValue, reason } = identifiers;
@@ -37,12 +37,12 @@ const getCorrection = (identifiers) => {
     return `La formule générale d'une suite géométrique est :
     
 $$
-u_n = u_1 \\times r^{n-1}
+u_n = u_1 \\times q^{n-1}
 $$
 
-où $u_1$ est le premier terme et $r$ la raison.
+où $u_1$ est le premier terme et $q$ la raison.
     
-Ici, puisque $u_1 = ${firstValue}$ et $r = ${reason}$, on a : 
+Ici, puisque $u_1 = ${firstValue}$ et $q = ${reason}$, on a : 
 
 $$
 ${answer}

package/lib/exercises/math/sequences/geometric/geometricFindExplicitFormulaFirstTermRandom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricFindExplicitFormulaFirstTermRandom.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindExplicitFormulaFirstTermRandom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA8FF,eAAO,MAAM,2CAA2C,EAAE,QAAQ,CAAC,WAAW,CAe3E,CAAC"}
+{"version":3,"file":"geometricFindExplicitFormulaFirstTermRandom.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindExplicitFormulaFirstTermRandom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgGF,eAAO,MAAM,2CAA2C,EAAE,QAAQ,CAAC,WAAW,CAe3E,CAAC"}

package/lib/exercises/math/sequences/geometric/geometricFindExplicitFormulaFirstTermRandom.js

@@ -10,7 +10,9 @@ import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
 const getInstruction = (identifiers) => {
     const { firstRank, firstValue, reason } = identifiers;
-    return `$(u_n)$ est une suite géométrique de premier terme $u_{${firstRank}} = ${firstValue}$ et de raison $q = ${reason}$. $\\\\$ Donner l'expression de $u_n$ en fonction de $n$.`;
+    return `$(u_n)$ est une suite géométrique de premier terme $u_{${firstRank}} = ${firstValue}$ et de raison $q = ${reason}$.
+  
+Donner l'expression de $u_n$ en fonction de $n$.`;
 };
 const getAnswer = (identifiers) => {
     const { firstRank, firstValue, reason } = identifiers;

package/lib/exercises/math/sequences/geometric/geometricFindReason.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricFindReason.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindReason.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAwDF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAYrD,CAAC"}
+{"version":3,"file":"geometricFindReason.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindReason.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA0FF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/math/sequences/geometric/geometricFindReason.js

@@ -1,12 +1,43 @@
 import { addValidProp, propWhile, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getHint = () => {
+    return `La raison d'une suite géométrique est le nombre par lequel on multiple un terme pour obtenir le suivant.`;
+};
+const getCorrection = (identifiers) => {
+    const { rank1, reason, value1 } = identifiers;
+    const rank2 = rank1 + 1;
+    const value2 = reason * value1;
+    return `Puisque la suite $u$ est géométrique, on sait que : 
+
+$$
+u_{${rank2}} = u_{${rank1}} \\times q
+$$
+
+où $q$ est la raison.
+
+On a donc : 
+
+${alignTex([
+        ["q", "=", `\\frac{u_{${rank2}}}{u_{${rank1}}}`],
+        ["", "=", `\\frac{${value2}}{${value1}}`],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+`;
+};
 const getInstruction = (identifiers) => {
     const { rank1, value1, reason } = identifiers;
     const rank2 = rank1 + 1;
     const value2 = reason * value1;
-    return `$(u_n)$ est une suite géométrique. On sait que $u_{${rank1}} = ${value1}$ et $u_{${rank2}} = ${value2}$. Quelle est la raison de la suite $(u_n)$ ?`;
+    return `$(u_n)$ est une suite géométrique. 
+  
+On sait que $u_{${rank1}} = ${value1}$ et $u_{${rank2}} = ${value2}$. 
+  
+Quelle est la raison de la suite $(u_n)$ ?`;
 };
 const getAnswer = (identifiers) => {
     const { reason } = identifiers;
@@ -20,6 +51,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         identifiers,
     };
     return question;
@@ -43,7 +76,12 @@ const getPropositions = (n, { answer, value1, reason }) => {
     return shuffle(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    try {
+        return numberVEA(ans, answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const geometricFindReason = {
     id: "geometricFindReason",
@@ -57,4 +95,5 @@ export const geometricFindReason = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/sequences/geometric/geometricRecurrenceFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgFF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyGF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/sequences/geometric/geometricRecurrenceFormulaUsage.js

@@ -1,11 +1,34 @@
 import { tryToAddWrongProp, addValidProp, propWhile, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getHint = (identifiers) => {
+    const { firstRank } = identifiers;
+    return `Il suffit de remplacer $n$ par $${firstRank}$ dans la formule de récurrence de la suite $u$.`;
+};
+const getCorrection = (identifiers) => {
+    const { firstRank, firstValue, reason } = identifiers;
+    const askedRank = firstRank + 1;
+    return `On remplace $n$ par $${firstRank}$ dans la formule de récurrence :
+  
+${alignTex([
+        [
+            `u_{${firstRank}+1}`,
+            "=",
+            multiply(reason, `u_{${firstRank}}`).toTex({ forceTimesSign: true }),
+        ],
+        [`u_{${askedRank}}`, "=", multiply(reason, firstValue).toTex()],
+        ["", "=", getAnswer(identifiers)],
+    ])}
+
+`;
+};
 const getInstruction = (identifiers) => {
     const { firstRank, firstValue, reason } = identifiers;
     const askedRank = firstRank + 1;
-    return `$(u_n)$ est une suite définie par :
+    return `$(u_n)$ est une suite définie, pour $n\\geq 0$, par :
   
 $$
 u_{n+1} = ${reason}\\times u_n
@@ -30,9 +53,11 @@ const getQuestionFromIdentifiers = (identifiers) => {
         instruction: getInstruction(identifiers),
         startStatement: getStartStatement(identifiers),
         answer: getAnswer(identifiers),
-        keys: ["u", "underscore", "equal"],
+        keys: [],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -73,4 +98,5 @@ export const geometricRecurrenceFormulaUsage = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"sequenceEvaluation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/sequenceEvaluation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAkOF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAYpD,CAAC"}
+{"version":3,"file":"sequenceEvaluation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/sequenceEvaluation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAqPF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

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

@@ -8,6 +8,23 @@ import { MultiplyNode } from "../../../tree/nodes/operators/multiplyNode.js";
 import { substract } from "../../../tree/nodes/operators/substractNode.js";
 import { VariableNode } from "../../../tree/nodes/variables/variableNode.js";
 import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
+import { alignTex } from "../../../utils/latex/alignTex.js";
+const getHint = (identifiers) => {
+    const { termeAdd, termeMult } = identifiers;
+    const f = new Affine(termeMult, termeAdd, "n").toTree().simplify().toTex();
+    return `Il suffit de remplacer $n$ par $${f}$ dans la formule donnant $u_n$. Puis, simplifie et réduis l'expression obtenue.`;
+};
+const getCorrection = (identifiers) => {
+    const { termeAdd, termeMult, affine } = identifiers;
+    const aff = new Affine(affine[0], affine[1], "n").toTree();
+    const f = new Affine(termeMult, termeAdd, "n").toTree().simplify();
+    return `On remplace $n$ par $${f.toTex()}$ dans la formule donnant $u_n$ : 
+  
+${alignTex([
+        [`u_{${f.toTex()}}`, "=", aff.toDetailedEvaluation({ n: f }).toTex()],
+        ["", "=", getAnswer(identifiers)],
+    ])}`;
+};
 const getInstruction = (identifiers) => {
     const { termeid, affine, termeAdd, termeMult } = identifiers;
     const aff = new Affine(affine[0], affine[1], "n");
@@ -27,7 +44,7 @@ $$
 u_n = ${aff.toTree().toTex()}
 $$
     
-Exprimer $u_{${terme.toTex()}}$.`;
+Exprimer $u_{${terme.toTex()}}$ en fonction de $n$.`;
 };
 const getAnswer = (identifiers) => {
     const { termeid, affine, termeAdd, termeMult } = identifiers;
@@ -60,6 +77,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["n"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -70,7 +89,7 @@ const getSequenceEvaluationQuestion = () => {
     let termeAdd = 0;
     let termeMult = 1;
     if (termeid === 1) {
-        termeAdd = randint(1, 4);
+        termeAdd = randint(-4, 4, [0]);
     }
     else if (termeid === 2) {
         termeMult = randint(2, 4);
@@ -179,4 +198,5 @@ export const sequenceEvaluation = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/spaceGeometry/solids/recognizeSolidFromSolidPattern.js

@@ -961,7 +961,7 @@ const getAnswer = (identifiers) => {
     return pattern.str;
 };
 const getHint = () => {
-    return `Les hachures indiquent les endroits où l'on plie le patron.
+    return `S'il y a des hachures sur le patron, sache qu'elles indiquent les endroits où le plier.
 Il n'y a pas de languettes sur les patrons en mathématiques.`;
 };
 const getCorrection = (identifiers) => {

package/lib/exercises/math/spaceGeometry/sphere/index.d.ts

@@ -1,2 +1,4 @@
 export * from "./pickIsPointInSphereOrBall.js";
+export * from "./sphereLatLonReading.2d.js";
+export * from "./pinPointLatLon.2d.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/spaceGeometry/sphere/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/sphere/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/sphere/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC;AAE/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC"}

package/lib/exercises/math/spaceGeometry/sphere/index.js

@@ -1,2 +1,4 @@
 export * from "./pickIsPointInSphereOrBall.js";
-// export * from "./sphereLatLonReading.js";
+// export * from "./sphereLatLonReading.3d.js";
+export * from "./sphereLatLonReading.2d.js";
+export * from "./pinPointLatLon.2d.js";

package/lib/exercises/math/spaceGeometry/sphere/pinPointLatLon.2d.d.ts

@@ -0,0 +1,12 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { PointIdentifiers } from "../../../../math/geometry/point.js";
+type Identifiers = {
+    pointsDict: Record<string, {
+        latLon: PointIdentifiers;
+        "2d": PointIdentifiers;
+    }>;
+    namePointTarget: string;
+};
+export declare const pinPointLatLon2d: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=pinPointLatLon.2d.d.ts.map

package/lib/exercises/math/spaceGeometry/sphere/pinPointLatLon.2d.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pinPointLatLon.2d.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/sphere/pinPointLatLon.2d.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAoFtC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,MAAM,EAAE,gBAAgB,CAAC;QACzB,IAAI,EAAE,gBAAgB,CAAC;KACxB,CACF,CAAC;IACF,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAmKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}

package/lib/exercises/math/spaceGeometry/sphere/pinPointLatLon.2d.js

@@ -0,0 +1,205 @@
+import { toolBarConstructor } from "../../../../exercises/utils/geogebra/toolBarConstructor.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { greenMain, red } from "../../../../geogebra/colors.js";
+import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
+import { ggbPointToCoords } from "../../../../geogebra/parsers/ggbPointToCoords.js";
+import { parseGGBPoints } from "../../../../geogebra/parsers/parseGGBPoints.js";
+import { Point, PointConstructor, } from "../../../../math/geometry/point.js";
+import { cos } from "../../../../tree/nodes/functions/cosNode.js";
+import { sin } from "../../../../tree/nodes/functions/sinNode.js";
+import { PiNode } from "../../../../tree/nodes/numbers/piNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { random, randomMany } from "../../../../utils/alea/random.js";
+import { getCartesiansProducts } from "../../../../utils/arrays/cartesianProducts.js";
+const earthGlobe2DGGBCommands = () => {
+    const [pointN, pointS, pointE, pointO] = [
+        ["N", [0, 1]],
+        ["S", [0, -1]],
+        ["E", [1, 0]],
+        ["O", [-1, 0]],
+    ].map(([pointName, [x, y]]) => new Point(pointName, x, y));
+    return [
+        //Greenwich and equator
+        ...[pointN, pointS, pointE, pointO].flatMap((point) => point.toGGBCommand({
+            isFixed: true,
+            showLabel: true,
+            color: "#000000",
+            size: 2,
+        })),
+        `Seg_greenwich = Segment(S,N)`,
+        `SetColor(Seg_greenwich,"${greenMain}")`,
+        `Seg_equator = Segment(O,E)`,
+        `SetColor(Seg_equator,"${red}")`,
+        //labels
+        `Lbl_greenwich = Text(RotateText("\\tiny Greenwich", 90°), (-0.05, 0.62), true, true, 0, 0)`,
+        `Lbl_equator = Text("\\tiny Équateur", (0.62, 0), true, true, 0, 0)`,
+        `Lbl_15_greenwich = Text("\\tiny 15", (0.27, -0.05), true, true, 0, 0)`,
+        `SetFixed(Lbl_15_greenwich, true, false)`,
+        `Lbl_15_equator = Text("\\tiny 15", (-0.07, 0.27), true, true, 0, 0)`,
+        `SetFixed(Lbl_15_equator, true, false)`,
+        //curves
+        `l1 = Sequence(x² / sin²(λ) + y² = 1, λ, 0, π / 2, π / 12)`,
+        `SetColor(l1, "#AAAAAA")`,
+        `SetFilling(l1, 0)`,
+        `l2 = Sequence(If(x² + sin²(α) ≤ 1, sin(α)), α, (-π) / 2, π / 2, π / 12)`,
+        `SetColor(l2,"#AAAAAA")`,
+        `SetFilling(l2, 0)`,
+    ];
+};
+const xyPointForLatLonPoint = (latlonPoint) => {
+    const { x: lat, y: lon } = latlonPoint;
+    const toRadians = frac(PiNode, 180);
+    const phi = multiply(lat, toRadians);
+    const lambda = multiply(lon, toRadians);
+    const x = multiply(cos(phi), sin(lambda));
+    const y = sin(phi);
+    return new Point("S", x, y);
+};
+const getStrLatitude = (angleInDegrees) => {
+    if (angleInDegrees % 90 === 0) {
+        return `${angleInDegrees.frenchify()}°`;
+    }
+    else if (angleInDegrees < 0) {
+        return `${(-angleInDegrees).frenchify()}°S`;
+    }
+    else {
+        return `${angleInDegrees.frenchify()}°N`;
+    }
+};
+const getStrLongitude = (angleInDegrees) => {
+    if (angleInDegrees % 180 === 0) {
+        return `${angleInDegrees.frenchify()}°`;
+    }
+    else if (angleInDegrees < 0) {
+        return `${(-angleInDegrees).frenchify()}°O`;
+    }
+    else {
+        return `${angleInDegrees.frenchify()}°E`;
+    }
+};
+const getAnswerPoint = (identifiers) => {
+    const { namePointTarget, pointsDict } = identifiers;
+    const pointDst = PointConstructor.fromIdentifiers(pointsDict[namePointTarget]["2d"]);
+    return pointDst;
+};
+const getGGBAnswer = (identifiers) => {
+    const { namePointTarget, pointsDict } = identifiers;
+    const pointDst = PointConstructor.fromIdentifiers(pointsDict[namePointTarget]["2d"]);
+    return [`${pointDst.toMathString()}`];
+};
+const getInstruction = (identifiers) => {
+    const { namePointTarget, pointsDict } = identifiers;
+    const latLonPoint = PointConstructor.fromIdentifiers(pointsDict[namePointTarget].latLon);
+    const [lat, lon] = [latLonPoint.x.evaluate(), latLonPoint.y.evaluate()];
+    return `Placer le point $A$ de coordonnées $(${getStrLatitude(lat)};${getStrLongitude(lon)})$ sur la figure ci-dessous.`;
+};
+const getHint = () => {
+    return `Pour déterminer la latitude, on utlise les parallèles.
+Pour déterminer la longitude, on utilise les méridiens.`;
+};
+const getCorrection = () => {
+    return `La latitude donne la position Nord/Sud. 
+La longitude donne la position Est/Ouest.`;
+};
+const getCorrectionGGBOptions = (identifiers) => {
+    const { pointsDict } = identifiers;
+    const xyPoints = Object.values(pointsDict)
+        .map((pointMiniDict) => pointMiniDict["2d"])
+        .map((pointIds) => PointConstructor.fromIdentifiers(pointIds));
+    const commands = [
+        ...earthGlobe2DGGBCommands(),
+        ...xyPoints.flatMap((point) => point.toGGBCommand({
+            isFixed: true,
+            showLabel: true,
+            size: 2,
+            color: greenMain,
+        })),
+    ];
+    const ggb = new GeogebraConstructor({
+        commands,
+        hideAxes: true,
+        hideGrid: true,
+    });
+    return ggb.getOptions({
+        coords: [-1.1, 1.1, -1.1, 1.1],
+    });
+};
+const getStudentGGBOptions = () => {
+    const commands = [...earthGlobe2DGGBCommands()];
+    const studentGgb = new GeogebraConstructor({
+        customToolBar: toolBarConstructor({
+            point: true,
+        }),
+        commands,
+        hideAxes: true,
+        hideGrid: true,
+    });
+    return studentGgb.getOptions({
+        coords: [-1.1, 1.1, -1.1, 1.1],
+    });
+};
+const isGGBAnswerValid = (ans, { ggbAnswer, ...identifiers }) => {
+    const isPointValid = () => {
+        const points = parseGGBPoints(ans)
+            .map((p) => ggbPointToCoords(p))
+            .map((coords, i) => new Point(`K_${i}`, coords.x, coords.y));
+        const answerPoint = getAnswerPoint(identifiers);
+        return points.some((point) => point.distanceTo(answerPoint) < 0.1);
+    };
+    return isPointValid();
+};
+const getPinPointLatLon2dQuestion = () => {
+    const letters = ["A"];
+    const arrLat = [...Array(9).keys()].map((i) => (i - 4) * 15);
+    const arrLon = [...Array(9).keys()].map((i) => (i - 4) * 15);
+    //we need student to figure out the correct mapping
+    const arrLatLon = getCartesiansProducts([arrLat, arrLon]).filter(([lat, lon]) => lat !== lon && -lat !== lon);
+    const pickedLatLon = randomMany(arrLatLon, letters.length);
+    const pointsDict = letters.reduce((acc, letter, i) => {
+        const [lat, lon] = pickedLatLon[i];
+        const latLonPoint = new Point(`${letter}`, lat, lon);
+        const xyPoint = xyPointForLatLonPoint(latLonPoint);
+        xyPoint.name = letter;
+        acc[letter] = {
+            latLon: latLonPoint.toIdentifiers(),
+            "2d": xyPoint.toIdentifiers(),
+        };
+        return acc;
+    }, {});
+    const namePointTarget = random(Object.keys(pointsDict));
+    const identifiers = {
+        pointsDict,
+        namePointTarget,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        identifiers,
+        instruction: getInstruction(identifiers),
+        ggbAnswer: getGGBAnswer(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        studentGgbOptions: getStudentGGBOptions(identifiers),
+        correctionGgbOptions: getCorrectionGGBOptions(identifiers),
+    };
+    return question;
+};
+export const pinPointLatLon2d = {
+    id: "pinPointLatLon2d",
+    label: "Placer un point à partir de sa latitude et de sa longitude",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getPinPointLatLon2dQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getGGBAnswer,
+    getStudentGGBOptions,
+    isGGBAnswerValid,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
+    subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    answerType: "GGB",
+};

package/lib/exercises/math/spaceGeometry/sphere/sphereLatLonReading.2d.d.ts

@@ -0,0 +1,13 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { PointIdentifiers } from "../../../../math/geometry/point.js";
+type Identifiers = {
+    pointData: {
+        latLon: PointIdentifiers;
+        "2d": PointIdentifiers;
+    };
+    isLatitude: boolean;
+    namePointTarget: string;
+};
+export declare const sphereLatLonReading2d: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=sphereLatLonReading.2d.d.ts.map

package/lib/exercises/math/spaceGeometry/sphere/sphereLatLonReading.2d.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sphereLatLonReading.2d.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/sphere/sphereLatLonReading.2d.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AAuFtC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE;QACT,MAAM,EAAE,gBAAgB,CAAC;QACzB,IAAI,EAAE,gBAAgB,CAAC;KACxB,CAAC;IAEF,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AA+KF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}