math-exercises 2.0.0 → 2.0.1

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.d.ts

@@ -1,4 +1,4 @@
-import { MathExercise } from '../../../exercises/exercise';
+import { MathExercise } from "../../../exercises/exercise";
 type QCMProps = {
     answer: string;
     sqrt: number;

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2EnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAelC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8EnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.js

@@ -28,19 +28,19 @@ const getEquationSimpleSquare = () => {
     const instruction = `Résoudre l'équation : $x^2 = ${randNbr}$`;
     const sqrt = Math.sqrt(randNbr);
     if (randNbr < 0)
-        answer = `S=\\varnothing`;
+        answer = `S=\\emptyset`;
     else if (sqrt === Math.floor(sqrt))
         answer = `S=\\left\\{-${sqrt};${sqrt}\\right\\}`;
     else {
         const factor = higherFactor(randNbr);
         const radicand = randNbr / factor ** 2;
-        answer = `S=\\left\\{-${factor === 1 ? '' : factor}\\sqrt{${radicand}};${factor === 1 ? '' : factor}\\sqrt{${radicand}}\\right\\}`;
+        answer = `S=\\left\\{-${factor === 1 ? "" : factor}\\sqrt{${radicand}};${factor === 1 ? "" : factor}\\sqrt{${radicand}}\\right\\}`;
     }
     const question = {
         instruction,
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        answerFormat: 'tex',
+        keys: ["x", "S", "equal", "lbrace", "rbrace", "semicolon", "emptyset"],
+        answerFormat: "tex",
         qcmGeneratorProps: { answer, sqrt, randNbr },
     };
     return question;
@@ -58,34 +58,34 @@ const getPropositions = (n, { answer, sqrt, randNbr }) => {
     else if (randNbr >= 0 && sqrt !== Math.floor(sqrt)) {
         const factor = higherFactor(randNbr);
         const radicand = randNbr / factor ** 2;
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${factor}\\sqrt{${radicand}}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${radicand}\\sqrt{${factor}}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${Math.floor(sqrt)}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${factor}\\sqrt{${radicand}}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${radicand}\\sqrt{${factor}}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${Math.floor(sqrt)}\\right\\}`);
         while (propositions.length < n) {
             const tempFactor = factor + (0, randint_1.randint)(-factor + 1, 7, [0]);
             const tempRadicand = radicand + (0, randint_1.randint)(-radicand + 1, 7, [0]);
             (0, exercise_1.tryToAddWrongProp)(propositions, (0, coinFlip_1.coinFlip)()
-                ? `\\{${tempFactor}\\sqrt{${tempRadicand}}\\ ; -${tempFactor}\\sqrt{${tempRadicand}} \\}`
-                : `\\emptyset`);
+                ? `S=\\left\\{${tempFactor}\\sqrt{${tempRadicand}}\\ ; -${tempFactor}\\sqrt{${tempRadicand}} \\right}`
+                : `S=\\emptyset`);
         }
     }
     else {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `-\\sqrt{${-randNbr}}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `${Math.floor(Math.sqrt(-randNbr))}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{-\\sqrt{${-randNbr}}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${Math.floor(Math.sqrt(-randNbr))}\\right\\}`);
         while (propositions.length < n) {
             const factor = (0, randint_1.randint)(2, 5);
             const radicand = (0, randint_1.randint)(2, -randNbr);
-            (0, exercise_1.tryToAddWrongProp)(propositions, `\\{${factor}\\sqrt{${radicand}}\\ ; -${factor}\\sqrt{${radicand}} \\}`);
+            (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${factor}\\sqrt{${radicand}};-${factor}\\sqrt{${radicand}}\\right\\}`);
         }
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.equationSimpleSquare = {
-    id: 'equationSimpleSquare',
-    connector: '=',
-    label: 'Résoudre une équation du second degré du type $x^2 = a$',
-    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
-    sections: ['Équations'],
+    id: "equationSimpleSquare",
+    connector: "=",
+    label: "Résoudre une équation du second degré du type $x^2 = a$",
+    levels: ["2nde", "1reESM", "1reSpé", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationSimpleSquare, nb),
     qcmTimer: 60,

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

@@ -1 +1 @@
-{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuGnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}
+{"version":3,"file":"diceCounting.d.ts","sourceRoot":"","sources":["../../../src/exercises/combinatory/diceCounting.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2GnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

package/lib/exercises/combinatory/diceCounting.js

@@ -46,6 +46,10 @@ const getDiceCountingQuestion = () => {
             instruction = `dans lesquels toutes les faces sont différentes`;
             answer = 6 * 5 * 4 + '';
             break;
+        case 7:
+            instruction = '';
+            answer = 6 * 6 * 6 + '';
+            break;
     }
     const question = {
         answer: answer,

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

@@ -0,0 +1,10 @@
+import { MathExercise } from "../../exercises/exercise";
+type QCMProps = {
+    answer: string;
+    re: number;
+    im: number;
+};
+type VEAProps = {};
+export declare const argumentFromAlgebraicComplex: MathExercise<QCMProps, VEAProps>;
+export {};
+//# sourceMappingURL=argumentFromAlgebraicComplex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAIlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuBnB,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzE,CAAC"}

package/lib/exercises/complex/argumentFromAlgebraicComplex.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.argumentFromAlgebraicComplex = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const complex_1 = require("../../math/complex/complex");
+const getArgumentFromAlgebraicComplexQuestion = () => {
+    const z = complex_1.ComplexConstructor.random();
+    const zTex = z.toTree().toTex();
+    const answer = z.toModuleTree().toTex();
+    const question = {
+        answer: answer,
+        instruction: `Soit $z=${zTex}$. Déterminer le module $|z|$ de $z$.`,
+        keys: [],
+        answerFormat: "tex",
+        qcmGeneratorProps: { answer, re: z.re, im: z.im },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) { }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.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) => (0, getDistinctQuestions_1.getDistinctQuestions)(getArgumentFromAlgebraicComplexQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/complex/moduloFromAlgebraicComplex.d.ts

@@ -0,0 +1,10 @@
+import { MathExercise } from "../../exercises/exercise";
+type QCMProps = {
+    answer: string;
+    re: number;
+    im: number;
+};
+type VEAProps = {};
+export declare const moduloFromAlgebraicComplex: MathExercise<QCMProps, VEAProps>;
+export {};
+//# sourceMappingURL=moduloFromAlgebraicComplex.d.ts.map

package/lib/exercises/complex/moduloFromAlgebraicComplex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"moduloFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/moduloFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA4BnB,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWvE,CAAC"}

package/lib/exercises/complex/moduloFromAlgebraicComplex.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.moduloFromAlgebraicComplex = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const complex_1 = require("../../math/complex/complex");
+const real_1 = require("../../math/numbers/reals/real");
+const randint_1 = require("../../math/utils/random/randint");
+const getModuloFromAlgebraicComplexQuestion = () => {
+    const z = complex_1.ComplexConstructor.random();
+    const zTex = z.toTree().toTex();
+    const answer = z.toModuleTree().toTex();
+    const question = {
+        answer: answer,
+        instruction: `Soit $z=${zTex}$. Déterminer le module $|z|$ de $z$.`,
+        keys: [],
+        answerFormat: "tex",
+        qcmGeneratorProps: { answer, re: z.re, im: z.im },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, re, im }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new real_1.SquareRoot(re + im).simplify().toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, re ** 2 + im ** 2 + "");
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `\\sqrt{${(0, randint_1.randint)(0, 100)}}`);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+exports.moduloFromAlgebraicComplex = {
+    id: "moduloFromAlgebraicComplex",
+    connector: "=",
+    label: "Déterminer le module d'un nombre complexe via sa forme algébrique",
+    levels: ["MathExp"],
+    isSingleStep: true,
+    sections: ["Nombres complexes"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getModuloFromAlgebraicComplexQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/exercises.d.ts

@@ -1,3 +1,3 @@
-import { MathExercise } from './exercise';
+import { MathExercise } from "./exercise";
 export declare const exercises: MathExercise<any, any>[];
 //# sourceMappingURL=exercises.d.ts.map

package/lib/exercises/exercises.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA8B1C,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAkS7C,CAAC"}
+{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAgC1C,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAoS7C,CAAC"}

package/lib/exercises/exercises.js

@@ -198,6 +198,8 @@ const productDerivative_1 = require("./derivation/derivative/productDerivative")
 const quotientDerivative_1 = require("./derivation/derivative/quotientDerivative");
 const derivativeNumberCalcul_1 = require("./derivation/derivativeNumberCalcul");
 const averagePoint_1 = require("./probaStat/stats2var/averagePoint");
+const rationalFractionForbiddenValue_1 = require("./functions/rationalFraction/rationalFractionForbiddenValue");
+const moduloFromAlgebraicComplex_1 = require("./complex/moduloFromAlgebraicComplex");
 exports.exercises = [
     /**
      * calcul litteral
@@ -346,6 +348,7 @@ exports.exercises = [
     inverseImageFunction_1.inverseImageFunction,
     imageFunctionGeogebra_1.imageFunctionGeogebra,
     inverseImageFunctionGeogebra_1.inverseImageFunctionGeogebra,
+    rationalFractionForbiddenValue_1.rationalFractionForbiddenValue,
     /**
      * derivation
      */
@@ -444,6 +447,7 @@ exports.exercises = [
     inverseComplex_1.inverseComplex,
     divideComplex_1.divideComplex,
     conjugateDivideComplex_1.conjugateDivideComplex,
+    moduloFromAlgebraicComplex_1.moduloFromAlgebraicComplex,
     /**sets */
     inequalityToInterval_1.inequalityToInterval,
     setBelonging_1.setBelonging,

package/lib/exercises/functions/rationalFraction/rationalFractionForbiddenValue.d.ts

@@ -0,0 +1,12 @@
+import { MathExercise } from "../../../exercises/exercise";
+type QCMProps = {
+    answer: string;
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+};
+type VEAProps = {};
+export declare const rationalFractionForbiddenValue: MathExercise<QCMProps, VEAProps>;
+export {};
+//# sourceMappingURL=rationalFractionForbiddenValue.d.ts.map

package/lib/exercises/functions/rationalFraction/rationalFractionForbiddenValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rationalFractionForbiddenValue.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/rationalFraction/rationalFractionForbiddenValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3E,CAAC"}

package/lib/exercises/functions/rationalFraction/rationalFractionForbiddenValue.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rationalFractionForbiddenValue = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const affine_1 = require("../../../math/polynomials/affine");
+const randint_1 = require("../../../math/utils/random/randint");
+const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getRationalFractionForbiddenValueQuestion = () => {
+    const a = (0, randint_1.randint)(-10, 11, [0]);
+    const b = (0, randint_1.randint)(-10, 11);
+    //pour éviter affine2 = k*affine1
+    let c, d;
+    do {
+        c = (0, randint_1.randint)(-10, 11, [0]);
+        d = (0, randint_1.randint)(-10, 11);
+    } while (a * d - b * c === 0);
+    const affine1 = new affine_1.Affine(a, b);
+    const affine2 = new affine_1.Affine(c, d);
+    const fct = new fractionNode_1.FractionNode(affine1.toTree(), affine2.toTree());
+    const fctTex = fct.toTex();
+    const answerTree = new rational_1.Rational(-d, c).simplify().toTree();
+    const answer = answerTree.toTex();
+    const question = {
+        answer,
+        instruction: `Soit $f(x)=${fctTex}$. Quelle est la valeur interdite de la fonction $f$ ?`,
+        keys: [],
+        answerFormat: "tex",
+        qcmGeneratorProps: { answer, a, b, c, d },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b, c, d }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(-b, a).simplify().toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, d + "");
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-10, 11) + "");
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+exports.rationalFractionForbiddenValue = {
+    id: "rationalFractionForbiddenValue",
+    connector: "=",
+    label: "Déterminer la valeur interdite d'un quotient de polynôme",
+    levels: ["2nde", "1reESM", "1reSpé"],
+    isSingleStep: true,
+    sections: ["Fonctions", "Fractions", "Fonctions affines"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRationalFractionForbiddenValueQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+};

package/lib/exercises/probaStat/stats2var/averagePoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"averagePoint.d.ts","sourceRoot":"","sources":["../../../../src/exercises/probaStat/stats2var/averagePoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwCnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}
+{"version":3,"file":"averagePoint.d.ts","sourceRoot":"","sources":["../../../../src/exercises/probaStat/stats2var/averagePoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAyCnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}

package/lib/exercises/probaStat/stats2var/averagePoint.js

@@ -9,18 +9,19 @@ const randint_1 = require("../../../math/utils/random/randint");
 const average_1 = require("../../../utils/average");
 const getAveragePointQuestion = () => {
     const points = (0, randTupleInt_1.distinctRandTupleInt)(4, 2, { from: -9, to: 10 });
+    const sortedPoints = points.sort((a, b) => a[0] - b[0]);
     const tab = `
 | | | | | |
 |-|-|-|-|-|
-|x|${points[0][0]}|${points[1][0]}|${points[2][0]}|${points[3][0]}|
-|y|${points[0][1]}|${points[1][1]}|${points[2][1]}|${points[3][1]}|
+|x|${sortedPoints[0][0]}|${sortedPoints[1][0]}|${sortedPoints[2][0]}|${sortedPoints[3][0]}|
+|y|${sortedPoints[0][1]}|${sortedPoints[1][1]}|${sortedPoints[2][1]}|${sortedPoints[3][1]}|
   `;
     const instruction = `On considère la liste de points suivante : ${tab}
   
   Déterminer les coordonnées du point moyen $G$.
   `;
-    const xG = (0, frenchify_1.frenchify)((0, average_1.average)(points.map((el) => el[0])) + '');
-    const yG = (0, frenchify_1.frenchify)((0, average_1.average)(points.map((el) => el[1])) + '');
+    const xG = (0, frenchify_1.frenchify)((0, average_1.average)(sortedPoints.map((el) => el[0])) + '');
+    const yG = (0, frenchify_1.frenchify)((0, average_1.average)(sortedPoints.map((el) => el[1])) + '');
     const answer = `\\left(${xG};${yG}\\right)`;
     const question = {
         answer,

package/lib/exercises/sequences/arithmetic/arithmeticFindExplicitFormula.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticFindExplicitFormula.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticFindExplicitFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1E,CAAC"}
+{"version":3,"file":"arithmeticFindExplicitFormula.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticFindExplicitFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1E,CAAC"}

package/lib/exercises/sequences/arithmetic/arithmeticFindExplicitFormula.js

@@ -14,9 +14,8 @@ const getArithmeticFindExplicitFormula = () => {
     const answer = formula.toString();
     const question = {
         instruction: `$(u_n)$ est une suite arithmétique de premier terme $u_{${firstRank}} = ${firstValue}$ et de raison $r = ${reason}$. $\\\\$ Donner l'expression de $u_n$ en fonction de $n$.`,
-        startStatement: 'u_n',
         answer,
-        keys: ['r', 'n', 'u', 'underscore'],
+        keys: ['un', 'equal', 'r', 'n', 'u', 'underscore'],
         answerFormat: 'tex',
         qcmGeneratorProps: { answer, firstValue, reason },
     };

package/lib/exercises/sequences/geometric/geometricFindExplicitFormula.js

@@ -18,9 +18,8 @@ const getGeometricFindExplicitFormula = () => {
     const answer = (0, simplify_1.simplifyNode)(formula).toTex();
     const question = {
         instruction: `$(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$.`,
-        startStatement: 'u_n',
         answer,
-        keys: ['q', 'n', 'u', 'underscore'],
+        keys: ['un', 'equal', 'q', 'n', 'u', 'underscore'],
         answerFormat: 'tex',
         qcmGeneratorProps: { answer, reason, firstValue },
     };

package/lib/math/complex/complex.d.ts

@@ -1,5 +1,8 @@
-import { ComplexNode } from '../../tree/nodes/complex/complexNode';
-import { AddNode } from '../../tree/nodes/operators/addNode';
+import { ComplexNode } from "../../tree/nodes/complex/complexNode";
+import { OppositeNode } from "../../tree/nodes/functions/oppositeNode";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { AddNode } from "../../tree/nodes/operators/addNode";
+import { FractionNode } from "../../tree/nodes/operators/fractionNode";
 export declare abstract class ComplexConstructor {
     static random(): Complex;
     static randomNotReal(): Complex;
@@ -14,6 +17,8 @@ export declare class Complex {
     multiply(z: Complex): Complex;
     opposite(): Complex;
     conjugate(): Complex;
+    toArgumentTree(): NumberNode | FractionNode | OppositeNode | import("../../tree/nodes/numbers/constantNode").ConstantNode | undefined;
+    toModuleTree(): import("../../tree/nodes/node").Node;
     toTree(): ComplexNode;
 }
 //# sourceMappingURL=complex.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"complex.d.ts","sourceRoot":"","sources":["../../../src/math/complex/complex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAO7D,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,aAAa;CAQrB;AACD,qBAAa,OAAO;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;gBACC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAIlC,aAAa;IAIb,WAAW;IAQX,UAAU,CAAC,CAAC,EAAE,OAAO;IAYrB,QAAQ,CAAC,CAAC,EAAE,OAAO;IAGnB,QAAQ;IAGR,SAAS;IAGT,MAAM;CAGP"}
+{"version":3,"file":"complex.d.ts","sourceRoot":"","sources":["../../../src/math/complex/complex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAQvE,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM;IAQb,MAAM,CAAC,aAAa;CAQrB;AACD,qBAAa,OAAO;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;gBACC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAIlC,aAAa;IAIb,WAAW;IAQX,UAAU,CAAC,CAAC,EAAE,OAAO;IAYrB,QAAQ,CAAC,CAAC,EAAE,OAAO;IAGnB,QAAQ;IAGR,SAAS;IAGT,cAAc;IAsBd,YAAY;IAGZ,MAAM;CAGP"}

package/lib/math/complex/complex.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Complex = exports.ComplexConstructor = void 0;
 const complexNode_1 = require("../../tree/nodes/complex/complexNode");
+const oppositeNode_1 = require("../../tree/nodes/functions/oppositeNode");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const piNode_1 = require("../../tree/nodes/numbers/piNode");
 const addNode_1 = require("../../tree/nodes/operators/addNode");
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
 const rational_1 = require("../numbers/rationals/rational");
+const real_1 = require("../numbers/reals/real");
 const randint_1 = require("../utils/random/randint");
 class ComplexConstructor {
     static random() {
@@ -39,22 +44,22 @@ class Complex {
         const conj = this.conjugate();
         const invRe = new rational_1.Rational(conj.re, moduleSq).simplify().toTree();
         const invIm = new rational_1.Rational(conj.im, moduleSq).simplify().toTree();
-        return new addNode_1.AddNode(invRe, new multiplyNode_1.MultiplyNode(invIm, new variableNode_1.VariableNode('i')));
+        return new addNode_1.AddNode(invRe, new multiplyNode_1.MultiplyNode(invIm, new variableNode_1.VariableNode("i")));
     }
     divideNode(z) {
         const moduleSq = z.moduleSquared();
         const newRe = new rational_1.Rational(this.re * z.re + this.im * z.im, moduleSq).simplify().toTree();
         const newIm = new rational_1.Rational(this.im * z.re - z.im * this.re, moduleSq).simplify().toTree();
         let imNode;
-        if (newIm.toTex() === '0')
+        if (newIm.toTex() === "0")
             return newRe;
-        if (newIm.toTex() === '1')
-            imNode = new variableNode_1.VariableNode('i');
+        if (newIm.toTex() === "1")
+            imNode = new variableNode_1.VariableNode("i");
         else
-            imNode = new multiplyNode_1.MultiplyNode(newIm, new variableNode_1.VariableNode('i'));
-        if (newRe.toTex() === '0')
+            imNode = new multiplyNode_1.MultiplyNode(newIm, new variableNode_1.VariableNode("i"));
+        if (newRe.toTex() === "0")
             return imNode;
-        return new addNode_1.AddNode(newRe, new multiplyNode_1.MultiplyNode(newIm, new variableNode_1.VariableNode('i')));
+        return new addNode_1.AddNode(newRe, new multiplyNode_1.MultiplyNode(newIm, new variableNode_1.VariableNode("i")));
     }
     multiply(z) {
         return new Complex(this.re * z.re - this.im * z.im, this.re * z.im + this.im * z.re);
@@ -65,6 +70,35 @@ class Complex {
     conjugate() {
         return new Complex(this.re, -this.im);
     }
+    toArgumentTree() {
+        if (this.re === 0 && this.im === 0)
+            throw Error("0 n'a pas d'argument");
+        if (this.re === 0) {
+            const piOver2 = new fractionNode_1.FractionNode(piNode_1.PiNode, new numberNode_1.NumberNode(2));
+            if (this.im > 0)
+                return piOver2;
+            else
+                return new oppositeNode_1.OppositeNode(piOver2);
+        }
+        if (this.im === 0) {
+            if (this.re > 0)
+                return new numberNode_1.NumberNode(0);
+            else
+                return piNode_1.PiNode;
+        }
+        if (this.re > 0) {
+            //arctan(b/a)
+        }
+        if (this.im > 0) {
+            //arctan(b/a)+pi
+        }
+        if (this.im < 0) {
+            //arctan(b/a)-pi
+        }
+    }
+    toModuleTree() {
+        return new real_1.SquareRoot(this.re ** 2 + this.im ** 2).simplify().toTree();
+    }
     toTree() {
         return new complexNode_1.ComplexNode(this.re, this.im);
     }

package/lib/math/numbers/reals/real.d.ts

@@ -1,5 +1,5 @@
-import { Node } from '../../../tree/nodes/node';
-import { Nombre, NumberType } from '../nombre';
+import { Node } from "../../../tree/nodes/node";
+import { Nombre, NumberType } from "../nombre";
 export declare abstract class RealConstructor {
     static random(): Real;
 }
@@ -24,7 +24,7 @@ export declare class SquareRoot extends Real {
     operand: number;
     constructor(operand: number);
     getSimplifiedCoeffs(): [number, number];
-    simplify(): Real;
+    simplify(): Nombre;
     toTex(): string;
     toTree(): Node;
 }

package/lib/math/numbers/reals/real.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"real.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/real.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAQ7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,8BAAsB,eAAe;IACnC,MAAM,CAAC,MAAM;CAUd;AACD,qBAAa,IAAK,YAAW,MAAM;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBACL,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAKtC,MAAM,IAAI,IAAI;CAIf;AAED,8BAAsB,qBAAqB;IACzC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,EAAE,kBAA0B,EAAE,SAAc,EAAE;;;KAAA,GAAG,UAAU;IASrF,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW,GAAG,UAAU;CAIxD;AAED,qBAAa,UAAW,SAAQ,IAAI;IAClC,OAAO,EAAE,MAAM,CAAC;gBACJ,OAAO,EAAE,MAAM;IAK3B,mBAAmB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAevC,QAAQ,IAAI,IAAI;IAoBhB,KAAK,IAAI,MAAM;IAIf,MAAM,IAAI,IAAI;CAGf"}
+{"version":3,"file":"real.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/real.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAQ7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,8BAAsB,eAAe;IACnC,MAAM,CAAC,MAAM;CAUd;AACD,qBAAa,IAAK,YAAW,MAAM;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBACL,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAKtC,MAAM,IAAI,IAAI;CAIf;AAED,8BAAsB,qBAAqB;IACzC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,EAAE,kBAA0B,EAAE,SAAc,EAAE;;;KAAA,GAAG,UAAU;IASrF,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW,GAAG,UAAU;CAIxD;AAED,qBAAa,UAAW,SAAQ,IAAI;IAClC,OAAO,EAAE,MAAM,CAAC;gBACJ,OAAO,EAAE,MAAM;IAK3B,mBAAmB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAevC,QAAQ,IAAI,MAAM;IAqBlB,KAAK,IAAI,MAAM;IAIf,MAAM,IAAI,IAAI;CAGf"}

package/lib/math/numbers/reals/real.js

@@ -10,6 +10,7 @@ const piNode_1 = require("../../../tree/nodes/numbers/piNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const diceFlip_1 = require("../../../utils/diceFlip");
 const random_1 = require("../../../utils/random");
+const integer_1 = require("../integer/integer");
 const primes_1 = require("../integer/primes");
 const nombre_1 = require("../nombre");
 class RealConstructor {
@@ -17,11 +18,11 @@ class RealConstructor {
         const dice = (0, diceFlip_1.diceFlip)(2);
         switch (dice) {
             case 0:
-                return new Real(Math.PI, '\\pi');
+                return new Real(Math.PI, "\\pi");
             case 1:
                 return SquareRootConstructor.randomIrreductible();
         }
-        return new Real(Math.PI, '\\pi');
+        return new Real(Math.PI, "\\pi");
     }
 }
 exports.RealConstructor = RealConstructor;
@@ -32,7 +33,7 @@ class Real {
         this.type = nombre_1.NumberType.Real;
     }
     toTree() {
-        if (this.tex === '\\pi')
+        if (this.tex === "\\pi")
             return piNode_1.PiNode;
         return new numberNode_1.NumberNode(this.value);
     }
@@ -78,10 +79,12 @@ class SquareRoot extends Real {
         return [outsideSqrt, insideSqrt];
     }
     simplify() {
+        if (this.operand === 0)
+            return new integer_1.Integer(0);
         const [outsideSqrt, insideSqrt] = this.getSimplifiedCoeffs();
         const simplified = insideSqrt !== 1
-            ? new Real(outsideSqrt * Math.sqrt(insideSqrt), `${outsideSqrt === 1 ? '' : `${outsideSqrt}`}\\sqrt{${insideSqrt}}`)
-            : new Real(outsideSqrt, outsideSqrt + '');
+            ? new Real(outsideSqrt * Math.sqrt(insideSqrt), `${outsideSqrt === 1 ? "" : `${outsideSqrt}`}\\sqrt{${insideSqrt}}`)
+            : new Real(outsideSqrt, outsideSqrt + "");
         simplified.toTree = () => {
             return insideSqrt !== 1
                 ? outsideSqrt === 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [