math-exercises 2.0.0 → 2.0.2

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

@@ -14,20 +14,32 @@ const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFactoType1Question = () => {
     const affines = affine_1.AffineConstructor.differentRandoms(3);
-    const permut = [(0, shuffle_1.shuffle)([affines[0], affines[1]]), (0, shuffle_1.shuffle)([affines[0], affines[2]])];
-    const operation = (0, random_1.random)(['add', 'substract']);
-    const statementTree = operation === 'add'
+    const permut = [
+        (0, shuffle_1.shuffle)([affines[0], affines[1]]),
+        (0, shuffle_1.shuffle)([affines[0], affines[2]]),
+    ];
+    const operation = (0, random_1.random)(["add", "substract"]);
+    const statementTree = operation === "add"
         ? new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(permut[0][0].toTree(), permut[0][1].toTree()), new multiplyNode_1.MultiplyNode(permut[1][0].toTree(), permut[1][1].toTree()))
         : new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(permut[0][0].toTree(), permut[0][1].toTree()), new multiplyNode_1.MultiplyNode(permut[1][0].toTree(), permut[1][1].toTree()));
-    const answerTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree());
+    const affine1 = affines[0];
+    const affine2 = affines[1].add(operation === "add" ? affines[2] : affines[2].opposite());
+    const answerTree = affine2.coefficients[0] === 0
+        ? affine1.coefficients[0] === 0
+            ? affine1.multiply(affine2).toTree()
+            : new multiplyNode_1.MultiplyNode(affine2.toTree(), affine1.toTree())
+        : new multiplyNode_1.MultiplyNode(affine1.toTree(), affine2.toTree());
     const answer = answerTree.toTex();
     const question = {
         instruction: `Factoriser : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, affinesCoeffs: affines.map((affine) => affine.coefficients), operation },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            affinesCoeffs: affines.map((affine) => affine.coefficients),
+            operation,
+        },
     };
     return question;
 };
@@ -35,24 +47,45 @@ const getPropositions = (n, { answer, affinesCoeffs, operation }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const affines = affinesCoeffs.map((coeffs) => new affine_1.Affine(coeffs[1], coeffs[0]));
-    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(operation !== 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[1].toTree(), affines[0].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[2].toTree(), affines[0].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1]
+        .add(operation !== "add" ? affines[2] : affines[2].opposite())
+        .toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[1].toTree(), affines[0]
+        .add(operation === "add" ? affines[2] : affines[2].opposite())
+        .toTree()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affines[2].toTree(), affines[0]
+        .add(operation === "add" ? affines[2] : affines[2].opposite())
+        .toTree()).toTex());
     while (propositions.length < n) {
         const wrongAnswer = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(affine_1.AffineConstructor.differentRandoms(1)[0]).toTree());
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { affinesCoeffs, operation }) => {
+    const affines = affinesCoeffs.map((coeffs) => new affine_1.Affine(coeffs[1], coeffs[0]));
+    const affine1 = affines[0];
+    const affine2 = affines[1].add(operation === "add" ? affines[2] : affines[2].opposite());
+    const answerTree = affine2.coefficients[0] === 0
+        ? affine1.coefficients[0] === 0
+            ? affine1.multiply(affine2).toTree()
+            : new multiplyNode_1.MultiplyNode(affine2.toTree(), affine1.toTree())
+        : new multiplyNode_1.MultiplyNode(affine1.toTree(), affine2.toTree());
+    const answer = answerTree.toTex();
+    const validLatexs = answerTree.toAllValidTexs();
+    console.log(ans, validLatexs);
+    return validLatexs.includes(ans);
+};
 exports.factoType1Exercise = {
-    id: 'facto1',
-    connector: '=',
+    id: "facto1",
+    connector: "=",
     isSingleStep: false,
-    label: 'Factorisation du type $(ax+b)(cx+d) \\pm (ax+b)(ex+f)$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    label: "Factorisation du type $(ax+b)(cx+d) \\pm (ax+b)(ex+f)$",
+    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/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./factoIdRmq1";
+export * from "./factoIdRmq2";
+export * from "./factoIdRmq3";
+export * from "./factoType1Exercise";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC"}

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

@@ -0,0 +1,20 @@
+"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("./factoIdRmq1"), exports);
+__exportStar(require("./factoIdRmq2"), exports);
+__exportStar(require("./factoIdRmq3"), exports);
+__exportStar(require("./factoType1Exercise"), exports);

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

@@ -0,0 +1,6 @@
+export * from "./distributivity";
+export * from "./equation";
+export * from "./factorisation";
+export * from "./inequations";
+export * from "./simplifying";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/calculLitteral/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

package/lib/exercises/calculLitteral/index.js

@@ -0,0 +1,21 @@
+"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("./distributivity"), exports);
+__exportStar(require("./equation"), exports);
+__exportStar(require("./factorisation"), exports);
+__exportStar(require("./inequations"), exports);
+__exportStar(require("./simplifying"), exports);

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxE,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAqBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA+DF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,WAAW,CAajE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.js

@@ -3,8 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType0 = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const inequationKeys_1 = require("../../../exercises/utils/keys/inequationKeys");
 const affine_1 = require("../../../math/polynomials/affine");
 const randint_1 = require("../../../math/utils/random/randint");
+const inequationNode_1 = require("../../../tree/nodes/inequations/inequationNode");
+const inequationSolutionNode_1 = require("../../../tree/nodes/inequations/inequationSolutionNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
@@ -12,37 +17,52 @@ const getFirstDegreeInequationsQuestion = () => {
     const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 11));
     const c = (0, randint_1.randint)(-10, 11);
     const result = c - affine.b;
-    const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
+    const ineqType = (0, random_1.random)(["\\le", "<", "\\ge", ">"]);
     const answer = `x${ineqType}${result}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType} ${c}$ `,
-        keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, ineqType, result },
+        keys: inequationKeys_1.inequationKeys,
+        answerFormat: "tex",
+        identifiers: { ineqType, b: affine.b, c },
     };
     return question;
 };
-const getPropositions = (n, { answer, a, ineqType, result }) => {
+const getPropositions = (n, { answer, ineqType, b, c }) => {
+    const result = c - b;
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
+    const invIneqType = ineqType === "<"
+        ? ">"
+        : ineqType === ">"
+            ? "<"
+            : ineqType === "\\le"
+                ? "\\ge"
+                : "\\le";
+    (0, exercise_1.tryToAddWrongProp)(propositions, `x${invIneqType}${result}`);
     while (propositions.length < n) {
         const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { ineqType, b, c }) => {
+    const result = c - b;
+    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(result)], ineqType);
+    const answer = new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval());
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.firstDegreeInequationsType0 = {
-    id: 'firstDegreeInequationsType0',
-    connector: '\\iff',
-    label: 'Résoudre une inéquation du type $x+b<c$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    id: "firstDegreeInequationsType0",
+    connector: "\\iff",
+    label: "Résoudre une inéquation du type $x+b<c$",
+    levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
-    sections: ['Inéquations'],
+    sections: ["Inéquations"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType1.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType1.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,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYxE,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAgFF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType1.js

@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType1 = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const inequationKeys_1 = require("../../../exercises/utils/keys/inequationKeys");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
 const randint_1 = require("../../../math/utils/random/randint");
+const inequationNode_1 = require("../../../tree/nodes/inequations/inequationNode");
+const inequationSolutionNode_1 = require("../../../tree/nodes/inequations/inequationSolutionNode");
+const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
@@ -13,22 +17,35 @@ const getFirstDegreeInequationsQuestion = () => {
     const affine = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, 1]), 0);
     const b = (0, randint_1.randint)(-10, 11);
     const result = new rational_1.Rational(b, affine.a).simplify().toTree().toTex();
-    const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
-    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    const ineqType = (0, random_1.random)(["\\le", "<", "\\ge", ">"]);
+    const invIneqType = ineqType === "<"
+        ? ">"
+        : ineqType === ">"
+            ? "<"
+            : ineqType === "\\le"
+                ? "\\ge"
+                : "\\le";
     const answer = `x${affine.a > 0 ? ineqType : invIneqType}${result}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType} ${b}$ `,
-        keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, ineqType, result },
+        keys: inequationKeys_1.inequationKeys,
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b, ineqType },
     };
     return question;
 };
-const getPropositions = (n, { answer, a, ineqType, result }) => {
+const getPropositions = (n, { answer, a, ineqType, b }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    const invIneqType = ineqType === "<"
+        ? ">"
+        : ineqType === ">"
+            ? "<"
+            : ineqType === "\\le"
+                ? "\\ge"
+                : "\\le";
+    const result = new rational_1.Rational(b, a).simplify().toTree().toTex();
     (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
     while (propositions.length < n) {
         const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
@@ -36,15 +53,28 @@ const getPropositions = (n, { answer, a, ineqType, result }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, ineqType }) => {
+    const trueIneqType = a < 0
+        ? (0, inequationNode_1.getInversedInequationSymbol)(ineqType)
+        : ineqType;
+    const result = new rational_1.Rational(b, a).simplify().toTree();
+    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), result], trueIneqType);
+    const answer = new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval(), {
+        opts: { allowFractionToDecimal: true },
+    });
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.firstDegreeInequationsType1 = {
-    id: 'firstDegreeInequationsType1',
-    connector: '\\iff',
+    id: "firstDegreeInequationsType1",
+    connector: "\\iff",
     getPropositions,
-    label: 'Résoudre une inéquation du type $ax<b$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    label: "Résoudre une inéquation du type $ax<b$",
+    levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
-    sections: ['Inéquations'],
+    sections: ["Inéquations"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType2.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYxE,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType2.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAoBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmFF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,WAAW,CAajE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType2.js

@@ -3,32 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType2 = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const inequationKeys_1 = require("../../../exercises/utils/keys/inequationKeys");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
 const randint_1 = require("../../../math/utils/random/randint");
+const inequationNode_1 = require("../../../tree/nodes/inequations/inequationNode");
+const inequationSolutionNode_1 = require("../../../tree/nodes/inequations/inequationSolutionNode");
+const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFirstDegreeInequationsQuestion = () => {
     const affine = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, 1]), (0, randint_1.randint)(-10, 10, [0]));
     const c = (0, randint_1.randint)(-10, 11);
-    const result = new rational_1.Rational(c - affine.b, affine.a).simplify().toTree().toTex();
-    const ineqType = (0, random_1.random)(['\\le', '<', '\\ge', '>']);
-    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    const result = new rational_1.Rational(c - affine.b, affine.a)
+        .simplify()
+        .toTree()
+        .toTex();
+    const ineqType = (0, random_1.random)(["\\le", "<", "\\ge", ">"]);
+    const invIneqType = ineqType === "<"
+        ? ">"
+        : ineqType === ">"
+            ? "<"
+            : ineqType === "\\le"
+                ? "\\ge"
+                : "\\le";
     const answer = `x${affine.a > 0 ? ineqType : invIneqType}${result}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType} ${c}$ `,
-        keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, result, ineqType },
+        keys: inequationKeys_1.inequationKeys,
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b: affine.b, c, ineqType },
     };
     return question;
 };
-const getPropositions = (n, { answer, a, ineqType, result }) => {
+const getPropositions = (n, { answer, a, ineqType, b, c }) => {
+    const result = new rational_1.Rational(c - b, a).simplify().toTree().toTex();
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const invIneqType = ineqType === '<' ? '>' : ineqType === '>' ? '<' : ineqType === '\\le' ? '\\ge' : '\\le';
+    const invIneqType = ineqType === "<"
+        ? ">"
+        : ineqType === ">"
+            ? "<"
+            : ineqType === "\\le"
+                ? "\\ge"
+                : "\\le";
     (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
     while (propositions.length < n) {
         const wrongAnswer = `x${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType}${(0, randint_1.randint)(-10, 11)}`;
@@ -36,14 +56,27 @@ const getPropositions = (n, { answer, a, ineqType, result }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c, ineqType }) => {
+    const trueIneqType = a < 0
+        ? (0, inequationNode_1.getInversedInequationSymbol)(ineqType)
+        : ineqType;
+    const result = new rational_1.Rational(c - b, a).simplify().toTree();
+    const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), result], trueIneqType);
+    const answer = new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval(), {
+        opts: { allowFractionToDecimal: true },
+    });
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.firstDegreeInequationsType2 = {
-    id: 'firstDegreeInequationsType2',
-    connector: '\\iff',
+    id: "firstDegreeInequationsType2",
+    connector: "\\iff",
     getPropositions,
-    label: 'Résoudre une inéquation du type $ax+b<c$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    isAnswerValid,
+    label: "Résoudre une inéquation du type $ax+b<c$",
+    levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
-    sections: ['Inéquations'],
+    sections: ["Inéquations"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType3.d.ts

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

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWxE,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgGF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,WAAW,CAajE,CAAC"}