math-exercises 3.0.68 → 3.0.70

package/lib/exercises/math/calculLitteral/distributivity/idRmq3.d.ts

@@ -1,9 +1,10 @@
-import { Exercise, QCMGenerator, QuestionGenerator, VEA } from "../../../../exercises/exercise.js";
+import { Exercise, GetQuestionFromIdentifiers, QCMGenerator, QuestionGenerator, VEA } from "../../../../exercises/exercise.js";
 type Identifiers = {
     affine1Coeffs: number[];
     affine2Coeffs: number[];
 };
 export declare const getThirdIdentityQuestion: QuestionGenerator<Identifiers>;
+export declare const getThirdIdentityQuestionFromIdentifiers: GetQuestionFromIdentifiers<Identifiers>;
 export declare const getThirdIdentityPropositions: QCMGenerator<Identifiers>;
 export declare const isThirdIdentityAnswerValid: VEA<Identifiers>;
 export declare const thirdIdentity: Exercise<Identifiers>;

package/lib/exercises/math/calculLitteral/distributivity/idRmq3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"idRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/idRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQR,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAoEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAQnE,CAAC;AAiBF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAgBvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}
+{"version":3,"file":"idRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/idRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,0BAA0B,EAG1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAoEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAQnE,CAAC;AAEF,eAAO,MAAM,uCAAuC,EAAE,0BAA0B,CAC9E,WAAW,CAaZ,CAAC;AACF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAgBvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAa/C,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/idRmq3.js

@@ -78,9 +78,9 @@ export const getThirdIdentityQuestion = () => {
         affine1Coeffs: affine.coefficients,
         affine2Coeffs: affine2.coefficients,
     };
-    return getQuestionFromIdentifiers(identifiers);
+    return getThirdIdentityQuestionFromIdentifiers(identifiers);
 };
-const getQuestionFromIdentifiers = (identifiers) => {
+export const getThirdIdentityQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
         startStatement: getStartStatement(identifiers),
@@ -138,5 +138,5 @@ export const thirdIdentity = {
     freeTimer: 60,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
-    getQuestionFromIdentifiers,
+    getQuestionFromIdentifiers: getThirdIdentityQuestionFromIdentifiers,
 };

package/lib/exercises/math/calculLitteral/factorisation/facto1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facto1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/facto1.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAwBrC;;;GAGG;AACH,KAAK,WAAW,GAAG;IAEjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAIlB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA4NF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}
+{"version":3,"file":"facto1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/facto1.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AA0BrC;;;GAGG;AACH,KAAK,WAAW,GAAG;IAEjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAIlB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA6NF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/facto1.js

@@ -5,6 +5,7 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Affine, AffineConstructor } from "../../../../math/polynomials/affine.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { isOppositeNode } from "../../../../tree/nodes/functions/oppositeNode.js";
 import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { MultiplyNode, isMultiplyNode, multiply, } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { isPowerNode, isSquareNode, } from "../../../../tree/nodes/operators/powerNode.js";
