math-exercises 2.2.66 → 2.2.68

package/lib/exercises/math/calcul/fractions/fractionAndIntegerSum.d.ts

@@ -1,5 +1,6 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
+    isIntegerFirst: boolean;
     integer: number;
     rational: [number, number];
 };

package/lib/exercises/math/calcul/fractions/fractionAndIntegerSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AA4ClC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAgCF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAwBF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAehE,CAAC"}
+{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AA+FF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAcF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBhE,CAAC"}

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

@@ -4,35 +4,60 @@ exports.fractionAndIntegerSum = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const allowNonIrreductibleFractions_1 = require("../../../../exercises/options/allowNonIrreductibleFractions");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
 const integer_1 = require("../../../../math/numbers/integer/integer");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
-const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const rebuildIdentifiers = (oldIdentifiers) => {
+    if (oldIdentifiers.isIntegerFirst !== undefined)
+        return oldIdentifiers;
+    return {
+        integer: oldIdentifiers.integer,
+        isIntegerFirst: (0, coinFlip_1.coinFlip)(),
+        rational: oldIdentifiers.rational,
+    };
+};
+const getStatementNode = (identifiers) => {
+    const ratio = (0, fractionNode_1.frac)(identifiers.rational[0], identifiers.rational[1]);
+    const statement = identifiers.isIntegerFirst
+        ? (0, addNode_1.add)(identifiers.integer, ratio)
+        : (0, addNode_1.add)(ratio, identifiers.integer);
+    return statement;
+};
+const getInstruction = (identifiers, opts) => {
+    const statement = getStatementNode(identifiers);
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+  
+$$
+${statement.toTex()}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const answerTree = getStatementNode(identifiers);
+    return answerTree.simplify().toTex();
+};
 const getFractionAndIntegerSum = (opts) => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
-    const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]));
-    const statementTree = new addNode_1.AddNode(rational.toTree(), integer.toTree());
-    statementTree.shuffle();
-    const answerTree = rational.add(integer).toTree();
-    const answer = answerTree.toTex();
+    const integer = (0, randint_1.randint)(-10, 11, [0]);
+    const isIntegerFirst = (0, coinFlip_1.coinFlip)();
+    const identifiers = {
+        integer: integer,
+        rational: [rational.num, rational.denum],
+        isIntegerFirst,
+    };
     const question = {
-        instruction: `Calculer ${opts?.allowNonIrreductible
-            ? ""
-            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
-  
-$$
-${statementTree.toTex()}
-$`,
-        startStatement: statementTree.toTex(),
-        answer,
+        instruction: getInstruction(identifiers, opts),
+        startStatement: getStatementNode(identifiers).toTex(),
+        answer: getAnswer(identifiers, opts),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            integer: integer.value,
-            rational: [rational.num, rational.denum],
-        },
+        identifiers,
     };
     return question;
 };
