math-exercises 2.2.96 → 2.2.97

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

@@ -29,3 +29,4 @@ __exportStar(require("./digitDecimalRankNumber"), exports);
 __exportStar(require("./ordering"), exports);
 __exportStar(require("./decimals"), exports);
 // export * from "./writing";
+// export * from "./sign";

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

@@ -1 +1 @@
-{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA0GF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAetD,CAAC"}
+{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA+JF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAmBtD,CAAC"}

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

@@ -10,12 +10,47 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const operatorComposition_1 = require("../../../../tree/utilities/operatorComposition");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const getDoubleDistributivityQuestion = () => {
-    const affines = affine_1.AffineConstructor.differentRandoms(2, undefined, {
-        excludes: [0],
-    });
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const polynomialParser_1 = require("../../../../tree/parsers/polynomialParser");
+const getStatementNode = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affines = [
+        new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
     const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].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 affines = [
+        new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
     const answer = affines[0].multiply(affines[1]).toTree().toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    return "Multiplie chaque terme du premier facteur par chaque terme du second facteur, puis regroupe les termes similaires.";
+};
+const getCorrection = (identifiers) => {
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affines = [
+        new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
     const subTerms = [
         new multiplyNode_1.MultiplyNode(affines[0].a.toTree(), "x".toTree()),
         affines[0].b.toTree(),
@@ -28,30 +63,37 @@ const getDoubleDistributivityQuestion = () => {
         new multiplyNode_1.MultiplyNode(subTerms[1], subTerms[2], { forceTimesSign: true }),
         new multiplyNode_1.MultiplyNode(subTerms[1], subTerms[3], { forceTimesSign: true }),
     ];
-    const statementTex = statementTree.toTex();
+    return `
+${(0, alignTex_1.alignTex)([
+        [statementTex, "=", (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, subMultiplications).toTex()],
+        [
+            "",
+            "=",
+            (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, subMultiplications.map((e) => e.simplify())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}
+
+    `;
+};
+const getDoubleDistributivityQuestion = () => {
+    const affines = affine_1.AffineConstructor.differentRandoms(2, undefined, {
+        excludes: [0],
+    });
+    const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].toTree());
+    const identifiers = {
+        affine1Coeffs: affines[0].coefficients,
+        affine2Coeffs: affines[1].coefficients,
+    };
     const question = {
-        instruction: `Développer et réduire : $${statementTex}$`,
+        instruction: getInstruction(identifiers),
         startStatement: statementTree.toTex(),
-        answer,
+        answer: getAnswer(identifiers),
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: {
-            affine1Coeffs: affines[0].coefficients,
-            affine2Coeffs: affines[1].coefficients,
-        },
-        hint: "Multiplie chaque terme du premier facteur par chaque terme du second facteur, puis regroupe les termes similaires.",
-        correction: `
-${(0, alignTex_1.alignTex)([
-            [statementTex, "=", (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, subMultiplications).toTex()],
-            [
-                "",
-                "=",
-                (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, subMultiplications.map((e) => e.simplify())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}
-
-    `,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -79,14 +121,21 @@ const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { affine1Coeffs, affine2Coeffs }) => {
-    const affines = [
-        new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]),
-        new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]),
-    ];
-    const answerTree = affines[0].multiply(affines[1]).toTree();
-    const validLatexs = answerTree.toAllValidTexs();
-    return validLatexs.includes(ans);
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const parsed = (0, polynomialParser_1.polynomialParser)(ans);
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({
+            forbidFactorize: true,
+            towardsDistribute: true,
+        })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return (0, handleVEAError_1.handleVEAError)(err);
+    }
 };
 exports.doubleDistributivity = {
     id: "doubleDistri",
@@ -102,4 +151,8 @@ exports.doubleDistributivity = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA8FF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAmBtD,CAAC"}
+{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAqGF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAmBtD,CAAC"}

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

@@ -10,6 +10,8 @@ const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+const polynomialParser_1 = require("../../../../tree/parsers/polynomialParser");
 const buildStatement = (identifiers) => {
     const { a, b, coeff } = identifiers;
     const affine = new affine_1.Affine(a, b);
@@ -18,7 +20,11 @@ const buildStatement = (identifiers) => {
 };
 const getInstruction = (identifiers) => {
     const statementTex = buildStatement(identifiers).toTex();
-    return `Développer et réduire : $${statementTex}$`;
+    return `Développer et réduire : 
+  
+$$
+${statementTex}
+$$`;
 };
 const getAnswer = (identifiers) => {
     const { a, b, coeff } = identifiers;
@@ -75,11 +81,16 @@ const getPropositions = (n, { answer, a, b, coeff }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b, coeff }) => {
-    const affine = new affine_1.Affine(a, b);
-    const answerTree = affine.times(coeff).toTree();
-    const validLatexs = answerTree.toAllValidTexs();
-    return validLatexs.includes(ans);
+const isAnswerValid = (ans, { answer, a, b, coeff }) => {
+    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.simpleDistributivity = {
     id: "simpleDistri",

package/lib/tree/parsers/polynomialParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polynomialParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/polynomialParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AASvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,eAAO,MAAM,gBAAgB,QAAS,MAAM,SAAS,IAAI,8OAkCxD,CAAC"}
+{"version":3,"file":"polynomialParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/polynomialParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AASvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAIF,eAAO,MAAM,gBAAgB,QAAS,MAAM,SAAS,IAAI,8OAkCxD,CAAC"}

package/lib/tree/parsers/polynomialParser.js

@@ -10,6 +10,7 @@ const latexParser_1 = require("./latexParser");
 const monomParser_1 = require("./monomParser");
 const numberParser_1 = require("./numberParser");
 //!parses polynomes sous forme développée
+//! ne surtout pas transformer ça en un parse généraliste (qui pourrait parse une forme factorisée par exemple)
 //minDegree = 0, max = undefined
 const polynomialParser = (ans, opts) => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.2.96",
+  "version": "2.2.97",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [