math-exercises 2.0.0 → 2.0.2

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

@@ -3,33 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType3 = 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 affine1 = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0]), (0, randint_1.randint)(-10, 10));
     const affine2 = new affine_1.Affine((0, randint_1.randint)(-10, 10, [0, affine1.a]), (0, randint_1.randint)(-10, 10));
-    const result = new rational_1.Rational(affine2.b - affine1.b, affine1.a - affine2.a).simplify().toTree().toTex();
+    const result = new rational_1.Rational(affine2.b - affine1.b, affine1.a - affine2.a)
+        .simplify()
+        .toTree()
+        .toTex();
     const coeff = affine1.a - affine2.a;
-    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${coeff > 0 ? ineqType : invIneqType}${result}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'inéquation : $${affine1.toTex()} ${ineqType} ${affine2.toTex()}$ `,
-        keys: ['x', 'sup', 'inf', 'geq', 'leq'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, coeff, ineqType, result },
+        keys: inequationKeys_1.inequationKeys,
+        answerFormat: "tex",
+        identifiers: {
+            coeff,
+            ineqType,
+            a: affine1.a,
+            b: affine1.b,
+            c: affine2.a,
+            d: affine2.b,
+        },
     };
     return question;
 };
-const getPropositions = (n, { answer, coeff, ineqType, result }) => {
+const getPropositions = (n, { answer, coeff, ineqType, a, b, c, d }) => {
+    const result = new rational_1.Rational(d - b, a - c).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${coeff < 0 ? ineqType : invIneqType}${result}`);
     while (propositions.length < n) {
         const wrongAnswer = `x ${(0, coinFlip_1.coinFlip)() ? ineqType : invIneqType} ${(0, randint_1.randint)(-10, 11)}`;
@@ -37,15 +64,29 @@ const getPropositions = (n, { answer, coeff, ineqType, result }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c, d, ineqType }) => {
+    const trueIneqType = a - c < 0
+        ? (0, inequationNode_1.getInversedInequationSymbol)(ineqType)
+        : ineqType;
+    const result = new rational_1.Rational(d - b, a - c).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();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.firstDegreeInequationsType3 = {
-    id: 'firstDegreeInequationsType3',
-    connector: '\\iff',
-    label: 'Résoudre une inéquation du type $ax+b<cx+d$',
-    levels: ['3ème', '2ndPro', '2nde', '1reESM', '1rePro', '1reTech'],
+    id: "firstDegreeInequationsType3",
+    connector: "\\iff",
+    label: "Résoudre une inéquation du type $ax+b<cx+d$",
+    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/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./firstDegreeInequationsType0";
+export * from "./firstDegreeInequationsType1";
+export * from "./firstDegreeInequationsType2";
+export * from "./firstDegreeInequationsType3";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAE9C,cAAc,+BAA+B,CAAC"}

package/lib/exercises/calculLitteral/inequations/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("./firstDegreeInequationsType0"), exports);
+__exportStar(require("./firstDegreeInequationsType1"), exports);
+__exportStar(require("./firstDegreeInequationsType2"), exports);
+__exportStar(require("./firstDegreeInequationsType3"), exports);

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.d.ts

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

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}
+{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAmDF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAYxD,CAAC"}

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.js

@@ -10,18 +10,29 @@ const shuffle_1 = require("../../../utils/shuffle");
 const getEvaluateExpression = () => {
     const rand = (0, coinFlip_1.coinFlip)();
     const polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-5, 6, [0])]);
-    const polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-4, 5, [0])]);
+    const polynome2 = new polynomial_1.Polynomial([
+        (0, randint_1.randint)(-9, 10),
+        (0, randint_1.randint)(-9, 10),
+        (0, randint_1.randint)(-4, 5, [0]),
+    ]);
     const xValue = (0, randint_1.randint)(-9, 10);
     const statement = rand
-        ? `Calculer $${polynome1.toTree().toTex()}$ pour $x = ${xValue}$`
-        : `Calculer $${polynome2.toTree().toTex()}$ pour $x = ${xValue}$`;
-    const answer = rand ? polynome1.calculate(xValue) + '' : polynome2.calculate(xValue) + '';
+        ? `Calculer $${polynome1.toTree().toTex()}$ pour $x = ${xValue}$.`
+        : `Calculer $${polynome2.toTree().toTex()}$ pour $x = ${xValue}$.`;
+    const answer = rand
+        ? polynome1.calculate(xValue) + ""
+        : polynome2.calculate(xValue) + "";
     const question = {
         instruction: statement,
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            rand,
+            poly1: polynome1.coefficients,
+            poly2: polynome2.coefficients,
+            xValue,
+        },
     };
     return question;
 };
@@ -30,19 +41,23 @@ const getPropositions = (n, { answer }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const wrongAnswer = Number(answer) + (0, randint_1.randint)(-10, 11, [0]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer + "");
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.evaluateExpression = {
-    id: 'evaluateExpression',
-    connector: '=',
-    label: 'Evaluer une expression',
-    levels: ['4ème', '3ème', '2nde', 'CAP', '2ndPro'],
-    sections: ['Calcul littéral'],
+    id: "evaluateExpression",
+    connector: "=",
+    label: "Evaluer une expression",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro"],
+    sections: ["Calcul littéral"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEvaluateExpression, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/simplifying/expSimplifiying.d.ts

@@ -1,9 +1,10 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     random: number;
+    a?: number;
+    uCoeffs: number[];
+    vCoeffs: number[];
 };
-type VEAProps = {};
-export declare const expSimplifiying: MathExercise<QCMProps, VEAProps>;
+export declare const expSimplifiying: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=expSimplifiying.d.ts.map

package/lib/exercises/calculLitteral/simplifying/expSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/expSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAalC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwFnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"expSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/expSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmIF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAYrD,CAAC"}

package/lib/exercises/calculLitteral/simplifying/expSimplifiying.js

@@ -9,73 +9,108 @@ const expNode_1 = require("../../../tree/nodes/functions/expNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
-const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
 const getExpSimplifiying = () => {
     const random = (0, randint_1.randint)(1, 4);
+    let a;
+    let u, v;
     let expression;
+    let answer;
     switch (random) {
         case 1:
-            expression = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([0, (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])))), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-            expression.shuffle();
+            //e^u*e^a / e^v
+            a = (0, randint_1.randint)(-9, 10, [0]);
+            u = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-9, 10, [0])]);
+            v = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            expression = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(u.toTree()), new expNode_1.ExpNode(new numberNode_1.NumberNode(a))), new expNode_1.ExpNode(v.toTree()));
+            answer = new expNode_1.ExpNode(u.add(a).add(v.opposite()).toTree()).toTex();
             break;
         case 2:
-            expression = new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
+            //e^u * e^v
+            u = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            v = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            expression = new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(u.toTree()), new expNode_1.ExpNode(v.toTree()));
             expression.shuffle();
+            answer = new expNode_1.ExpNode(u.add(v).toTree()).toTex();
             break;
         case 3:
-            expression = new fractionNode_1.FractionNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-            expression.shuffle();
+            //e^u / e^v
+            u = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            v = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            expression = new fractionNode_1.FractionNode(new expNode_1.ExpNode(u.toTree()), new expNode_1.ExpNode(v.toTree()));
+            answer = new expNode_1.ExpNode(u.add(v.opposite()).toTree()).toTex();
             break;
         default:
-            expression = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
+            throw Error("something wrong happened");
     }
-    const simplifiedExpression = (0, simplify_1.simplifyNode)(expression);
-    const answer = simplifiedExpression.toTex();
     const question = {
         instruction: `Simplifier l'expression $${expression.toTex()}$.`,
         answer,
-        keys: ['x', 'epower', 'exp'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, random },
+        keys: ["x", "epower", "exp"],
+        answerFormat: "tex",
+        identifiers: {
+            random,
+            a,
+            uCoeffs: u.coefficients,
+            vCoeffs: v.coefficients,
+        },
     };
     return question;
 };
