math-exercises 2.2.81 → 2.2.82

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

@@ -6,6 +6,9 @@ type Identifiers = {
     b: number;
     c: number;
 };
-export declare const firstDegreeInequationsType2: Exercise<Identifiers>;
+type Options = {
+    inequationSolutionFormat: string;
+};
+export declare const firstDegreeInequationsType2: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=firstDegreeInequationsType2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAc3C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAyEF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAW3C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwIF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBtE,CAAC"}

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

@@ -2,62 +2,107 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType2 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
+const inequationSolutionFormat_1 = require("../../../../exercises/options/inequationSolutionFormat");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const inequationKeys_1 = require("../../../../exercises/utils/keys/inequationKeys");
 const inequation_1 = require("../../../../math/inequations/inequation");
 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 inequationParser_1 = require("../../../../tree/parsers/inequationParser");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 /**ax+b<c */
-const getFirstDegreeInequationsQuestion = () => {
+const getKeys = (identifiers, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    if (isInterval)
+        return ["S", "equal", "lbracket", "semicolon", "rbracket", "infty"];
+    return ["x", "inf", "sup", "leq", "geq"];
+};
+const getInstruction = (identifiers) => {
+    const { ineqType, a, b, c } = identifiers;
+    const affine = new affine_1.Affine(a, b);
+    return `Résoudre l'inéquation : 
+  
+$$
+${affine.toTex()} ${ineqType} ${c}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const { ineqType, a, b, c } = identifiers;
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    const result = new rational_1.Rational(c - b, a).simplify().toTree();
+    const invIneqType = new inequation_1.InequationSymbol(ineqType).reversed();
+    const ineq = new inequationNode_1.InequationNode(["x".toTree(), result], a > 0 ? ineqType : invIneqType);
+    const answer = isInterval
+        ? new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval()).toTex()
+        : ineq.toTex();
+    return answer;
+};
+const getFirstDegreeInequationsQuestion = (opts) => {
     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 = inequation_1.InequationSymbolConstructor.random();
-    const invIneqType = ineqType.reversed();
-    const answer = `x${affine.a > 0 ? ineqType.symbol : invIneqType}${result}`;
+    const identifiers = {
+        a: affine.a,
+        b: affine.b,
+        c,
+        ineqType: ineqType.symbol,
+    };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'inéquation : $${affine.toTex()} ${ineqType.symbol} ${c}$ `,
-        keys: inequationKeys_1.inequationKeys,
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
-        identifiers: { a: affine.a, b: affine.b, c, ineqType: ineqType.symbol },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, a, ineqType, b, c }) => {
-    const result = new rational_1.Rational(c - b, a).simplify().toTree().toTex();
+const getPropositions = (n, { answer, a, ineqType, b, c }, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    const result = new rational_1.Rational(c - b, a).simplify().toTree();
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const ineq = new inequation_1.InequationSymbol(ineqType);
     const invIneqType = ineq.reversed();
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x${a < 0 ? ineqType : invIneqType}${result}`);
+    const fakeIneq = new inequationNode_1.InequationNode(["x".toTree(), result], a < 0 ? ineqType : invIneqType);
+    (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+        ? new inequationSolutionNode_1.InequationSolutionNode(fakeIneq.toInterval()).toTex()
+        : fakeIneq.toTex());
     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);
+        const wrongRes = (0, randint_1.randint)(-10, 11).toTree();
+        const wrongSymb = (0, coinFlip_1.coinFlip)() ? ineqType : invIneqType;
+        const wrongIneq = new inequationNode_1.InequationNode(["x".toTree(), wrongRes], wrongSymb);
+        (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+            ? new inequationSolutionNode_1.InequationSolutionNode(wrongIneq.toInterval()).toTex()
+            : wrongIneq.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b, c, ineqType }) => {
-    const ineqSymbol = new inequation_1.InequationSymbol(ineqType);
-    const invIneqType = ineqSymbol.reversed();
-    const trueIneqType = a < 0 ? invIneqType : 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);
+const isAnswerValid = (ans, { answer, a, b, c, ineqType }, opts) => {
+    try {
+        const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+        if (isInterval) {
+            const parsed = (0, intervalParser_1.intervalParser)(ans.replaceAll("S", "").replaceAll("=", ""));
+            if (!parsed)
+                return false;
+            return ("S=\\ " + parsed.simplify({ decimalToFractions: true }).toTex() ===
+                answer);
+        }
+        else {
+            const parsed = (0, inequationParser_1.inequationParser)(ans);
+            if (!parsed)
+                return false;
+            return parsed.simplify({ decimalToFractions: true }).toTex() === answer;
+        }
+    }
+    catch (err) {
+        return false;
+    }
 };
+const options = [inequationSolutionFormat_1.inequationSolutionFormat];
 exports.firstDegreeInequationsType2 = {
     id: "firstDegreeInequationsType2",
     connector: "\\iff",
@@ -67,8 +112,12 @@ exports.firstDegreeInequationsType2 = {
     levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
     sections: ["Inéquations"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFirstDegreeInequationsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     subject: "Mathématiques",
+    options,
+    getKeys,
+    getAnswer,
+    getInstruction,
 };

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

@@ -8,6 +8,9 @@ type Identifiers = {
     c: number;
     d: number;
 };
-export declare const firstDegreeInequationsType3: Exercise<Identifiers>;
+type Options = {
+    inequationSolutionFormat: string;
+};
+export declare const firstDegreeInequationsType3: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=firstDegreeInequationsType3.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAW3C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoFF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAc7D,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/firstDegreeInequationsType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAW3C,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBtE,CAAC"}

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

@@ -2,70 +2,116 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstDegreeInequationsType3 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
+const inequationSolutionFormat_1 = require("../../../../exercises/options/inequationSolutionFormat");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const inequationKeys_1 = require("../../../../exercises/utils/keys/inequationKeys");
 const inequation_1 = require("../../../../math/inequations/inequation");
 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 inequationParser_1 = require("../../../../tree/parsers/inequationParser");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 /**ax+b<cx+d */
-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 getInstruction = (identifiers) => {
+    const { ineqType, a, b, c, d } = identifiers;
+    const affine1 = new affine_1.Affine(a, b);
+    const affine2 = new affine_1.Affine(c, d);
+    return `Résoudre l'inéquation : 
+  
+$$
+${affine1.toTex()} ${ineqType} ${affine2.toTex()}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    const { ineqType, a, b, c, d, coeff } = identifiers;
+    const affine1 = new affine_1.Affine(a, b);
+    const affine2 = new affine_1.Affine(c, d);
     const result = new rational_1.Rational(affine2.b - affine1.b, affine1.a - affine2.a)
         .simplify()
-        .toTree()
-        .toTex();
+        .toTree();
+    const invIneqType = new inequation_1.InequationSymbol(ineqType).reversed();
+    const ineq = new inequationNode_1.InequationNode(["x".toTree(), result], coeff > 0 ? ineqType : invIneqType);
+    const answer = isInterval
+        ? new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval()).toTex()
+        : ineq.toTex();
+    return answer;
+};
+const getFirstDegreeInequationsQuestion = (opts) => {
+    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 coeff = affine1.a - affine2.a;
     const ineqType = inequation_1.InequationSymbolConstructor.random();
-    const invIneqType = ineqType.reversed();
-    const answer = `x${coeff > 0 ? ineqType.symbol : invIneqType}${result}`;
+    const identifiers = {
+        coeff,
+        ineqType: ineqType.symbol,
+        a: affine1.a,
+        b: affine1.b,
+        c: affine2.a,
+        d: affine2.b,
+    };
     const question = {
-        answer: answer,
-        instruction: `Résoudre l'inéquation : $${affine1.toTex()} ${ineqType.symbol} ${affine2.toTex()}$ `,
-        keys: inequationKeys_1.inequationKeys,
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers, opts),
         answerFormat: "tex",
-        identifiers: {
-            coeff,
-            ineqType: ineqType.symbol,
-            a: affine1.a,
-            b: affine1.b,
-            c: affine2.a,
-            d: affine2.b,
-        },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, coeff, ineqType, a, b, c, d }) => {
-    const result = new rational_1.Rational(d - b, a - c).simplify().toTree().toTex();
+const getKeys = (identifiers, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    if (isInterval)
+        return ["S", "equal", "lbracket", "semicolon", "rbracket", "infty"];
+    return ["x", "inf", "sup", "leq", "geq"];
+};
+const getPropositions = (n, { answer, coeff, ineqType, a, b, c, d }, opts) => {
+    const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+    const result = new rational_1.Rational(d - b, a - c).simplify().toTree();
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const ineq = new inequation_1.InequationSymbol(ineqType);
-    const invIneqType = ineq.reversed();
-    (0, exercise_1.tryToAddWrongProp)(propositions, `x${coeff < 0 ? ineqType : invIneqType}${result}`);
+    const ineqSymb = new inequation_1.InequationSymbol(ineqType);
+    const invIneqSymb = ineqSymb.reversed();
+    const ineq = new inequationNode_1.InequationNode(["x".toTree(), result], coeff < 0 ? ineqSymb.symbol : invIneqSymb);
+    const fakeAns = isInterval
+        ? new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval()).toTex()
+        : ineq.toTex();
+    (0, exercise_1.tryToAddWrongProp)(propositions, fakeAns);
     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);
+        const wrongRes = (0, randint_1.randint)(-10, 11).toTree();
+        const wrongSymb = (0, coinFlip_1.coinFlip)() ? ineqSymb.symbol : invIneqSymb;
+        const wrongIneq = new inequationNode_1.InequationNode(["x".toTree(), wrongRes], wrongSymb);
+        (0, exercise_1.tryToAddWrongProp)(propositions, isInterval
+            ? new inequationSolutionNode_1.InequationSolutionNode(wrongIneq.toInterval()).toTex()
+            : wrongIneq.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b, c, d, ineqType }) => {
-    const ineqSymbol = new inequation_1.InequationSymbol(ineqType);
-    const invIneqType = ineqSymbol.reversed();
-    const trueIneqType = a - c < 0 ? invIneqType : 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();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, a, b, c, d, ineqType }, opts) => {
+    try {
+        const isInterval = opts?.inequationSolutionFormat === "Intervalle (S = [a;b])";
+        if (isInterval) {
+            const parsed = (0, intervalParser_1.intervalParser)(ans.replaceAll("S", "").replaceAll("=", ""));
+            if (!parsed)
+                return false;
+            return ("S=\\ " + parsed.simplify({ decimalToFractions: true }).toTex() ===
+                answer);
+        }
+        else {
+            const parsed = (0, inequationParser_1.inequationParser)(ans);
+            if (!parsed)
+                return false;
+            return parsed.simplify({ decimalToFractions: true }).toTex() === answer;
+        }
+    }
+    catch (err) {
+        return false;
+    }
 };
