math-exercises 2.0.1 → 2.0.2

package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.d.ts

@@ -5,11 +5,15 @@
  * a*b±c*d
  * a/b ± c*d
  */
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    type: number;
+    flip: number;
+    a: number;
+    b: number;
+    c: number;
+    d: number;
 };
-type VEAProps = {};
-export declare const operationsPrioritiesWithoutRelative: MathExercise<QCMProps, VEAProps>;
+export declare const operationsPrioritiesWithoutRelative: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=operationsPrioritiesWithoutRelative.d.ts.map

package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmPnB,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhF,CAAC"}
+{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4QF,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAAC,WAAW,CAazE,CAAC"}

package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.js

@@ -20,9 +20,9 @@ const shuffle_1 = require("../../../utils/shuffle");
 const getOperationsPrioritiesWithoutRelative = () => {
     const type = (0, randint_1.randint)(1, 7);
     const flip = (0, randint_1.randint)(1, 4);
-    let startStatement = '';
-    let answer = '';
-    let a, b, c, d;
+    let startStatement = "";
+    let answer = "";
+    let a = 1, b = 1, c = 1, d = 1;
     let statement;
     switch (type) {
         case 1: // a*b ± c±d
@@ -161,14 +161,16 @@ const getOperationsPrioritiesWithoutRelative = () => {
                 answer = (a * b * c + d).toString();
             }
             break;
+        default:
+            throw Error("impossible");
     }
     const question = {
         instruction: `Calculer : $${startStatement}$`,
         startStatement,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answerFormat: "tex",
+        identifiers: { a, b, c, d, flip, type },
     };
     return question;
 };
@@ -176,19 +178,25 @@ const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(1, 50) + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(1, 50) + "");
     }
     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.operationsPrioritiesWithoutRelative = {
-    id: 'operationsPrioritiesWithoutRelative',
-    connector: '=',
-    label: 'Priorités opératoires sans les nombres relatifs',
-    levels: ['6ème', '5ème', '4ème'],
-    sections: ['Calculs'],
+    id: "operationsPrioritiesWithoutRelative",
+    connector: "=",
+    label: "Priorités opératoires sans les nombres relatifs",
+    levels: ["6ème", "5ème", "4ème"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getOperationsPrioritiesWithoutRelative, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,2 @@
+export * from "./proportionalityTable";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC"}

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

@@ -0,0 +1,17 @@
+"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("./proportionalityTable"), exports);

package/lib/exercises/calcul/proportionality/proportionalityTable.d.ts

@@ -1,8 +1,11 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    randQuation: number;
+    x1: string | number;
+    x2: string | number;
+    x3: string | number;
+    x4: string | number;
 };
-type VEAProps = {};
-export declare const proportionalityTable: MathExercise<QCMProps, VEAProps>;
+export declare const proportionalityTable: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=proportionalityTable.d.ts.map

package/lib/exercises/calcul/proportionality/proportionalityTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAyDnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAmEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAY1D,CAAC"}

package/lib/exercises/calcul/proportionality/proportionalityTable.js

@@ -10,24 +10,24 @@ const getProportionalityTable = () => {
     const fact = (0, randint_1.randint)(2, 10);
     let [x1, x2] = integer_1.IntegerConstructor.randomDifferents(1, 100 / fact, 2);
     let [x3, x4] = [x1 * fact, x2 * fact];
-    let answer = '';
+    let answer = "";
     const randQuation = (0, randint_1.randint)(0, 4);
     switch (randQuation) {
         case 0:
-            answer = x1 + '';
-            x1 = '?';
+            answer = x1 + "";
+            x1 = "?";
             break;
         case 1:
-            answer = +x2 + '';
-            x2 = '?';
+            answer = +x2 + "";
+            x2 = "?";
             break;
         case 2:
-            answer = x3 + '';
-            x3 = '?';
+            answer = x3 + "";
+            x3 = "?";
             break;
         case 3:
-            answer = x4 + '';
-            x4 = '?';
+            answer = x4 + "";
+            x4 = "?";
             break;
     }
     const question = {
@@ -41,8 +41,8 @@ const getProportionalityTable = () => {
 Déterminer le nombre manquant.`,
         answer: answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        answerFormat: "tex",
+        identifiers: { randQuation, x1, x2, x3, x4 },
     };
     return question;
 };
@@ -50,19 +50,23 @@ const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, Number(answer) + (0, randint_1.randint)(Number(-answer) + 1, 20, [0]) + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, Number(answer) + (0, randint_1.randint)(Number(-answer) + 1, 20, [0]) + "");
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.proportionalityTable = {
-    id: 'proportionalityTable',
-    connector: '=',
-    label: 'Calcul dans un tableau de proportionnalité',
-    levels: ['5ème', '4ème', '3ème', 'CAP', '2ndPro', '1rePro'],
+    id: "proportionalityTable",
+    connector: "=",
+    label: "Calcul dans un tableau de proportionnalité",
+    levels: ["5ème", "4ème", "3ème", "CAP", "2ndPro", "1rePro"],
     isSingleStep: false,
-    sections: ['Proportionnalité'],
+    sections: ["Proportionnalité"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProportionalityTable, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,2 @@
+export * from "./rounding";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/rounding/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC"}

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

@@ -0,0 +1,17 @@
+"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("./rounding"), exports);

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

@@ -1,24 +1,22 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     precisionAsked: number;
     decimal: number;
     precision: number;
 };
-type VEAProps = {};
-export declare const roundToUnit: MathExercise<QCMProps, VEAProps>;
+export declare const roundToUnit: MathExercise<Identifiers>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToDixieme: MathExercise<QCMProps, VEAProps>;
+export declare const roundToDixieme: MathExercise<Identifiers>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToCentieme: MathExercise<QCMProps, VEAProps>;
+export declare const roundToCentieme: MathExercise<Identifiers>;
 /**
  * arrondi à l'unité
  */
-export declare const roundToMillieme: MathExercise<QCMProps, VEAProps>;
-export declare const allRoundings: MathExercise<QCMProps, VEAProps>;
+export declare const roundToMillieme: MathExercise<Identifiers>;
+export declare const allRoundings: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=rounding.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAoClC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzD,CAAC"}
+{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AA8ClC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAajD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAapD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAarD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAarD,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,WAAW,CAgBlD,CAAC"}

package/lib/exercises/calcul/rounding/rounding.js

@@ -12,9 +12,9 @@ const shuffle_1 = require("../../../utils/shuffle");
  */
 const instructions = [
     "Arrondir à l'unité :",
-    'Arrondir au dixième :',
-    'Arrondir au centième :',
-    'Arrondir au millième :',
+    "Arrondir au dixième :",
+    "Arrondir au centième :",
+    "Arrondir au millième :",
 ];
 const getRoundQuestions = (opts) => {
     const precisionAsked = opts?.precisionAsked || 0;
@@ -27,8 +27,12 @@ const getRoundQuestions = (opts) => {
         startStatement: decTex,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, precisionAsked, decimal: dec.value, precision },
+        answerFormat: "tex",
+        identifiers: {
+            precisionAsked,
+            decimal: dec.value,
+            precision,
+        },
     };
     return question;
 };
@@ -36,9 +40,14 @@ const getPropositions = (n, { answer, precisionAsked, decimal, precision }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const dec = new decimal_1.Decimal(decimal);
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(dec.value, precisionAsked) === (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked)
-        ? (0, round_1.round)(dec.value - 0.5 * 10 ** -precisionAsked, precisionAsked) + ''
-        : (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked) + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(dec.value, precisionAsked) ===
+        (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked)
+        ? (0, round_1.round)(dec.value - 0.5 * 10 ** -precisionAsked, precisionAsked)
+            .toString()
+            .replace(".", ",")
+        : (0, round_1.round)(dec.value + 0.5 * 10 ** -precisionAsked, precisionAsked)
+            .toString()
+            .replace(".", ","));
     (0, exercise_1.tryToAddWrongProp)(propositions, dec.toTree().toTex());
     if (dec.decimalPart.length !== precisionAsked + 1)
         (0, exercise_1.tryToAddWrongProp)(propositions, dec
@@ -50,72 +59,83 @@ const getPropositions = (n, { answer, precisionAsked, decimal, precision }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { decimal, precisionAsked }) => {
+    const dec = new decimal_1.Decimal(decimal);
+    const answer = dec.round(precisionAsked).toTree();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.roundToUnit = {
-    id: 'roundToUnit',
-    connector: '\\approx',
+    id: "roundToUnit",
+    connector: "\\approx",
     label: "Arrondir à l'unité",
-    levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Calculs'],
+    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 0 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };
 /**
  * arrondi à l'unité
  */
 exports.roundToDixieme = {
-    id: 'roundToDixieme',
-    connector: '\\approx',
-    label: 'Arrondir au dixième',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Calculs'],
+    id: "roundToDixieme",
+    connector: "\\approx",
+    label: "Arrondir au dixième",
+    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 1 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };
 /**
  * arrondi à l'unité
  */
 exports.roundToCentieme = {
-    id: 'roundToCentieme',
-    connector: '\\approx',
-    label: 'Arrondir au centième',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Calculs'],
+    id: "roundToCentieme",
+    connector: "\\approx",
+    label: "Arrondir au centième",
+    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 2 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };
 /**
  * arrondi à l'unité
  */
 exports.roundToMillieme = {
-    id: 'roundToMillieme',
-    connector: '\\approx',
-    label: 'Arrondir au millième',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Calculs'],
+    id: "roundToMillieme",
+    connector: "\\approx",
+    label: "Arrondir au millième",
+    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: 3 }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };
 exports.allRoundings = {
-    id: 'allRoundings',
-    connector: '\\approx',
-    label: 'Arrondir un nombre décimal',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro', '1rePro'],
-    sections: ['Calculs'],
+    id: "allRoundings",
+    connector: "\\approx",
+    label: "Arrondir un nombre décimal",
+    levels: ["6ème", "5ème", "CAP", "2ndPro", "1rePro"],
+    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRoundQuestions({ precisionAsked: (0, randint_1.randint)(0, 4) }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/distributivity/allIdentities.d.ts

@@ -1,13 +1,11 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     type: number;
     a?: number;
     b?: number;
     affine1Coeffs?: number[];
     affine2Coeffs?: number[];
 };
-type VEAProps = {};
-export declare const allIdentities: MathExercise<QCMProps, VEAProps>;
+export declare const allIdentities: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=allIdentities.d.ts.map

package/lib/exercises/calculLitteral/distributivity/allIdentities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allIdentities.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/allIdentities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA6C,MAAM,0BAA0B,CAAC;AAMnG,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}
+{"version":3,"file":"allIdentities.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/allIdentities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA6DF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,WAAW,CAYnD,CAAC"}

package/lib/exercises/calculLitteral/distributivity/allIdentities.js

@@ -9,23 +9,23 @@ const thirdIdentity_1 = require("./thirdIdentity");
 const getAllIdentitiesQuestion = () => {
     const type = (0, random_1.random)([1, 2, 3]);
     let question;
-    let qcmGeneratorProps;
+    let identifiers;
     switch (type) {
         case 1:
             question = (0, firstIdentity_1.getFirstIdentityQuestion)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 1 };
+            identifiers = { ...question.identifiers, type: 1 };
             break;
         case 2:
             question = (0, secondIdentity_1.getSecondIdentityQuestion)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 2 };
+            identifiers = { ...question.identifiers, type: 2 };
             break;
         case 3:
         default:
             question = (0, thirdIdentity_1.getThirdIdentityQuestion)();
-            qcmGeneratorProps = { ...question.qcmGeneratorProps, type: 3 };
+            identifiers = { ...question.identifiers, type: 3 };
             break;
     }
-    return { ...question, qcmGeneratorProps };
+    return { ...question, identifiers };
 };
 const getPropositions = (n, { answer, type, a, b, affine1Coeffs, affine2Coeffs }) => {
     switch (type) {
@@ -35,18 +35,38 @@ const getPropositions = (n, { answer, type, a, b, affine1Coeffs, affine2Coeffs }
             return (0, secondIdentity_1.getSecondIdentityPropositions)(n, { a: a, answer, b: b });
         case 3:
         default:
-            return (0, thirdIdentity_1.getThirdIdentityPropositions)(n, { affine1Coeffs: affine1Coeffs, affine2Coeffs: affine2Coeffs, answer });
+            return (0, thirdIdentity_1.getThirdIdentityPropositions)(n, {
+                affine1Coeffs: affine1Coeffs,
+                affine2Coeffs: affine2Coeffs,
+                answer,
+            });
+    }
+};
+const isAnswerValid = (ans, { type, a, b, affine1Coeffs, affine2Coeffs, answer }) => {
+    switch (type) {
+        case 1:
+            return (0, firstIdentity_1.isFirstIdentityAnswerValid)(ans, { answer, a: a, b: b });
+        case 2:
+            return (0, secondIdentity_1.isSecondIdentityAnswerValid)(ans, { answer, a: a, b: b });
+        case 3:
+        default:
+            return (0, thirdIdentity_1.isThirdIdentityAnswerValid)(ans, {
+                answer,
+                affine1Coeffs: affine1Coeffs,
+                affine2Coeffs: affine2Coeffs,
+            });
     }
 };
 exports.allIdentities = {
-    id: 'allIdRmq',
-    connector: '=',
-    label: 'Identités remarquables (toutes)',
-    levels: ['3ème', '2nde', '1reTech'],
-    sections: ['Calcul littéral'],
+    id: "allIdRmq",
+    connector: "=",
+    label: "Identités remarquables (toutes)",
+    levels: ["3ème", "2nde", "1reTech"],
+    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAllIdentitiesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkDnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAiFF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.js

@@ -10,7 +10,7 @@ const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getDoubleDistributivityQuestion = () => {
     const affines = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
     const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].toTree());
@@ -19,16 +19,22 @@ const getDoubleDistributivityQuestion = () => {
         instruction: `Développer et réduire : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, affine1Coeffs: affines[0].coefficients, affine2Coeffs: affines[1].coefficients },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            affine1Coeffs: affines[0].coefficients,
+            affine2Coeffs: affines[1].coefficients,
+        },
     };
     return question;
 };
 const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const affines = [new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]), new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0])];
+    const affines = [
+        new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
     (0, exercise_1.tryToAddWrongProp)(propositions, affines[0]
         .multiply(new affine_1.Affine(-affines[1].a, (0, randint_1.randint)(-9, 10, [affines[1].b])))
         .toTree()
@@ -44,15 +50,25 @@ const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { affine1Coeffs, affine2Coeffs }) => {
+    const affines = [
+        new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
+    const answerTree = affines[0].multiply(affines[1]).toTree();
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.doubleDistributivity = {
-    id: 'doubleDistri',
-    connector: '=',
-    label: 'Distributivité double',
-    levels: ['3ème', '2nde', '1reTech'],
-    sections: ['Calcul littéral'],
+    id: "doubleDistri",
+    connector: "=",
+    label: "Distributivité double",
+    levels: ["3ème", "2nde", "1reTech"],
+    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDoubleDistributivityQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };