math-exercises 2.0.0 → 2.0.2

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

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationType1Exercise = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
 const affine_1 = require("../../../math/polynomials/affine");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
 const shuffle_1 = require("../../../utils/shuffle");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
 const getEquationType1ExerciseQuestion = () => {
     const b = (0, randint_1.randint)(-10, 11);
     const a = (0, randint_1.randint)(-10, 11, [0]);
@@ -19,9 +22,9 @@ const getEquationType1ExerciseQuestion = () => {
         instruction: `Résoudre : $${tree.toTex()}$`,
         startStatement: tree.toTex(),
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: equationKeys_1.equationKeys,
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
@@ -36,15 +39,22 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const solution = b - a;
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(solution)]));
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.equationType1Exercise = {
-    id: 'equa1',
-    connector: '\\iff',
-    label: 'Équations $x+a = b$',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    sections: ['Équations'],
+    id: "equa1",
+    connector: "\\iff",
+    label: "Équations $x+a = b$",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType1ExerciseQuestion, nb),
     getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC;;GAEG;AACH,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,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWlE,CAAC"}
+{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsDF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAa3D,CAAC"}

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

@@ -3,28 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationType2Exercise = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
 const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
-const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getEquationType2ExerciseQuestion = () => {
-    const interval = new intervals_1.Interval('[[-10; 10]]');
+    const interval = new intervals_1.Interval("[[-10; 10]]");
     const b = interval.getRandomElement();
     const a = (0, randint_1.randint)(-9, 10, [0, 1]);
     const solution = new rational_1.Rational(b.value, a).simplify();
     const affine = new affine_1.Affine(a, 0).toTree();
     const tree = new equalNode_1.EqualNode(affine, b.toTree());
-    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), solution.toTree()).toTex();
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree()).toTex();
     const question = {
         instruction: `Résoudre : $${tree.toTex()}$`,
         startStatement: tree.toTex(),
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b: b.value },
+        keys: equationKeys_1.equationKeys,
+        answerFormat: "tex",
+        identifiers: { a, b: b.value },
     };
     return question;
 };
@@ -33,19 +36,29 @@ const getPropositions = (n, { answer, a, b }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const wrongAnswer = new rational_1.Rational(b + (0, randint_1.randint)(-7, 8, [0, -b]), a + (0, randint_1.randint)(-7, 8, [-a, 0])).simplify();
-        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.toTree()).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), wrongAnswer.toTree()).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const solution = new rational_1.Rational(b, a).simplify().toTree();
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
+        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
+    });
+    const validLatexs = answerTree.toAllValidTexs();
+    console.log(validLatexs);
+    return validLatexs.includes(ans);
+};
 exports.equationType2Exercise = {
-    id: 'equa2',
-    connector: '\\iff',
-    label: 'Équations $ax=b$',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    sections: ['Équations'],
+    id: "equa2",
+    connector: "\\iff",
+    label: "Équations $ax=b$",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType2ExerciseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"equationType3Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType3Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC;;GAEG;AACH,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoCnB,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYlE,CAAC"}
+{"version":3,"file":"equationType3Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType3Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsDF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

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

@@ -3,33 +3,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationType3Exercise = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
 const discreteSet_1 = require("../../../math/sets/discreteSet");
 const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
-const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getEquationType3ExerciseQuestion = () => {
-    const interval = new intervals_1.Interval('[[-10; 10]]');
-    const intervalStar = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+    const interval = new intervals_1.Interval("[[-10; 10]]");
+    const intervalStar = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const b = intervalStar.getRandomElement();
     const a = intervalStar.getRandomElement();
     const c = interval.getRandomElement();
     const affine = new affine_1.Affine(a.value, b.value).toTree();
     const solution = new rational_1.Rational(c.value - b.value, a.value).simplify();
     const statementTree = new equalNode_1.EqualNode(affine, c.toTree());
-    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), solution.toTree());
+    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
     const answer = answerTree.toTex();
     const question = {
         instruction: `Résoudre : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: a.value, b: b.value, c: c.value },
+        keys: equationKeys_1.equationKeys,
+        answerFormat: "tex",
+        identifiers: { a: a.value, b: b.value, c: c.value },
     };
     return question;
 };
@@ -38,19 +41,28 @@ const getPropositions = (n, { answer, a, b, c }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const wrongAnswer = new rational_1.Rational(c - b + (0, randint_1.randint)(-7, 8, [0, -c + b]), a + (0, randint_1.randint)(-7, 8, [-a, 0])).simplify();
-        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.toTree()).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), wrongAnswer.toTree()).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const solution = new rational_1.Rational(c - b, a).simplify().toTree();
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
+        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
+    });
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.equationType3Exercise = {
-    id: 'equa3',
-    connector: '\\iff',
-    label: 'Équations $ax+b=c$',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    sections: ['Équations'],
+    id: "equa3",
+    connector: "\\iff",
+    label: "Équations $ax+b=c$",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType3ExerciseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC;;GAEG;AAEH,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAyCnB,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYlE,CAAC"}
+{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC;;GAEG;AAEH,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;AAqEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

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

@@ -3,35 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationType4Exercise = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
 const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
 const discreteSet_1 = require("../../../math/sets/discreteSet");
 const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
-const equalNode_1 = require("../../../tree/nodes/operators/equalNode");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getEquationType4ExerciseQuestion = () => {
-    const interval = new intervals_1.Interval('[[-10; 10]]');
-    const intervalStar = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+    const interval = new intervals_1.Interval("[[-10; 10]]");
+    const intervalStar = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const a = intervalStar.getRandomElement();
     const b = interval.getRandomElement();
-    const intervalC = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0), new integer_1.Integer(a.value)]));
+    const intervalC = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0), new integer_1.Integer(a.value)]));
     const c = intervalC.getRandomElement();
     const d = interval.getRandomElement();
     const affines = [new affine_1.Affine(a.value, b.value), new affine_1.Affine(c.value, d.value)];
     const solution = new rational_1.Rational(d.value - b.value, a.value - c.value).simplify();
     const statementTree = new equalNode_1.EqualNode(affines[0].toTree(), affines[1].toTree());
-    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), solution.toTree());
+    const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
     const answer = answerTree.toTex();
     const question = {
         instruction: `Résoudre : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
-        answer: answerTree.toTex(),
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: a.value, b: b.value, c: c.value, d: d.value },
+        answer,
+        keys: equationKeys_1.equationKeys,
+        answerFormat: "tex",
+        identifiers: {
+            a: a.value,
+            b: b.value,
+            c: c.value,
+            d: d.value,
+        },
     };
     return question;
 };
@@ -40,19 +48,28 @@ const getPropositions = (n, { answer, a, b, c, d }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const wrongAnswer = new rational_1.Rational(d - b + (0, randint_1.randint)(-7, 8, [0, -d + b]), a - c + (0, randint_1.randint)(-7, 8, [-a + c, 0])).simplify();
-        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode('x'), wrongAnswer.toTree()).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), wrongAnswer.toTree()).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c, d }) => {
+    const solution = new rational_1.Rational(d - b, a - c).simplify().toTree();
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
+        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
+    });
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.equationType4Exercise = {
-    id: 'equa4',
-    connector: '\\iff',
-    label: 'Équations $ax+b=cx+d$',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro', '1rePro', '1reTech'],
-    sections: ['Équations'],
+    id: "equa4",
+    connector: "\\iff",
+    label: "Équations $ax+b=cx+d$",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
+    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType4ExerciseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

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

@@ -1 +1 @@
-{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC,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":"expEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

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

@@ -3,27 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expEquation = void 0;
 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 getExpEquation = () => {
     const a = (0, randint_1.randint)(-9, 20, [0]);
     const k = a > 0 ? (0, randint_1.randint)(1, 20) : (0, randint_1.randint)(-20, 0);
-    const equation = new equalNode_1.EqualNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode('x')))), new numberNode_1.NumberNode(k));
-    const answer = new logNode_1.LogNode((0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(k), new numberNode_1.NumberNode(a)))).toTex();
+    const equation = new equalNode_1.EqualNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new expNode_1.ExpNode(new variableNode_1.VariableNode("x"))), new numberNode_1.NumberNode(k));
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new logNode_1.LogNode(new rational_1.Rational(k, a).simplify().toTree())])).toTex();
     const question = {
         instruction: `Résoudre l'équation $${equation.toTex()}$.`,
         answer: answer,
-        keys: ['x', 'equal', 'epower', 'exp', 'ln'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: [
+            "x",
+            "equal",
+            "epower",
+            "exp",
+            "ln",
+            "S",
+            "lbrace",
+            "semicolon",
+            "rbrace",
+        ],
+        answerFormat: "tex",
+        identifiers: { a, k },
     };
     return question;
 };
@@ -33,19 +44,32 @@ 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 logNode_1.LogNode((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 logNode_1.LogNode(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 logNode_1.LogNode(new rational_1.Rational(k, a)
+            .simplify()
+            .toTree({ allowFractionToDecimal: true })),
+    ], { allowRawRightChildAsSolution: true }));
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.expEquation = {
-    id: 'expEquation',
-    connector: '=',
-    label: 'Résoudre des équations de type $a \\times \\exp(x) = k$',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
-    sections: ['Exponentielle'],
+    id: "expEquation",
+    connector: "=",
+    label: "Résoudre des équations de type $a \\times \\exp(x) = k$",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
+    sections: ["Exponentielle"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpEquation, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,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;AA+BnB,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}
+{"version":3,"file":"firstDegreeEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/firstDegreeEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6CF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAYzD,CAAC"}

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

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeEquation = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../math/utils/random/randint");
-const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const 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 getFirstDegreeEquation = () => {
     const a = (0, randint_1.randint)(-30, 30, [0]);
@@ -16,30 +17,42 @@ const getFirstDegreeEquation = () => {
         instruction: `Résoudre l'équation suivante : $\\frac{${a}}{x} = ${b}$`,
         startStatement: `x`,
         answer,
-        keys: ['x', 'S', 'equal', 'lbrace', 'rbrace', 'semicolon', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: equationKeys_1.equationKeys,
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
 const getPropositions = (n, { answer, a, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(b / a)).toTex()}`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x=${new rational_1.Rational(b, a).simplify().toTree().toTex()}`);
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `x=${(0, simplify_1.simplifyNode)(new numberNode_1.NumberNode((a + (0, randint_1.randint)(-7, 8, [-a])) / (b + (0, randint_1.randint)(-7, 8, [-b])))).toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `x=${new rational_1.Rational(a + (0, randint_1.randint)(-7, 8, [-a]), b + (0, randint_1.randint)(-7, 8, [-b]))
+            .simplify()
+            .toTree()
+            .toTex()}`);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const solution = new rational_1.Rational(a, b).simplify().toTree();
+    const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
+        opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
+    });
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.firstDegreeEquation = {
-    id: 'firstDegreeEquation',
-    connector: '=',
-    label: 'Résoudre une équation du premier degré du type $\\frac{a}{x} = b$',
-    levels: ['2nde', '1reESM', '1reSpé'],
-    sections: ['Équations'],
+    id: "firstDegreeEquation",
+    connector: "=",
+    label: "Résoudre une équation du premier degré du type $\\frac{a}{x} = b$",
+    levels: ["2nde", "1reESM", "1reSpé"],
+    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeEquation, nb),
     getPropositions,
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

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

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

@@ -1 +1 @@
-{"version":3,"file":"fractionEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/fractionEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"fractionEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/fractionEquation.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;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8EF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}