@@ -149,7 +150,8 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
         if (answer !== "0" &&
             !isMultiplyNode(parsed) &&
             !isSquareNode(parsed) &&
-            !isPowerNode(parsed))
+            !isPowerNode(parsed) &&
+            !isOppositeNode(parsed))
             return false;
         const simp = parsed.simplify({
             forbidFactorize: true,

package/lib/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.js

@@ -23,7 +23,7 @@ $$
 *Donner le couple solution sous la forme $\\left(x;y\\right)$ : par exemple, si la solution est $x=2$ et $y=3$, alors on écrira $\\left(2;3\\right)$.*`;
 };
 const getHint = (identifiers) => {
-    return `On peut utilise la méthode par substitution ou bien celle par combinaison : 
+    return `Utilise la méthode par substitution ou bien celle par combinaison : 
   
 - Si une des variables est facile à isoler dans une des équations, alors on utilise la méthode par substitution : on isole cette variable, puis on injecte le résultat obtenu dans l'autre équation.
 

package/lib/exercises/math/combinatory/anagrams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAsGrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsDF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}
+{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAsGrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAoEF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAY1C,CAAC"}

package/lib/exercises/math/combinatory/anagrams.js

@@ -97,8 +97,12 @@ const letters = [
     "à",
     "ç",
 ];
-const getAnagramsQuestion = () => {
-    const word = random(words);
+const getInstruction = (identifiers) => {
+    const { word } = identifiers;
+    return `Combien d'anagrammes mathématiques du mot ${word} sont possibles ?`;
+};
+const getAnswer = (identifiers) => {
+    const { word } = identifiers;
     const repeats = [];
     const wordLetters = word.split("");
     letters.forEach((letter) => {
@@ -120,12 +124,20 @@ const getAnagramsQuestion = () => {
         arrangements *= getFacto(nbOfRepeats);
     });
     const answer = facto / arrangements + "";
+    return answer;
+};
+const getAnagramsQuestion = () => {
+    const word = random(words);
+    const identifiers = { word };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Combien d'anagrammes mathématiques du mot ${word} sont possibles ? `,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { word },
+        identifiers,
     };
     return question;
 };
@@ -147,13 +159,12 @@ export const anagrams = {
     id: "anagrams",
     connector: "=",
     label: "Compter le nombre d'anagrammes d'un mot",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Combinatoire et dénombrement"],
     generator: (nb) => getDistinctQuestions(getAnagramsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/combinatory/ballsCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiJF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAe/C,CAAC"}
+{"version":3,"file":"ballsCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/ballsCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAwJF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}

package/lib/exercises/math/combinatory/ballsCounting.js

@@ -58,8 +58,10 @@ const getInstruction = (identifiers) => {
             instruction = `comportant exactement une boule verte`;
     }
     return `Une urne contient $${blacks}$ boules noires numérotées de $1$ à $${blacks}$, $${reds}$ boules rouges numérotées de $1$ à $${reds}$ et $${greens}$ boules vertes numérotées de $1$ à $${greens}$.
-    On tire successivement et sans remise $3$ boules dans l'urne. 
-    Combien de tirages ${instruction} sont possibles ?`;
+
+On tire successivement et sans remise $3$ boules dans l'urne. 
+
+Combien de tirages ${instruction} sont possibles ?`;
 };
 const getBallsCountingQuestion = () => {
     const type = randint(0, 6);
@@ -67,6 +69,9 @@ const getBallsCountingQuestion = () => {
     const greens = randint(2, 6);
     const reds = randint(3, 6);
     const identifiers = { type, reds, greens, blacks };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -122,15 +127,12 @@ export const ballsCounting = {
     id: "ballsCounting",
     connector: "=",
     label: "Dénombrement avec des boules",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Combinatoire et dénombrement"],
     generator: (nb) => getDistinctQuestions(getBallsCountingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getAnswer,
-    getInstruction,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/combinatory/diceCounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAkHF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAa9C,CAAC"}
+{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAyJF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAY9C,CAAC"}

package/lib/exercises/math/combinatory/diceCounting.js

@@ -1,64 +1,100 @@
 import { shuffleProps, tryToAddWrongProp, addValidProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../math/utils/random/randint.js";
-const getDiceCountingQuestion = () => {
-    const type = randint(0, 8);
+const getInstruction = (identifiers) => {
+    const { type, face1, face2, face3 } = identifiers;
     let instruction = "";
-    let answer = "";
-    let face1;
-    let face2;
-    let face3;
     switch (type) {
         case 0:
             instruction = `avec exactement deux chiffres identiques`;
-            answer = 6 * 3 * 5 + "";
             break;
         case 1:
             instruction = `avec trois chiffres identiques`;
-            answer = 6 + "";
             break;
         case 2:
-            face1 = randint(1, 7);
             instruction = `avec exactement une fois la face $${face1}$`;
-            answer = 3 * 5 * 5 + "";
             break;
         case 3:
-            face1 = randint(1, 7);
             instruction = `avec exactement deux fois la face $${face1}$`;
-            answer = 3 * 5 + "";
             break;
         case 4:
-            face1 = randint(1, 7);
-            face2 = randint(1, 7, [face1]);
-            face3 = randint(1, 7, [face1, face2]);
             instruction = `avec exactement les faces $${face1}$, $${face2}$ et $${face3}$`;
-            answer = 6 + "";
             break;
         case 5:
-            face1 = randint(1, 7);
-            face2 = randint(1, 7, [face1]);
-            face3 = randint(1, 7, [face1, face2]);
             instruction = `avec exactement une fois la face $${face1}$ et une fois la face $${face2}$`;
-            answer = 3 * 5 + "";
             break;
         case 6:
             instruction = `dans lesquels toutes les faces sont différentes`;
-            answer = 6 * 5 * 4 + "";
             break;
         case 7:
+        default:
             instruction = "";
-            answer = 6 * 6 * 6 + "";
             break;
     }
+    return `On tire $3$ fois consécutivement un dé à six faces numérotées de $1$ à $6$. 
+  
+Combien de tirages ${instruction} sont possibles ?`;
+};
+const getAnswer = (identifiers) => {
+    const { type, face1, face2, face3 } = identifiers;
+    switch (type) {
+        case 0:
+            return 6 * 3 * 5 + "";
+        case 1:
+            return 6 + "";
+        case 2:
+            return 3 * 5 * 5 + "";
+        case 3:
+            return 3 * 5 + "";
+        case 4:
+            return 6 + "";
+        case 5:
+            return 3 * 5 + "";
+        case 6:
+            return 6 * 5 * 4 + "";
+        case 7:
+        default:
+            return 6 * 6 * 6 + "";
+    }
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answer,
-        instruction: `On tire $3$ fois consécutivement un dé à six faces numérotées de $1$ à $6$. Combien de tirages ${instruction} sont possibles ?`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { type, face1, face2, face3 },
+        identifiers,
     };
     return question;
 };
+const getDiceCountingQuestion = () => {
+    const type = randint(0, 8);
+    let face1;
+    let face2;
+    let face3;
+    switch (type) {
+        case 2:
+            face1 = randint(1, 7);
+            break;
+        case 3:
+            face1 = randint(1, 7);
+            break;
+        case 4:
+            face1 = randint(1, 7);
+            face2 = randint(1, 7, [face1]);
+            face3 = randint(1, 7, [face1, face2]);
+            break;
+        case 5:
+            face1 = randint(1, 7);
+            face2 = randint(1, 7, [face1]);
+            face3 = randint(1, 7, [face1, face2]);
+            break;
+        default:
+            break;
+    }
+    const identifiers = { type, face1, face2, face3 };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, type }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -110,13 +146,12 @@ export const diceCounting = {
     id: "diceCounting",
     connector: "=",
     label: "Dénombrement avec des dés",
-    levels: ["TermSpé"],
     isSingleStep: true,
-    sections: ["Combinatoire et dénombrement"],
     generator: (nb) => getDistinctQuestions(getDiceCountingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/complex/addComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/addComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsDF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAa5C,CAAC"}
+{"version":3,"file":"addComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/addComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAuEF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAY5C,CAAC"}

package/lib/exercises/math/complex/addComplex.js

@@ -2,30 +2,44 @@ import { addValidProp, tryToAddWrongProp, } from "../../../exercises/exercise.js
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Complex, ComplexConstructor } from "../../../math/complex/complex.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
-const getAddComplexQuestion = () => {
-    const z1 = ComplexConstructor.random();
-    let z2;
-    do {
-        z2 = ComplexConstructor.random();
-    } while (z1.im === 0 && z2.im === 0);
+const getInstruction = (identifiers) => {
+    const z1 = new Complex(identifiers.z1Re, identifiers.z1Im);
+    const z2 = new Complex(identifiers.z2Re, identifiers.z2Im);
+    return `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2.toTree().toTex()}$.
+      
+Calculer $z + z'$.`;
+};
+const getAnswer = (identifiers) => {
+    const z1 = new Complex(identifiers.z1Re, identifiers.z1Im);
+    const z2 = new Complex(identifiers.z2Re, identifiers.z2Im);
     const answer = z1.add(z2).toTree().toTex();
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2
-            .toTree()
-            .toTex()}$. Calculer $z + z'$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["i", "z", "quote"],
         answerFormat: "tex",
         startStatement: "z+z'",
-        identifiers: {
-            z1Re: z1.re,
-            z1Im: z1.im,
-            z2Re: z2.re,
-            z2Im: z2.im,
-        },
+        identifiers,
     };
     return question;
 };
