math-exercises 1.3.57 → 1.3.59

package/lib/math/polynomials/trinom.js

@@ -11,6 +11,8 @@ const variableNode_1 = require("../../tree/nodes/variables/variableNode");
 const simplify_1 = require("../../tree/parsers/simplify");
 const point_1 = require("../geometry/point");
 const integer_1 = require("../numbers/integer/integer");
+const rational_1 = require("../numbers/rationals/rational");
+const squareRoot_1 = require("../numbers/reals/squareRoot");
 const discreteSet_1 = require("../sets/discreteSet");
 const intervals_1 = require("../sets/intervals/intervals");
 const polynomial_1 = require("./polynomial");
@@ -29,6 +31,13 @@ class TrinomConstructor {
         const c = a.value * alpha.value ** 2 + beta.value;
         return new Trinom(a.value, b, c);
     }
+    static randomFactorized(domainA = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)])), domainX1 = new intervals_1.Interval('[[-10; 10]]'), domainX2 = new intervals_1.Interval('[[-10; 10]]')) {
+        const a = domainA.getRandomElement();
+        const x1 = domainX1.getRandomElement();
+        const x2 = domainX2.getRandomElement();
+        //a*x^2 + ax*-x2 + a*-x1*x + a*-x1*-x2
+        return new Trinom(a.value, -a.value * (x1.value + x2.value), a.value * x1.value * x2.value);
+    }
 }
 exports.TrinomConstructor = TrinomConstructor;
 class Trinom extends polynomial_1.Polynomial {
@@ -45,6 +54,34 @@ class Trinom extends polynomial_1.Polynomial {
     getDeltaNode() {
         return new numberNode_1.NumberNode(this.getDelta());
     }
+    getRoots() {
+        const delta = this.getDelta();
+        if (delta < 0)
+            return [];
+        if (delta === 0)
+            return [-this.b / (2 * this.a)];
+        return [(-this.b - Math.sqrt(delta)) / (2 * this.a), (-this.b + Math.sqrt(delta)) / (2 * this.a)];
+    }
+    //! la simplification de mathjs est foireuse, exemple (4+4sqrt(3))/16 est simplifiée mais pas (4-4sqrt(3))/16 ??
+    getRootsNode() {
+        const delta = this.getDelta();
+        if (delta < 0)
+            return [];
+        if (delta === 0)
+            return [new rational_1.Rational(-this.b, 2 * this.a).simplify().toTree()];
+        return [
+            (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new substractNode_1.SubstractNode(new numberNode_1.NumberNode(-this.b), new squareRoot_1.SquareRoot(delta).simplify().toTree()), new numberNode_1.NumberNode(2 * this.a))),
+            (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new addNode_1.AddNode(new numberNode_1.NumberNode(-this.b), new squareRoot_1.SquareRoot(delta).simplify().toTree()), new numberNode_1.NumberNode(2 * this.a))),
+        ];
+    }
+    getRootsEquationSolutionTex() {
+        const roots = this.getRootsNode();
+        if (!roots.length)
+            return `S = \\emptyset`;
+        if (roots.length === 1)
+            return `S = \\left\\lbrace ${roots[0].toTex()} \\right\\rbrace`;
+        return `S = \\left\\lbrace ${roots[0].toTex()} ; ${roots[1].toTex()} \\right\\rbrace`;
+    }
     getAlpha() {
         return -this.b / (2 * this.a);
     }
@@ -57,6 +94,14 @@ class Trinom extends polynomial_1.Polynomial {
     getBetaNode() {
         return (0, simplify_1.simplifyNode)(new fractionNode_1.FractionNode(new numberNode_1.NumberNode(-this.getDelta()), new numberNode_1.NumberNode(4 * this.a)));
     }
+    getFactorizedForm() {
+        const roots = this.getRootsNode();
+        if (!roots.length)
+            return this.toTree();
+        if (roots.length === 1)
+            return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new powerNode_1.PowerNode(new substractNode_1.SubstractNode(new variableNode_1.VariableNode('x'), roots[0]), new numberNode_1.NumberNode(2))));
+        return (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(new variableNode_1.VariableNode('x'), roots[0]), new substractNode_1.SubstractNode(new variableNode_1.VariableNode('x'), roots[1]))));
+    }
     getCanonicalForm() {
         return (0, simplify_1.simplifyNode)(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(this.a), new powerNode_1.PowerNode(new substractNode_1.SubstractNode(new variableNode_1.VariableNode(this.variable), this.getAlphaNode()), new numberNode_1.NumberNode(2))), new numberNode_1.NumberNode(this.getBeta())));
     }

package/lib/math/sets/intervals/intervals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intervals.d.ts","sourceRoot":"","sources":["../../../../src/math/sets/intervals/intervals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,aAAK,SAAS;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;CACb;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;gBACS,GAAG,SAAc;IA+C7B,OAAO,CAAC,EAAE,EAAE,MAAM;IAWlB,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAYrC,KAAK,IAAI,MAAM;IAIf,gBAAgB,CAAC,SAAS,GAAE,MAAiD,GAAG,MAAM;CAYvF"}
+{"version":3,"file":"intervals.d.ts","sourceRoot":"","sources":["../../../../src/math/sets/intervals/intervals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,aAAK,SAAS;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;CACb;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;gBACS,GAAG,SAAc;IA+C7B,OAAO,CAAC,EAAE,EAAE,MAAM;IAWlB,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO;IAYrC,KAAK,IAAI,MAAM;IAIf,gBAAgB,CAAC,SAAS,GAAE,MAAiD,GAAG,MAAM;CAYvF"}

package/lib/tree/nodes/functions/oppositeNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oppositeNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/oppositeNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAE5D,qBAAa,YAAa,SAAQ,YAAa,YAAW,IAAI;gBAChD,KAAK,EAAE,IAAI;IAGvB,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAWf,QAAQ;CAGT"}
+{"version":3,"file":"oppositeNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/oppositeNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAG5D,qBAAa,YAAa,SAAQ,YAAa,YAAW,IAAI;gBAChD,KAAK,EAAE,IAAI;IAGvB,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAcf,QAAQ;CAGT"}

package/lib/tree/nodes/functions/oppositeNode.js

@@ -19,6 +19,9 @@ class OppositeNode extends functionNode_1.FunctionNode {
             const operatorChild = this.child;
             needBrackets || (needBrackets = [operatorNode_1.OperatorIds.add, operatorNode_1.OperatorIds.substract].includes(operatorChild.id));
         }
+        if (this.child.type === node_1.NodeType.number && childTex[0] === '-') {
+            return childTex.substring(1);
+        }
         if (needBrackets)
             childTex = `(${childTex})`;
         return `-${childTex}`;

package/lib/tree/nodes/functions/sqrtNode.js

@@ -10,7 +10,7 @@ class SqrtNode extends functionNode_1.FunctionNode {
         this.type = node_1.NodeType.function;
     }
     toMathString() {
-        return `sqrt(${this.child.toMathString()})`;
+        return `sqr(${this.child.toMathString()})`;
     }
     toMathjs() {
         return (0, mathjs_1.sqrt)(this.child.toMathjs());

package/lib/tree/parsers/simplify.js

@@ -56,6 +56,9 @@ const mathjsNodeToNode = (mathjsNode) => {
     else if (mathjsNode.isFunctionNode) {
         const fn = mathjsNode.fn;
         switch (fn.name) {
+            //mathjs arrondit les racines carrées, on truc avec sqr pour bypass
+            case 'sqr':
+                return new sqrtNode_1.SqrtNode(mathjsNodeToNode(mathjsNode.args[0]));
             case 'sqrt':
                 return new sqrtNode_1.SqrtNode(mathjsNodeToNode(mathjsNode.args[0]));
             case 'log':

package/package.json

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