math-exercises 2.0.1 → 2.0.2

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

@@ -6,9 +6,8 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 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 simplify_1 = require("../../../tree/parsers/simplify");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFractionEquation = () => {
     // (ax + b)/(cx + d) = 0
@@ -18,41 +17,66 @@ const getFractionEquation = () => {
     const d = (0, randint_1.randint)(-9, 10, [0]);
     const polynome1 = new polynomial_1.Polynomial([b, a]);
     const polynome2 = new polynomial_1.Polynomial([d, c]);
-    const answer = -d / c === -b / a ? `S=\\emptyset` : `S=\\left\\{${new rational_1.Rational(-b, a).simplify().toTree().toTex()}\\right\\}`;
+    const answer = -d / c === -b / a
+        ? `S=\\emptyset`
+        : `S=\\left\\{${new rational_1.Rational(-b, a)
+            .simplify()
+            .toTree()
+            .toTex()}\\right\\}`;
     const question = {
         instruction: `Résoudre : $\\frac{${polynome1.toTex()}}{${polynome2.toTex()}} = 0$`,
         startStatement: `\\frac{${polynome1.toTex()}}{${polynome2.toTex()}} = 0`,
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'ou', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: [
+            "x",
+            "S",
+            "equal",
+            "lbrace",
+            "rbrace",
+            "semicolon",
+            "ou",
+            "emptyset",
+        ],
+        answerFormat: "tex",
+        identifiers: { a, b, c, d },
     };
     return question;
 };
-const getPropositions = (n, { answer }) => {
+const getPropositions = (n, { answer, a, b, c, d }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new rational_1.Rational(-d, c).simplify().toTree()])).toTex());
     while (propositions.length < n) {
         const a = (0, randint_1.randint)(-9, 10, [0]);
         const b = (0, randint_1.randint)(-9, 10, [0]);
-        const c = (0, randint_1.randint)(-9, 10, [0]);
-        const d = (0, randint_1.randint)(-9, 10, [0]);
-        const wrongAnswer = -d / c === -b / a
-            ? `S=\\emptyset`
-            : `S=\\left\\{${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-b), new numberNode_1.NumberNode(a))).toTex()}\\right\\}`;
+        const wrongAnswer = `S=\\left\\{${new rational_1.Rational(-b, a)
+            .simplify()
+            .toTree()
+            .toTex()}\\right\\}`;
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c, d }) => {
+    const solutions = -d / c === -b / a
+        ? discreteSetNode_1.EmptySet
+        : new discreteSetNode_1.DiscreteSetNode([new rational_1.Rational(-b, a).simplify().toTree()]);
+    const answer = new equationSolutionNode_1.EquationSolutionNode(solutions, {
+        opts: { allowFractionToDecimal: true },
+    });
+    const validLatexs = answer.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.fractionEquation = {
-    id: 'fractionEquation',
-    connector: '\\iff',
-    label: 'Résoudre une équation quotient nul',
-    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
-    sections: ['Équations'],
+    id: "fractionEquation",
+    connector: "\\iff",
+    label: "Résoudre une équation quotient nul",
+    levels: ["2nde", "1reESM", "1reSpé", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionEquation, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/equation/index.d.ts

@@ -0,0 +1,11 @@
+export * from "./equationSimpleSquare";
+export * from "./equationType1Exercise";
+export * from "./equationType2Exercise";
+export * from "./equationType3Exercise";
+export * from "./equationType4Exercise";
+export * from "./expEquation";
+export * from "./firstDegreeEquation";
+export * from "./fractionEquation";
+export * from "./logEquation";
+export * from "./multiplicationEquation";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,0BAA0B,CAAC"}

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

@@ -0,0 +1,26 @@
+"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("./equationSimpleSquare"), exports);
+__exportStar(require("./equationType1Exercise"), exports);
+__exportStar(require("./equationType2Exercise"), exports);
+__exportStar(require("./equationType3Exercise"), exports);
+__exportStar(require("./equationType4Exercise"), exports);
+__exportStar(require("./expEquation"), exports);
+__exportStar(require("./firstDegreeEquation"), exports);
+__exportStar(require("./fractionEquation"), exports);
+__exportStar(require("./logEquation"), exports);
+__exportStar(require("./multiplicationEquation"), exports);

package/lib/exercises/calculLitteral/equation/logEquation.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAelC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}
+{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

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

@@ -5,26 +5,37 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const expNode_1 = require("../../../tree/nodes/functions/expNode");
 const logNode_1 = require("../../../tree/nodes/functions/logNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
-const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
 const getLnEquation = () => {
     const a = (0, randint_1.randint)(-9, 20, [0]);
     const k = (0, randint_1.randint)(-9, 20, [0]);
-    const equation = new equalNode_1.EqualNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode('x')))), new numberNode_1.NumberNode(k));
-    const answer = new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree()).toTex();
+    const equation = new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new logNode_1.LogNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(k));
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree())])).toTex();
     const question = {
         instruction: `Résoudre l'équation $${equation.toTex()}$.`,
         answer,
-        keys: ['x', 'equal', 'ln', 'epower', 'exp'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: [
+            "x",
+            "equal",
+            "ln",
+            "e",
+            "epower",
+            "exp",
+            "lbrace",
+            "S",
+            "semicolon",
+            "rbrace",
+        ],
+        answerFormat: "tex",
+        identifiers: { a, k },
     };
     return question;
 };
@@ -34,19 +45,30 @@ const getPropositions = (n, { answer }) => {
     while (propositions.length < n) {
         const randomA = (0, randint_1.randint)(1, 10);
         const randomK = (0, randint_1.randint)(1, 20);
-        (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(randomK), new numberNode_1.NumberNode(randomA)))).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
+            new expNode_1.ExpNode(new rational_1.Rational(randomK, randomA).simplify().toTree()),
+        ])).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, k }) => {
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
+        new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree({ allowFractionToDecimal: true })),
+    ]));
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.logEquation = {
-    id: 'logEquation',
-    connector: '=',
-    label: 'Résoudre des équations de type $a \\times \\ln(x) = k$',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
-    sections: ['Logarithme népérien'],
+    id: "logEquation",
+    connector: "=",
+    label: "Résoudre des équations de type $a \\times \\ln(x) = k$",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
+    sections: ["Logarithme népérien", "Exponentielle"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLnEquation, nb),
     getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/equation/multiplicationEquation.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqDnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}
+{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAa5D,CAAC"}

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

@@ -6,9 +6,8 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 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 simplify_1 = require("../../../tree/parsers/simplify");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getMultiplicationEquation = () => {
     // (ax + b)(cx + d) = 0
@@ -21,21 +20,21 @@ const getMultiplicationEquation = () => {
     } while (a / c === b / d);
     const polynome1 = new polynomial_1.Polynomial([b, a]);
     const polynome2 = new polynomial_1.Polynomial([d, c]);
-    const answer = `S=\\left\\{${new rational_1.Rational(-b, a).simplify().toTree().toTex()};${new rational_1.Rational(-d, c)
-        .simplify()
-        .toTree()
-        .toTex()}\\right\\}`;
+    const sol1 = new rational_1.Rational(-b, a).simplify().toTree();
+    const sol2 = new rational_1.Rational(-d, c).simplify().toTree();
+    const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(sortedSols)).toTex();
     const question = {
         instruction: `Résoudre : $(${polynome1.toTex()})(${polynome2.toTex()}) = 0$`,
         startStatement: `(${polynome1.toTex()})(${polynome2.toTex()}) = 0`,
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'ou'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: ["x", "S", "equal", "lbrace", "rbrace", "semicolon", "ou"],
+        answerFormat: "tex",
+        identifiers: { a, b, c, d },
     };
     return question;
 };
