math-exercises 2.2.95 → 2.2.96

package/lib/exercises/math/calculLitteral/distributivity/firstIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CA6DnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAKvD,CAAC;AAMF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}
+{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOR,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2EF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAwBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAgBvD,CAAC;AAMF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAmB/C,CAAC"}

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

@@ -11,34 +11,42 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const getFirstIdentityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random({
-        min: 1,
-        max: 11,
-    }, {
-        min: 1,
-        max: 11,
-    });
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const getStatementNode = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(a, b);
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const answer = affine.multiply(affine).toTree().toTex();
+    return statementTree;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Développer et réduire : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getHint = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
     const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
-    const statementTex = statementTree.toTex();
-    const question = {
-        instruction: `Développer et réduire : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
-        answerFormat: "tex",
-        identifiers: { a: affine.a, b: affine.b },
-        hint: `Utilise l'identité remarquable :
+    return `Utilise l'identité remarquable :
     
 $$
 (a+b)^2 = a^2 + 2ab+b^2
 $$ 
 
-en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$`,
-        correction: `
-On utilise l'identité remarquable :
+en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$.`;
+};
+const getCorrection = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    return `On utilise l'identité remarquable :
 
 $$
 (a+b)^2 = a^2 + 2ab+b^2
@@ -46,15 +54,41 @@ $$
 
 en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$.
 
+Cela donne donc : 
+
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "=",
-                new addNode_1.AddNode(new addNode_1.AddNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, affine.b.toTree()))), new powerNode_1.SquareNode(affine.b.toTree())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}
-`,
+        [
+            statementTex,
+            "=",
+            new addNode_1.AddNode(new addNode_1.AddNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, affine.b.toTree()))), new powerNode_1.SquareNode(affine.b.toTree())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}
+`;
+};
+const getAnswer = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
+    const answer = affine.multiply(affine).toTree().toTex();
+    return answer;
+};
+const getFirstIdentityQuestion = () => {
+    const affine = affine_1.AffineConstructor.random({
+        min: 1,
+        max: 11,
+    }, {
+        min: 1,
+        max: 11,
+    });
+    const identifiers = { a: affine.a, b: affine.b };
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -78,11 +112,20 @@ const getFirstIdentityPropositions = (n, { answer, a, b }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.getFirstIdentityPropositions = getFirstIdentityPropositions;
-const isFirstIdentityAnswerValid = (ans, { a, b }) => {
-    const affine = new affine_1.Affine(a, b);
-    const answer = affine.multiply(affine).toTree();
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isFirstIdentityAnswerValid = (ans, { answer, a, b }) => {
+    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.isFirstIdentityAnswerValid = isFirstIdentityAnswerValid;
 const tests = () => {
@@ -102,4 +145,9 @@ exports.firstIdentity = {
     isAnswerValid: exports.isFirstIdentityAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getAnswer,
+    getInstruction,
+    getCorrection,
+    getHint,
+    getStartStatement,
 };

package/lib/exercises/math/calculLitteral/distributivity/secondIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CA6DpE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAqCnE,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,WAAW,CAQxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}
+{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOR,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiFF,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CAuBpE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAqCnE,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,WAAW,CAgBxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAkBhD,CAAC"}

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

@@ -12,35 +12,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 getSecondIdentityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random({
-        min: 1,
-        max: 11,
-    }, {
-        min: -10,
-        max: 0,
-    });
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const getStatementNode = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(a, b);
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const answer = affine.multiply(affine).toTree().toTex();
+    return statementTree;
+};
+const getStartStatement = (identifiers) => {
+    const statementTree = getStatementNode(identifiers);
+    const statementTex = statementTree.toTex();
+    return statementTex;
+};
+const getInstruction = (identifiers) => {
+    const { a, b } = identifiers;
+    return `Développer et réduire : 
+
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getHint = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(a, b);
     const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
     const bPositive = -affine.b;
-    const statementTex = statementTree.toTex();
-    const question = {
-        instruction: `Développer et réduire : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
-        answerFormat: "tex",
-        identifiers: { a: affine.a, b: affine.b },
-        hint: `Utilise l'identité remarquable 
+    return `Utilise l'identité remarquable 
 
 $$
 (a-b)^2 = a^2 - 2ab+b^2
 $$ 
 
-en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$`,
-        correction: `
-On utilise l'identité remarquable 
+en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$`;
+};
+const getAnswer = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(a, b);
+    const answer = affine.multiply(affine).toTree().toTex();
+    return answer;
+};
+const getCorrection = (identifiers) => {
+    const { a, b } = identifiers;
+    const affine = new affine_1.Affine(a, b);
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    const bPositive = -affine.b;
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    return `On utilise l'identité remarquable 
 
 $$
 (a-b)^2 = a^2 - 2ab+b^2
@@ -49,14 +68,33 @@ $$
 en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$ : 
 
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "=",
-                new addNode_1.AddNode(new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, bPositive.toTree()))), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}
-`,
+        [
+            statementTex,
+            "=",
+            new addNode_1.AddNode(new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, bPositive.toTree()))), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}
+`;
+};
+const getSecondIdentityQuestion = () => {
+    const affine = affine_1.AffineConstructor.random({
+        min: 1,
+        max: 11,
+    }, {
+        min: -10,
+        max: 0,
+    });
+    const identifiers = { a: affine.a, b: affine.b };
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -82,19 +120,26 @@ const getSecondIdentityPropositions = (n, { answer, a, b }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.getSecondIdentityPropositions = getSecondIdentityPropositions;
-const isSecondIdentityAnswerValid = (ans, { a, b }) => {
-    const affine = new affine_1.Affine(a, b);
-    const answer = affine.multiply(affine).toTree();
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isSecondIdentityAnswerValid = (ans, { a, b, answer }) => {
+    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.isSecondIdentityAnswerValid = isSecondIdentityAnswerValid;
 exports.secondIdentity = {
     id: "idRmq2",
     connector: "=",
     label: "Identité remarquable $(a-b)^2$",
-    levels: ["3ème", "2nde"],
-    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getSecondIdentityQuestion, nb),
     getPropositions: exports.getSecondIdentityPropositions,
@@ -103,4 +148,9 @@ exports.secondIdentity = {
     freeTimer: 60,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getCorrection,
+    getHint,
+    getAnswer,
+    getStartStatement,
 };

package/lib/exercises/math/calculLitteral/distributivity/thirdIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAiDnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAUvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAc/C,CAAC"}
+{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOR,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAoEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAkBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAgBvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAiB/C,CAAC"}

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"}