math-exercises 2.0.1 → 2.0.2

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"addAndSub.d.ts","sourceRoot":"","sources":["../../../src/exercises/calcul/addAndSub.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AA8BrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAenB,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW9D,CAAC"}
+{"version":3,"file":"addAndSub.d.ts","sourceRoot":"","sources":["../../../src/exercises/calcul/addAndSub.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AA8BrB,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAoBzC,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAYvD,CAAC"}

package/lib/exercises/calcul/addAndSub.js

@@ -21,15 +21,15 @@ const getAddAndSubQuestions = () => {
     for (let i = 2; i < allNumbersNodes.length; i++) {
         statementTree = new addNode_1.AddNode(statementTree, allNumbersNodes[i]);
     }
-    const answer = numbers.reduce((a, b) => a + b) + '';
+    const answer = numbers.reduce((a, b) => a + b) + "";
     const statement = statementTree.toTex();
     const question = {
         instruction: `Calculer : $${statement}$`,
         startStatement: statement,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answerFormat: "tex",
+        identifiers: { numbers },
     };
     return question;
 };
@@ -43,15 +43,21 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (studentAns, { answer }) => {
+    const answerTree = new numberNode_1.NumberNode(Number(answer));
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(studentAns);
+};
 exports.addAndSubExercise = {
-    id: 'addAndSub',
-    connector: '=',
-    label: 'Additions et soustractions',
-    levels: ['6ème', '5ème'],
-    sections: ['Calculs'],
+    id: "addAndSub",
+    connector: "=",
+    label: "Additions et soustractions",
+    levels: ["6ème", "5ème"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAddAndSubQuestions, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"addAndSubWithoutRelatives.d.ts","sourceRoot":"","sources":["../../../src/exercises/calcul/addAndSubWithoutRelatives.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AA8CrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAcnB,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWtE,CAAC"}
+{"version":3,"file":"addAndSubWithoutRelatives.d.ts","sourceRoot":"","sources":["../../../src/exercises/calcul/addAndSubWithoutRelatives.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AA4CrB,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAoBzC,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAa/D,CAAC"}

package/lib/exercises/calcul/addAndSubWithoutRelatives.js

@@ -13,9 +13,10 @@ const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
 const getAddAndSubWithoutRelatives = () => {
     let answer = -1;
     let statementTree;
+    let numbers = [];
     while (answer < 0) {
         const nbOperations = (0, randint_1.randint)(2, 4);
-        let numbers = [];
+        numbers = [];
         do {
             numbers = [];
             numbers.push((0, randint_1.randint)(1, 15));
@@ -38,8 +39,8 @@ const getAddAndSubWithoutRelatives = () => {
         startStatement: statementTree.toTex(),
         answer: answerTex,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer: answerTex },
+        answerFormat: "tex",
+        identifiers: { numbers },
     };
     return question;
 };
@@ -52,15 +53,21 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (studentAns, { answer }) => {
+    const answerTree = new numberNode_1.NumberNode(Number(answer));
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(studentAns);
+};
 exports.addAndSubWithoutRelatives = {
-    id: 'addAndSubWithoutRelatives',
-    connector: '=',
-    label: 'Additions et soustractions sans les nombres relatifs',
-    levels: ['6ème', '5ème'],
-    sections: ['Calculs'],
+    id: "addAndSubWithoutRelatives",
+    connector: "=",
+    label: "Additions et soustractions sans les nombres relatifs",
+    levels: ["6ème", "5ème"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAddAndSubWithoutRelatives, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calcul/arithmetics/euclideanDivision.d.ts

@@ -1,14 +1,10 @@
-import { MathExercise } from '../../../exercises/exercise';
-type VEAProps = {
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     dividend: number;
     divisor: number;
     quotient: number;
     remainder: number;
 };
-type QCMProps = {
-    answer: string;
-    dividend: number;
-};
-export declare const euclideanDivision: MathExercise<QCMProps, VEAProps>;
+export declare const euclideanDivision: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=euclideanDivision.d.ts.map

package/lib/exercises/calcul/arithmetics/euclideanDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"euclideanDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/euclideanDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAoClC,KAAK,QAAQ,GAAG;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAWF,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAiBF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY9D,CAAC"}
+{"version":3,"file":"euclideanDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/euclideanDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAsClC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAwCF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAYvD,CAAC"}

package/lib/exercises/calcul/arithmetics/euclideanDivision.js

@@ -6,7 +6,7 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
-const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const getEuclideanDivisionQuestions = () => {
     let dividend = (0, randint_1.randint)(5, 100);
@@ -22,15 +22,14 @@ const getEuclideanDivisionQuestions = () => {
     const question = {
         instruction: `Ecrire la division euclidienne de ${dividend} par ${divisor}.`,
         answer: answerTex,
-        keys: ['equal'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer: answerTex, dividend },
-        veaProps: { dividend, divisor, quotient, remainder },
+        keys: ["equal"],
+        answerFormat: "tex",
+        identifiers: { dividend, divisor, quotient, remainder },
     };
     return question;
 };
 const isAnswerValid = (ans, { dividend, divisor, quotient, remainder }) => {
-    const tree = new equalNode_1.EqualNode(new numberNode_1.NumberNode(dividend), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(divisor), new numberNode_1.NumberNode(quotient)), new numberNode_1.NumberNode(remainder)), { isRightChildOnlyValid: true });
+    const tree = new equalNode_1.EqualNode(new numberNode_1.NumberNode(dividend), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(divisor), new numberNode_1.NumberNode(quotient)), new numberNode_1.NumberNode(remainder)), { allowRawRightChildAsSolution: true });
     const validLatexs = tree.toAllValidTexs();
     return validLatexs.includes(ans);
 };
@@ -47,11 +46,11 @@ const getPropositions = (n, { answer, dividend }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 exports.euclideanDivision = {
-    id: 'euclideanDivision',
-    connector: '=',
-    label: 'Ecrire une division euclidienne',
-    levels: ['6ème', '5ème', '4ème'],
-    sections: ['Arithmétique'],
+    id: "euclideanDivision",
+    connector: "=",
+    label: "Ecrire une division euclidienne",
+    levels: ["6ème", "5ème", "4ème"],
+    sections: ["Arithmétique"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEuclideanDivisionQuestions, nb),
     qcmTimer: 60,

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

@@ -0,0 +1,4 @@
+export * from "./euclideanDivision";
+export * from "./paritySumsAndProducts";
+export * from "./primeNumbers";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC"}

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

@@ -0,0 +1,19 @@
+"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("./euclideanDivision"), exports);
+__exportStar(require("./paritySumsAndProducts"), exports);
+__exportStar(require("./primeNumbers"), exports);

package/lib/exercises/calcul/arithmetics/paritySumsAndProducts.d.ts

@@ -1,7 +1,5 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-};
-export declare const paritySumsAndProducts: MathExercise<QCMProps>;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {};
+export declare const paritySumsAndProducts: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=paritySumsAndProducts.d.ts.map

package/lib/exercises/calcul/arithmetics/paritySumsAndProducts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paritySumsAndProducts.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/paritySumsAndProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAKb,MAAM,0BAA0B,CAAC;AAsElC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAgCF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,CAaxD,CAAC"}
+{"version":3,"file":"paritySumsAndProducts.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/paritySumsAndProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,0BAA0B,CAAC;AAyElC,KAAK,WAAW,GAAG,EAAE,CAAC;AAgCtB,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

package/lib/exercises/calcul/arithmetics/paritySumsAndProducts.js

@@ -7,64 +7,66 @@ const shuffle_1 = require("../../../utils/shuffle");
 const uuid_1 = require("uuid");
 const getParitySumsAndProductsQuestion = () => {
     const type = (0, randint_1.randint)(0, 12);
-    let instruction = '';
-    let answer = 'Pair';
+    let instruction = "";
+    let answer = "Pair";
     switch (type) {
         case 0:
-            instruction = 'La somme de deux nombres pairs est un nombre...';
-            answer = 'Pair';
+            instruction = "La somme de deux nombres pairs est un nombre...";
+            answer = "Pair";
             break;
         case 1:
-            instruction = 'La somme de deux nombres impairs est un nombre...';
-            answer = 'Pair';
+            instruction = "La somme de deux nombres impairs est un nombre...";
+            answer = "Pair";
             break;
         case 2:
-            instruction = "La somme d'un nombre pair et d'un nombre impair un nombre...";
-            answer = 'Impair';
+            instruction =
+                "La somme d'un nombre pair et d'un nombre impair un nombre...";
+            answer = "Impair";
             break;
         case 3:
-            instruction = 'La somme de trois nombres impairs est un nombre...';
-            answer = 'Impair';
+            instruction = "La somme de trois nombres impairs est un nombre...";
+            answer = "Impair";
             break;
         case 4:
-            instruction = 'La somme de trois nombres consécutifs est un nombre...';
-            answer = 'Parfois pair, parfois impair';
+            instruction = "La somme de trois nombres consécutifs est un nombre...";
+            answer = "Parfois pair, parfois impair";
             break;
         case 5:
-            instruction = 'La somme de quatre nombres consécutifs est un nombre...';
-            answer = 'Pair';
+            instruction = "La somme de quatre nombres consécutifs est un nombre...";
+            answer = "Pair";
             break;
         case 6:
-            instruction = 'Le produit de deux nombres pairs est un nombre...';
-            answer = 'Pair';
+            instruction = "Le produit de deux nombres pairs est un nombre...";
+            answer = "Pair";
             break;
         case 7:
-            instruction = 'Le produit de deux nombres impairs est un nombre...';
-            answer = 'Impair';
+            instruction = "Le produit de deux nombres impairs est un nombre...";
+            answer = "Impair";
             break;
         case 8:
-            instruction = "Le produit d'un nombre pair et d'un nombre impair est un nombre...";
-            answer = 'Pair';
+            instruction =
+                "Le produit d'un nombre pair et d'un nombre impair est un nombre...";
+            answer = "Pair";
             break;
         case 9:
-            instruction = 'Le produit de trois nombres consécutifs est un nombre...';
-            answer = 'Pair';
+            instruction = "Le produit de trois nombres consécutifs est un nombre...";
+            answer = "Pair";
             break;
         case 10:
-            instruction = 'Le produit de trois nombres impairs est un nombre...';
-            answer = 'Impair';
+            instruction = "Le produit de trois nombres impairs est un nombre...";
+            answer = "Impair";
             break;
         case 11:
-            instruction = 'Le produit de trois nombres pairs est un nombre...';
-            answer = 'Pair';
+            instruction = "Le produit de trois nombres pairs est un nombre...";
+            answer = "Pair";
             break;
     }
     const question = {
         answer: answer,
         instruction,
         keys: [],
-        answerFormat: 'raw',
-        qcmGeneratorProps: { answer },
+        answerFormat: "raw",
+        identifiers: { answer },
     };
     return question;
 };
@@ -73,41 +75,41 @@ const getPropositions = (n, { answer }) => {
         {
             id: (0, uuid_1.v4)(),
             statement: `Pair`,
-            isRightAnswer: answer === 'Pair',
-            format: 'raw',
+            isRightAnswer: answer === "Pair",
+            format: "raw",
         },
         {
             id: (0, uuid_1.v4)(),
             statement: `Impair`,
-            isRightAnswer: answer === 'Impair',
-            format: 'raw',
+            isRightAnswer: answer === "Impair",
+            format: "raw",
         },
         {
             id: (0, uuid_1.v4)(),
             statement: `Parfois pair, parfois impair`,
-            isRightAnswer: answer === 'Parfois pair, parfois impair',
-            format: 'raw',
+            isRightAnswer: answer === "Parfois pair, parfois impair",
+            format: "raw",
         },
         {
             id: (0, uuid_1.v4)(),
             statement: `Premier`,
-            isRightAnswer: answer === 'Premier',
-            format: 'raw',
+            isRightAnswer: answer === "Premier",
+            format: "raw",
         },
     ];
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.paritySumsAndProducts = {
-    id: 'paritySumsAndProducts',
-    connector: '=',
-    label: 'Parité de sommes et de produits',
-    levels: ['2nde'],
+    id: "paritySumsAndProducts",
+    connector: "=",
+    label: "Parité de sommes et de produits",
+    levels: ["2nde"],
     isSingleStep: true,
-    sections: ['Arithmétique'],
+    sections: ["Arithmétique"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getParitySumsAndProductsQuestion, nb, 12),
     qcmTimer: 60,
     freeTimer: 60,
-    answerType: 'QCM',
+    answerType: "QCM",
     maxAllowedQuestions: 12,
     getPropositions,
 };

package/lib/exercises/calcul/arithmetics/primeNumbers.d.ts

@@ -1,11 +1,7 @@
-import { MathExercise } from '../../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercise";
+type Identifiers = {
     chosenNumbers: number[];
 };
-type VEAProps = {
-    chosenNumbers: number[];
-};
-export declare const primeNumbers: MathExercise<QCMProps, VEAProps>;
+export declare const primeNumbers: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=primeNumbers.d.ts.map

package/lib/exercises/calcul/arithmetics/primeNumbers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EASb,MAAM,gBAAgB,CAAC;AAmDxB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA6BF,KAAK,QAAQ,GAAG;IACd,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAqBF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYzD,CAAC"}
+{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EASb,MAAM,gBAAgB,CAAC;AAsDxB,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAuDF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAYlD,CAAC"}

package/lib/exercises/calcul/arithmetics/primeNumbers.js

@@ -7,6 +7,7 @@ const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
+const operatorComposition_1 = require("../../../tree/utilities/operatorComposition");
 function prodNumbers(tab) {
     let temp = 1;
     for (let i = 0; i < tab.length; i++)
@@ -39,9 +40,8 @@ const getPrimeNumbers = () => {
         startStatement: `${prod}`,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, chosenNumbers },
-        veaProps: { chosenNumbers },
+        answerFormat: "tex",
+        identifiers: { chosenNumbers },
     };
     return question;
 };
@@ -77,24 +77,25 @@ const isAnswerValid = (ans, { chosenNumbers }) => {
         nbsToPower.push([nb, count]);
     });
     const nodes = nbsToPower.map((el) => {
-        if (el[1] === 1)
-            return new numberNode_1.NumberNode(el[0]);
-        else
-            return new powerNode_1.PowerNode(new numberNode_1.NumberNode(el[0]), new numberNode_1.NumberNode(el[1]), { allowProductSyntax: true });
+        const nbNode = new numberNode_1.NumberNode(el[0]);
+        if (el[1] === 1) {
+            return nbNode;
+        }
+        else {
+            return new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(el[1]));
+        }
     });
-    let tree = new multiplyNode_1.MultiplyNode(nodes[nodes.length - 1], nodes[nodes.length - 2]);
-    for (let i = nodes.length - 3; i > -1; i--) {
-        tree = new multiplyNode_1.MultiplyNode(nodes[i], tree);
-    }
-    const texs = tree.toAllValidTexs();
+    const answer = nodes.length === 1 ? nodes[0] : (0, operatorComposition_1.operatorComposition)(multiplyNode_1.MultiplyNode, nodes);
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
     return texs.includes(ans);
 };
 exports.primeNumbers = {
-    id: 'primeNumbers',
-    connector: '=',
-    label: 'Décomposition en nombres premiers',
-    levels: ['5ème', '4ème', '3ème', '2nde'],
-    sections: ['Arithmétique'],
+    id: "primeNumbers",
+    connector: "=",
+    label: "Décomposition en nombres premiers",
+    levels: ["5ème", "4ème", "3ème", "2nde"],
+    sections: ["Arithmétique"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPrimeNumbers, nb),
     qcmTimer: 60,

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAmClC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAsBF,KAAK,QAAQ,GAAG;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAaF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYvE,CAAC"}
+{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAwClC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAyCF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,WAAW,CAahE,CAAC"}

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

@@ -11,25 +11,27 @@ const coinFlip_1 = require("../../../utils/coinFlip");
 const getFractionAndIntegerDivision = () => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
     const integerFirst = (0, coinFlip_1.coinFlip)();
-    const integer = integerFirst ? new integer_1.Integer((0, randint_1.randint)(-10, 11, [0])) : new integer_1.Integer((0, randint_1.randint)(-10, 11, [0, 1]));
+    const integer = integerFirst
+        ? new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]))
+        : new integer_1.Integer((0, randint_1.randint)(-10, 11, [0, 1]));
     const statementTree = integerFirst
         ? new divideNode_1.DivideNode(integer.toTree(), rational.toTree())
         : new divideNode_1.DivideNode(rational.toTree(), integer.toTree());
-    const answerTree = integerFirst ? integer.divide(rational).toTree() : rational.divide(integer).toTree();
+    const answerTree = integerFirst
+        ? integer.divide(rational).toTree()
+        : rational.divide(integer).toTree();
     const answerTex = answerTree.toTex();
     const question = {
         instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer: answerTex,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: {
-            answer: answerTex,
+        answerFormat: "tex",
+        identifiers: {
             integerFirst,
             integer: integer.value,
             rational: [rational.num, rational.denum],
         },
-        veaProps: { integerFirst, integer: integer.value, rational: [rational.num, rational.denum] },
     };
     return question;
 };
@@ -38,7 +40,9 @@ const getPropositions = (n, { answer, integerFirst, integer, rational }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     const integerObj = new integer_1.Integer(integer);
     const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    (0, exercise_1.tryToAddWrongProp)(propositions, !integerFirst ? integerObj.divide(rationalObj).toTree().toTex() : rationalObj.divide(integerObj).toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, !integerFirst
+        ? integerObj.divide(rationalObj).toTree().toTex()
+        : rationalObj.divide(integerObj).toTree().toTex());
     while (propositions.length < n) {
         const wrongRational = rational_1.RationalConstructor.randomIrreductible();
         const wrongAnswerTree = integerFirst
@@ -52,19 +56,19 @@ const isAnswerValid = (ans, { integer, integerFirst, rational }) => {
     const integerObj = new integer_1.Integer(integer);
     const rationalObj = new rational_1.Rational(rational[0], rational[1]);
     const answerTree = integerFirst
-        ? integerObj.divide(rationalObj).toTree({ FractionNodeOpts: { allowDecimalSyntax: true } })
-        : rationalObj.divide(integerObj).toTree({ FractionNodeOpts: { allowDecimalSyntax: true } });
+        ? integerObj.divide(rationalObj).toTree({ allowFractionToDecimal: true })
+        : rationalObj.divide(integerObj).toTree({ allowFractionToDecimal: true });
     const texs = answerTree.toAllValidTexs();
     console.log(texs);
     return texs.includes(ans);
 };
 exports.fractionAndIntegerDivision = {
-    id: 'fractionAndIntegerDivision',
-    connector: '=',
+    id: "fractionAndIntegerDivision",
+    connector: "=",
     label: "Division d'un entier et d'une fraction",
-    levels: ['4ème', '3ème', '2nde', '2ndPro', '1rePro', 'CAP'],
+    levels: ["4ème", "3ème", "2nde", "2ndPro", "1rePro", "CAP"],
     isSingleStep: false,
-    sections: ['Fractions'],
+    sections: ["Fractions"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerDivision, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/calcul/fractions/fractionAndIntegerProduct.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 fractionAndIntegerProduct: MathExercise<QCMProps, VEAProps>;
+export declare const fractionAndIntegerProduct: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=fractionAndIntegerProduct.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA4BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAmBF,KAAK,QAAQ,GAAG;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAUF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYtE,CAAC"}
+{"version":3,"file":"fractionAndIntegerProduct.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/fractionAndIntegerProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAiClC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAsCF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAa/D,CAAC"}