-const getPropositions = (n, { answer, random }) => {
+const getPropositions = (n, { answer, random, a, uCoeffs, vCoeffs }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    const u = new polynomial_1.Polynomial(uCoeffs);
+    const v = new polynomial_1.Polynomial(vCoeffs);
+    switch (random) {
+        case 1:
+            (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(u.times(a).add(v.opposite()).toTree()).toTex());
+            break;
+        case 2:
+            (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(u.multiply(v).toTree()).toTex());
+            break;
+        case 3:
+            (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(new fractionNode_1.FractionNode(u.toTree(), v.toTree())).toTex());
+            (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(u.add(v).toTree()).toTex());
+            break;
+        default:
+            throw Error("received wrong quesiton type");
+    }
     while (propositions.length < n) {
-        let wrongExpression;
-        switch (random) {
-            case 1:
-                wrongExpression = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([0, (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new numberNode_1.NumberNode((0, randint_1.randint)(-9, 10, [0])))), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-                wrongExpression.shuffle();
-                break;
-            case 2:
-                wrongExpression = new multiplyNode_1.MultiplyNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-                wrongExpression.shuffle();
-                break;
-            case 3:
-                wrongExpression = new fractionNode_1.FractionNode(new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()), new expNode_1.ExpNode(new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]).toTree()));
-                wrongExpression.shuffle();
-                break;
-            default:
-                wrongExpression = new expNode_1.ExpNode(new variableNode_1.VariableNode('x'));
-        }
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(wrongExpression).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new expNode_1.ExpNode(polynomial_1.PolynomialConstructor.randomWithOrder(1).toTree()).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, random, uCoeffs, vCoeffs }) => {
+    const u = new polynomial_1.Polynomial(uCoeffs);
+    const v = new polynomial_1.Polynomial(vCoeffs);
+    let answer;
+    switch (random) {
+        case 1:
+            answer = new expNode_1.ExpNode(u.add(a).add(v.opposite()).toTree());
+            break;
+        case 2:
+            answer = new expNode_1.ExpNode(u.add(v).toTree());
+            break;
+        case 3:
+            answer = new expNode_1.ExpNode(u.add(v.opposite()).toTree());
+            break;
+        default:
+            throw Error("wrong random in exp simplifying");
+    }
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.expSimplifiying = {
-    id: 'expSimplifiying',
-    connector: '\\iff',
+    id: "expSimplifiying",
+    connector: "\\iff",
     label: "Simplifier des expressions avec l'exponentielle",
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
-    sections: ['Exponentielle'],
+    levels: ["1reSpé", "TermSpé", "MathComp"],
+    sections: ["Exponentielle"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,5 @@
+export * from "./evaluateExpression";
+export * from "./expSimplifiying";
+export * from "./logSimplifiying";
+export * from "./reduceExpression";
+//# sourceMappingURL=index.d.ts.map

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

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

package/lib/exercises/calculLitteral/simplifying/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("./evaluateExpression"), exports);
+__exportStar(require("./expSimplifiying"), exports);
+__exportStar(require("./logSimplifiying"), exports);
+__exportStar(require("./reduceExpression"), exports);

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.d.ts

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

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+CnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAYrD,CAAC"}

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.js

@@ -3,37 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logSimplifiying = 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 logNode_1 = require("../../../tree/nodes/functions/logNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../../tree/nodes/operators/addNode");
 const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
 const getExpSimplifiying = () => {
-    const a = (0, randint_1.randint)(1, 10);
-    const b = (0, randint_1.randint)(1, 10);
     let expression;
     let simplifiedExpression;
-    let pm = 0;
-    if ((0, coinFlip_1.coinFlip)()) {
-        expression = new addNode_1.AddNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a)), new logNode_1.LogNode(new numberNode_1.NumberNode(b)));
+    let pm = (0, coinFlip_1.coinFlip)() ? 1 : -1;
+    const a = (0, randint_1.randint)(1, 10);
+    let b;
+    do {
+        b = (0, randint_1.randint)(1, 10);
+    } while (pm === -1 && a === b);
+    const opts = { allowLnOfOne: true };
+    if (pm === 1) {
+        expression = new addNode_1.AddNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts), new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts));
         simplifiedExpression = new logNode_1.LogNode(new numberNode_1.NumberNode(a * b));
