math-exercises 3.0.176 → 3.0.178

package/lib/exercises/math/sequences/geometric/situations/geometricFindTermFromSituation.js

@@ -24,7 +24,7 @@ const getInstruction = (identifiers, optsIn) => {
     const situation = situations[situationIndex];
     return `${situation.getStrSituation(initial, reason, firstRank, superfluousData)}
 
-Que vaut $u_{${rankAsked}}$ ?`;
+Quel calcul permet de trouver $u_{${rankAsked}}$ ?`;
 };
 const getAnswerNode = (identifiers, opts) => {
     const firstRank = opts?.firstTermRankOne ? 1 : 0;

package/lib/exercises/math/sequences/geometric/sum/geometricComputeSumWithDots.js

@@ -185,7 +185,7 @@ const createRandomIdentifiers = (opts) => {
     const initial = randint(-9, 10, [0]);
     const signReason = coinFlip() ? 1 : -1;
     const reason = signReason * randint(2, 6);
-    const nbTerms = randint(7, 15);
+    const nbTerms = randint(5, 9);
     const minRankDots = firstRank + 2;
     const lastRank = firstRank + nbTerms - 1;
     const lowRankDots = randint(minRankDots, Math.min(minRankDots + randint(1, 3), lastRank));
@@ -225,7 +225,7 @@ const options = [
     generatorOptionFirstTermRankOne,
     {
         id: "isGiveCount",
-        label: "Donner $n$",
+        label: "Donner le nombre de termes de la somme dans la consigne",
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.checkbox,
         defaultValue: optsDefault.isGiveCount,

package/lib/exercises/math/sequences/graph/placeFirstSequencePoints.js

@@ -102,12 +102,12 @@ export const placeFirstSequencePoints = {
     isGGBAnswerValid,
     subject: "Mathématiques",
     getHint,
-    getInstruction,
     getCorrection,
+    hasHintAndCorrection: true,
+    getInstruction,
     getGGBAnswer,
     getStudentGGBOptions,
     answerType: "GGB",
     getQuestionFromIdentifiers,
     options,
-    hasHintAndCorrection: true,
 };

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

@@ -7,5 +7,6 @@ export * from "./sequenceEvaluation.js";
 export * from "./sequencePlot.js";
 export * from "./graph/index.js";
 export * from "./notation/index.js";
+export * from "./seqArithmGeom/index.js";
 export * from "./variations/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,uBAAuB,CAAC"}

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

@@ -7,5 +7,6 @@ export * from "./sequenceEvaluation.js";
 export * from "./sequencePlot.js";
 export * from "./graph/index.js";
 export * from "./notation/index.js";
+export * from "./seqArithmGeom/index.js";
 // export * from "./limits/index.js";
 export * from "./variations/index.js";

package/lib/exercises/math/sequences/seqArithmGeom/seqArithmGeomRecurrenceFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"seqArithmGeomRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/seqArithmGeom/seqArithmGeomRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AA8C3D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAoMF,KAAK,OAAO,GAAG,sBAAsB,GAAG;IAAE,mBAAmB,EAAE,MAAM,CAAA;CAAE,CAAC;AAkBxE,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CACxD,WAAW,EACX,OAAO,CAoBR,CAAC"}
+{"version":3,"file":"seqArithmGeomRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/seqArithmGeom/seqArithmGeomRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AA8C3D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA+LF,KAAK,OAAO,GAAG,sBAAsB,GAAG;IAAE,mBAAmB,EAAE,MAAM,CAAA;CAAE,CAAC;AAkBxE,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CACxD,WAAW,EACX,OAAO,CAoBR,CAAC"}

package/lib/exercises/math/sequences/seqArithmGeom/seqArithmGeomRecurrenceFormulaUsage.js

@@ -26,9 +26,11 @@ const getDictSequenceSlice = (coeffs, rank1, value1, rankAsked) => {
         return acc;
     }, { [rank1]: value1.toTree() });
 };
-const getInstruction = (identifiers) => {
+const getInstruction = (identifiers, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const firstRank = opts.firstTermRankOne ? 1 : 0;
     const { rank1, value1, coeffs, rankAsked } = identifiers;
-    return `$(u_n)$ est une suite définie par, pour $n\\geq 1$ :
+    return `$(u_n)$ est une suite définie par, pour $n\\geq ${firstRank}$ :
   
 $$
 u_{n+1} = ${getNodeUNext(coeffs).toTex()}
@@ -38,11 +40,6 @@ et $u_{${rank1}} = ${value1}$.
 
 Calculer le terme $u_{${rankAsked}}$.`;
 };