+const options = [inequationSolutionFormat_1.inequationSolutionFormat];
 exports.firstDegreeInequationsType3 = {
     id: "firstDegreeInequationsType3",
     connector: "\\iff",
@@ -73,10 +119,14 @@ exports.firstDegreeInequationsType3 = {
     levels: ["3ème", "2ndPro", "2nde", "1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
     sections: ["Inéquations"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeInequationsQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFirstDegreeInequationsQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    options,
+    getAnswer,
+    getKeys,
+    getInstruction,
 };

package/lib/exercises/math/calculLitteral/inequations/squareFunctionInequation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"squareFunctionInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/squareFunctionInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAc3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAoEF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"squareFunctionInequation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/squareFunctionInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAe3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAqFF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAgB1D,CAAC"}

package/lib/exercises/math/calculLitteral/inequations/squareFunctionInequation.js

@@ -10,46 +10,64 @@ const sqrtNode_1 = require("../../../../tree/nodes/functions/sqrtNode");
 const inequationSolutionNode_1 = require("../../../../tree/nodes/inequations/inequationSolutionNode");
 const closure_1 = require("../../../../tree/nodes/sets/closure");
 const intervalNode_1 = require("../../../../tree/nodes/sets/intervalNode");
+const unionIntervalParser_1 = require("../../../../tree/parsers/unionIntervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
-const getAnswer = (k, ineqSymbol) => {
-    const sqrt = Math.sqrt(k);
-    const sqrtTree = Math.floor(sqrt) === sqrt ? sqrt.toTree() : new sqrtNode_1.SqrtNode(k.toTree());
-    const inequationSymbol = new inequation_1.InequationSymbol(ineqSymbol);
-    const isStrict = inequationSymbol.isStrict;
+const getAnswer = (identifiers) => {
+    const { k, inequationSymbol } = identifiers;
+    const sqrtTree = (0, sqrtNode_1.sqrt)(k).simplify();
+    const symbol = new inequation_1.InequationSymbol(inequationSymbol);
+    const isStrict = symbol.isStrict;
     const insideInterval = new intervalNode_1.IntervalNode(new oppositeNode_1.OppositeNode(sqrtTree), sqrtTree, isStrict ? closure_1.ClosureType.OO : closure_1.ClosureType.FF);
-    const set = inequationSymbol.isSup
+    const set = symbol.isSup
         ? insideInterval.toReversedClosure().toComplement()
         : insideInterval;
     const solution = new inequationSolutionNode_1.InequationSolutionNode(set);
-    return solution;
+    return solution.toTex();
+};
+const getInstruction = (identifiers) => {
+    const { k, inequationSymbol } = identifiers;
+    return `Résoudre l'inéquation suivante : 
+  
+$$
+x^2 ${inequationSymbol} ${k}
+$$`;
 };
 const getSquareFunctionInequationQuestion = () => {
     const k = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(1, 11) ** 2 : (0, randint_1.randint)(1, 100);
     const inequationSymbol = inequation_1.InequationSymbolConstructor.random();
-    const solution = getAnswer(k, inequationSymbol.symbol);
+    const identifiers = { k, inequationSymbol: inequationSymbol.symbol };
     const question = {
-        answer: solution.toTex(),
-        instruction: `Résoudre l'inéquation suivante : $x^2 ${inequationSymbol.symbol} ${k}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["S", "equal", "lbracket", "rbracket", "semicolon", "infty", "cup"],
         answerFormat: "tex",
-        identifiers: { k, inequationSymbol: inequationSymbol.symbol },
+        identifiers,
     };
     return question;
 };
 const getPropositions = (n, { answer, k, inequationSymbol }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer(k ** 2, inequationSymbol).toTex());
-    (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer(k, new inequation_1.InequationSymbol(inequationSymbol).reversed()).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer({ k: k ** 2, inequationSymbol }));
+    (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer({
+        k,
+        inequationSymbol: new inequation_1.InequationSymbol(inequationSymbol).reversed(),
+    }));
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer((0, randint_1.randint)(1, 100), inequationSymbol).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, getAnswer({ k: (0, randint_1.randint)(1, 100), inequationSymbol }));
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, k, inequationSymbol }) => {
-    const solution = getAnswer(k, inequationSymbol);
-    const texs = solution.toAllValidTexs();
-    return texs.includes(ans);
+    try {
+        const parsed = (0, unionIntervalParser_1.unionIntervalParser)(ans.replaceAll("S", "").replaceAll("=", ""));
+        if (!parsed)
+            return false;
+        return "S=\\ " + parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.squareFunctionInequation = {
     id: "squareFunctionInequation",
@@ -64,4 +82,6 @@ exports.squareFunctionInequation = {
     isAnswerValid,
     subject: "Mathématiques",
     pdfOptions: { shouldSpreadPropositions: true },
+    getAnswer,
+    getInstruction,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,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,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAUlC,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;AAoFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}

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

@@ -3,10 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateExpression = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const numberVEA_1 = require("../../../../exercises/vea/numberVEA");
 const polynomial_1 = require("../../../../math/polynomials/polynomial");
 const randint_1 = require("../../../../math/utils/random/randint");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const alignTex_1 = require("../../../../utils/latex/alignTex");
+const getInstruction = (identifiers) => {
+    const { rand, poly1, poly2, xValue } = identifiers;
+    const polynome1 = new polynomial_1.Polynomial(poly1);
+    const polynome2 = new polynomial_1.Polynomial(poly2);
+    return rand
+        ? `Calculer $${polynome1.toTree().toTex()}$ pour $x = ${xValue}$.`
+        : `Calculer $${polynome2.toTree().toTex()}$ pour $x = ${xValue}$.`;
+};
+const getHint = (identifiers) => {
+    return `Remplace $x$ par $${identifiers.xValue}$ dans l'expression.`;
+};
+const getCorrection = (identifiers) => {
+    const answer = getAnswer(identifiers);
+    const { rand, poly1, poly2, xValue } = identifiers;
+    const polynome1 = new polynomial_1.Polynomial(poly1);
+    const polynome2 = new polynomial_1.Polynomial(poly2);
+    return `On remplace $x$ par $${identifiers.xValue}$ dans l'expression : 
+  
+${(0, alignTex_1.alignTex)([
+        [
+            "",
+            rand
+                ? polynome1.toTree().toDetailedEvaluation({ x: xValue.toTree() }).toTex()
+                : polynome2.toTree().toDetailedEvaluation({ x: xValue.toTree() }).toTex(),
+        ],
+        ["=", answer],
+    ])}`;
+};
+const getAnswer = (identifiers) => {
+    const { rand, poly1, poly2, xValue } = identifiers;
+    const polynome1 = new polynomial_1.Polynomial(poly1);
+    const polynome2 = new polynomial_1.Polynomial(poly2);
+    return rand
+        ? polynome1.calculate(xValue) + ""
+        : polynome2.calculate(xValue) + "";
+};
 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])]);
@@ -16,23 +54,20 @@ const getEvaluateExpression = () => {
         (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) + "";
+    const identifiers = {
+        rand,
+        poly1: polynome1.coefficients,
+        poly2: polynome2.coefficients,
+        xValue,
+    };
     const question = {
-        instruction: statement,
-        answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: {
-            rand,
-            poly1: polynome1.coefficients,
-            poly2: polynome2.coefficients,
-            xValue,
-        },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -46,7 +81,7 @@ const getPropositions = (n, { answer }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    return (0, numberVEA_1.numberVEA)(ans, answer);
 };
 exports.evaluateExpression = {
     id: "evaluateExpression",
@@ -61,4 +96,9 @@ exports.evaluateExpression = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getHint,
+    getCorrection,
+    getAnswer,
+    getInstruction,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/derivation/derivative/convexityQuadrinomials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convexityQuadrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/convexityQuadrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAoIF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}
+{"version":3,"file":"convexityQuadrinomials.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/convexityQuadrinomials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAqHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}

package/lib/exercises/math/derivation/derivative/convexityQuadrinomials.js

@@ -11,6 +11,7 @@ const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const closure_1 = require("../../../../tree/nodes/sets/closure");
 const intervalNode_1 = require("../../../../tree/nodes/sets/intervalNode");
+const intervalParser_1 = require("../../../../tree/parsers/intervalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const getConvexityQuadrinomialsQuestion = () => {
     const quadrinomial = polynomial_1.PolynomialConstructor.randomWithOrder(3);
@@ -59,26 +60,16 @@ const getPropositions = (n, { answer, quadcoeffs }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, wrongInterval4);
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { askConvex, quadcoeffs }) => {
-    const quadrinomial = new polynomial_1.Polynomial(quadcoeffs);
-    const secondderivative = quadrinomial.derivate().derivate();
-    const seconddcoeffs = secondderivative.coefficients;
-    const inflexionPoint = new fractionNode_1.FractionNode(new multiplyNode_1.MultiplyNode(seconddcoeffs[0].toTree(), new numberNode_1.NumberNode(-1)), seconddcoeffs[1].toTree()).simplify();
-    let interval;
-    if (askConvex) {
-        interval =
-            quadcoeffs[3] > 0
-                ? new intervalNode_1.IntervalNode(inflexionPoint, infiniteNode_1.PlusInfinityNode, closure_1.ClosureType.OO)
-                : new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, inflexionPoint, closure_1.ClosureType.OO);
+const isAnswerValid = (ans, { answer, askConvex, quadcoeffs }) => {
+    try {
+        const parsed = (0, intervalParser_1.intervalParser)(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify().toTex() === answer;
     }
-    else {
-        interval =
-            quadcoeffs[3] <= 0
-                ? new intervalNode_1.IntervalNode(inflexionPoint, infiniteNode_1.PlusInfinityNode, closure_1.ClosureType.OO)
-                : new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, inflexionPoint, closure_1.ClosureType.OO);
+    catch (err) {
+        return false;
     }
-    const latexs = interval.toAllValidTexs({ allowFractionToDecimal: true });
-    return latexs.includes(ans);
 };
 exports.convexityQuadrinomials = {
     id: "convexityQuadrinomials",

package/lib/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAuHF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAwB9D,CAAC"}
+{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAkHF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAwB9D,CAAC"}