math-exercises 1.3.29 → 1.3.31

package/lib/exercises/calcul/fractions/fractionAndIntegerDivision.js

@@ -10,7 +10,7 @@ const coinFlip_1 = require("../../../utils/coinFlip");
 exports.fractionAndIntegerDivision = {
     id: 'fractionAndIntegerDivision',
     connector: '=',
-    instruction: 'Calculer la forme irréductible :',
+    instruction: "Calculer et donner le résultat sous la forme d'une fraction irréductible.",
     label: "Division d'un entier et d'une fraction",
     levels: ['4', '3', '2', '1'],
     isSingleStep: false,

package/lib/exercises/calcul/fractions/fractionAndIntegerProduct.js

@@ -9,7 +9,7 @@ const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 exports.fractionAndIntegerProduct = {
     id: 'fractionAndIntegerProduct',
     connector: '=',
-    instruction: 'Calculer la forme irréductible :',
+    instruction: "Calculer et donner le résultat sous la forme d'une fraction irréductible.",
     label: "Produit d'un entier et d'une fraction",
     levels: ['4', '3', '2', '1'],
     isSingleStep: false,

package/lib/exercises/calcul/fractions/fractionAndIntegerSum.js

@@ -9,7 +9,7 @@ const addNode_1 = require("../../../tree/nodes/operators/addNode");
 exports.fractionAndIntegerSum = {
     id: 'fractionAndIntegerSum',
     connector: '=',
-    instruction: 'Calculer la forme irréductible :',
+    instruction: "Calculer et donner le résultat sous la forme d'une fraction irréductible.",
     label: "Somme d'un entier et d'une fraction",
     levels: ['4', '3', '2', '1'],
     isSingleStep: false,

package/lib/exercises/calcul/fractions/fractionToPercentToDecimal.js

@@ -11,7 +11,7 @@ exports.fractionToPercentToDecimal = {
     id: 'fractionToPercentToDecimal',
     connector: '\\iff',
     instruction: '',
-    label: "Passer d'une écriture d'un nombre à une autre (décimale, fractionnaire, sous forme de pourcentage).",
+    label: "Passer d'une écriture d'un nombre à une autre",
     levels: ['2', '1'],
     section: 'Fractions',
     isSingleStep: false,
@@ -19,7 +19,7 @@ exports.fractionToPercentToDecimal = {
 };
 function getFractionToPercentToDecimal() {
     const denominator = 2 ** (0, randint_1.randint)(0, 5) * 5 ** (0, randint_1.randint)(0, 5);
-    const numerator = (0, randint_1.randint)(1, denominator);
+    const numerator = denominator !== 1 ? (0, randint_1.randint)(1, denominator) : (0, randint_1.randint)(1, 100);
     const fraction = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator), new numberNode_1.NumberNode(denominator));
     const decimal = numerator / denominator;
     const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
@@ -28,39 +28,39 @@ function getFractionToPercentToDecimal() {
     let answer = '';
     switch (rand) {
         case 1: {
-            instruction = `Convertir le nombre suivant $${decimal}$ en pourcentage`;
+            instruction = `Écrire le nombre $${decimal}$ sous forme de pourcentage.`;
             answer = `${percent}\\%`;
             break;
         }
         case 2: {
-            instruction = `Convertir le nombre suivant $${decimal}$ en fraction`;
+            instruction = `Écrire le nombre $${decimal}$ sous forme de fraction.`;
             answer = `${(0, simplify_1.simplifyNode)(fraction).toTex()}`;
             break;
         }
         case 3: {
-            instruction = `Convertir le nombre suivant $${percent}\\%$ en décimal`;
+            instruction = `Écrire le nombre $${percent}\\%$ sous forme décimale.`;
             answer = `${decimal}`;
             break;
         }
         case 4: {
-            instruction = `Convertir le nombre suivant $${percent}\\%$ en fraction`;
+            instruction = `Écrire le nombre $${percent}\\%$ sous forme de fraction.`;
             answer = `${(0, simplify_1.simplifyNode)(fraction).toTex()}`;
             break;
         }
         case 5: {
-            instruction = `Convertir le nombre suivant $${fraction.toTex()}$ en décimal`;
+            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme décimale.`;
             answer = `${decimal}`;
             break;
         }
         case 6: {
-            instruction = `Convertir le nombre suivant $${fraction.toTex()}$ en pourcentage`;
+            instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme de pourcentage.`;
             answer = `${percent}\\%`;
             break;
         }
     }
     const question = {
         instruction,
-        //startStatement: `${simplifyNode(fraction).toTex()}`,
+        //startStatement: `${numerator} et ${denominator}`,
         answer,
         keys: ['percent'],
     };

package/lib/exercises/calcul/fractions/fractionsDivision.js

@@ -7,7 +7,7 @@ const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
 exports.fractionsDivision = {
     id: 'fractionsDivision',
     connector: '=',
-    instruction: 'Calculer la forme irréductible :',
+    instruction: "Calculer et donner le résultat sous la forme d'une fraction irréductible.",
     label: 'Divisions de fractions',
     levels: ['4', '3', '2', '1'],
     section: 'Fractions',

package/lib/exercises/calcul/fractions/fractionsProduct.js

@@ -7,7 +7,7 @@ const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 exports.fractionsProduct = {
     id: 'fractionsProduct',
     connector: '=',
-    instruction: 'Calculer la forme irréductible :',
+    instruction: "Calculer et donner le résultat sous la forme d'une fraction irréductible.",
     label: 'Produits de fractions',
     levels: ['4', '3', '2', '1'],
     section: 'Fractions',

package/lib/exercises/calcul/fractions/fractionsSum.js

@@ -7,7 +7,7 @@ const addNode_1 = require("../../../tree/nodes/operators/addNode");
 exports.fractionsSum = {
     id: 'fractionsSum',
     connector: '=',
-    instruction: 'Calculer la forme irréductible :',
+    instruction: "Calculer et donner le résultat sous la forme d'une fraction irréductible.",
     label: 'Sommes de fractions',
     levels: ['4', '3', '2', '1'],
     section: 'Fractions',

package/lib/exercises/calcul/mentalCaluls.ts/mentalAddAndSub.js

@@ -10,8 +10,8 @@ const coinFlip_1 = require("../../../utils/coinFlip");
 exports.mentalAddAndSub = {
     id: 'mentalAddAndSub',
     connector: '=',
-    instruction: 'Calculer :',
-    label: "Effectuer mentalement des calculs d'additions et de soustractions simples",
+    instruction: 'Calculer.',
+    label: 'Effectuer mentalement des additions et des soustractions simples',
     levels: ['6', '5', '4', '3', '2', '1', '0'],
     section: 'Calculs',
     isSingleStep: true,

package/lib/exercises/calcul/mentalCaluls.ts/mentalDivisions.js

@@ -10,8 +10,8 @@ const coinFlip_1 = require("../../../utils/coinFlip");
 exports.mentalDivisions = {
     id: 'mentalDivisions',
     connector: '=',
-    instruction: 'Calculer :',
-    label: 'Effectuer mentalement des calculs de divisions simples',
+    instruction: 'Calculer.',
+    label: 'Effectuer mentalement des divisions simples',
     levels: ['6', '5', '4', '3', '2', '1', '0'],
     section: 'Calculs',
     isSingleStep: true,

package/lib/exercises/calcul/mentalCaluls.ts/mentalMultiplications.js

@@ -10,8 +10,8 @@ const coinFlip_1 = require("../../../utils/coinFlip");
 exports.mentalMultiplications = {
     id: 'mentalMultiplications',
     connector: '=',
-    instruction: 'Calculer :',
-    label: 'Effectuer mentalement des calculs de multiplications simples',
+    instruction: 'Calculer.',
+    label: 'Effectuer mentalement des multiplications simples',
     levels: ['6', '5', '4', '3', '2', '1', '0'],
     section: 'Calculs',
     isSingleStep: true,

package/lib/exercises/calcul/mentalCaluls.ts/mentalPercentage.js

@@ -58,7 +58,7 @@ function getMentalPercentage() {
             break;
     }
     const question = {
-        instruction: `Calculer $${a}\\%$ de $${b}$`,
+        instruction: `Calculer : $${a}\\%$ de $${b}$.`,
         answer: (a * b) / 100 + '',
         keys: [],
     };

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,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAI9D,eAAO,MAAM,oBAAoB,EAAE,QAUlC,CAAC;AAOF,wBAAgB,uBAAuB,IAAI,QAAQ,CA0BlD"}
+{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAI9D,eAAO,MAAM,oBAAoB,EAAE,QAUlC,CAAC;AAOF,wBAAgB,uBAAuB,IAAI,QAAQ,CAyBlD"}

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

@@ -26,10 +26,10 @@ function getEquationSimpleSquare() {
     if (randNbr >= 0)
         while (higherFactor(randNbr) === 1)
             randNbr = (0, randint_1.randint)(1, 100);
-    const instruction = `Résoudre l'équation suivante $x^2 = ${randNbr}$`;
-    let ans = Math.sqrt(randNbr);
-    if (Math.sqrt(randNbr) == Math.floor(Math.sqrt(randNbr)))
-        answer = `\\{${Math.sqrt(randNbr)}\\ ; -${Math.sqrt(randNbr)}\\}`;
+    const instruction = `Résoudre l'équation suivante : $x^2 = ${randNbr}$`;
+    const ans = Math.sqrt(randNbr);
+    if (ans === Math.floor(ans))
+        answer = `\\{${ans}\\ ; -${ans}\\}`;
     else {
         const factor = higherFactor(randNbr);
         const radicand = randNbr / factor ** 2;

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

@@ -14,7 +14,7 @@ exports.equationType1Exercise = {
     id: 'equa1',
     connector: '\\iff',
     instruction: 'Résoudre : ',
-    label: 'Equations $x+a = b$',
+    label: 'Équations $x+a = b$',
     levels: ['4', '3', '2'],
     section: 'Équations',
     isSingleStep: true,

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

@@ -16,7 +16,7 @@ exports.equationType2Exercise = {
     id: 'equa2',
     connector: '\\iff',
     instruction: 'Résoudre : ',
-    label: 'Equations $ax=b$',
+    label: 'Équations $ax=b$',
     levels: ['4', '3', '2'],
     section: 'Équations',
     isSingleStep: true,

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

@@ -16,7 +16,7 @@ exports.equationType3Exercise = {
     id: 'equa3',
     connector: '\\iff',
     instruction: 'Résoudre : ',
-    label: 'Equations $ax+b=c$',
+    label: 'Équations $ax+b=c$',
     levels: ['4', '3', '2'],
     section: 'Équations',
     isSingleStep: false,

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

@@ -16,7 +16,7 @@ exports.equationType4Exercise = {
     id: 'equa4',
     connector: '\\iff',
     instruction: 'Résoudre : ',
-    label: 'Equations $ax+b=cx+d$',
+    label: 'Équations $ax+b=cx+d$',
     levels: ['4', '3', '2'],
     section: 'Équations',
     isSingleStep: false,

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAO9D,eAAO,MAAM,mBAAmB,EAAE,QAUjC,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CAYjD"}
+{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM9D,eAAO,MAAM,mBAAmB,EAAE,QAUjC,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,QAAQ,CAYjD"}

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

@@ -20,7 +20,7 @@ function getFirstDegreeEquation() {
     const a = (0, randint_1.randint)(-30, 30, [0]);
     const b = (0, randint_1.randint)(-30, 30, [0]);
     const question = {
-        instruction: `Résoudre l'équation suivante $\\frac{${a}}{x} = ${b}$`,
+        instruction: `Résoudre l'équation suivante : $\\frac{${a}}{x} = ${b}$`,
         startStatement: `x`,
         answer: (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b)).toTex(),
         keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],

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

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const aeraConversion: Exercise;
+export declare function getAeraConversion(): Question;
+//# sourceMappingURL=aeraConversion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,cAAc,EAAE,QAU5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAmB5C"}

package/lib/exercises/conversion/aeraConversion.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAeraConversion = exports.aeraConversion = void 0;
+const decimal_1 = require("../../math/numbers/decimals/decimal");
+const randint_1 = require("../../math/utils/random/randint");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+exports.aeraConversion = {
+    id: 'aeraConversion',
+    connector: '=',
+    instruction: '',
+    label: 'Conversion des aires',
+    levels: ['6', '5'],
+    section: 'Conversions',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAeraConversion, nb),
+    keys: [],
+};
+function getAeraConversion() {
+    const units = ['mm^2', 'cm^2', 'dm^2', 'm^2', 'dam^2', 'hm^2', 'km^2'];
+    const randomUnitIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitInstructionIndex = (0, randint_1.randint)(
+    // cette manip a pour but d'éviter des conversion de type km² --> cm² ou le contraire (chiffre trop grand/petit)
+    randomUnitIndex - 2 < 0 ? 0 : randomUnitIndex - 2, randomUnitIndex + 2 > 7 ? 7 : randomUnitIndex + 3, [randomUnitIndex]);
+    const randomAera = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const question = {
+        instruction: `$${randomAera.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer: randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '',
+        keys: [],
+    };
+    return question;
+}
+exports.getAeraConversion = getAeraConversion;

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

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const capacityConversion: Exercise;
+export declare function getCapacityConversion(): Question;
+//# sourceMappingURL=capacityConversion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,kBAAkB,EAAE,QAUhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAchD"}

package/lib/exercises/conversion/capacityConversion.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCapacityConversion = exports.capacityConversion = void 0;
+const decimal_1 = require("../../math/numbers/decimals/decimal");
+const randint_1 = require("../../math/utils/random/randint");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+exports.capacityConversion = {
+    id: 'capacityConversion',
+    connector: '=',
+    instruction: '',
+    label: 'Conversion de capacités',
+    levels: ['6', '5'],
+    section: 'Conversions',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCapacityConversion, nb),
+    keys: [],
+};
+function getCapacityConversion() {
+    const units = ['mL', 'cL', 'dL', 'L', 'daL', 'hL', 'kL'];
+    const randomUnitIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
+    const randomCapacity = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const question = {
+        instruction: `$${randomCapacity.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer: randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
+        keys: [],
+    };
+    return question;
+}
+exports.getCapacityConversion = getCapacityConversion;

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

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const lengthConversion: Exercise;
+export declare function getLengthConversion(): Question;
+//# sourceMappingURL=lengthConversion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,gBAAgB,EAAE,QAU9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAc9C"}

package/lib/exercises/conversion/lengthConversion.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLengthConversion = exports.lengthConversion = void 0;
+const decimal_1 = require("../../math/numbers/decimals/decimal");
+const randint_1 = require("../../math/utils/random/randint");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+exports.lengthConversion = {
+    id: 'lengthConversion',
+    connector: '=',
+    instruction: '',
+    label: 'Conversion de longueurs',
+    levels: ['6', '5'],
+    section: 'Conversions',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLengthConversion, nb),
+    keys: [],
+};
+function getLengthConversion() {
+    const units = ['mm', 'cm', 'dm', 'm', 'dam', 'hm', 'km'];
+    const randomUnitIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
+    const randomlength = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const question = {
+        instruction: `$${randomlength.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer: randomlength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
+        keys: [],
+    };
+    return question;
+}
+exports.getLengthConversion = getLengthConversion;

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

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const massConversion: Exercise;
+export declare function getMassConversion(): Question;
+//# sourceMappingURL=massConversion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"massConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/massConversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,cAAc,EAAE,QAU5B,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,QAAQ,CAc5C"}

package/lib/exercises/conversion/massConversion.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMassConversion = exports.massConversion = void 0;
+const decimal_1 = require("../../math/numbers/decimals/decimal");
+const randint_1 = require("../../math/utils/random/randint");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+exports.massConversion = {
+    id: 'massConversion',
+    connector: '=',
+    instruction: '',
+    label: 'Conversion de masses',
+    levels: ['6', '5'],
+    section: 'Conversions',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMassConversion, nb),
+    keys: [],
+};
+function getMassConversion() {
+    const units = ['mg', 'cg', 'dg', 'g', 'dag', 'hg', 'kg'];
+    const randomUnitIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
+    const randomMass = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const question = {
+        instruction: `$${randomMass.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer: randomMass.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '',
+        keys: [],
+    };
+    return question;
+}
+exports.getMassConversion = getMassConversion;

package/lib/exercises/conversion/volumeCapacityConversion.d.ts

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const volumeCapacityConversion: Exercise;
+export declare function getVolumeCapacityConversion(): Question;
+//# sourceMappingURL=volumeCapacityConversion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"volumeCapacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeCapacityConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,wBAAwB,EAAE,QAUtC,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,QAAQ,CAiCtD"}

package/lib/exercises/conversion/volumeCapacityConversion.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVolumeCapacityConversion = exports.volumeCapacityConversion = void 0;
+const decimal_1 = require("../../math/numbers/decimals/decimal");
+const randint_1 = require("../../math/utils/random/randint");
+const coinFlip_1 = require("../../utils/coinFlip");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+exports.volumeCapacityConversion = {
+    id: 'volumeCapacityConversion',
+    connector: '=',
+    instruction: '',
+    label: "Conversion d'un volume vers une contenance et vice versa",
+    levels: ['6', '5'],
+    section: 'Conversions',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeCapacityConversion, nb),
+    keys: [],
+};
+function getVolumeCapacityConversion() {
+    const volumeUnits = ['mm^3', 'cm^3', 'dm^3', 'm^3', 'dam^3', 'hm^3', 'km^3'];
+    const capacityUnits = ['mL', 'cL', 'dL', 'L', 'daL', 'hL', 'kL'];
+    const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitIndex = (0, randint_1.randint)(
+    // cette manip a pour but d'éviter des conversion avec des nombres trop grand/petit
+    randomUnitInstructionIndex - 1 < 0 ? 0 : randomUnitInstructionIndex - 1, randomUnitInstructionIndex + 2 > 7 ? 7 : randomUnitInstructionIndex + 2);
+    const random = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    let instructionUnit;
+    let AsnwerUnit;
+    let answer;
+    if ((0, coinFlip_1.coinFlip)()) {
+        instructionUnit = volumeUnits[randomUnitIndex];
+        AsnwerUnit = capacityUnits[randomUnitInstructionIndex];
+        answer = random.multiplyByPowerOfTen(3 * (randomUnitIndex - 2) + 3 - randomUnitInstructionIndex).value + '';
+    }
+    else {
+        instructionUnit = capacityUnits[randomUnitIndex];
+        AsnwerUnit = volumeUnits[randomUnitInstructionIndex];
+        answer = random.multiplyByPowerOfTen(randomUnitIndex - 3 + 3 * (2 - randomUnitInstructionIndex)).value + '';
+    }
+    const question = {
+        instruction: `$${random.value}$ $${instructionUnit}$ = ... $${AsnwerUnit}$`,
+        answer,
+        keys: [],
+    };
+    return question;
+}
+exports.getVolumeCapacityConversion = getVolumeCapacityConversion;

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

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../exercise';
+export declare const volumeConversion: Exercise;
+export declare function getVolumeConversion(): Question;
+//# sourceMappingURL=volumeConversion.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/volumeConversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,gBAAgB,EAAE,QAU9B,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAmB9C"}

package/lib/exercises/conversion/volumeConversion.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVolumeConversion = exports.volumeConversion = void 0;
+const decimal_1 = require("../../math/numbers/decimals/decimal");
+const randint_1 = require("../../math/utils/random/randint");
+const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+exports.volumeConversion = {
+    id: 'volumeConversion',
+    connector: '=',
+    instruction: '',
+    label: 'Conversion de volumes',
+    levels: ['6', '5'],
+    section: 'Conversions',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getVolumeConversion, nb),
+    keys: [],
+};
+function getVolumeConversion() {
+    const units = ['mm^3', 'cm^3', 'dm^3', 'm^3', 'dam^3', 'hm^3', 'km^3'];
+    const randomUnitIndex = (0, randint_1.randint)(0, 7);
+    const randomUnitInstructionIndex = (0, randint_1.randint)(
+    // cette manip a pour but d'éviter des conversion de type km³ --> cm³ ou le contraire (chiffre trop grand/petit)
+    randomUnitIndex - 2 < 0 ? 0 : randomUnitIndex - 2, randomUnitIndex + 2 > 7 ? 7 : randomUnitIndex + 3, [randomUnitIndex]);
+    const randomVolume = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const question = {
+        instruction: `$${randomVolume.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        answer: randomVolume.multiplyByPowerOfTen(3 * (randomUnitIndex - randomUnitInstructionIndex)).value + '',
+        keys: [],
+    };
+    return question;
+}
+exports.getVolumeConversion = getVolumeConversion;

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

@@ -17,7 +17,7 @@ exports.constanteDerivative = {
 function getConstanteDerivative() {
     const c = (0, randint_1.randint)(-9, 10, [0]);
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${c}$ `,
+        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${c}$.`,
         startStatement: `f'(x)`,
         answer: '0',
         keys: [],

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

@@ -19,7 +19,7 @@ function getFirstDegreeDerivative() {
     const [a, b] = [(0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10)];
     const polynomial = new polynomial_1.Polynomial([b, a]);
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$ `,
+        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$.`,
         startStatement: `f'(x)`,
         answer: a + '',
         keys: [],

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

@@ -17,7 +17,7 @@ exports.inverseFunctionDerivative = {
 function getInverseFunctionDerivative() {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =\\frac{${a}}{x}$ `,
+        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}`,
         keys: ['x'],

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

@@ -25,7 +25,7 @@ function getPowerFunctionDerivative() {
     const statement = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new powerNode_1.PowerNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(n))));
     const answerStatement = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a * n), new powerNode_1.PowerNode(new variableNode_1.VariableNode('x'), new numberNode_1.NumberNode(n - 1))));
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =${statement.toTex()}$ `,
+        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =${statement.toTex()}$.`,
         startStatement: `f'(x)`,
         answer: answerStatement.toTex(),
         keys: ['x'],

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

@@ -20,11 +20,11 @@ function getRootFunctionDerivative() {
     let instruction = `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =$ `;
     let answer = '';
     if (a === 1)
-        instruction += `$\\sqrt{x}$`;
+        instruction += `$\\sqrt{x}$.`;
     else if (a === -1)
-        instruction += `$-\\sqrt{x}$`;
+        instruction += `$-\\sqrt{x}$.`;
     else
-        instruction += `$${a}\\sqrt{x}$`;
+        instruction += `$${a}\\sqrt{x}$.`;
     if (a / 2 === (0, round_1.round)(a / 2, 0))
         answer = `\\frac{${a / 2}}{\\sqrt{x}}`;
     else

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

@@ -20,7 +20,7 @@ function getSecondDegreeDerivative() {
     const polynomial = new polynomial_1.Polynomial(coefficients);
     const derivative = polynomial.derivate();
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$ `,
+        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(),
         keys: ['x'],

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

@@ -23,7 +23,7 @@ function getThirdDegreeDerivative() {
     const polynomial = new polynomial_1.Polynomial(coefficients);
     const derivative = polynomial.derivate();
     const question = {
-        instruction: `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) = ${polynomial.toString()}$ `,
+        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(),
         keys: ['x'],

package/lib/exercises/derivation/derivative/usualderivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usualderivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/usualderivative.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAUpD,eAAO,MAAM,eAAe,EAAE,QAU7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAqB7C"}
+{"version":3,"file":"usualderivative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/usualderivative.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAOpD,eAAO,MAAM,eAAe,EAAE,QAU7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAe7C"}

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

@@ -5,16 +5,13 @@ const randint_1 = require("../../../math/utils/random/randint");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const constanteDerivative_1 = require("./constanteDerivative");
 const firstDegreeDerivative_1 = require("./firstDegreeDerivative");
-const inverseFunctionDerivative_1 = require("./inverseFunctionDerivative");
-const powerFunctionDerivative_1 = require("./powerFunctionDerivative");
-const rootFunctionDerivative_1 = require("./rootFunctionDerivative");
 const secondDegreeDerivative_1 = require("./secondDegreeDerivative");
 const thirdDegreeDerivative_1 = require("./thirdDegreeDerivative");
 exports.usualDerivative = {
     id: 'usualDerivative',
     connector: '=',
     instruction: '',
-    label: 'Dérivées usuelles',
+    label: 'Dérivées des fonctions de référence',
     levels: ['1', '0'],
     section: 'Dérivation',
     isSingleStep: false,
@@ -22,7 +19,7 @@ exports.usualDerivative = {
     keys: ['x'],
 };
 function getUsualDerivative() {
-    const rand = (0, randint_1.randint)(1, 8);
+    const rand = (0, randint_1.randint)(1, 5);
     switch (rand) {
         case 1:
             return (0, firstDegreeDerivative_1.getFirstDegreeDerivative)();
@@ -31,12 +28,6 @@ function getUsualDerivative() {
         case 3:
             return (0, thirdDegreeDerivative_1.getThirdDegreeDerivative)();
         case 4:
-            return (0, inverseFunctionDerivative_1.getInverseFunctionDerivative)();
-        case 5:
-            return (0, powerFunctionDerivative_1.getPowerFunctionDerivative)();
-        case 6:
-            return (0, rootFunctionDerivative_1.getRootFunctionDerivative)();
-        case 7:
             return (0, constanteDerivative_1.getConstanteDerivative)();
         default:
             throw Error('erreur');

package/lib/exercises/exercise.d.ts

@@ -6,6 +6,7 @@ export interface Question {
     keys?: string[];
     commands?: string[];
     coords?: number[];
+    options?: any;
 }
 export interface Exercise {
     id: string;

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

@@ -1 +1 @@
-{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;CAC/D"}
+{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;CAC/D"}

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

@@ -1 +1 @@
-{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AA+EA,eAAO,MAAM,SAAS,iCAwHrB,CAAC"}
+{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAqFA,eAAO,MAAM,SAAS,iCAmIrB,CAAC"}

package/lib/exercises/exercises.js

@@ -34,6 +34,12 @@ const factoIdRmq1_1 = require("./calculLitteral/factorisation/factoIdRmq1");
 const factoIdRmq2_1 = require("./calculLitteral/factorisation/factoIdRmq2");
 const factoIdRmq3_1 = require("./calculLitteral/factorisation/factoIdRmq3");
 const factoType1Exercise_1 = require("./calculLitteral/factorisation/factoType1Exercise");
+const aeraConversion_1 = require("./conversion/aeraConversion");
+const capacityConversion_1 = require("./conversion/capacityConversion");
+const lengthConversion_1 = require("./conversion/lengthConversion");
+const massConversion_1 = require("./conversion/massConversion");
+const volumeCapacityConversion_1 = require("./conversion/volumeCapacityConversion");
+const volumeConversion_1 = require("./conversion/volumeConversion");
 const constanteDerivative_1 = require("./derivation/derivative/constanteDerivative");
 const firstDegreeDerivative_1 = require("./derivation/derivative/firstDegreeDerivative");
 const inverseFunctionDerivative_1 = require("./derivation/derivative/inverseFunctionDerivative");
@@ -180,4 +186,13 @@ exports.exercises = [
     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,
 ];

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

@@ -33,7 +33,7 @@ function getDerivativeNumberReading() {
     const c = (0, mathjs_1.evaluate)(droite.a.toMathString()) - a * Math.pow(xA, 2) - b * xA;
     const d = yA - (a / 3) * Math.pow(xA, 3) - (b / 2) * Math.pow(xA, 2) - xA * c;
     const polynome = new polynomial_1.Polynomial([d, c, b / 2, a / 3]);
-    const instruction = `Ci-dessous sont tracées la courbe de la fonction f et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer le coefficient directeur de la tangente qui passe par ce point.`;
+    const instruction = `Ci-dessous sont tracées la courbe de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer le coefficient directeur de la tangente qui passe par ce point.`;
     const commands = [
         polynome.toString(),
         `g(x) = (${droite.a.toMathString()}) * x + (${droite.b.toMathString()})`,

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

@@ -1 +1 @@
-{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../src/exercises/percent/applyPercent.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,YAAY,EAAE,QAW1B,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAuBlD"}
+{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../src/exercises/percent/applyPercent.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,YAAY,EAAE,QAU1B,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAuBlD"}

package/lib/exercises/percent/applyPercent.js

@@ -24,12 +24,12 @@ function getApplyPercentQuestion() {
     if ((0, coinFlip_1.coinFlip)()) {
         ans = randNbr * (1 + randPercent / 100);
         ans = (0, round_1.round)(ans, 2);
-        instruction = `Appliquer une augmentation de $${randPercent}\\%$ à $${randNbr}$ :`;
+        instruction = `Appliquer une hausse de $${randPercent}\\%$ à $${randNbr}$.`;
     }
     else {
         ans = randNbr * (1 - randPercent / 100);
         ans = (0, round_1.round)(ans, 2);
-        instruction = `Appliquer une diminution de $${randPercent}\\%$ à $${randNbr}$ :`;
+        instruction = `Appliquer une baisse de $${randPercent}\\%$ à $${randNbr}$.`;
     }
     const question = {
         instruction,

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

@@ -1 +1 @@
-{"version":3,"file":"averageEvolutionRate.d.ts","sourceRoot":"","sources":["../../../src/exercises/percent/averageEvolutionRate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,oBAAoB,EAAE,QAUlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAclD"}
+{"version":3,"file":"averageEvolutionRate.d.ts","sourceRoot":"","sources":["../../../src/exercises/percent/averageEvolutionRate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,oBAAoB,EAAE,QAUlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAclD"}

package/lib/exercises/percent/averageEvolutionRate.js

@@ -18,7 +18,7 @@ exports.averageEvolutionRate = {
 function getAverageEvolutionRate() {
     const rate = (0, randint_1.randint)(1, 100);
     const nbMois = (0, randint_1.randint)(2, 13);
-    const instruction = `un prix augmente de $${rate}\\%$ en $${nbMois}$ mois. Quel est le taux d'évolution moyen par mois ?`;
+    const instruction = `Un prix augmente de $${rate}\\%$ en $${nbMois}$ mois. Quel est le taux d'évolution mensuel moyen ?`;
     const answer = `${(0, round_1.round)((Math.pow(1 + rate / 100, 1 / nbMois) - 1) * 100, 2)}\\%`;
     const question = {
         instruction,

package/lib/exercises/percent/reciprocalPercentage.js

@@ -24,7 +24,7 @@ function getReciprocalPercentageQuestion() {
     ans = a == 0 ? (1 / (1 + randPercent / 100) - 1) * 100 : (1 / (1 - randPercent / 100) - 1) * 100;
     const question = {
         instruction,
-        answer: `${(0, mathjs_1.round)(ans, 2)} \\%`,
+        answer: `${ans > 0 ? '+' + (0, mathjs_1.round)(ans, 2) : (0, mathjs_1.round)(ans, 2)} \\%`,
         keys: ['percent'],
     };
     return question;

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

@@ -1 +1 @@
-{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIjD,eAAO,MAAM,sBAAsB,EAAE,QAUpC,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CA4DpD"}
+{"version":3,"file":"conditionalProbability.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/conditionalProbability.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIjD,eAAO,MAAM,sBAAsB,EAAE,QAUpC,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,QAAQ,CA8EpD"}

package/lib/exercises/proba/conditionalProbability.js

@@ -8,7 +8,7 @@ exports.conditionalProbability = {
     id: 'conditionalProbability',
     connector: '=',
     instruction: '',
-    label: 'Calcul de probabilité conditionnelle avec la formule',
+    label: 'Calcul de probabilité conditionnelle avec la formule de Bayes',
     levels: ['1', '0'],
     isSingleStep: false,
     section: 'Probabilités',
@@ -27,38 +27,38 @@ function getConditionalProbability() {
     let answer = '';
     switch (flip) {
         case 1: {
-            instruction += `$p(A) = ${pA / 100}, p(A \\cap B) = ${pAB / 100}$.$\\\\$Déterminer $p_A(B)$.`;
-            startStatement = `p_A(B)`;
+            instruction += `$P(A) = ${(pA / 100 + '').replace('.', ',')}\\ et\\ P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}$.$\\\\$Déterminer $P_A(B)$.`;
+            startStatement = `P_A(B)`;
             answer = `${pB_A}`;
             break;
         }
         case 2: {
-            instruction += `$p(B) = ${pB / 100}, p(B \\cap A) = ${pAB / 100}$.$\\\\$Déterminer $p_B(A)$.`;
-            startStatement = `p_B(A)`;
+            instruction += `$P(B) = ${(pB / 100 + '').replace('.', ',')}\\ et\\ P(B \\cap A) = ${(pAB / 100 + '').replace('.', ',')}$.$\\\\$Déterminer $P_B(A)$.`;
+            startStatement = `P_B(A)`;
             answer = `${pA_B}`;
             break;
         }
         case 3: {
-            instruction += `$p(A) = ${pA / 100}, p_A(B) = ${pB_A}$.$\\\\$Déterminer $p(A \\cap B)$.`;
-            startStatement = `p(A \\cap B)`;
+            instruction += `$P(A) = ${(pA / 100 + '').replace('.', ',')}\\ et\\ P_A(B) = ${(pB_A + '').replace('.', ',')}$.$\\\\$Déterminer $P(A \\cap B)$.`;
+            startStatement = `P(A \\cap B)`;
             answer = `${pAB / 100}`;
             break;
         }
         case 4: {
-            instruction += `$p(B) = ${pB / 100}, p_B(A) = ${pA_B}$.$\\\\$Déterminer $p(A \\cap B)$.`;
-            startStatement = `p(A \\cap B)`;
+            instruction += `$P(B) = ${(pB / 100 + '').replace('.', ',')}\\ et\\ P_B(A) = ${(pA_B + '').replace('.', ',')}$.$\\\\$Déterminer $P(A \\cap B)$.`;
+            startStatement = `P(A \\cap B)`;
             answer = `${pAB / 100}`;
             break;
         }
         case 5: {
-            instruction += `$p(A \\cap B) = ${pAB / 100}, p_B(A) = ${pA_B}$.$\\\\$Déterminer $p(B)$.`;
-            startStatement = `p(B)`;
+            instruction += `$P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}\\ et\\ P_B(A) = ${(pA_B + '').replace('.', ',')}$.$\\\\$Déterminer $P(B)$.`;
+            startStatement = `P(B)`;
             answer = `${pB / 100}`;
             break;
         }
         case 6: {
-            instruction += `$p(A \\cap B) = ${pAB / 100}, p_A(B) = ${pB_A}$.$\\\\$Déterminer $p(A)$.`;
-            startStatement = `p(A)`;
+            instruction += `$P(A \\cap B) = ${(pAB / 100 + '').replace('.', ',')}\\ et\\ P_A(B) = ${(pB_A + '').replace('.', ',')}$.$\\\\$Déterminer $P(A)$.`;
+            startStatement = `P(A)`;
             answer = `${pA / 100}`;
             break;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,+BAA+B,EAAE,QAU7C,CAAC;AAEF,wBAAgB,kCAAkC,IAAI,QAAQ,CAmE7D"}
+{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,+BAA+B,EAAE,QAU7C,CAAC;AAEF,wBAAgB,kCAAkC,IAAI,QAAQ,CAmE7D"}

package/lib/exercises/proba/marginalAndConditionalFrequency.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMarginalAndConditionalFrequency = exports.marginalAndConditionalFrequency = void 0;
 const randint_1 = require("../../math/utils/random/randint");
-const round_1 = require("../../math/utils/round");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const simplify_1 = require("../../tree/parsers/simplify");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 exports.marginalAndConditionalFrequency = {
     id: 'marginalAndConditionalFrequency',
@@ -47,7 +48,7 @@ function getMarginalAndConditionalFrequency() {
         'f_A(D)',
         'f_B(D)',
     ];
-    let Calculs = [
+    const Calculs = [
         (x1 + x3) / x,
         (x2 + x4) / x,
         (x1 + x2) / x,
@@ -61,7 +62,7 @@ function getMarginalAndConditionalFrequency() {
         x2 / (x2 + x4),
         x4 / (x2 + x4),
     ];
-    Calculs = Calculs.map((el) => (0, round_1.round)(el, 2));
+    const calculsNodes = Calculs.map((el) => (0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(el)));
     const question = {
         instruction: `On considère le tableau d'effectifs suivant : 
 
@@ -72,7 +73,7 @@ function getMarginalAndConditionalFrequency() {
 
 Calculer la fréquence ${freqString[rand]}.`,
         startStatement: `${frequences[rand]}`,
-        answer: Calculs[rand].toString(),
+        answer: calculsNodes[rand].toTex(),
         keys: ['f', 'cap', 'underscore'],
     };
     return question;

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

@@ -1 +1 @@
-{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/probabilityTree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,eAAe,EAAE,QAS7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CAwF7C"}
+{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../src/exercises/proba/probabilityTree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,eAAe,EAAE,QAS7B,CAAC;AAOF,wBAAgB,kBAAkB,IAAI,QAAQ,CAwF7C"}

package/lib/exercises/proba/probabilityTree.js

@@ -10,12 +10,17 @@ exports.probabilityTree = {
     id: 'probabilityTree',
     connector: '=',
     instruction: '',
-    label: 'Calculs dans un arbre pondéré',
+    label: "Calculs de probabilités à l'aide d'un arbre pondéré",
     levels: ['1', '0'],
     isSingleStep: false,
     section: 'Probabilités',
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProbabilityTree, nb),
 };
+function pgcd(a, b) {
+    while (b)
+        [a, b] = [b, a % b];
+    return a;
+}
 function getProbabilityTree() {
     const A = (0, randint_1.randint)(2, 9);
     const B = (0, randint_1.randint)(2, 10 - A);
@@ -74,12 +79,12 @@ function getProbabilityTree() {
         'Segment(B,BD)',
         'ShowAxes(false)',
         'ShowGrid(false)',
-        `Text("\\scriptsize${pA.toTex()}", (0.5, 2.5), true, true)`,
-        `Text("\\scriptsize${pA_C.toTex()}", (3, 4), true, true)`,
-        `Text("\\scriptsize${pA_D.toTex()}", (3.2, 1.5), true, true)`,
-        `Text("\\scriptsize${pB.toTex()}", (0.5, -1), true, true)`,
-        `Text("\\scriptsize${pB_C.toTex()}", (2.8, 0), true, true)`,
-        `Text("\\scriptsize${pB_D.toTex()}", (3, -2.5), true, true)`,
+        `Text("\\scriptsize${A / pgcd(A, A + B)}/${(A + B) / pgcd(A, A + B)}", (0.3, 2.1), true, true)`,
+        `Text("\\scriptsize${AC / pgcd(AC, AC + AD)}/${(AC + AD) / pgcd(AC, AC + AD)}", (2.8, 3.5), true, true)`,
+        `Text("\\scriptsize${AD / pgcd(AD, AC + AD)}/${(AC + AD) / pgcd(AD, AC + AD)}", (2.8, 1.4), true, true)`,
+        `Text("\\scriptsize${B / pgcd(B, A + B)}/${(A + B) / pgcd(B, A + B)}", (0.3, -1.2), true, true)`,
+        `Text("\\scriptsize${BC / pgcd(BC, BC + BD)}/${(BC + BD) / pgcd(BC, BC + BD)}", (2.8, -0.6), true, true)`,
+        `Text("\\scriptsize${BD / pgcd(BD, BC + BD)}/${(BC + BD) / pgcd(BD, BC + BD)}", (2.8, -2.5), true, true)`,
         'Text("A", (1.85 , 2.5))',
         'Text("B", (1.85 , -2.8))',
         'Text("C", (5.5 , 2.85))',

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

@@ -1 +1 @@
-{"version":3,"file":"arithmeticThresholdFind.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticThresholdFind.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGpD,eAAO,MAAM,uBAAuB,EAAE,QAUrC,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,QAAQ,CA0BrD"}
+{"version":3,"file":"arithmeticThresholdFind.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticThresholdFind.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGpD,eAAO,MAAM,uBAAuB,EAAE,QAUrC,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,QAAQ,CAyBrD"}

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

@@ -21,14 +21,13 @@ function getArithmeticThresholdFind() {
     let randValue = firstValue;
     const formula = new polynomial_1.Polynomial([firstValue, reason], 'n');
     let instruction = `$(u_n)$ est une suite arithmétique définie par $u_n = ${formula.toString()}$. `;
-    let answer = '';
     if (reason > 0) {
         randValue += (0, randint_1.randint)(reason, 100);
-        instruction += `A partir de quel rang a-t-on $u_n > ${randValue}$ ?`;
+        instruction += `À partir de quel rang a-t-on $u_n > ${randValue}$ ?`;
     }
     else {
         randValue += (0, randint_1.randint)(-100, reason);
-        instruction += `A partir de quel rang a-t-on $u_n < ${randValue}$ ?`;
+        instruction += `À partir de quel rang a-t-on $u_n < ${randValue}$ ?`;
     }
     const question = {
         instruction,

package/lib/math/geometry/point.d.ts

@@ -10,4 +10,17 @@ export declare class Point {
     toTexWithCoords(): string;
     midpoint(B: Point, name?: string): Point;
 }
+/**
+ * Droite{
+ * constructor :
+ *  depuis 2 points : A,B --> Droite
+ *  depuis 1 point + coeff dir --> Droite
+ *  avec une équation de droite --> Droite
+ *
+ * méthodes :
+ *    toEquation() --> y = 3x+2
+ *    toCoeffDIr --> a
+
+ * }
+ */
 //# sourceMappingURL=point.d.ts.map

package/lib/math/geometry/point.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/point.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAM7C,8BAAsB,gBAAgB;CAMrC;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,IAAI,CAAC;IACR,CAAC,EAAE,IAAI,CAAC;gBACI,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI;IAM1C,KAAK,IAAI,MAAM;IAGf,eAAe,IAAI,MAAM;IAIzB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,SAAM,GAAG,KAAK;CAOtC"}
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/point.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAM7C,8BAAsB,gBAAgB;CAMrC;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,IAAI,CAAC;IACR,CAAC,EAAE,IAAI,CAAC;gBACI,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI;IAM1C,KAAK,IAAI,MAAM;IAIf,eAAe,IAAI,MAAM;IAIzB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,SAAM,GAAG,KAAK;CAOtC;AAED;;;;;;;;;;;;GAYG"}

package/lib/math/geometry/point.js

@@ -25,3 +25,16 @@ class Point {
     }
 }
 exports.Point = Point;
+/**
+ * Droite{
+ * constructor :
+ *  depuis 2 points : A,B --> Droite
+ *  depuis 1 point + coeff dir --> Droite
+ *  avec une équation de droite --> Droite
+ *
+ * méthodes :
+ *    toEquation() --> y = 3x+2
+ *    toCoeffDIr --> a
+
+ * }
+ */

package/package.json

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