-const getStartStatement = (identifiers) => {
-    const { rank1 } = identifiers;
-    const askedRank = rank1 + 1;
-    return `u_{${askedRank}}`;
-};
 const getAnswerStuff = (identifiers) => {
     const { rank1, value1, coeffs, rankAsked } = identifiers;
     const dictSequenceSlice = getDictSequenceSlice(coeffs, rank1, value1, rankAsked);
@@ -149,7 +146,7 @@ const getSeqArithmGeomRecurrenceFormulaUsageQuestion = (optsIn) => {
     const distanceOfRankAsked = Number(opts.distanceOfRankAsked);
     const rank1 = randint(firstRank, 20);
     const value1 = randint(-10, 10);
-    const a = randint(-10, 10, [0]);
+    const a = randint(-10, 10, [0, 1]);
     const b = randint(-10, 10, [0]);
     const coeffs = [a, b];
     const rankAsked = rank1 + distanceOfRankAsked;
@@ -159,7 +156,6 @@ const getSeqArithmGeomRecurrenceFormulaUsageQuestion = (optsIn) => {
 const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
         instruction: getInstruction(identifiers, opts),
-        startStatement: getStartStatement(identifiers, opts),
         answer: getAnswer(identifiers, opts),
         keys: [],
         answerFormat: "tex",

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

@@ -152,7 +152,7 @@ const getKeys = () => {
     return ["degree", "N", "O", "S", "E"];
 };
 const isAnswerValid = (ans, { answer }) => {
-    const ansRefined = ans.replace("^{\\circ}", "°");
+    const ansRefined = ans.replace("^{\\circ}", "°").replace("^\\circ", "°");
     return ansRefined === answer;
 };
 const getSphereLatLonReading2dQuestion = () => {

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

@@ -1 +1 @@
-{"version":3,"file":"findAngleFromCosAndSin.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/findAngleFromCosAndSin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAkBxD,CAAC"}
+{"version":3,"file":"findAngleFromCosAndSin.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/findAngleFromCosAndSin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA4HF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}

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

@@ -30,14 +30,13 @@ const getHint = (identifiers) => {
     const isSinPos = value.sin.evaluate() > 0;
     return `Puisque $\\cos(a)$ est ${isCosPos ? "positif" : "négatif"}, le point image de $a$ sur le cercle trigonométrique se trouve ${isCosPos ? "à droite" : "à gauche"} de l'axe des ordonnées.
   
-De plus, puisque $\\sin(a)$ est ${isSinPos ? "positif" : "négatif"}, le point image de $a$ sur le cercle trigonométrique se trouve ${isSinPos ? "au-dessus" : "en-dessous"} de l'axe des abscisses.`;
+De plus, puisque $\\sin(a)$ est ${isSinPos ? "positif" : "négatif"}, le point image de $a$ sur le cercle trigonométrique se trouve ${isSinPos ? "au-dessus" : "en-dessous"} de l'axe des abscisses.
+  
+Sers-toi ensuite du cercle trigonométrique ci-dessous pour trouver la valeur de $a$ :
+
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_nombres.jpg)`;
 };
 const getCorrection = (identifiers) => {
-    const { point } = identifiers;
-    const value = mainTrigoValues.find((e) => e.point === point);
-    const isCosPos = value.cos.evaluate() > 0;
-    const isSinPos = value.sin.evaluate() > 0;
-    const answer = getAnswer(identifiers);
     return `On rappelle les valeurs remarquables des fonctions cosinus et sinus : 
   
 ${mdTable([
@@ -67,7 +66,16 @@ ${mdTable([
         ],
     ])}
 
-${isCosPos && isSinPos ? `L'angle recherché est donc $${answer}$.` : ``}`;
+Puis, on se sers du cercle trigonométrique ci-dessous : 
+
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_nombres.jpg)
+
+On en déduit donc que :
+
+$$
+a = ${getAnswer(identifiers)}
+$$
+`;
 };
 const getKeys = () => {
     return ["pi"];
@@ -105,7 +113,7 @@ export const findAngleFromCosAndSin = {
     connector: "=",
     label: "Déterminer $a$ en connaissant $\\cos(a)$ et $\\sin(a)$",
     isSingleStep: true,
-    generator: (nb, opts) => getDistinctQuestions(() => getFindAngleFromCosAndSinQuestion(opts), nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getFindAngleFromCosAndSinQuestion(opts), nb, 15),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -117,4 +125,5 @@ export const findAngleFromCosAndSin = {
     getAnswer,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    maxAllowedQuestions: 15,
 };

package/lib/exercises/math/trigonometry/circle/index.d.ts

@@ -4,7 +4,9 @@ export * from "./mainRemarkableValues.js";
 export * from "./remarkableValues.js";
 export * from "./areReelsOnTheSameTrigoCirclePoint.js";
 export * from "./associateReelToTrigoCirclePoint.js";
+export * from "./findAngleFromCosAndSin.js";
 export * from "./placeAssociateAngleOnCircle.js";
 export * from "./findAssociateAnglePointOnTrigoCircle.js";
 export * from "./trigoFunctionsFundamentalEquation.js";
+export * from "./selectQuadrantOnTrigoCircle.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AAErD,cAAc,kCAAkC,CAAC;AACjD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC"}

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

@@ -4,7 +4,8 @@ export * from "./mainRemarkableValues.js";
 export * from "./remarkableValues.js";
 export * from "./areReelsOnTheSameTrigoCirclePoint.js";
 export * from "./associateReelToTrigoCirclePoint.js";
-// export * from "./findAngleFromCosAndSin.js";
+export * from "./findAngleFromCosAndSin.js";
 export * from "./placeAssociateAngleOnCircle.js";
 export * from "./findAssociateAnglePointOnTrigoCircle.js";
 export * from "./trigoFunctionsFundamentalEquation.js";
+export * from "./selectQuadrantOnTrigoCircle.js";

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

@@ -1 +1 @@
-{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/mainRemarkableValues.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,QAAQ,EAaT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAuFF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}
+{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/mainRemarkableValues.ts"],"names":[],"mappings":"AASA,OAAO,EACL,QAAQ,EAeT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAiJF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAe9D,CAAC"}

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

@@ -6,6 +6,7 @@ import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercise.js";
 import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
 const getStatementNode = (identifiers) => {
@@ -31,6 +32,59 @@ const getAnswer = (identifiers) => {
     const remarkableValue = mainTrigoValues[valueIndex];
     return isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex();
 };
+const getHint = (identifiers) => {
+    const { valueIndex } = identifiers;
+    const remarkableValue = mainTrigoValues[valueIndex];
+    const angle = remarkableValue.angle;
+    return `Repère le point-image de $${angle.toTex()}$ sur le cercle trigonométrique ci-dessous : 
+  
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_nombres.jpg)
+
+Le cosinus de $${angle.toTex()}$ est l'abscisse de ce point, et son sinus est son ordonnée.`;
+};
+const getCorrection = (identifiers) => {
+    const { valueIndex } = identifiers;
+    const remarkableValue = mainTrigoValues[valueIndex];
+    const angle = remarkableValue.angle;
+    return `On repère le point-image de $${angle.toTex()}$ sur le cercle trigonométrique ci-dessous : 
+  
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_nombres.jpg)
+
+Puis, on utilise les valeurs remarquables ci-dessous :
+  
+${mdTable([
+        [
+            "$x$",
+            "$0$",
+            "$\\frac{\\pi}{6}$",
+            "$\\frac{\\pi}{4}$",
+            "$\\frac{\\pi}{3}$",
+            "$\\frac{\\pi}{2}$",
+        ],
+        [
+            "$\\cos(x)$",
+            "$1$",
+            "$\\frac{\\sqrt{3}}{2}$",
+            "$\\frac{\\sqrt{2}}{2}$",
+            "$\\frac{1}{2}$",
+            "$0$",
+        ],
+        [
+            "$\\sin(x)$",
+            "$0$",
+            "$\\frac{1}{2}$",
+            "$\\frac{\\sqrt{2}}{2}$",
+            "$\\frac{\\sqrt{3}}{2}$",
+            "$1$",
+        ],
+    ])}
+
+On a donc :
+
+$$
+${getStartStatement(identifiers)} = ${getAnswer(identifiers)}
+$$`;
+};
 const getMainRemarkableValues = () => {
     const isCos = coinFlip();
     const valueIndex = randint(0, mainTrigoValues.length);
@@ -45,6 +99,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["pi", "cos", "sin"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -94,4 +150,5 @@ export const mainRemarkableValuesExercise = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/remarkableValues.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAM7C,OAAO,EACL,QAAQ,EAaT,MAAM,sBAAsB,CAAC;AAmD9B,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IAEf,gBAAgB,EAAE,eAAe,CAAC;CACnC,CAAC;AAkDF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/remarkableValues.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAU7C,OAAO,EACL,QAAQ,EAeT,MAAM,sBAAsB,CAAC;AAmD9B,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IAEf,gBAAgB,EAAE,eAAe,CAAC;CACnC,CAAC;AAsIF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}

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

@@ -2,11 +2,15 @@ import { RemarkableValueConstructor } from "../../../../math/trigonometry/remark
 import { cos, CosNode } from "../../../../tree/nodes/functions/cosNode.js";
 import { sin, SinNode } from "../../../../tree/nodes/functions/sinNode.js";
 import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
+import { PiNode } from "../../../../tree/nodes/numbers/piNode.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { random } from "../../../../utils/alea/random.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
 import { addValidProp, propWhile, tryToAddWrongProp, } from "../../../exercise.js";
 import { getDistinctQuestions } from "../../../utils/getDistinctQuestions.js";
 const values = [
@@ -70,9 +74,92 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["pi", "cos", "sin"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
+const getHint = (identifiers) => {
+    const { angleIdentifiers } = identifiers;
+    const angle = reifyAlgebraic(angleIdentifiers);
+    return `Commence par te ramener à l'intervalle $]-\\pi; \\pi]$, en ajoutant ou en retirant un multiple de $2\\pi$ à $${angle.toTex()}$.
+  
+Puis, repère le point-image de l'angle ainsi obtenu sur le cercle trigonométrique ci-dessous : 
+  
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_nombres.jpg)
+
+Le cosinus de $${angle.toTex()}$ est l'abscisse de ce point, et son sinus est son ordonnée.`;
+};
+const getCorrection = (identifiers) => {
+    const { isCos, angleIdentifiers } = identifiers;
+    const angle = reifyAlgebraic(angleIdentifiers);
+    let toAdd = 0;
+    let newAngle = angle;
+    let counter = 0;
+    while (newAngle.evaluate() > Math.PI || newAngle.evaluate() <= -Math.PI) {
+        counter++;
+        if (counter > 1000)
+            throw new Error("too many iterations in remarkable values");
+        if (newAngle.evaluate() > 0)
+            toAdd--;
+        else
+            toAdd++;
+        console.log(newAngle.evaluate(), toAdd);
+        newAngle = add(newAngle, multiply(toAdd > 0 ? 2 : -2, PiNode)).simplify();
+    }
+    // const raw = frac(angle, PiNode).simplify();
+    return `On se ramène à l'intervalle $]-\\pi; \\pi]$ :
+
+$$
+${add(angle, multiply(2 * toAdd, PiNode)).toTex()} = ${newAngle.toTex()}
+$$
+
+On a donc :
+
+$$
+${(isCos ? cos : sin)(angle).toTex()} = ${(isCos ? cos : sin)(newAngle).toTex()}
+$$
+  
+  
+On repère le point-image de $${newAngle.toTex()}$ sur le cercle trigonométrique ci-dessous : 
+  
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_nombres.jpg)
+
+Puis, on utilise les valeurs remarquables ci-dessous :
+  
+${mdTable([
+        [
+            "$x$",
+            "$0$",
+            "$\\frac{\\pi}{6}$",
+            "$\\frac{\\pi}{4}$",
+            "$\\frac{\\pi}{3}$",
+            "$\\frac{\\pi}{2}$",
+        ],
+        [
+            "$\\cos(x)$",
+            "$1$",
+            "$\\frac{\\sqrt{3}}{2}$",
+            "$\\frac{\\sqrt{2}}{2}$",
+            "$\\frac{1}{2}$",
+            "$0$",
+        ],
+        [
+            "$\\sin(x)$",
+            "$0$",
+            "$\\frac{1}{2}$",
+            "$\\frac{\\sqrt{2}}{2}$",
+            "$\\frac{\\sqrt{3}}{2}$",
+            "$1$",
+        ],
+    ])}
+
+On a donc :
+
+$$
+${getStartStatement(identifiers)} = ${getAnswer(identifiers)}
+$$`;
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -109,4 +196,5 @@ export const remarkableValuesExercise = {
     getInstruction,
     getAnswer,
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/trigonometry/circle/selectQuadrantOnTrigoCircle.d.ts

@@ -1,2 +1,7 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    quartant: number;
+};
+export declare const selectQuadrantOnTrigoCircle: Exercise<Identifiers>;
 export {};
 //# sourceMappingURL=selectQuadrantOnTrigoCircle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"selectQuadrantOnTrigoCircle.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/selectQuadrantOnTrigoCircle.ts"],"names":[],"mappings":""}
+{"version":3,"file":"selectQuadrantOnTrigoCircle.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/circle/selectQuadrantOnTrigoCircle.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2FF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAuB7D,CAAC"}

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

@@ -1,94 +1,92 @@
-// import {
-//   Exercise,
-//   Proposition,
-//   QCMGenerator,
-//   Question,
-//   QuestionGenerator,
-//   VEA,
-//   addValidProp,
-//   shuffleProps,
-//   GetAnswer,
-//   GetHint,
-//   GetCorrection,
-//   GetInstruction,
-//   GetKeys,
-//   GetQuestionFromIdentifiers,
-//   propWhile,
-// } from "../../../../exercises/exercise.js";
-// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
-// import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
-// import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
-export {};
-// //angle donné genre Pi/6, donner la couleur
-// //donner couleur pour signe cos et sin
-// //une couleur est donnée, donner signe sin&cos
-// type Identifiers = {
-//   angle?: NodeIdentifiers;
-// };
-// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
-//   const propositions: Proposition[] = [];
-//   addValidProp(propositions, answer);
-//   propWhile(propositions, n, () => {
-//     throw Error("QCM not implemented");
-//   });
-//   return shuffleProps(propositions, n);
-// };
-// const getAnswer: GetAnswer<Identifiers> = (identifiers) => {};
-// const getInstruction: GetInstruction<Identifiers> = (identifiers) => {
-//   return `On considère le cercle trigonométrique ci-dessous.
-//   https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_couleur.jpg`;
-// };
-// const getHint: GetHint<Identifiers> = (identifiers) => {};
-// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
-// const getKeys: GetKeys<Identifiers> = (identifiers) => {
-//   return [];
-// };
-// const isAnswerValid: VEA<Identifiers> = (ans, { answer }) => {
-//   try {
-//     throw Error("VEA not implemented");
-//   } catch (err) {
-//     return handleVEAError(err);
-//   }
-// };
-// const getSelectQuadrantOnTrigoCircleQuestion: QuestionGenerator<Identifiers> = (
-//   ops,
-// ) => {
-//   const identifiers: Identifiers = {};
-//   return getQuestionFromIdentifiers(identifiers);
-// };
-// const getQuestionFromIdentifiers: GetQuestionFromIdentifiers<Identifiers> = (
-//   identifiers,
-// ) => {
-//   return {
-//     answer: getAnswer(identifiers),
-//     instruction: getInstruction(identifiers),
-//     keys: getKeys(identifiers),
-//     answerFormat: "tex",
-//     identifiers,
-//     hint: getHint(identifiers),
-//     correction: getCorrection(identifiers),
-//   };
-// };
-// export const selectQuadrantOnTrigoCircle: Exercise<Identifiers> = {
-//   id: "selectQuadrantOnTrigoCircle",
-//   label:
-//     "Donner le quadrant du cercle trigonométrique auquel un angle appartient",
-//   isSingleStep: true,
-//   generator: (nb, opts) =>
-//     getDistinctQuestions(
-//       () => getSelectQuadrantOnTrigoCircleQuestion(opts),
-//       nb,
-//     ),
-//   qcmTimer: 60,
-//   freeTimer: 60,
-//   getPropositions,
-//   isAnswerValid,
-//   subject: "Mathématiques",
-//   getInstruction,
-//   getHint,
-//   getCorrection,
-//   getAnswer,
-//   getQuestionFromIdentifiers,
-//   hasHintAndCorrection: true,
-//   answerType: "QCU",
-// };
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer, "raw");
+    ["Bleu", "Rouge", "Vert", "Jaune"].forEach((color) => {
+        tryToAddWrongProp(propositions, color, "raw");
+    });
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return ["Bleu", "Rouge", "Vert", "Jaune"][identifiers.quartant];
+};
+const getInstruction = (identifiers) => {
+    const { quartant } = identifiers;
+    const isSinPos = quartant === 0 || quartant === 1;
+    const isCosPos = quartant === 0 || quartant === 3;
+    return `On considère le cercle trigonométrique ci-dessous.
+
+![](https://heureuxhasarddocsbucket.s3.eu-west-3.amazonaws.com/mathliveV2/activities/quizzes/generator/piCercle_couleur.jpg)
+
+Soit un réel $a$ tel que : 
+
+$$
+\\sin(a)${isSinPos ? ">0" : "<0"}
+$$
+
+et 
+
+$$
+\\cos(a)${isCosPos ? ">0" : "<0"}
+$$
+
+De quelle couleur est le point-image de $a$ sur le cercle trigonométrique?
+`;
+};
+const getHint = () => {
+    return `Le cosinus d'un nombre $a$ est l'abscisse de son point-image sur le cercle trigonométrique, et le sinus son ordonnée.`;
+};
+const getCorrection = (identifiers) => {
+    const { quartant } = identifiers;
+    const isSinPos = quartant === 0 || quartant === 1;
+    const isCosPos = quartant === 0 || quartant === 3;
+    return `Le cosinus d'un nombre $a$ est l'abscisse de son point-image sur le cercle trigonométrique, et le sinus son ordonnée.
+  
+Puisque $\\cos(a)${isCosPos ? ">0" : "<0"}$, le point-image de $a$ sur le cercle trigonométrique se trouve ${isCosPos ? "à droite" : "à gauche"} de l'axe des ordonnées.
+  
+Puisque $\\sin(a)${isSinPos ? ">0" : "<0"}$, le point-image de $a$ sur le cercle trigonométrique se trouve ${isSinPos ? "au-dessus" : "en-dessous"} de l'axe des abscisses.
+
+Le point-image de $a$ sur le cercle trigonométrique se trouve donc sur le quartant de couleur ${[
+        "Bleu",
+        "Rouge",
+        "Vert",
+        "Jaune",
+    ][quartant].toLocaleLowerCase()}.`;
+};
+const getSelectQuadrantOnTrigoCircleQuestion = () => {
+    const identifiers = {
+        quartant: randint(0, 4),
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+export const selectQuadrantOnTrigoCircle = {
+    id: "selectQuadrantOnTrigoCircle",
+    label: "Donner le quadrant du cercle trigonométrique auquel un angle appartient en fonction du signe de son cosinus et son sinus",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getSelectQuadrantOnTrigoCircleQuestion(opts), nb, 4),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+    answerType: "QCU",
+    maxAllowedQuestions: 4,
+};

package/lib/exercises/math/trigonometry/functions/associateAngleSimplification.d.ts

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    isCos: boolean;
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+};
+export declare const associateAngleSimplification: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=associateAngleSimplification.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"associateAngleSimplification.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/trigonometry/functions/associateAngleSimplification.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgKF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAsB9D,CAAC"}