math-exercises 1.4.14 → 1.4.16

package/lib/exercises/combinatory/diceCounting.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDiceCountingQuestion = exports.diceCounting = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../math/utils/random/randint");
+const uuid_1 = require("uuid");
+exports.diceCounting = {
+    id: 'diceCounting',
+    connector: '=',
+    instruction: '',
+    label: 'Dénombrement avec des dés',
+    levels: ['TermSpé'],
+    isSingleStep: true,
+    sections: ['Combinatoire et dénombrement'],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDiceCountingQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+};
+function getDiceCountingQuestion() {
+    const type = (0, randint_1.randint)(0, 8);
+    let instruction = '';
+    let answer = '';
+    let face1, face2, 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 = (0, randint_1.randint)(1, 7);
+            instruction = `avec exactement une fois la face ${face1}`;
+            answer = 3 * 5 * 5 + '';
+            break;
+        case 3:
+            face1 = (0, randint_1.randint)(1, 7);
+            instruction = `avec exactement deux fois la face ${face1}`;
+            answer = 3 * 5 + '';
+            break;
+        case 4:
+            face1 = (0, randint_1.randint)(1, 7);
+            face2 = (0, randint_1.randint)(1, 7, [face1]);
+            face3 = (0, randint_1.randint)(1, 7, [face1, face2]);
+            instruction = `avec exactement les faces ${face1}, ${face2} et ${face3}`;
+            answer = 6 + '';
+            break;
+        case 5:
+            face1 = (0, randint_1.randint)(1, 7);
+            face2 = (0, randint_1.randint)(1, 7, [face1]);
+            face3 = (0, randint_1.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;
+    }
+    const getPropositions = (n) => {
+        const res = [];
+        res.push({
+            id: (0, uuid_1.v4)(),
+            statement: answer,
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        switch (type) {
+            case 0:
+                (0, exercise_1.tryToAddWrongProp)(res, 3 * 5 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 6 * 3 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 3 + '');
+                break;
+            case 1:
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 3 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 1 + '');
+                break;
+            case 2:
+                (0, exercise_1.tryToAddWrongProp)(res, 3 * 6 * 6 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 5 * 5 + '');
+                break;
+            case 3:
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 3 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 5 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 5 + '');
+                break;
+            case 4:
+                (0, exercise_1.tryToAddWrongProp)(res, 3 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 1 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 6 * 6 + '');
+                break;
+            case 5:
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 3 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 5 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 5 + '');
+                break;
+            case 6:
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 6 * 6 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 * 5 + '');
+                (0, exercise_1.tryToAddWrongProp)(res, 6 + '');
+                break;
+        }
+        const missing = n - res.length;
+        for (let i = 0; i < missing; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                const wrongAnswer = (0, randint_1.randint)(1, 100) + '';
+                proposition = {
+                    id: (0, uuid_1.v4)() + ``,
+                    statement: wrongAnswer,
+                    isRightAnswer: false,
+                    format: 'tex',
+                };
+                isDuplicate = res.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            res.push(proposition);
+        }
+        return (0, exercise_1.shuffleProps)(res, n);
+    };
+    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 ?`,
+        keys: [],
+        getPropositions,
+        answerFormat: 'tex',
+    };
+    return question;
+}
+exports.getDiceCountingQuestion = getDiceCountingQuestion;

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

@@ -1 +1 @@
-{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAuD5C"}
+{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CA0D5C"}

package/lib/exercises/conversion/aeraConversion.js

@@ -54,7 +54,7 @@ function getAeraConversion() {
     };
     const question = {
         instruction: `$${randomAera.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '',
+        answer: (randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ','),
         keys: [],
         getPropositions,
         answerFormat: 'tex',

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

@@ -1 +1 @@
-{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,kBAAkB,EAAE,YAYhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAkDhD"}
+{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,kBAAkB,EAAE,YAYhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAqDhD"}

package/lib/exercises/conversion/capacityConversion.js

@@ -52,7 +52,7 @@ function getCapacityConversion() {
     };
     const question = {
         instruction: `$${randomCapacity.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
+        answer: (randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ','),
         keys: [],
         getPropositions,
         answerFormat: 'tex',

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

@@ -1 +1 @@
-{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAiD9C"}
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAoD9C"}

package/lib/exercises/conversion/lengthConversion.js

@@ -51,7 +51,7 @@ function getLengthConversion() {
     };
     const question = {
         instruction: `$${randomlength.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: randomlength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
+        answer: (randomlength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ','),
         keys: [],
         getPropositions,
         answerFormat: 'tex',

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

@@ -1 +1 @@
-{"version":3,"file":"massConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/massConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAiD5C"}
+{"version":3,"file":"massConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/massConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,cAAc,EAAE,YAY5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAoD5C"}

package/lib/exercises/conversion/massConversion.js

@@ -51,7 +51,7 @@ function getMassConversion() {
     };
     const question = {
         instruction: `$${randomMass.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
+        answer: (randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ','),
         keys: [],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/conversion/volumeCapacityConversion.js

@@ -68,7 +68,7 @@ function getVolumeCapacityConversion() {
     };
     const question = {
         instruction: `$${random.value}$ $${instructionUnit}$ = ... $${AsnwerUnit}$`,
-        answer: answer.value + '',
+        answer: (answer.value + '').replace('.', ','),
         keys: [],
         getPropositions,
         answerFormat: 'tex',

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

@@ -1 +1 @@
-{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAsD9C"}
+{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,gBAAgB,EAAE,YAY9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAyD9C"}

package/lib/exercises/conversion/volumeConversion.js

@@ -53,7 +53,7 @@ function getVolumeConversion() {
     };
     const question = {
         instruction: `$${randomVolume.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
-        answer: randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '',
+        answer: (randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ','),
         keys: [],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/derivation/derivative/inverseFunctionDerivative.js

@@ -53,7 +53,7 @@ function getInverseFunctionDerivative() {
     const question = {
         instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =\\frac{${a}}{x}$.`,
         startStatement: `f'(x)`,
-        answer: `\\frac{${-a}}{x^2}`,
+        answer: `${a > 0 ? '-' : ''}\\frac{${Math.abs(a)}}{x^2}`,
         keys: ['x'],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/derivation/derivative/rootFunctionDerivative.js

@@ -31,9 +31,9 @@ function getRootFunctionDerivative() {
     else
         instruction += `$${a}\\sqrt{x}$.`;
     if (a % 2 === 0)
-        answer = `\\frac{${a / 2}}{\\sqrt{x}}`;
+        answer = `${a < 0 ? '-' : ''}\\frac{${Math.abs(a / 2)}}{\\sqrt{x}}`;
     else
-        answer = `\\frac{${a}}{2\\sqrt{x}}`;
+        answer = `${a < 0 ? '-' : ''}\\frac{${Math.abs(a)}}{2\\sqrt{x}}`;
     const getPropositions = (numOptions) => {
         const propositions = [];
         propositions.push({

package/lib/exercises/derivation/derivative/secondDegreeDerivative.js

@@ -62,7 +62,7 @@ function getSecondDegreeDerivative() {
     const question = {
         instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$.`,
         startStatement: `f'(x)`,
-        answer: derivative.toString(),
+        answer: derivative.toTree().toTex(),
         keys: ['x'],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/derivation/derivative/thirdDegreeDerivative.js

@@ -26,11 +26,12 @@ function getThirdDegreeDerivative() {
     coefficients.push((0, randint_1.randint)(-9, 10, [0]));
     const polynomial = new polynomial_1.Polynomial(coefficients);
     const derivative = polynomial.derivate();
+    const answer = derivative.toTree().toTex();
     const getPropositions = (numOptions) => {
         const propositions = [];
         propositions.push({
             id: (0, uuid_1.v4)(),
-            statement: derivative.toString(),
+            statement: answer,
             isRightAnswer: true,
             format: 'tex',
         });
@@ -63,7 +64,7 @@ function getThirdDegreeDerivative() {
     const question = {
         instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$.`,
         startStatement: `f'(x)`,
-        answer: derivative.toString(),
+        answer: answer,
         keys: ['x'],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/exercise.d.ts

@@ -36,5 +36,5 @@ export interface MathExercise {
     freeTimer: number;
 }
 export type MathLevel = '6ème' | '5ème' | '4ème' | '3ème' | '2nde' | '1reTech' | '1reESM' | '1reSpé' | 'TermSpé' | 'TermTech' | 'MathExp' | 'MathComp' | 'CAP' | '2ndPro' | '1rePro' | 'TermPro';
-export type MathSection = 'Arithmétique' | 'Calcul littéral' | 'Calculs' | 'Conversions' | 'Dérivation' | 'Droites' | 'Ensembles et intervalles' | 'Équations' | 'Équations différentielles' | 'Exponentielle' | 'Fonction cube' | 'Fonction inverse' | 'Fonctions' | 'Fonctions affines' | 'Fonctions de référence' | 'Fractions' | 'Géométrie cartésienne' | 'Géométrie euclidienne' | 'Inéquations' | 'Intégration' | 'Limites' | 'Logarithme népérien' | 'Nombres complexes' | 'Pourcentages' | 'Primitives' | 'Probabilités' | 'Proportionnalité' | 'Puissances' | 'Racines carrées' | 'Second degré' | 'Statistiques' | 'Suites' | 'Trigonométrie' | 'Vecteurs';
+export type MathSection = 'Arithmétique' | 'Calcul littéral' | 'Calculs' | 'Combinatoire et dénombrement' | 'Conversions' | 'Dérivation' | 'Droites' | 'Ensembles et intervalles' | 'Équations' | 'Équations différentielles' | 'Exponentielle' | 'Fonction cube' | 'Fonction inverse' | 'Fonctions' | 'Fonctions affines' | 'Fonctions de référence' | 'Fractions' | 'Géométrie cartésienne' | 'Géométrie euclidienne' | 'Inéquations' | 'Intégration' | 'Limites' | 'Logarithme népérien' | 'Nombres complexes' | 'Pourcentages' | 'Primitives' | 'Probabilités' | 'Proportionnalité' | 'Puissances' | 'Racines carrées' | 'Second degré' | 'Statistiques' | 'Suites' | 'Trigonométrie' | 'Vecteurs';
 //# sourceMappingURL=exercise.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAI3C,eAAO,MAAM,iBAAiB,UAAW,WAAW,EAAE,aAAa,MAAM,WAAU,KAAK,GAAG,KAAK,SAS/F,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,WAAW,EAAE,KAAK,MAAM,kBAE3D,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACvC,eAAe,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;CAC/C;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACvC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;IAC9D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,iBAAiB,GACjB,SAAS,GACT,aAAa,GACb,YAAY,GACZ,SAAS,GACT,0BAA0B,GAC1B,WAAW,GACX,2BAA2B,GAC3B,eAAe,GACf,eAAe,GACf,kBAAkB,GAClB,WAAW,GACX,mBAAmB,GACnB,wBAAwB,GACxB,WAAW,GACX,uBAAuB,GACvB,uBAAuB,GACvB,aAAa,GACb,aAAa,GACb,SAAS,GACT,qBAAqB,GACrB,mBAAmB,GACnB,cAAc,GACd,YAAY,GACZ,cAAc,GACd,kBAAkB,GAClB,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,cAAc,GACd,QAAQ,GACR,eAAe,GACf,UAAU,CAAC"}
+{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAI3C,eAAO,MAAM,iBAAiB,UAAW,WAAW,EAAE,aAAa,MAAM,WAAU,KAAK,GAAG,KAAK,SAS/F,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,WAAW,EAAE,KAAK,MAAM,kBAE3D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACvC,eAAe,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;CAC/C;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACvC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;IAC9D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,iBAAiB,GACjB,SAAS,GACT,8BAA8B,GAC9B,aAAa,GACb,YAAY,GACZ,SAAS,GACT,0BAA0B,GAC1B,WAAW,GACX,2BAA2B,GAC3B,eAAe,GACf,eAAe,GACf,kBAAkB,GAClB,WAAW,GACX,mBAAmB,GACnB,wBAAwB,GACxB,WAAW,GACX,uBAAuB,GACvB,uBAAuB,GACvB,aAAa,GACb,aAAa,GACb,SAAS,GACT,qBAAqB,GACrB,mBAAmB,GACnB,cAAc,GACd,YAAY,GACZ,cAAc,GACd,kBAAkB,GAClB,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,cAAc,GACd,QAAQ,GACR,eAAe,GACf,UAAU,CAAC"}

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;AAc1C,eAAO,MAAM,SAAS,EAAE,YAAY,EA+QnC,CAAC"}
+{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAmB1C,eAAO,MAAM,SAAS,EAAE,YAAY,EAwRnC,CAAC"}

package/lib/exercises/exercises.js

@@ -182,6 +182,11 @@ const niceRootsFromDevForm_1 = require("./functions/trinoms/niceRootsFromDevForm
 const diceBasicProbas_1 = require("./probaStat/diceBasicProbas");
 const cardBasicProbas_1 = require("./probaStat/cardBasicProbas");
 const ballsBasicProbas_1 = require("./probaStat/ballsBasicProbas");
+const coordinatesReading_1 = require("./geometry/vectors/coordinatesReading");
+const anagrams_1 = require("./combinatory/anagrams");
+const ballsCounting_1 = require("./combinatory/ballsCounting");
+const diceCounting_1 = require("./combinatory/diceCounting");
+const paritySumsAndProducts_1 = require("./calcul/arithmetics/paritySumsAndProducts");
 exports.exercises = [
     /**
      * calcul litteral
@@ -205,6 +210,8 @@ exports.exercises = [
     equationType4Exercise_1.equationType4Exercise,
     firstDegreeEquation_1.firstDegreeEquation,
     equationSimpleSquare_1.equationSimpleSquare,
+    multiplicationEquation_1.multiplicationEquation,
+    fractionEquation_1.fractionEquation,
     /**
      * inequations
      */
@@ -234,6 +241,10 @@ exports.exercises = [
     addAndSubWithoutRelatives_1.addAndSubWithoutRelatives,
     operationsPriorities_1.operationsPriorities,
     operationsPrioritiesWithoutRelative_1.operationsPrioritiesWithoutRelative,
+    mentalAddAndSub_1.mentalAddAndSub,
+    mentalMultiplications_1.mentalMultiplications,
+    mentalDivisions_1.mentalDivisions,
+    mentalPercentage_1.mentalPercentage,
     /**
      * rounding
      */
@@ -264,12 +275,22 @@ exports.exercises = [
     trigonometrySideCalcul_1.trigonometrySideCalcul,
     rightTriangleArea_1.rightTriangleArea,
     triangleArea_1.triangleArea,
+    rectangleArea_1.rectangleArea,
+    rectanglePerimeter_1.rectanglePerimeter,
+    squareArea_1.squareArea,
+    squarePerimeter_1.squarePerimeter,
+    triangleAreaV2_1.triangleAreaV2,
+    trianglePerimeter_1.trianglePerimeter,
+    circleArea_1.circleArea,
+    circleCircumference_1.circleCircumference,
+    distanceBetweenTwoPoints_1.distanceBetweenTwoPoints,
     /**
      * vectors
      */
     scalarProductViaCoords_1.scalarProductViaCoords,
     determinant_1.determinant,
     chasles_1.chasles,
+    coordinatesReading_1.coordinatesReading,
     /**
      * puissances
      */
@@ -328,7 +349,7 @@ exports.exercises = [
     expDerivativeTwo_1.expDerivativeTwo,
     expDerivativeThree_1.expDerivativeThree,
     /**
-     * primitive
+     * primitive and equa diff
      */
     constantPrimitive_1.constantPrimitive,
     polynomialPrimitive_1.polynomialPrimitive,
@@ -336,6 +357,8 @@ exports.exercises = [
     exponentialPrimitive_1.exponentialPrimitive,
     logarithmePrimitive_1.logarithmePrimitive,
     usualPrimitives_1.usualPrimitives,
+    equaDiffGeneralForme_1.exponentialDifferentialEquation,
+    equaDiffGeneralFormeWithIC_1.exponentialDifferentialEquationWithIC,
     /**
      * probabilités
      */
@@ -344,39 +367,21 @@ exports.exercises = [
     diceBasicProbas_1.diceBasicProbas,
     cardBasicProbas_1.cardBasicProbas,
     ballsBasicProbas_1.ballsBasicProbas,
+    /**arithmetic */
+    primeNumbers_1.primeNumbers,
+    paritySumsAndProducts_1.paritySumsAndProducts,
+    euclideanDivision_1.euclideanDivision,
     /**
      * islam
      */
     leadingCoefficient_1.leadingCoefficient,
     fractionToPercentToDecimal_1.fractionToPercentToDecimal,
     marginalAndConditionalFrequency_1.marginalAndConditionalFrequency,
-    mentalAddAndSub_1.mentalAddAndSub,
-    mentalMultiplications_1.mentalMultiplications,
-    mentalDivisions_1.mentalDivisions,
-    mentalPercentage_1.mentalPercentage,
     /**
      * nv generateurs
      */
-    capacityConversion_1.capacityConversion,
-    lengthConversion_1.lengthConversion,
-    massConversion_1.massConversion,
-    aeraConversion_1.aeraConversion,
-    volumeConversion_1.volumeConversion,
-    volumeCapacityConversion_1.volumeCapacityConversion,
-    primeNumbers_1.primeNumbers,
-    multiplicationEquation_1.multiplicationEquation,
-    fractionEquation_1.fractionEquation,
     leadingCoefficientCalculV1_1.leadingCoefficientCalculV1,
     leadingCoefficientCalculV2_1.leadingCoefficientCalculV2,
-    rectangleArea_1.rectangleArea,
-    rectanglePerimeter_1.rectanglePerimeter,
-    squareArea_1.squareArea,
-    squarePerimeter_1.squarePerimeter,
-    triangleAreaV2_1.triangleAreaV2,
-    trianglePerimeter_1.trianglePerimeter,
-    circleArea_1.circleArea,
-    circleCircumference_1.circleCircumference,
-    distanceBetweenTwoPoints_1.distanceBetweenTwoPoints,
     reduceExpression_1.reduceExpression,
     evaluateExpression_1.evaluateExpression,
     proportionalityTable_1.proportionalityTable,
@@ -384,11 +389,15 @@ exports.exercises = [
     expEquation_1.expEquation,
     expSimplifiying_1.expSimplifiying,
     logSimplifiying_1.logSimplifiying,
-    euclideanDivision_1.euclideanDivision,
     signFunction_1.signFunction,
     thirdDegreeFunctionVariation_1.thirdDegreeFunctionVariation,
-    equaDiffGeneralForme_1.exponentialDifferentialEquation,
-    equaDiffGeneralFormeWithIC_1.exponentialDifferentialEquationWithIC,
+    /**conversions */
+    capacityConversion_1.capacityConversion,
+    lengthConversion_1.lengthConversion,
+    massConversion_1.massConversion,
+    aeraConversion_1.aeraConversion,
+    volumeConversion_1.volumeConversion,
+    volumeCapacityConversion_1.volumeCapacityConversion,
     /**Stats */
     averageWithTable_1.averageWithTable,
     medianList_1.medianWithList,
@@ -430,4 +439,8 @@ exports.exercises = [
     sequenceRationalFracLimit_1.sequenceRationalFracLimit,
     sequencePolynomProductLimit_1.sequencePolynomProductLimit,
     sequenceGeometricLimit_1.sequenceGeometricLimit,
+    /**combinatory */
+    anagrams_1.anagrams,
+    ballsCounting_1.ballsCounting,
+    diceCounting_1.diceCounting,
 ];

package/lib/exercises/functions/affines/leadingCoefficientCalculV1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,qCAAqC,IAAI,QAAQ,CAoDhE"}
+{"version":3,"file":"leadingCoefficientCalculV1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,qCAAqC,IAAI,QAAQ,CAoDhE"}

package/lib/exercises/functions/affines/leadingCoefficientCalculV1.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLeadingCoefficientCalculV1Question = exports.leadingCoefficientCalculV1 = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
@@ -52,7 +53,7 @@ function getLeadingCoefficientCalculV1Question() {
     const question = {
         instruction: `Soit $f$ une fonction affine telle que $f(${xA})$ = $${yA}$ et $f(${xB})$ = $${yB}$.$\\\\$Quel est le coefficient directeur de $f$ ?`,
         startStatement: 'a',
-        answer: (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA), new numberNode_1.NumberNode(xB - xA))).toTex(),
+        answer: new rational_1.Rational(yB - yA, xB - xA).simplify().toTree().toTex(),
         getPropositions,
         answerFormat: 'tex',
         keys: [],

package/lib/exercises/functions/affines/leadingCoefficientCalculV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,qCAAqC,IAAI,QAAQ,CAmDhE"}
+{"version":3,"file":"leadingCoefficientCalculV2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficientCalculV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAU/E,eAAO,MAAM,0BAA0B,EAAE,YAWxC,CAAC;AAEF,wBAAgB,qCAAqC,IAAI,QAAQ,CAmDhE"}

package/lib/exercises/functions/affines/leadingCoefficientCalculV2.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLeadingCoefficientCalculV1Question = exports.leadingCoefficientCalculV2 = void 0;
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
@@ -24,11 +25,12 @@ function getLeadingCoefficientCalculV1Question() {
     const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
     const xB = (0, randint_1.randint)(-9, 10, [xA]);
     const yB = (0, randint_1.randint)(-9, 10);
+    const answer = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree().toTex();
     const getPropositions = (n) => {
         const res = [];
         res.push({
             id: (0, uuid_1.v4)() + '',
-            statement: (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA), new numberNode_1.NumberNode(xB - xA))).toTex(),
+            statement: answer,
             isRightAnswer: true,
             format: 'tex',
         });
@@ -51,7 +53,7 @@ function getLeadingCoefficientCalculV1Question() {
     };
     const question = {
         instruction: `Soit $d$ une droite passant par les points $A(${xA};${yA})$ et $B(${xB};${yB})$.$\\\\$Déterminer le coefficient directeur de $d$.`,
-        answer: (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(yB - yA), new numberNode_1.NumberNode(xB - xA))).toTex(),
+        answer: answer,
         getPropositions,
         answerFormat: 'tex',
         keys: [],

package/lib/exercises/functions/basics/inverseImageFunction.js

@@ -54,7 +54,7 @@ function getInverseImageFunction() {
     const question = {
         instruction: statement,
         startStatement: `f(x) = ${answer}`,
-        answer: xValue + '',
+        answer: 'x=' + xValue,
         keys: ['x', 'equal'],
         getPropositions,
         answerFormat: 'tex',

package/lib/exercises/functions/basics/inverseImageFunctionGeogebra.js

@@ -47,7 +47,7 @@ function getInverseImageFunctionGeogebra() {
     const answer = rand
         ? xValue
         : roots.length === 2
-            ? `\\{${(0, round_1.round)(roots[0], 1)};${(0, round_1.round)(roots[1], 1)}\\}`
+            ? `\\left\\{${(0, round_1.round)(roots[0], 1)};${(0, round_1.round)(roots[1], 1)}\\right\\}`
             : roots.length === 1
                 ? roots[0]
                 : `\\emptyset`;
@@ -149,7 +149,7 @@ function getInverseImageFunctionGeogebra() {
     ];
     const question = {
         instruction: statement,
-        answer: answer + '',
+        answer: (answer + '').replaceAll('.', ','),
         keys: ['S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
         commands,
         coords: [xmin, xmax, ymin, ymax],

package/lib/exercises/functions/cube/cubicEquation.js

@@ -21,7 +21,7 @@ exports.cubicEquation = {
 function getCubicEquationQuestion() {
     const x = (0, randint_1.randint)(-10, 11);
     const k = x ** 3;
-    const answer = `S=\\{${x}\\}`;
+    const answer = `S=\\left\\{${x}\\right\\}`;
     const getPropositions = (n) => {
         const res = [];
         res.push({

package/lib/exercises/geometry/cartesian/midpoint.js

@@ -56,7 +56,7 @@ function getMidpointQuestion() {
         instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Quelles sont les coordonnées du milieu $I$ de $[AB]$ ?`,
         startStatement: 'I',
         answer: A.midpoint(B).toTexWithCoords(),
-        keys: ['semicolon'],
+        keys: ['I', 'semicolon'],
         getPropositions,
         answerFormat: 'tex',
     };

package/lib/exercises/geometry/euclidean/circleArea.js

@@ -51,7 +51,7 @@ function getCircleArea() {
     };
     const question = {
         instruction: `Calculer l'aire d'un cercle de ${coin ? 'rayon ' + radius : 'diamètre ' + diametre} cm.`,
-        answer: correctAnswer,
+        answer: correctAnswer.replace('.', ','),
         getPropositions,
         answerFormat: 'tex',
         keys: [],

package/lib/exercises/geometry/euclidean/circleCircumference.js

@@ -51,7 +51,7 @@ function getCircleCircumference() {
     };
     const question = {
         instruction: `Calculer la circonférence d'un cercle de ${coin ? 'rayon ' + radius : 'diamètre ' + diametre} cm.`,
-        answer: correctAnswer,
+        answer: correctAnswer.replace('.', ','),
         getPropositions,
         answerFormat: 'tex',
         keys: [],

package/lib/exercises/geometry/euclidean/rightTriangleArea.js

@@ -57,7 +57,7 @@ function getRightTriangleArea() {
     };
     const question = {
         instruction: `Calculer l'aire du triangle ${triangle.getTriangleName()} rectangle en ${triangle.getRightAngle()} sachant que ${triangle.getSideBName()} = $${sidesLength[0]}$ cm et ${triangle.getSideCName()} = $${sidesLength[1]}$ cm.`,
-        answer: (sidesLength[0] * sidesLength[1]) / 2 + '',
+        answer: ((sidesLength[0] * sidesLength[1]) / 2 + '').replace('.', ','),
         keys: [...vertices, 'equal', 'cm2'],
         commands,
         coords: triangle.generateCoords(),

package/lib/exercises/geometry/euclidean/thales.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thales.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/thales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,MAAM,EAAE,YAWpB,CAAC;AAEF,wBAAgB,SAAS,IAAI,QAAQ,CA8GpC"}
+{"version":3,"file":"thales.d.ts","sourceRoot":"","sources":["../../../../src/exercises/geometry/euclidean/thales.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO/E,eAAO,MAAM,MAAM,EAAE,YAWpB,CAAC;AAEF,wBAAgB,SAAS,IAAI,QAAQ,CA4GpC"}

package/lib/exercises/geometry/euclidean/thales.js

@@ -101,9 +101,7 @@ function getThales() {
     };
     const question = {
         instruction: `En utilisant le théoreme de Thalès, Écrire l'égalité des quotients sachant que :$\\\\$ (${vertices[3]}${vertices[4]})//(${vertices[1]}${vertices[2]})`,
-        answer: `\\frac{${vertices[0]}${vertices[3]}}{${vertices[0]}${vertices[1]}}=
-    \\frac{${vertices[0]}${vertices[4]}}{${vertices[0]}${vertices[2]}}=
-    \\frac{${vertices[3]}${vertices[4]}}{${vertices[1]}${vertices[2]}}`,
+        answer: `\\frac{${vertices[0]}${vertices[3]}}{${vertices[0]}${vertices[1]}}=\\frac{${vertices[0]}${vertices[4]}}{${vertices[0]}${vertices[2]}}=\\frac{${vertices[3]}${vertices[4]}}{${vertices[1]}${vertices[2]}}`,
         keys: [...vertices, 'equal'],
         commands,
         coords: [xMin - 1, xMax + 1, yMin - 1, yMax + 1],

package/lib/exercises/geometry/euclidean/triangleArea.js

@@ -70,7 +70,7 @@ function getTriangleArea() {
     };
     const question = {
         instruction: `Calculer l'aire du triangle ${triangle.getTriangleName()} sachant que ${sides[randoms[0]]} = $${sidesLength[randoms[0]]}$ cm et la hauteur ${vertices[randoms[0]]}${String.fromCharCode(code + 3)} = $${height}$ cm.`,
-        answer: (sidesLength[randoms[0]] * height) / 2 + '',
+        answer: ((sidesLength[randoms[0]] * height) / 2 + '').replace('.', ','),
         keys: [...vertices, 'equal', 'cm2'],
         commands,
         coords: triangle.generateCoords(),

package/lib/exercises/geometry/euclidean/trigonometrySideCalcul.js

@@ -70,7 +70,7 @@ function getTrigonometrySideCalcul() {
     };
     const question = {
         instruction: `Le triangle ${triangle.getTriangleName()} rectangle en ${triangle.getRightAngle()} tel que ${sides[randside]} = $${sideLengths[randside]}$ cm et $\\widehat{${angle[randAngle]}}$ = $${angleValue[randAngle]}$°.$\\\\$ Calculer ${sides[randsideQuestion]} à $0,1$ cm près.`,
-        answer: `${(0, round_1.round)(sideLengths[randsideQuestion], 1)}`,
+        answer: `${((0, round_1.round)(sideLengths[randsideQuestion], 1) + '').replace('.', ',')}`,
         keys: [...vertices, 'equal', 'degree', 'cos', 'sin', 'tan', 'arccos', 'arcsin', 'arctan'],
         commands,
         coords: triangle.generateCoords(),