math-exercises 2.2.95 → 2.2.97

package/lib/exercises/math/calculLitteral/distributivity/thirdIdentity.js

@@ -9,32 +9,54 @@ const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const getThirdIdentityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random(undefined, { excludes: [0] });
-    const affine2 = new affine_1.Affine(affine.a, -affine.b);
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const getStatementNode = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
     const statementTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
+    return statementTree;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Développer et réduire : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
     const answer = affine.multiply(affine2).toTree().toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
     const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
     const bPositive = Math.abs(affine.b);
-    const statementTex = statementTree.toTex();
-    const question = {
-        instruction: `Développer et réduire : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
-        answerFormat: "tex",
-        identifiers: {
-            affine1Coeffs: affine.coefficients,
-            affine2Coeffs: affine2.coefficients,
-        },
-        hint: `Utilise l'identité remarquable 
+    return `Utilise l'identité remarquable 
     
 $$
 (a-b)(a+b) = a^2 - b^2
 $$ 
 
-en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$`,
-        correction: `
+en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$`;
+};
+const getCorrection = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    const bPositive = Math.abs(affine.b);
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    return `
 On utilise l'identité remarquable 
 
 $$
@@ -44,13 +66,30 @@ $$
 en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$.
 
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "=",
-                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}`,
+        [
+            statementTex,
+            "=",
+            new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}`;
+};
+const getThirdIdentityQuestion = () => {
+    const affine = affine_1.AffineConstructor.random(undefined, { excludes: [0] });
+    const affine2 = new affine_1.Affine(affine.a, -affine.b);
+    const identifiers = {
+        affine1Coeffs: affine.coefficients,
+        affine2Coeffs: affine2.coefficients,
+    };
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -74,20 +113,26 @@ const getThirdIdentityPropositions = (n, { answer, affine1Coeffs, affine2Coeffs
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.getThirdIdentityPropositions = getThirdIdentityPropositions;
-const isThirdIdentityAnswerValid = (ans, { affine1Coeffs, affine2Coeffs }) => {
-    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
-    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
-    const answer = affine.multiply(affine2).toTree();
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isThirdIdentityAnswerValid = (ans, { answer, affine1Coeffs, affine2Coeffs }) => {
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        if (!(0, addNode_1.isAddNode)(parsed) && !(0, substractNode_1.isSubstractNode)(parsed))
+            return false;
+        return (parsed
+            .simplify({ forbidFactorize: true, towardsDistribute: true })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
 };
 exports.isThirdIdentityAnswerValid = isThirdIdentityAnswerValid;
 exports.thirdIdentity = {
     id: "idRmq3",
     connector: "=",
     label: "Identité remarquable $(a+b)(a-b)$",
-    levels: ["3ème", "2nde"],
-    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getThirdIdentityQuestion, nb),
     getPropositions: exports.getThirdIdentityPropositions,
@@ -96,4 +141,9 @@ exports.thirdIdentity = {
     freeTimer: 60,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getCorrection,
+    getHint,
+    getAnswer,
+    getStartStatement,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAmBlC;;;GAGG;AACH,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgKF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAmBlC;;;GAGG;AACH,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAiKF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}

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

@@ -103,6 +103,7 @@ const getPropositions = (n, { answer, affinesCoeffs, operation }) => {
 };
 const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
+        console.log(ans, answer);
         const parsed = (0, latexParser_1.parseAlgebraic)(ans);
         if (!parsed)
             return false;

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

@@ -1 +1 @@
-{"version":3,"file":"distributeAndSimplify.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/distributeAndSimplify.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"distributeAndSimplify.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/distributeAndSimplify.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}

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

@@ -7,9 +7,32 @@ const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const polynomialParser_1 = require("../../../../tree/parsers/polynomialParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 //[a]|[b*(cx+d)] +- e*(fx+g)]
 // c & f > 0
+const getStatementNode = (identifiers) => {
+    const { firstTermIsAffine, a, b, c, d, e, f, g } = identifiers;
+    const statement = new addNode_1.AddNode(firstTermIsAffine
+        ? new multiplyNode_1.MultiplyNode(b.toTree(), new affine_1.Affine(c, d).toTree())
+        : a.toTree(), new multiplyNode_1.MultiplyNode(e.toTree(), new affine_1.Affine(f, g).toTree()));
+    return statement;
+};
+const getInstruction = (identifiers) => {
+    return `Développer et réduire : 
+  
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { firstTermIsAffine, a, b, c, d, e, f, g } = identifiers;
+    const answer = firstTermIsAffine
+        ? new affine_1.Affine(b * c + e * f, b * d + e * g).toTree().toTex()
+        : new affine_1.Affine(e * f, a + e * g).toTree().toTex();
+    return answer;
+};
 const getDistributeAndSimplifyQuestion = () => {
     const firstTermIsAffine = (0, coinFlip_1.coinFlip)();
     const a = (0, randint_1.randint)(-5, 6, [0]);
@@ -22,18 +45,13 @@ const getDistributeAndSimplifyQuestion = () => {
         f = (0, randint_1.randint)(1, 6);
     } while (b * c + e * f === 0);
     const g = (0, randint_1.randint)(-5, 6, [0]);
-    const statement = new addNode_1.AddNode(firstTermIsAffine
-        ? new multiplyNode_1.MultiplyNode(b.toTree(), new affine_1.Affine(c, d).toTree())
-        : a.toTree(), new multiplyNode_1.MultiplyNode(e.toTree(), new affine_1.Affine(f, g).toTree())).simplify();
-    const answer = firstTermIsAffine
-        ? new affine_1.Affine(b * c + e * f, b * d + e * g).toTree().toTex()
-        : new affine_1.Affine(e * f, a + e * g).toTree().toTex();
+    const identifiers = { firstTermIsAffine, a, b, c, d, e, f, g };
     const question = {
-        answer,
-        instruction: `Développer et réduire : $${statement.toTex()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: { firstTermIsAffine, a, b, c, d, e, f, g },
+        identifiers,
     };
     return question;
 };
@@ -46,23 +64,27 @@ const getPropositions = (n, { answer }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, firstTermIsAffine, a, b, c, d, e, f, g }) => {
-    const answerNode = firstTermIsAffine
-        ? new affine_1.Affine(b * c + e * f, b * d + e * g).toTree()
-        : new affine_1.Affine(e * f, a + e * g).toTree();
-    const texs = answerNode.toAllValidTexs();
-    return texs.includes(ans);
+    try {
+        const parsed = (0, polynomialParser_1.polynomialParser)(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
 };
 exports.distributeAndSimplify = {
     id: "distributeAndSimplify",
     connector: "=",
     label: "Développer et réduire une expression",
-    levels: ["4ème", "3ème", "2nde"],
     isSingleStep: true,
-    sections: ["Calcul littéral"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDistributeAndSimplifyQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getAnswer,
+    getInstruction,
 };

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

@@ -1,8 +1,8 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
-    rand: number;
-    polynome1Coeffs: number[];
-    polynome2Coeffs: number[];
+    variable: string;
+    coeffs: number[][];
+    order: number[];
 };
 export declare const reduceExpression: Exercise<Identifiers>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,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;AAiHF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"reduceExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/reduceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IAOjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IAGnB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AA+MF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAgBlD,CAAC"}

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

@@ -3,100 +3,193 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduceExpression = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const polynomial_1 = require("../../../../math/polynomials/polynomial");
+const affine_1 = require("../../../../math/polynomials/affine");
+const trinom_1 = require("../../../../math/polynomials/trinom");
 const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const polynomialParser_1 = require("../../../../tree/parsers/polynomialParser");
+const operatorComposition_1 = require("../../../../tree/utilities/operatorComposition");
+const random_1 = require("../../../../utils/alea/random");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const rebuildIdentifiers = (oldids) => {
+    if (oldids.variable)
+        return oldids;
+    const { polynome1Coeffs, polynome2Coeffs } = oldids;
+    const nbTerms = polynome1Coeffs.filter((e) => e === 0 || !!e).length +
+        polynome2Coeffs.filter((e) => e === 0 || !!e).length;
+    return {
+        variable: "x",
+        coeffs: [
+            [polynome1Coeffs[0], polynome2Coeffs[0]].filter((e) => e === 0 || !!e),
+            [polynome1Coeffs[1], polynome2Coeffs[1]].filter((e) => e === 0 || !!e),
+            [polynome1Coeffs[2], polynome2Coeffs[2]].filter((e) => e === 0 || !!e),
+        ],
+        order: (0, shuffle_1.shuffle)(Array.from({ length: nbTerms }, (_, i) => i)),
+    };
+};
+const getStatementNode = (identifiers) => {
+    const { variable, coeffs, order } = identifiers;
+    const nodes = coeffs.flatMap((coeff, i) => coeff.map((c) => {
+        if (i === 0)
+            return c.toTree();
+        if (i === 1)
+            return (0, multiplyNode_1.multiply)(c, variable);
+        else
+            return (0, multiplyNode_1.multiply)(c, (0, powerNode_1.square)(variable));
+    }));
+    const shuffled = order.map((i) => nodes[i]);
+    // const polynome1 = new Polynomial(polynome1Coeffs, variable);
+    // const polynome2 = new Polynomial(polynome2Coeffs, variable);
+    return (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, shuffled);
+    // const statement = new AddNode(polynome1.toTree(), polynome2.toTree());
+    // return statement.deepShuffle({ nodeIdsToShuffle: [OperatorIds.add] });
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getAnswer = (identifiers) => {
+    const answer = getStatementNode(identifiers)
+        .simplify({
+        forbidFactorize: true,
+        towardsDistribute: true,
+    })
+        .toTex();
+    return answer;
+};
+const getInstruction = (identifiers) => {
+    return `Réduire l'expression suivante : 
+
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
 const getReduceExpression = () => {
     const rand = (0, randint_1.randint)(0, 7);
     let polynome1;
     let polynome2;
-    switch (rand) {
-        case 0: // ax + b + cx + d
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 1:
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 2:
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 3:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 4:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, 0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 5:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 6:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        default:
-            throw Error("something went wrong");
+    //coeffs[0] est degré 0, coeffs[1] est degré 1, coeffs[2] degré 2
+    const coeffs = [[], [], []];
+    const nbTerms = (0, randint_1.randint)(4, 6);
+    for (let i = 0; i < nbTerms; i++) {
+        if (i === nbTerms - 1) {
+            let availableDegree = coeffs.findIndex((coeff) => coeff.length === 0);
+            if (availableDegree === -1)
+                availableDegree = (0, randint_1.randint)(0, 3);
+            coeffs[availableDegree].push((0, randint_1.randint)(-9, 10, [0]));
+        }
+        else {
+            const degree = (0, randint_1.randint)(0, 3);
+            coeffs[degree].push((0, randint_1.randint)(-9, 10, [0]));
+        }
     }
-    const statement = new addNode_1.AddNode(polynome1.toTree(), polynome2.toTree());
-    statement.shuffle();
-    const statementTex = statement.toTex();
-    const answer = polynome1.add(polynome2).toTree().toTex();
+    const order = (0, shuffle_1.shuffle)(Array.from({ length: nbTerms }, (_, i) => i));
+    // switch (rand) {
+    //   case 0: // ax + b + cx + d
+    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
+    //     polynome2 = new Polynomial([randint(-5, 6, [0]), randint(-5, 6, [0])]);
+    //     break;
+    //   case 1: //ax+b + cx
+    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
+    //     polynome2 = new Polynomial([0, randint(-5, 6, [0])]);
+    //     break;
+    //   case 2: //ax+b+c
+    //     polynome1 = new Polynomial([randint(-9, 10, [0]), randint(-9, 10, [0])]);
+    //     polynome2 = new Polynomial([randint(-5, 6, [0])]);
+    //     break;
+    //   case 3: //ax^2+bx+c + ax^2+bx
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([0, randint(-5, 6), randint(-5, 6, [0])]);
+    //     break;
+    //   case 4: //ax^2+bx+c + ax^2
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([0, 0, randint(-5, 6, [0])]);
+    //     break;
+    //   case 5: //ax^2+bx+c + ax
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([0, randint(-5, 6, [0])]);
+    //     break;
+    //   case 6: //ax^2 +bx+c + c
+    //     polynome1 = new Polynomial([
+    //       randint(-9, 10),
+    //       randint(-9, 10),
+    //       randint(-9, 10, [0]),
+    //     ]);
+    //     polynome2 = new Polynomial([randint(-5, 6, [0])]);
+    //     break;
+    //   default:
+    //     throw Error("something went wrong");
+    // }
+    const variable = (0, random_1.random)(["x", "n", "a", "y", "t"]);
+    const identifiers = {
+        // rand,
+        // polynome1Coeffs: polynome1.coefficients,
+        // polynome2Coeffs: polynome2.coefficients,
+        coeffs,
+        variable,
+        order,
+    };
     const question = {
-        instruction: `Réduire l'expression suivante : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [variable],
         answerFormat: "tex",
-        identifiers: {
-            rand,
-            polynome1Coeffs: polynome1.coefficients,
-            polynome2Coeffs: polynome2.coefficients,
-        },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, rand, polynome1Coeffs }) => {
+const getPropositions = (n, { answer, coeffs, variable }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
+    (0, exercise_1.tryToAddWrongProp)(propositions, coeffs
+        .flatMap((e) => e)
+        .reduce((acc, curr) => acc + curr, 0)
+        .frenchify());
     while (propositions.length < n) {
-        const polynome2 = new polynomial_1.Polynomial(rand < 3
-            ? [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]
-            : [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, polynome1.add(polynome2).toTree().toTex());
+        if (coeffs[2].length) {
+            (0, exercise_1.tryToAddWrongProp)(propositions, new trinom_1.Trinom((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10), {
+                variable,
+            })
+                .toTree()
+                .toTex());
+        }
+        else {
+            (0, exercise_1.tryToAddWrongProp)(propositions, new affine_1.Affine((0, randint_1.randint)(-9, 10, [0]), (0, randint_1.randint)(-9, 10)).toTree().toTex());
+        }
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { polynome1Coeffs, polynome2Coeffs, rand }) => {
-    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
-    const polynome2 = new polynomial_1.Polynomial(polynome2Coeffs);
-    const answer = polynome1
-        .add(polynome2)
-        .toTree({ forbidPowerToProduct: true });
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { variable, answer }) => {
+    try {
+        const parsed = (0, polynomialParser_1.polynomialParser)(ans, { variable });
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({
+            forbidFactorize: true,
+            towardsDistribute: true,
+            forbidAdditions: true,
+        })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
 };
 exports.reduceExpression = {
     id: "reduceExpression",
@@ -111,4 +204,7 @@ exports.reduceExpression = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    rebuildIdentifiers,
+    getAnswer,
+    getInstruction,
 };

package/lib/exercises/math/dataReading/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./tableReading";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/dataReading/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataReading/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC"}

package/lib/exercises/math/dataReading/index.js

@@ -0,0 +1,17 @@
+"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("./tableReading"), exports);

package/lib/exercises/math/dataReading/tableReading.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    values: number[][];
+    caseAsked: number;
+};
+export declare const tableReading: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=tableReading.d.ts.map

package/lib/exercises/math/dataReading/tableReading.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableReading.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataReading/tableReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IAIjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4FF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAgB9C,CAAC"}