+const getAddComplexQuestion = () => {
+    const z1 = ComplexConstructor.random();
+    let z2;
+    do {
+        z2 = ComplexConstructor.random();
+    } while (z1.im === 0 && z2.im === 0);
+    const identifiers = {
+        z1Re: z1.re,
+        z1Im: z1.im,
+        z2Re: z2.re,
+        z2Im: z2.im,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, z1Re, z1Im, z2Re, z2Im }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -49,13 +63,12 @@ export const addComplex = {
     id: "addComplex",
     connector: "=",
     label: "Additionner deux nombres complexes",
-    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ["Nombres complexes"],
     generator: (nb) => getDistinctQuestions(getAddComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/complex/argumentFromAlgebraicComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA8CF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}
+{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgEF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAa9D,CAAC"}

package/lib/exercises/math/complex/argumentFromAlgebraicComplex.js

@@ -9,6 +9,27 @@ import { SqrtNode } from "../../../tree/nodes/functions/sqrtNode.js";
 import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
 import { MultiplyNode } from "../../../tree/nodes/operators/multiplyNode.js";
 import { random } from "../../../utils/alea/random.js";
+const getInstruction = (identifiers) => {
+    const zTex = identifiers.zTex;
+    return `Soit $z=${zTex}$. 
+  
+Déterminer l'argument principal de $z$.`;
+};
+const getAnswer = (identifiers) => {
+    const arg = mainTrigoValues.find((point) => point.angle.evaluate({}) === identifiers.arg);
+    const answer = arg.angle.toTex();
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["pi"],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getArgumentFromAlgebraicComplexQuestion = () => {
     const arg = random(mainTrigoValues);
     const factor = random([
@@ -20,15 +41,8 @@ const getArgumentFromAlgebraicComplexQuestion = () => {
     const im = new MultiplyNode(factor, arg.sin).simplify();
     const z = new ComplexNode(re, im);
     const zTex = z.toTex();
-    const answer = arg.angle.toTex();
-    const question = {
-        answer: answer,
-        instruction: `Soit $z=${zTex}$. Déterminer l'argument principal de $z$.`,
-        keys: ["pi"],
-        answerFormat: "tex",
-        identifiers: { arg: arg.angle.evaluate({}), zTex },
-    };
-    return question;
+    const identifiers = { arg: arg.angle.evaluate({}), zTex };
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -48,13 +62,12 @@ export const argumentFromAlgebraicComplex = {
     id: "argumentFromAlgebraicComplex",
     connector: "=",
     label: "Déterminer l'argument d'un nombre complexe via sa forme algébrique",
-    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ["Nombres complexes"],
     generator: (nb) => getDistinctQuestions(getArgumentFromAlgebraicComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/complex/conjugateComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conjugateComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/conjugateComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA2CF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"conjugateComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/conjugateComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/math/complex/conjugateComplex.js

@@ -2,19 +2,33 @@ import { addValidProp, tryToAddWrongProp, } from "../../../exercises/exercise.js
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Complex, ComplexConstructor } from "../../../math/complex/complex.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
-const getConjugateComplexQuestion = () => {
-    const complex = ComplexConstructor.random();
+const getInstruction = (identifiers) => {
+    const { re, im } = identifiers;
+    const complex = new Complex(re, im);
+    return `Déterminer le conjugué de $z=${complex.toTree().toTex()}$.`;
+};
+const getAnswer = (identifiers) => {
+    const { re, im } = identifiers;
+    const complex = new Complex(re, im);
     const answer = complex.conjugate().toTree().toTex();
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer,
-        instruction: `Déterminer le conjugué de $z=${complex.toTree().toTex()}$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["i", "overline"],
         answerFormat: "tex",
         startStatement: "\\overline z",
-        identifiers: { re: complex.re, im: complex.im },
+        identifiers,
     };
     return question;
 };
+const getConjugateComplexQuestion = () => {
+    const complex = ComplexConstructor.random();
+    const identifiers = { re: complex.re, im: complex.im };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, re, im }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -40,12 +54,11 @@ export const conjugateComplex = {
     connector: "=",
     getPropositions,
     label: "Conjugué d'un nombre complexe",
-    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ["Nombres complexes"],
     generator: (nb) => getDistinctQuestions(getConjugateComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/complex/conjugateDivideComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conjugateDivideComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/conjugateDivideComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AAuDF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"conjugateDivideComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/conjugateDivideComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AAwEF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAaxD,CAAC"}

package/lib/exercises/math/complex/conjugateDivideComplex.js

@@ -2,30 +2,44 @@ import { addValidProp, tryToAddWrongProp, } from "../../../exercises/exercise.js
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { Complex, ComplexConstructor } from "../../../math/complex/complex.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
-const getConjugateDivideComplexQuestion = () => {
-    const z1 = ComplexConstructor.random();
-    let z2;
-    do {
-        z2 = ComplexConstructor.random();
-    } while (z1.im === 0 && z2.im === 0);
+const getInstruction = (identifiers) => {
+    const z1 = new Complex(identifiers.z1[0], identifiers.z1[1]);
+    const z2 = new Complex(identifiers.z2[0], identifiers.z2[1]);
+    return `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2.toTree().toTex()}$. 
+
+Calculer le conjugué de $\\frac{z}{z'}$.`;
+};
+const getAnswer = (identifiers) => {
+    const z1 = new Complex(identifiers.z1[0], identifiers.z1[1]);
+    const z2 = new Complex(identifiers.z2[0], identifiers.z2[1]);
     const conjz1 = z1.conjugate();
     const conjz2 = z2.conjugate();
     const answerTex = conjz1.divideNode(conjz2).toTex();
+    return answerTex;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        answer: answerTex,
-        instruction: `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2
-            .toTree()
-            .toTex()}$. Calculer le conjugué de $\\frac{z}{z'}$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["i", "z", "overline", "quote"],
         answerFormat: "tex",
         startStatement: "\\overline{\\frac{z}{z'}}",
-        identifiers: {
-            z1: [z1.re, z1.im],
-            z2: [z2.re, z2.im],
-        },
+        identifiers,
     };
     return question;
 };
+const getConjugateDivideComplexQuestion = () => {
+    const z1 = ComplexConstructor.random();
+    let z2;
+    do {
+        z2 = ComplexConstructor.random();
+    } while (z1.im === 0 && z2.im === 0);
+    const identifiers = {
+        z1: [z1.re, z1.im],
+        z2: [z2.re, z2.im],
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -46,13 +60,12 @@ export const conjugateDivideComplex = {
     id: "conjugateDivideComplex",
     connector: "=",
     label: "Conjugué d'une fraction de nombres complexes",
-    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ["Nombres complexes"],
     generator: (nb) => getDistinctQuestions(getConjugateDivideComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/complex/conjugateMultiplyComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conjugateMultiplyComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/conjugateMultiplyComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AAsDF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"conjugateMultiplyComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/conjugateMultiplyComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AAuEF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAa1D,CAAC"}