math-exercises 2.0.0 → 2.0.2

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

@@ -20,9 +20,11 @@ const getFractionAndIntegerProduct = () => {
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, integer: integer.value, rational: [rational.num, rational.denum] },
-        veaProps: { integer: integer.value, rational: [rational.num, rational.denum] },
+        answerFormat: "tex",
+        identifiers: {
+            integer: integer.value,
+            rational: [rational.num, rational.denum],
+        },
     };
     return question;
 };
@@ -34,7 +36,9 @@ const getPropositions = (n, { answer, integer, rational }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(integerObj.value * rationalObj.num, integerObj.value * rationalObj.denum).toTex());
     while (propositions.length < n) {
         const randomMultiplier = (0, randint_1.randint)(-10, 10);
-        const wrongAnswerTree = rationalObj.multiply(new integer_1.Integer(randomMultiplier)).toTree();
+        const wrongAnswerTree = rationalObj
+            .multiply(new integer_1.Integer(randomMultiplier))
+            .toTree();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswerTree.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
@@ -42,17 +46,20 @@ const getPropositions = (n, { answer, integer, rational }) => {
 const isAnswerValid = (ans, { integer, rational }) => {
     const integerObj = new integer_1.Integer(integer);
     const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = rationalObj.multiply(integerObj).toTree({ FractionNodeOpts: { allowDecimalSyntax: true } });
+    const answerTree = rationalObj
+        .multiply(integerObj)
+        .toTree({ allowFractionToDecimal: true });
     const texs = answerTree.toAllValidTexs();
+    console.log(texs);
     return texs.includes(ans);
 };
 exports.fractionAndIntegerProduct = {
-    id: 'fractionAndIntegerProduct',
-    connector: '=',
+    id: "fractionAndIntegerProduct",
+    connector: "=",
     label: "Produit d'un entier et d'une fraction",
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
     isSingleStep: false,
-    sections: ['Fractions'],
+    sections: ["Fractions"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerProduct, nb),
     qcmTimer: 60,
     freeTimer: 60,

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

@@ -1,13 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     integer: number;
     rational: [number, number];
 };
-type VEAProps = {
-    integer: number;
-    rational: [number, number];
-};
-export declare const fractionAndIntegerSum: MathExercise<QCMProps, VEAProps>;
+export declare const fractionAndIntegerSum: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=fractionAndIntegerSum.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA0BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAuBF,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAUF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYlE,CAAC"}
+{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgClC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AA0CF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}

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

@@ -20,8 +20,11 @@ const getFractionAndIntegerSum = () => {
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, integer: integer.value, rational: [rational.num, rational.denum] },
+        answerFormat: "tex",
+        identifiers: {
+            integer: integer.value,
+            rational: [rational.num, rational.denum],
+        },
     };
     return question;
 };
