math-exercises 2.2.94 → 2.2.96

package/lib/exercises/math/calcul/fractions/fractionSquare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6FF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAiBhD,CAAC"}
+{"version":3,"file":"fractionSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6FF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAiBhD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionSquare.js

@@ -7,6 +7,7 @@ const rational_1 = require("../../../../math/numbers/rationals/rational");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const getPropositions = (n, { answer, denum, num }) => {
     const propositions = [];
@@ -67,7 +68,7 @@ const isAnswerValid = (ans, { answer }) => {
         return parsed.simplify().toTex() === answer;
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 const getFractionSquareQuestion = (ops) => {

package/lib/exercises/math/calcul/fractions/fractionsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAyGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBvD,CAAC"}
+{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAyGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBvD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSum.js

@@ -7,6 +7,7 @@ const rational_1 = require("../../../../math/numbers/rationals/rational");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getInstruction = (identifiers, opts) => {
     const { rational, rational2 } = identifiers;
     const rationalObj = new rational_1.Rational(rational[0], rational[1]);
@@ -67,7 +68,7 @@ const isAnswerValid = (ans, { rational, rational2 }, opts) => {
             return texs.includes(parsed.simplify().toTex());
         }
         catch (err) {
-            return false;
+            return (0, handleVEAError_1.handleVEAError)(err);
         }
     else
         return texs.includes(ans);

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA2FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAkBpE,CAAC"}
+{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA2FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAkBpE,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.js

@@ -8,6 +8,7 @@ const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
 const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getFractionsSumsMultiplesDenominatorsQuestion = (opts) => {
     let denom1 = (0, randint_1.randint)(2, 10);
     let denom2 = denom1 * (0, randint_1.randint)(2, 10);
@@ -58,7 +59,7 @@ const isAnswerValid = (ans, { answer, denom1, denom2, num1, num2 }, opts) => {
             return texs.includes(parsed.simplify().toTex());
         }
         catch (err) {
-            return false;
+            return (0, handleVEAError_1.handleVEAError)(err);
         }
     }
     else

package/lib/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsPrimeDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAkBhE,CAAC"}
+{"version":3,"file":"fractionsSumsPrimeDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAkBhE,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.js

@@ -8,6 +8,7 @@ const gcd_1 = require("../../../../math/utils/arithmetic/gcd");
 const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getFractionsSumsPrimeDenominatorsQuestion = (opts) => {
     const denom1 = (0, randint_1.randint)(2, 13);
     let denom2 = 0;
@@ -59,7 +60,7 @@ const isAnswerValid = (ans, { answer, denom1, denom2, num1, num2 }, opts) => {
             return texs.includes(parsed.simplify().toTex());
         }
         catch (err) {
-            return false;
+            return (0, handleVEAError_1.handleVEAError)(err);
         }
     }
     else

package/lib/exercises/math/calcul/fractions/fractionsSumsSameDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsSameDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsSameDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}
+{"version":3,"file":"fractionsSumsSameDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsSameDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsSameDenominators.js

@@ -11,6 +11,7 @@ const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
 const operatorComposition_1 = require("../../../../tree/utilities/operatorComposition");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const getFractionsSumsSameDenominatorsQuestion = (opts) => {
     const denom = (0, randint_1.randint)(2, 15);
@@ -85,7 +86,7 @@ const isAnswerValid = (ans, { answer, denom, num1, num2 }, opts) => {
             return texs.includes(parsed.simplify().toTex());
         }
         catch (err) {
-            return false;
+            return (0, handleVEAError_1.handleVEAError)(err);
         }
     }
     else {

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAyHF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}
+{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAyHF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.js

@@ -11,6 +11,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
 const random_1 = require("../../../../utils/alea/random");
 const doWhile_1 = require("../../../../utils/doWhile");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const dollarize_1 = require("../../../../utils/latex/dollarize");
 const mdTable_1 = require("../../../../utils/markdown/mdTable");
 const getPropositions = (n, { answer, coeffType }) => {
@@ -58,7 +59,7 @@ const isAnswerValid = (ans, { answer }) => {
         return parsed.simplify().toTex() === answer;
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 const getFindCoeffInProportionalTableNonIntegersQuestion = (opts) => {

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

@@ -1 +1 @@
-{"version":3,"file":"doubleDistributivityWithCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA4IF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}
+{"version":3,"file":"doubleDistributivityWithCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAyIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}

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

@@ -89,9 +89,6 @@ const isAnswerValid = (ans, { answer, affine1, affine2, coeff }) => {
     const answerTree = affine1Obj.times(coeff).multiply(affine2Obj).toTree();
     return answerTree.toAllValidTexs().includes(ans);
 };
-const isGGBAnswerValid = (ans, { ggbAnswer }) => {
-    throw Error("GGBVea not implemented");
-};
 exports.doubleDistributivityWithCoeff = {
     id: "doubleDistributivityWithCoeff",
     connector: "=",
@@ -104,7 +101,6 @@ exports.doubleDistributivityWithCoeff = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
-    isGGBAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
     getHint,

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/identitiesWithNonIntegers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identitiesWithNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/identitiesWithNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAEL,eAAe,EAEhB,MAAM,kCAAkC,CAAC;AAS1C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AA2HF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAgB3D,CAAC"}
+{"version":3,"file":"identitiesWithNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/identitiesWithNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAEL,eAAe,EAEhB,MAAM,kCAAkC,CAAC;AAU1C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AA2HF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAgB3D,CAAC"}

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

@@ -14,6 +14,7 @@ const substractNode_1 = require("../../../../tree/nodes/operators/substractNode"
 const trinomNode_1 = require("../../../../tree/nodes/polynomials/trinomNode");
 const polynomialParser_1 = require("../../../../tree/parsers/polynomialParser");
 const random_1 = require("../../../../utils/alea/random");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
 const getPropositions = (n, { answer, a, b, type }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
@@ -79,7 +80,7 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
             .toTex() === answer);
     }
     catch (err) {
-        return false;
+        return (0, handleVEAError_1.handleVEAError)(err);
     }
 };
 //type1 (ax+b)^2

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