math-exercises 2.2.71 → 2.2.72

package/lib/tree/nodes/operators/multiplyNode.js

@@ -281,6 +281,8 @@ class MultiplyNode {
             return new numberNode_1.NumberNode(1);
         if (externals.length === 1)
             return externals[0];
+        //tout ca est un peu bordelique
+        //forceDistributeFractions sert à avoir par exemple (a/b)*x plutot que (ax/b)
         if (!opts?.forceDistributeFractions)
             if (externals.some((node) => (0, fractionNode_1.isFractionNode)(node))) {
                 //s'il y a une fraction on transforme en fracNode
@@ -323,6 +325,12 @@ class MultiplyNode {
                 a.value === b.leftChild.value) {
                 return new powerNode_1.PowerNode(b.leftChild, new addNode_1.AddNode(b.rightChild, (1).toTree())).simplify();
             }
+            if ((0, fractionNode_1.isFractionNode)(a) &&
+                a.isNumeric &&
+                (0, fractionNode_1.isFractionNode)(b) &&
+                b.isNumeric) {
+                return new fractionNode_1.FractionNode((0, exports.multiply)(a.leftChild, b.leftChild), (0, exports.multiply)(a.rightChild, b.rightChild)).simplify(opts);
+            }
             let powerSimplified = powerSimplify(a, b, opts);
             if (powerSimplified)
                 return powerSimplified;

package/lib/tree/nodes/polynomials/monomNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monomNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/polynomials/monomNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO/D,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,UAC1B,MAAM,SACP,gBAAgB,cAMxB,CAAC;AACF,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,SAAM,qBAGvD;AACD,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAO7C;;;GAGG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C,CAAC,EAAE,aAAa,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAkB;gBAG9B,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,gBAAgB;IAUzB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;IAMvC,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAG/B,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAG7C,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAGhD,YAAY;IAIZ,MAAM;IAIN,KAAK;IAIL,aAAa;;;;;;;;;;CAQd;AAED,eAAO,MAAM,YAAY,SACjB,aAAa;;;;uBAyIpB,CAAC"}
+{"version":3,"file":"monomNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/polynomials/monomNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO/D,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,UAC1B,MAAM,SACP,gBAAgB,cAMxB,CAAC;AACF,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,SAAM,qBAGvD;AACD,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAO7C;;;GAGG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C,CAAC,EAAE,aAAa,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAkB;gBAG9B,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,gBAAgB;IAUzB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;IAMvC,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAG/B,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAG7C,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAGhD,YAAY;IAIZ,MAAM;IAMN,KAAK;IAIL,aAAa;;;;;;;;;;CAQd;AAED,eAAO,MAAM,YAAY,SACjB,aAAa;;;;uBAyIpB,CAAC"}

package/lib/tree/nodes/polynomials/monomNode.js

@@ -64,7 +64,9 @@ class MonomNode {
         return this.toTree().toMathString();
     }
     toTree() {
-        return (0, multiplyNode_1.multiply)(this.a, (0, powerNode_1.power)(this.variable, this.degree)).simplify();
+        return (0, multiplyNode_1.multiply)(this.a, (0, powerNode_1.power)(this.variable, this.degree)).simplify({
+            forceDistributeFractions: true,
+        });
     }
     toTex() {
         return this.toTree().toTex();

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

@@ -1 +1 @@
-{"version":3,"file":"monomParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/monomParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,QACjB,MAAM,uCACyB,IAAI,0BAgBzC,CAAC;AAEF,eAAO,MAAM,OAAO,SACZ,aAAa,uCACiB,IAAI,YAyFzC,CAAC"}
+{"version":3,"file":"monomParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/monomParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,QACjB,MAAM,uCACyB,IAAI,0BAgBzC,CAAC;AAEF,eAAO,MAAM,OAAO,SACZ,aAAa,uCACiB,IAAI,YAoHzC,CAAC"}

package/lib/tree/parsers/monomParser.js

@@ -116,6 +116,31 @@ const isMonom = (node, { variable, maxDegree, minDegree } = {
             return true;
         }
     }
+    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, multiplyNode_1.isMultiplyNode)(node.child)) {
+        const numericChild = node.child.leftChild.isNumeric
+            ? "left"
+            : node.child.rightChild.isNumeric
+                ? "right"
+                : undefined;
+        if (!numericChild)
+            return false;
+        const varChild = numericChild === "left" ? node.child.rightChild : node.child.leftChild;
+        if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
+            return true;
+        //new MonomNode(numericChild, 1, {variable});
+        if ((0, powerNode_1.isPowerNode)(varChild) &&
+            (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
+            varChild.leftChild.name === variable &&
+            varChild.rightChild.isNumeric) {
+            const powerEv = varChild.rightChild.evaluate();
+            if (maxDegree && powerEv > maxDegree)
+                return false;
+            if (minDegree && powerEv < minDegree)
+                return false;
+            // new MonomNode(numericChild, powerEv, { variable });
+            return true;
+        }
+    }
     return false;
 };
 exports.isMonom = isMonom;

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

@@ -0,0 +1,3 @@
+import { AlgebraicNode } from "../nodes/algebraicNode";
+export declare const polynomialParser: (ans: string) => false | AlgebraicNode | import("../nodes/numbers/constantNode").ConstantNode | import("../nodes/numbers/numberNode").NumberNode | import("../nodes/operators/substractNode").SubstractNode | import("../nodes/operators/addNode").AddNode;
+//# sourceMappingURL=polynomialParser.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"polynomialParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/polynomialParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,eAAO,MAAM,gBAAgB,QAAS,MAAM,8OAmC3C,CAAC"}

package/lib/tree/parsers/polynomialParser.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.polynomialParser = void 0;
+const oppositeNode_1 = require("../nodes/functions/oppositeNode");
+const addNode_1 = require("../nodes/operators/addNode");
+const substractNode_1 = require("../nodes/operators/substractNode");
+const latexParser_1 = require("./latexParser");
+const monomParser_1 = require("./monomParser");
+const numberParser_1 = require("./numberParser");
+//!parses polynomes sous forme développée
+//minDegree = 0, max = undefined
+const polynomialParser = (ans) => {
+    try {
+        const nb = (0, numberParser_1.numberParser)(ans);
+        if (nb !== false) {
+            return nb.unfrenchify().toTree();
+        }
+        const monom = (0, monomParser_1.monomParser)(ans);
+        if (monom)
+            return monom;
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        if ((0, addNode_1.isAddNode)(parsed) || (0, substractNode_1.isSubstractNode)(parsed)) {
+            const externals = [];
+            const recursive = (node) => {
+                if ((0, addNode_1.isAddNode)(node)) {
+                    recursive(node.leftChild);
+                    recursive(node.rightChild);
+                }
+                else if ((0, substractNode_1.isSubstractNode)(node)) {
+                    recursive(node.leftChild);
+                    recursive(new oppositeNode_1.OppositeNode(node.rightChild));
+                }
+                else {
+                    externals.push(node);
+                }
+            };
+            recursive(parsed);
+            if (externals.every((node) => (0, monomParser_1.isMonom)(node))) {
+                return parsed;
+            }
+        }
+        return false;
+    }
+    catch (err) {
+        return false;
+    }
+};
+exports.polynomialParser = polynomialParser;

package/lib/utils/average.d.ts

@@ -1,2 +1,3 @@
 export declare const average: (arr: number[]) => number;
+export declare const averageWithEffectifs: (values: number[], effectifs: number[]) => number;
 //# sourceMappingURL=average.d.ts.map

package/lib/utils/average.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"average.d.ts","sourceRoot":"","sources":["../../src/utils/average.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,QAAS,MAAM,EAAE,WAGpC,CAAC"}
+{"version":3,"file":"average.d.ts","sourceRoot":"","sources":["../../src/utils/average.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,QAAS,MAAM,EAAE,WAGpC,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,MAAM,EAAE,aAAa,MAAM,EAAE,WAOzE,CAAC"}

package/lib/utils/average.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.average = void 0;
+exports.averageWithEffectifs = exports.average = void 0;
 const average = (arr) => {
     if (!arr.length)
         return 0;
     return arr.reduce((acc, curr) => acc + curr) / arr.length;
 };
 exports.average = average;
+const averageWithEffectifs = (values, effectifs) => {
+    if (!values.length || !effectifs.length || values.length !== effectifs.length)
+        throw Error("Malformed data in average");
+    const N = effectifs.reduce((acc, curr) => acc + curr, 0);
+    const avg = values.reduce((acc, value, index) => acc + value * effectifs[index], 0) / N;
+    return avg;
+};
+exports.averageWithEffectifs = averageWithEffectifs;

package/lib/utils/latex/approxOrEqual.d.ts

@@ -0,0 +1,2 @@
+export declare const approxOrEqual: (value: number, roundTo: number) => string[];
+//# sourceMappingURL=approxOrEqual.d.ts.map

package/lib/utils/latex/approxOrEqual.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"approxOrEqual.d.ts","sourceRoot":"","sources":["../../../src/utils/latex/approxOrEqual.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,UAAW,MAAM,WAAW,MAAM,aAI3D,CAAC"}

package/lib/utils/latex/approxOrEqual.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.approxOrEqual = void 0;
+const round_1 = require("../../math/utils/round");
+const approxOrEqual = (value, roundTo) => {
+    const rounded = (0, round_1.round)(value, roundTo);
+    if (rounded === value)
+        return ["=", value.frenchify()];
+    return ["\\approx", rounded.frenchify()];
+};
+exports.approxOrEqual = approxOrEqual;

package/lib/utils/variance.d.ts

@@ -0,0 +1,2 @@
+export declare const variance: (arr: number[]) => number;
+//# sourceMappingURL=variance.d.ts.map

package/lib/utils/variance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variance.d.ts","sourceRoot":"","sources":["../../src/utils/variance.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,QAAQ,QAAS,MAAM,EAAE,WAMrC,CAAC"}

package/lib/utils/variance.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.variance = void 0;
+const average_1 = require("./average");
+const variance = (arr) => {
+    if (!arr.length)
+        return 0;
+    const avg = (0, average_1.average)(arr);
+    const n = arr.length;
+    return arr.reduce((acc, curr) => acc + (curr - avg) ** 2) / n;
+};
+exports.variance = variance;

package/package.json

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