-const getPropositions = (n, { answer }) => {
+const getPropositions = (n, { answer, a, b, c, d }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
@@ -46,20 +45,34 @@ const getPropositions = (n, { answer }) => {
             c = (0, randint_1.randint)(-9, 10, [0]);
             d = (0, randint_1.randint)(-9, 10, [0]);
         } while (a / c === b / d);
-        const wrongAnswer = `S=\\left\\{${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-b), new numberNode_1.NumberNode(a))).toTex()};${(0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-d), new numberNode_1.NumberNode(c))).toTex()}\\right\\}`;
+        const sol1 = new rational_1.Rational(-b, a).simplify().toTree();
+        const sol2 = new rational_1.Rational(-d, c).simplify().toTree();
+        const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
+        const wrongAnswer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(sortedSols)).toTex();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c, d }) => {
+    const sol1 = new rational_1.Rational(-b, a).simplify().toTree();
+    const sol2 = new rational_1.Rational(-d, c).simplify().toTree();
+    const sortedSols = -b / a < -d / c ? [sol1, sol2] : [sol2, sol1];
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(sortedSols), {
+        opts: { allowFractionToDecimal: true },
+    });
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.multiplicationEquation = {
-    id: 'multiplicationEquation',
-    connector: '\\iff',
-    label: 'Résoudre une équation produit nul',
-    levels: ['2nde', '1reESM', '1reSpé', '1reTech'],
-    sections: ['Équations'],
+    id: "multiplicationEquation",
+    connector: "\\iff",
+    label: "Résoudre une équation produit nul",
+    levels: ["2nde", "1reESM", "1reSpé", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMultiplicationEquation, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.d.ts

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

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}
+{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiDF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.js

@@ -12,7 +12,7 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFactoType1Question = () => {
-    const interval = new intervals_1.Interval('[[1; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+    const interval = new intervals_1.Interval("[[1; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const affine = affine_1.AffineConstructor.random(interval, interval);
     const statementTree = affine.multiply(affine).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
@@ -21,9 +21,9 @@ const getFactoType1Question = () => {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b: affine.b },
     };
     return question;
 };
@@ -37,15 +37,22 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const affine = new affine_1.Affine(a, b);
+    const answerTree = new powerNode_1.SquareNode(affine.toTree());
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.factoIdRmq1 = {
-    id: 'factoIdRmq1',
-    connector: '=',
+    id: "factoIdRmq1",
+    connector: "=",
     isSingleStep: false,
-    label: 'Factorisation du type $a^2 + 2ab + b^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    label: "Factorisation du type $a^2 + 2ab + b^2$",
+    levels: ["3ème", "2nde"],
+    sections: ["Calcul littéral"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.d.ts

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

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}
+{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuDF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.js

@@ -12,8 +12,8 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFactoType1Question = () => {
-    const intervalA = new intervals_1.Interval('[[0; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const intervalB = new intervals_1.Interval('[[-10; 0]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+    const intervalA = new intervals_1.Interval("[[0; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+    const intervalB = new intervals_1.Interval("[[-10; 0]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const affine = affine_1.AffineConstructor.random(intervalA, intervalB);
     const statementTree = affine.multiply(affine).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
@@ -22,9 +22,9 @@ const getFactoType1Question = () => {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b: affine.b },
     };
     return question;
 };
@@ -39,15 +39,22 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const affine = new affine_1.Affine(a, b);
+    const answerTree = new powerNode_1.SquareNode(affine.toTree());
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.factoIdRmq2 = {
-    id: 'factoIdRmq2',
-    connector: '=',
+    id: "factoIdRmq2",
+    connector: "=",
     isSingleStep: false,
-    label: 'Factorisation du type $a^2 - 2ab + b^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    label: "Factorisation du type $a^2 - 2ab + b^2$",
+    levels: ["3ème", "2nde"],
+    sections: ["Calcul littéral"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,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;AA4CnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxD,CAAC"}
+{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA6EF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.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 getFactoType1Question = () => {
-    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 affine = affine_1.AffineConstructor.random(interval, interval);
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = affine.multiply(affine2).toTree();
@@ -20,9 +20,12 @@ const getFactoType1Question = () => {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, affine1Coeffs: affine.coefficients, affine2Coeffs: affine2.coefficients },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            affine1Coeffs: affine.coefficients,
+            affine2Coeffs: affine2.coefficients,
+        },
     };
     return question;
 };
@@ -41,15 +44,23 @@ const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { affine1Coeffs, affine2Coeffs }) => {
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
+    const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.factoIdRmq3 = {
-    id: 'factoIdRmq3',
-    connector: '=',
+    id: "factoIdRmq3",
+    connector: "=",
     isSingleStep: false,
-    label: 'Factorisation du type $a^2 - b^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    label: "Factorisation du type $a^2 - b^2$",
+    levels: ["3ème", "2nde"],
+    sections: ["Calcul littéral"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/factorisation/factoType1Exercise.d.ts

@@ -1,13 +1,11 @@
 /**
  *  type (ax+b)(cx+d) ± (ax+b)(ex+f)
  */
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     affinesCoeffs: number[][];
     operation: string;
 };
-type VEAProps = {};
-export declare const factoType1Exercise: MathExercise<QCMProps, VEAProps>;
+export declare const factoType1Exercise: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=factoType1Exercise.d.ts.map

package/lib/exercises/calculLitteral/factorisation/factoType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2EnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyHF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAYxD,CAAC"}