-        pm = 1;
     }
     else {
-        expression = new substractNode_1.SubstractNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a)), new logNode_1.LogNode(new numberNode_1.NumberNode(b)));
-        simplifiedExpression = new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b)));
-        pm = -1;
+        expression = new substractNode_1.SubstractNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts), new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts));
+        simplifiedExpression = new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree());
     }
     const answer = simplifiedExpression.toTex();
     const question = {
         instruction: `Simplifier l'expression $${expression.toTex()}$.`,
         answer,
-        keys: ['ln'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, pm },
+        keys: ["ln"],
+        answerFormat: "tex",
+        identifiers: { pm, a, b },
     };
     return question;
 };
@@ -43,19 +45,33 @@ const getPropositions = (n, { answer, pm }) => {
     while (propositions.length < n) {
         const a = (0, randint_1.randint)(1, 10);
         const b = (0, randint_1.randint)(1, 10);
-        (0, exercise_1.tryToAddWrongProp)(propositions, pm > 0 ? new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex() : new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b))).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, pm > 0
+            ? new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex()
+            : new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree()).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, pm }) => {
+    let answer;
+    if (pm === 1) {
+        answer = new logNode_1.LogNode(new numberNode_1.NumberNode(a * b));
+    }
+    else {
+        answer = new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree({ allowFractionToDecimal: true }));
+    }
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.logSimplifiying = {
-    id: 'logSimplifiying',
-    connector: '\\iff',
-    label: 'Simplifier des expressions avec $\\ln$',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
-    sections: ['Logarithme népérien'],
+    id: "logSimplifiying",
+    connector: "\\iff",
+    label: "Simplifier des expressions avec $\\ln$",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
+    sections: ["Logarithme népérien"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/simplifying/reduceExpression.d.ts

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

package/lib/exercises/calculLitteral/simplifying/reduceExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmHnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AAkHF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}