@@ -43,17 +46,19 @@ const getPropositions = (n, { answer, integer, rational }) => {
 const isAnswerValid = (ans, { integer, rational }) => {
     const integerObj = new integer_1.Integer(integer);
     const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = rationalObj.add(integerObj).toTree();
+    const answerTree = rationalObj
+        .add(integerObj)
+        .toTree({ allowFractionToDecimal: true });
     const texs = answerTree.toAllValidTexs();
     return texs.includes(ans);
 };
 exports.fractionAndIntegerSum = {
-    id: 'fractionAndIntegerSum',
-    connector: '=',
+    id: "fractionAndIntegerSum",
+    connector: "=",
     label: "Somme d'un entier et d'une fraction",
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
     isSingleStep: false,
-    sections: ['Fractions'],
+    sections: ["Fractions"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerSum, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/calcul/fractions/fractionToPercentToDecimal.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type VEAProps = {};
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     rand: number;
     numerator: number;
     denominator: number;
 };
-export declare const fractionToPercentToDecimal: MathExercise<QCMProps, VEAProps>;
+export declare const fractionToPercentToDecimal: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=fractionToPercentToDecimal.d.ts.map

package/lib/exercises/calcul/fractions/fractionToPercentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionToPercentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionToPercentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+DnB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA+CF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWvE,CAAC"}
+{"version":3,"file":"fractionToPercentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionToPercentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA+FlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAuFF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,WAAW,CAahE,CAAC"}

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

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fractionToPercentToDecimal = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const decimal_1 = require("../../../math/numbers/decimals/decimal");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const frenchify_1 = require("../../../math/utils/latex/frenchify");
 const randint_1 = require("../../../math/utils/random/randint");
 const round_1 = require("../../../math/utils/round");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const percentNode_1 = require("../../../tree/nodes/numbers/percentNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFractionToPercentToDecimal = () => {
     const denominator = 2 ** (0, randint_1.randint)(0, 5) * 5 ** (0, randint_1.randint)(0, 5);
@@ -16,47 +19,53 @@ const getFractionToPercentToDecimal = () => {
     const decimal = numerator / denominator;
     const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
     const rand = (0, randint_1.randint)(1, 7);
-    let instruction = '';
-    let answer = '';
+    let instruction = "";
+    let answer = "";
+    const percentTex = `${percent}\\%`;
+    const fracTex = new rational_1.Rational(numerator, denominator)
+        .simplify()
+        .toTree()
+        .toTex();
+    const decimalTex = `${decimal}`;
     switch (rand) {
         case 1: {
-            instruction = `Écrire le nombre $${String(decimal).replace('.', ',')}$ sous forme de pourcentage.`;
-            answer = `${percent}\\%`;
+            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de pourcentage.`;
+            answer = percentTex;
             break;
         }
         case 2: {
-            instruction = `Écrire le nombre $${String(decimal).replace('.', ',')}$ sous forme de fraction.`;
-            answer = `${(0, simplify_1.simplifyNode)(fraction).toTex()}`;
+            instruction = `Écrire le nombre $${String(decimal).replace(".", ",")}$ sous forme de fraction.`;
+            answer = fracTex;
             break;
         }
         case 3: {
-            instruction = `Écrire le nombre $${String(percent).replace('.', ',')}\\%$ sous forme décimale.`;
-            answer = `${decimal}`;
+            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme décimale.`;
+            answer = decimalTex;
             break;
         }
         case 4: {
-            instruction = `Écrire le nombre $${String(percent).replace('.', ',')}\\%$ sous forme de fraction.`;
-            answer = `${(0, simplify_1.simplifyNode)(fraction).toTex()}`;
+            instruction = `Écrire le nombre $${String(percent).replace(".", ",")}\\%$ sous forme de fraction.`;
+            answer = fracTex;
             break;
         }
         case 5: {
             instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme décimale.`;
-            answer = `${decimal}`;
+            answer = decimalTex;
             break;
         }
         case 6: {
             instruction = `Écrire le nombre $${fraction.toTex()}$ sous forme de pourcentage.`;
-            answer = `${percent}\\%`;
+            answer = percentTex;
             break;
         }
     }
+    answer = (0, frenchify_1.frenchify)(answer);
     const question = {
         instruction,
-        answer: answer.replace('.', ','),
-        keys: ['percent'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer,
+        answer,
+        keys: ["percent"],
+        answerFormat: "tex",
+        identifiers: {
             rand,
             numerator,
             denominator,
@@ -70,42 +79,79 @@ const getPropositions = (n, { answer, rand, numerator, denominator }) => {
     const decimal = numerator / denominator;
     const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
     while (propositions.length < n) {
-        let statement = '';
+        let statement = "";
         switch (rand) {
             case 1:
                 const temp1 = (0, randint_1.randint)(-5, 3, [0]);
-                statement = `${(0, round_1.round)(percent * 10 ** temp1, -temp1 + 2)}\\%`;
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(percent * 10 ** temp1, -temp1 + 2))}\\%`;
                 break;
             case 2:
-                statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
+                statement = `${new rational_1.Rational(numerator * (0, randint_1.randint)(1, 20, [0, 1]), denominator * (0, randint_1.randint)(1, 20, [0, 1]))
+                    .simplify()
+                    .toTree()
+                    .toTex()}`;
                 break;
             case 3:
                 const temp3 = (0, randint_1.randint)(-5, 3, [0]);
-                statement = `${(0, round_1.round)(percent * 10 ** temp3, -temp3 + 2)}`;
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(percent * 10 ** temp3, -temp3 + 2))}`;
                 break;
             case 4:
-                statement = `${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(numerator * (0, randint_1.randint)(1, 20, [0, 1])), new numberNode_1.NumberNode(denominator * (0, randint_1.randint)(1, 20, [0, 1])))).toTex()}`;
+                statement = `${new rational_1.Rational(numerator * (0, randint_1.randint)(1, 20, [0, 1]), denominator * (0, randint_1.randint)(1, 20, [0, 1]))
+                    .simplify()
+                    .toTree()
+                    .toTex()}`;
                 break;
             case 5:
-                statement = `${(0, round_1.round)(decimal + Math.random() * 10, 2)}`;
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(decimal + Math.random() * 10, 2))}`;
                 break;
             case 6:
-                statement = `${(0, round_1.round)(percent + Math.random() * 10, 2)}\\%`;
+                statement = `${(0, frenchify_1.frenchify)((0, round_1.round)(percent + Math.random() * 10, 2))}\\%`;
                 break;
         }
         (0, exercise_1.tryToAddWrongProp)(propositions, statement);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { rand, numerator, denominator }) => {
+    const decimal = numerator / denominator;
+    const percent = (0, round_1.round)((numerator / denominator) * 100, 2);
+    const percentNode = new percentNode_1.PercentNode(percent);
+    const fracNode = new rational_1.Rational(numerator, denominator).simplify().toTree();
+    const decimalNode = new decimal_1.Decimal(decimal).toTree();
+    let answer;
+    switch (rand) {
+        case 1:
+        case 6: {
+            answer = percentNode;
+            break;
+        }
+        case 2:
+        case 4: {
+            answer = fracNode;
+            break;
+        }
+        case 3:
+        case 5: {
+            answer = decimalNode;
+            break;
+        }
+        default:
+            throw Error("wrong type in fractiontopercenttodecimal");
+    }
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.fractionToPercentToDecimal = {
-    id: 'fractionToPercentToDecimal',
-    connector: '\\iff',
+    id: "fractionToPercentToDecimal",
+    connector: "\\iff",
     label: "Passer d'une écriture d'un nombre à une autre",
-    levels: ['3ème', '2nde', '1reESM', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
+    levels: ["3ème", "2nde", "1reESM", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionToPercentToDecimal, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calcul/fractions/fractionsDivision.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     rationalNum: [number, number];
     rationalDenum: [number, number];
 };
-type VEAProps = {};
-export declare const fractionsDivision: MathExercise<QCMProps, VEAProps>;
+export declare const fractionsDivision: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=fractionsDivision.d.ts.map

package/lib/exercises/calcul/fractions/fractionsDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AA2BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmBnB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}
+{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA6BlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAwCF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAYvD,CAAC"}

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

@@ -17,9 +17,8 @@ const getFractionsDivision = () => {
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer,
+        answerFormat: "tex",
+        identifiers: {
             rationalNum: [rational.num, rational.denum],
             rationalDenum: [rational2.num, rational2.denum],
         },
@@ -39,15 +38,25 @@ const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { rationalDenum, rationalNum }) => {
+    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    const answerTree = rational
+        .divide(rational2)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.fractionsDivision = {
-    id: 'fractionsDivision',
-    connector: '=',
-    label: 'Divisions de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
+    id: "fractionsDivision",
+    connector: "=",
+    label: "Divisions de fractions",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsDivision, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calcul/fractions/fractionsProduct.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     rationalNum: [number, number];
     rationalDenum: [number, number];
 };
-type VEAProps = {};
-export declare const fractionsProduct: MathExercise<QCMProps, VEAProps>;
+export declare const fractionsProduct: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=fractionsProduct.d.ts.map

package/lib/exercises/calcul/fractions/fractionsProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAqDF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}

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

@@ -17,9 +17,8 @@ const getFractionsProduct = () => {
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer,
+        answerFormat: "tex",
+        identifiers: {
             rationalNum: [rational.num, rational.denum],
             rationalDenum: [rational2.num, rational2.denum],
         },
@@ -37,15 +36,25 @@ const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { rationalDenum, rationalNum }) => {
+    const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
+    const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
+    const answerTree = rational
+        .multiply(rational2)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.fractionsProduct = {
-    id: 'fractionsProduct',
-    connector: '=',
-    label: 'Produits de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
+    id: "fractionsProduct",
+    connector: "=",
+    label: "Produits de fractions",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calcul/fractions/fractionsSum.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     rational: [number, number];
     rational2: [number, number];
 };
-type VEAProps = {};
-export declare const fractionsSum: MathExercise<QCMProps, VEAProps>;
+export declare const fractionsSum: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=fractionsSum.d.ts.map

package/lib/exercises/calcul/fractions/fractionsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}
+{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AA4DF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAYlD,CAAC"}

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

@@ -17,9 +17,8 @@ const getFractionsSum = () => {
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer,
+        answerFormat: "tex",
+        identifiers: {
             rational: [rational.num, rational.denum],
             rational2: [rational2.num, rational2.denum],
         },
@@ -37,15 +36,25 @@ const getPropositions = (n, { answer, rational, rational2 }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { rational, rational2 }) => {
+    const rationalA = new rational_1.Rational(rational[0], rational[1]);
+    const rationalB = new rational_1.Rational(rational2[0], rational2[1]);
+    const answerTree = rationalA
+        .add(rationalB)
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.fractionsSum = {
-    id: 'fractionsSum',
-    connector: '=',
-    label: 'Sommes de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
+    id: "fractionsSum",
+    connector: "=",
+    label: "Sommes de fractions",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsSum, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,9 @@
+export * from "./fractionAndIntegerDivision";
+export * from "./fractionAndIntegerProduct";
+export * from "./fractionAndIntegerSum";
+export * from "./fractionToPercentToDecimal";
+export * from "./fractionsDivision";
+export * from "./fractionsProduct";
+export * from "./fractionsSum";
+export * from "./simplifyFraction";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/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"}

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

@@ -0,0 +1,24 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./fractionAndIntegerDivision"), exports);
+__exportStar(require("./fractionAndIntegerProduct"), exports);
+__exportStar(require("./fractionAndIntegerSum"), exports);
+__exportStar(require("./fractionToPercentToDecimal"), exports);
+__exportStar(require("./fractionsDivision"), exports);
+__exportStar(require("./fractionsProduct"), exports);
+__exportStar(require("./fractionsSum"), exports);
+__exportStar(require("./simplifyFraction"), exports);

package/lib/exercises/calcul/fractions/simplifyFraction.d.ts

@@ -1,8 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    num: number;
+    denum: number;
 };
-type VEAProps = {};
-export declare const simplifyFraction: MathExercise<QCMProps, VEAProps>;
+export declare const simplifyFraction: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=simplifyFraction.d.ts.map

package/lib/exercises/calcul/fractions/simplifyFraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA4BnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA2CF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}

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

@@ -14,8 +14,8 @@ const getSimplifyFraction = () => {
         startStatement: rationalTex,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answerFormat: "tex",
+        identifiers: { num: rational.num, denum: rational.denum },
     };
     return question;
 };
@@ -28,15 +28,25 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { num, denum }) => {
+    const rational = new rational_1.Rational(num, denum);
+    const answerTree = rational
+        .simplify()
+        .toTree({ allowFractionToDecimal: true });
+    const texs = answerTree.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.simplifyFraction = {
-    id: 'simplifyFrac',
-    connector: '=',
-    label: 'Simplification de fractions',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Fractions'],
+    id: "simplifyFrac",
+    connector: "=",
+    label: "Simplification de fractions",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
+    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimplifyFraction, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,9 @@
+export * from "./addAndSub";
+export * from "./addAndSubWithoutRelatives";
+export * from "./arithmetics";
+export * from "./fractions";
+export * from "./mentalCaluls";
+export * from "./operations";
+export * from "./proportionality";
+export * from "./rounding";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC"}