@@ -52,30 +77,16 @@ const getPropositions = (n, { answer, integer, rational }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const options = [allowNonIrreductibleFractions_1.allowNonIrreductibleOption];
-const isAnswerValid = (ans, { integer, rational }, opts) => {
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = rationalObj
-        .add(integerObj)
-        .toTree({ allowFractionToDecimal: true });
-    const texs = answerTree.toAllValidTexs();
-    if (opts?.allowNonIrreductible) {
-        const parsed = (0, rationalParser_1.rationalParser)(ans);
-        if (!parsed)
-            return false;
-        return texs.includes(parsed.simplify().toTex());
-    }
-    else {
-        return texs.includes(ans);
-    }
+const isAnswerValid = (ans, { answer, integer, rational }, opts) => {
+    return (0, rationalVEA_1.rationalVEA)(ans, answer, {
+        allowNonIrreductible: !!opts?.allowNonIrreductible,
+    });
 };
 exports.fractionAndIntegerSum = {
     id: "fractionAndIntegerSum",
     connector: "=",
     label: "Somme d'un entier et d'une fraction",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
     isSingleStep: false,
-    sections: ["Fractions"],
     generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFractionAndIntegerSum(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -83,4 +94,7 @@ exports.fractionAndIntegerSum = {
     isAnswerValid,
     subject: "Mathématiques",
     options,
+    getAnswer,
+    getInstruction,
+    rebuildIdentifiers,
 };

package/lib/exercises/math/calcul/fractions/fractionsOperations.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../../exercises/exercise";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor";
+type Identifiers = {
+    statementIdentifiers: NodeIdentifiers;
+};
+export declare const fractionsOperations: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=fractionsOperations.d.ts.map

package/lib/exercises/math/calcul/fractions/fractionsOperations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fractionsOperations.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAS1C,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,eAAe,CAAC;CACvC,CAAC;AA6EF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAgBrD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsOperations.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionsOperations = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const randint_1 = require("../../../../math/utils/random/randint");
+const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const divideNode_1 = require("../../../../tree/nodes/operators/divideNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, rational_1.RationalConstructor.randomIrreductible(100).toTree().toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const statement = nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.statementIdentifiers);
+    return statement.simplify().toTex();
+};
+const getInstruction = (identifiers) => {
+    const statement = nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.statementIdentifiers);
+    return `Calculer : 
+  
+$$
+${statement.toTex({ forceTimesSign: true })}
+$$`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return (0, rationalVEA_1.rationalVEA)(ans, answer);
+};
+const getFractionsOperationsQuestion = (ops) => {
+    const operations = [addNode_1.add, substractNode_1.substract, multiplyNode_1.multiply, divideNode_1.divide];
+    const firstOpIndex = (0, randint_1.randint)(0, operations.length);
+    const secondOpIndex = (0, randint_1.randint)(0, operations.length, [firstOpIndex]);
+    const firstOp = operations[firstOpIndex];
+    const secondOp = operations[secondOpIndex];
+    const rationals = [
+        rational_1.RationalConstructor.randomIrreductible().toTree(),
+        rational_1.RationalConstructor.randomIrreductible().toTree(),
+        rational_1.RationalConstructor.randomIrreductible().toTree(),
+    ];
+    const statement = firstOp(secondOp(rationals[0], rationals[1]), rationals[2]);
+    statement.shuffle();
+    const ids = statement.toIdentifiers();
+    const identifiers = {
+        statementIdentifiers: ids,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.fractionsOperations = {
+    id: "fractionsOperations",
+    connector: "=",
+    label: "Calculs avec des fractions : mélange d'opérations",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFractionsOperationsQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    // getHint,
+    // getCorrection,
+    getAnswer,
+};

package/lib/exercises/math/calcul/fractions/index.d.ts

@@ -10,4 +10,5 @@ export * from "./periodicWritingToFraction";
 export * from "./fractionsSumsSameDenominators";
 export * from "./fractionsSumsMultiplesDenominators";
 export * from "./fractionsSumsPrimeDenominators";
+export * from "./fractionsOperations";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/fractions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC"}

package/lib/exercises/math/calcul/fractions/index.js

@@ -26,3 +26,4 @@ __exportStar(require("./periodicWritingToFraction"), exports);
 __exportStar(require("./fractionsSumsSameDenominators"), exports);
 __exportStar(require("./fractionsSumsMultiplesDenominators"), exports);
 __exportStar(require("./fractionsSumsPrimeDenominators"), exports);
+__exportStar(require("./fractionsOperations"), exports);

package/lib/exercises/math/derivation/derivative/rootFunctionDerivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/rootFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgEF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"rootFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/rootFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2EF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}

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

@@ -11,6 +11,16 @@ 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 shuffle_1 = require("../../../../utils/alea/shuffle");
+const getStatementNode = (identifiers) => {
+    return (0, multiplyNode_1.multiply)(identifiers.a, (0, sqrtNode_1.sqrt)("x"));
+};
+const getInstruction = (identifiers) => {
+    return `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par :
+  
+$$
+f(x) = ${getStatementNode(identifiers).toTex()}
+$$ `;
+};
 const getRootFunctionDerivative = () => {
     const a = (0, randint_1.randint)(-19, 20, [0]);
     let instruction = `Déterminer la fonction dérivée $f'$ de la fonction $f$ définie par $f(x) =$ `;
@@ -65,7 +75,7 @@ const isAnswerValid = (ans, { a }) => {
 exports.rootFunctionDerivative = {
     id: "rootFunctionDerivative",
     connector: "=",
-    label: "Dérivée d'une fonction racine",
+    label: "Dérivée d'une fonction racine carrée",
     levels: ["1reESM", "1reSpé", "1reTech", "MathComp"],
     sections: ["Dérivation", "Racines carrées"],
     isSingleStep: false,

package/lib/exercises/math/functions/affines/leadingCoefficient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}

package/lib/exercises/math/functions/affines/leadingCoefficient.js

@@ -3,36 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.leadingCoefficient = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
 const colors_1 = require("../../../../geogebra/colors");
 const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
-const integer_1 = require("../../../../math/numbers/integer/integer");
 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");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 const getLeadingCoefficientQuestion = () => {
     let xA, yA, xB, yB;
     [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-5, 6));
     xB = xA > 0 ? (0, randint_1.randint)(xA - 4, 6, [xA]) : (0, randint_1.randint)(-4, xA + 5, [xA]); // l'écart entre les deux points ne soit pas grand
     yB = yA > 0 ? (0, randint_1.randint)(yA - 4, 6) : (0, randint_1.randint)(-4, yA + 5);
-    const a = new rational_1.Rational(yB - yA, xB - xA).simplify();
-    const b = a.opposite().multiply(new integer_1.Integer(xA)).add(new integer_1.Integer(yA));
-    const aTree = a.toTree();
-    const bTree = b.toTree();
-    const aString = aTree.toMathString();
-    const bString = bTree.toMathString();
+    const a = (0, fractionNode_1.frac)(yB - yA, xB - xA).simplify();
+    const answer = a.toTex();
     const xMin = Math.min(xA, xB);
     const xMax = Math.max(xA, xB);
     const yMin = Math.min(yA, yB);
     const yMax = Math.max(yA, yB);
     const commands = [
-        `f(x) = (${aString}) * x + (${bString})`,
-        `SetColor(f, "${(0, colors_1.randomColor)()}")`,
+        `L = Line((${xA}, ${yA}), (${xB}, ${yB}))`,
+        "SetFixed(L, true)",
+        `SetColor(L, "${(0, colors_1.randomColor)()}")`,
     ];
     const ggb = new geogebraConstructor_1.GeogebraConstructor({
         commands,
     });
-    const answer = aTree.toTex();
     const question = {
         instruction: "Déterminer le coefficient directeur de la droite représentée ci-dessous : ",
         answer,
@@ -56,12 +53,8 @@ const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
-    const leadingCoeff = new rational_1.Rational(yB - yA, xB - xA)
-        .simplify()
-        .toTree({ allowFractionToDecimal: true });
-    const texs = leadingCoeff.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, xA, xB, yA, yB }) => {
+    return (0, rationalVEA_1.rationalVEA)(ans, answer);
 };
 exports.leadingCoefficient = {
     id: "leadingCoefficient",

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.js

@@ -18,7 +18,9 @@ const getDistanceBetweenTwoPoints = () => {
         .toTree()
         .toTex();
     const question = {
-        instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Calculer la distance $AB$.`,
+        instruction: `Dans un repère orthonormé, soit deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. 
+    
+Calculer la distance $AB$.`,
         startStatement: "AB",
         answer,
         keys: [],

package/lib/exercises/math/geometry/cartesian/placeAbscissOnLine.js

@@ -55,7 +55,7 @@ const isGGBAnswerValid = (ans, { ggbAnswer, absciss, abscissTex, abscissType, ax
     const points = (0, parseGGBPoints_1.parseGGBPoints)(ans).map((p) => (0, ggbPointToCoords_1.ggbPointToCoords)(p));
     return (points.length === 1 &&
         points[0].y === 0 &&
-        Math.abs(points[0].x - coeff) < 0.1);
+        Math.abs(points[0].x - coeff) < 0.2);
 };
 const getPlaceAbscissOnLineQuestion = () => {
     const abscissType = (0, random_1.random)([

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

@@ -1 +1 @@
-{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAqFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}
+{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAmFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}

package/lib/exercises/math/percent/applyPercent.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyPercent = void 0;
+const numberVEA_1 = require("../../../exercises/vea/numberVEA");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
-const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const coinFlip_1 = require("../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../utils/alea/shuffle");
 const exercise_1 = require("../../exercise");
@@ -74,9 +74,7 @@ const getPropositions = (n, { answer }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    const answerTree = new numberNode_1.NumberNode(Number(answer.replace(",", ".")));
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(ans);
+    return (0, numberVEA_1.numberVEA)(ans, answer);
 };
 exports.applyPercent = {
     id: "applyPercent",

package/lib/exercises/math/probaStat/probabilityTree.d.ts

@@ -1,15 +1,18 @@
+import { NodeIdentifiers } from "../../../tree/nodes/nodeConstructor";
 import { Exercise } from "../../exercise";
 type Identifiers = {
-    type: number;
-    A: number;
-    B: number;
-    AC: number;
-    AD: number;
-    BC: number;
-    BD: number;
+    A: NodeIdentifiers;
+    B: NodeIdentifiers;
+    AC: NodeIdentifiers;
+    AD: NodeIdentifiers;
+    BC: NodeIdentifiers;
+    BD: NodeIdentifiers;
+    probaName: string;
 };
 type Options = {
     allowApproximate: string;
+    eventTypes: string[];
+    probaType: string;
 };
 export declare const probabilityTree: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/probaStat/probabilityTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probabilityTree.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,QAAQ,EAWT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAwIF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AA0CF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAwB1D,CAAC"}
+{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probabilityTree.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAY1C,OAAO,EACL,QAAQ,EAeT,MAAM,gBAAgB,CAAC;AAmCxB,KAAK,WAAW,GAAG;IAIjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4MF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA+CF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB1D,CAAC"}