math-exercises 2.0.19 → 2.0.21

package/lib/math/numbers/decimals/decimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/decimals/decimal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,MAAM;IAW1E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMpE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAK/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;CAMrD;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,aAAsB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBACR,KAAK,EAAE,MAAM;IASzB;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAsEhC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IA4BlC,gBAAgB;IAgBhB,oBAAoB;IAmBpB,UAAU;IAMV,MAAM;CAGP"}
+{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/decimals/decimal.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,MAAM;IAY1E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMpE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAK/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;CAMrD;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,aAAsB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBACR,KAAK,EAAE,MAAM;IASzB;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIhC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAkClC,gBAAgB;IA2BhB,oBAAoB;IAsBpB,UAAU;IAMV,MAAM;CAGP"}

package/lib/math/numbers/decimals/decimal.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Decimal = exports.DecimalConstructor = void 0;
 const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
-const integer_1 = require("../integer/integer");
 const nombre_1 = require("../nombre");
 const rational_1 = require("../rationals/rational");
 class DecimalConstructor {
@@ -21,6 +21,7 @@ class DecimalConstructor {
         }
         return decimals;
     }
+    //! a refacto, pour inclure "-0" et des min/max décimaux
     static random(min, max, precision) {
         let prec = precision ?? (0, randint_1.randint)(1, 4);
         const int = (0, randint_1.randint)(min, max) + "";
@@ -57,84 +58,14 @@ class Decimal {
      * @returns
      */
     round(precision) {
-        const intPartString = this.intPart + "";
-        if (precision < 0) {
-            if (precision < -intPartString.length)
-                throw Error("can't round to higher precision");
-            return new integer_1.Integer(this.intPart).round(-precision);
-        }
-        if (precision > this.precision)
-            throw Error("can't round to higher precision");
-        if (precision === this.precision)
-            return this;
-        let newFracPart = "", newIntPart = "";
-        const shouldRoundUp = Number(this.decimalPart[precision]) > 4;
-        if (shouldRoundUp) {
-            let retenue = true;
-            let i = precision - 1;
-            while (retenue) {
-                if (i > -1) {
-                    const nb = (Number(this.decimalPart[i]) + 1) % 10;
-                    if (nb || newFracPart) {
-                        newFracPart = nb.toString() + newFracPart;
-                    }
-                    if (nb !== 0) {
-                        retenue = false;
-                        for (let j = i - 1; j > -1; j--) {
-                            newFracPart = this.decimalPart[j] + newFracPart;
-                        }
-                        newIntPart = intPartString;
-                    }
-                    else
-                        i--;
-                }
-                else {
-                    const nb = (Number(intPartString[i + intPartString.length]) + 1) % 10;
-                    newIntPart = nb + "" + newIntPart;
-                    if (nb !== 0) {
-                        retenue = false;
-                        for (let j = i + intPartString.length - 1; j > -1; j--) {
-                            newIntPart = intPartString[j] + newIntPart;
-                        }
-                    }
-                    else
-                        i--;
-                }
-            }
-        }
-        else {
-            let retenue = true;
-            let i = precision - 1;
-            while (retenue) {
-                if (i > -1) {
-                    const nb = Number(this.decimalPart[i]);
-                    if (nb || newFracPart) {
-                        newFracPart = nb.toString() + newFracPart;
-                    }
-                    if (nb !== 0) {
-                        retenue = false;
-                        for (let j = i - 1; j > -1; j--) {
-                            newFracPart = this.decimalPart[j] + newFracPart;
-                        }
-                        newIntPart = intPartString;
-                    }
-                    else
-                        i--;
-                }
-                else {
-                    newIntPart = intPartString;
-                    retenue = false;
-                }
-            }
-        }
-        return DecimalConstructor.fromParts(newIntPart, newFracPart);
+        return new Decimal((0, round_1.round)(this.value, precision));
     }
     multiplyByPowerOfTen(power) {
         if (power === 0)
             return this;
         let newIntPart = "", newFracPart = "";
-        if (power > -1) {
-            newIntPart = this.intPart + "";
+        if (power > 0) {
+            newIntPart = (this.value + "").split(".")[0];
             for (let i = 0; i < power; i++) {
                 newIntPart +=
                     i > this.decimalPart.length - 1 ? "0" : this.decimalPart[i];
@@ -142,35 +73,46 @@ class Decimal {
             newFracPart = this.decimalPart.slice(power);
         }
         else {
-            const intPartString = this.intPart + "";
+            const intPartString = this.intPart.toString().replace("-", "");
+            const isNegative = this.value < 0;
             newFracPart = this.decimalPart;
             for (let i = intPartString.length - 1; i > intPartString.length - 1 + power; i--) {
                 newFracPart = (i < 0 ? "0" : intPartString[i]) + newFracPart;
             }
             if (power + intPartString.length < 1)
-                newIntPart = "0";
+                newIntPart = isNegative ? "-0" : "0";
             else
-                newIntPart = intPartString.slice(0, power + intPartString.length);
+                newIntPart =
+                    (isNegative ? "-" : "") +
+                        intPartString.slice(0, power + intPartString.length);
         }
+        console.log("in", newIntPart, newFracPart);
         return DecimalConstructor.fromParts(newIntPart, newFracPart);
     }
     toScientificPart() {
-        const intString = this.intPart.toString();
-        const intSize = intString.length;
-        if (intSize === 0 && this.intPart !== 0)
-            return this.toTree();
+        if (!this.decimalPart.length)
+            return new numberNode_1.NumberNode(this.intPart);
+        // const intString = this.intPart.toString();
+        // const intSize = intString.length;
+        // if (intSize === 0 && this.intPart !== 0) return this.toTree();
         if (this.intPart === 0) {
+            //true for -0
             const firstNonZeroIndex = this.decimalPart
                 .split("")
                 .findIndex((el) => Number(el) !== 0);
-            return new numberNode_1.NumberNode(Number("0." + this.decimalPart.slice(firstNonZeroIndex)));
+            return new numberNode_1.NumberNode(Number((this.tex[0] === "-" ? "-0." : "0.") +
+                this.decimalPart.slice(firstNonZeroIndex)));
         }
-        return new numberNode_1.NumberNode(Number(intString[0] + "." + intString.slice(1) + this.decimalPart));
+        const intString = this.intPart + "";
+        return new numberNode_1.NumberNode(Number((this.tex[0] === "-" ? "-" + this.tex[1] : this.tex[0]) +
+            "." +
+            (this.tex[0] === "-" ? intString.slice(2) : intString.slice(1)) +
+            this.decimalPart));
     }
     toScientificNotation() {
-        const intString = this.intPart.toString();
-        const intSize = intString.length;
-        if (intSize === 0)
+        const intString = this.intPart + "";
+        // const intSize = intString.length + (this.value < 0 ? 1 : 0);
+        if (this.intPart > -10 && this.intPart < 10 && this.intPart !== 0)
             return this.toTree();
         const decNode = this.toScientificPart();
         let leadingZeros = 0;
@@ -180,7 +122,9 @@ class Decimal {
                 break;
             leadingZeros++;
         }
-        const power = this.intPart === 0 ? -leadingZeros : intSize - 1;
+        const power = this.intPart === 0 ? -leadingZeros : (this.intPart + "").length - 1;
+        if (power === 0)
+            return this.toTree();
         if (power === 1)
             return new multiplyNode_1.MultiplyNode(decNode, new numberNode_1.NumberNode(10));
         return new multiplyNode_1.MultiplyNode(decNode, new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(power)));

package/lib/server.js

@@ -35,19 +35,41 @@ const express_1 = __importDefault(require("express"));
 const body_parser_1 = __importDefault(require("body-parser"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const cors_1 = __importDefault(require("cors"));
+const decimal_1 = require("./math/numbers/decimals/decimal");
 const jsonParser = body_parser_1.default.json();
 const allExercises = [...exercises];
 const runServer = () => {
     dotenv_1.default.config();
     const app = (0, express_1.default)();
     app.use((0, cors_1.default)());
-    // const latex = "\\sqrt{3,230982}";
-    // try {
-    //   const res = parseLatex(latex);
-    //   console.log(res.toTex());
-    // } catch (err) {
-    //   throw err;
-    // }
+    // const string = "\\frac{9}{12}";
+    // const a = string.match(/^[0-9]+,?[0-9]*/);
+    // const before = Date.now();
+    // const parsed = parseLatex(string);
+    // console.log("res", parsed);
+    // console.log(parsed?.toTex());
+    // console.log(parsed?.simplify().toTex());
+    // console.log(parsed?.evaluate({ x: 1 }));
+    // console.log("time", Date.now() - before);
+    // tokenize(string);
+    // const a = DecimalConstructor.random(-4, 8);
+    // const a = new Decimal(-0.0009343);
+    // console.log(a.value, a.multiplyByPowerOfTen(-2).toTree().toTex());
+    // const b = new Decimal(0.0009343);
+    // console.log(b.value, b.multiplyByPowerOfTen(-2).toTree().toTex());
+    // const c = new Decimal(-2.00009343);
+    // console.log(c.value, c.multiplyByPowerOfTen(-2).toTree().toTex());
+    // const d = new Decimal(2.009343);
+    // console.log(d.value, d.multiplyByPowerOfTen(-2).toTree().toTex());
+    const power = 1;
+    const a = new decimal_1.Decimal(-0.00400250009343);
+    console.log(a.value, a.multiplyByPowerOfTen(power).toTree().toTex());
+    const b = new decimal_1.Decimal(0.04010009343);
+    console.log(b.value, b.multiplyByPowerOfTen(power).toTree().toTex());
+    const c = new decimal_1.Decimal(-23.00009343);
+    console.log(c.value, c.multiplyByPowerOfTen(power).toTree().toTex());
+    const d = new decimal_1.Decimal(20.4009343);
+    console.log(d.value, d.multiplyByPowerOfTen(power).toTree().toTex());
     app.get("/", (req, res) => {
         res.json(allExercises);
     });

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

@@ -19,7 +19,7 @@ export declare class OppositeNode implements FunctionNode {
      */
     toAllValidTexs(opts?: NodeOptions): string[];
     evaluate(vars: Record<string, number>): number;
-    simplify(opts?: SimplifyOptions): OppositeNode;
+    simplify(opts?: SimplifyOptions): AlgebraicNode;
     equals(node: AlgebraicNode): boolean;
 }
 //# sourceMappingURL=oppositeNode.d.ts.map

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

@@ -6,6 +6,7 @@ const node_1 = require("../node");
 const operatorNode_1 = require("../operators/operatorNode");
 const functionNode_1 = require("./functionNode");
 const numberNode_1 = require("../numbers/numberNode");
+const multiplyNode_1 = require("../operators/multiplyNode");
 const fractionNode_1 = require("../operators/fractionNode");
 function isOppositeNode(a) {
     return (0, functionNode_1.isFunctionNode)(a) && a.id === functionNode_1.FunctionsIds.opposite;
@@ -70,7 +71,7 @@ class OppositeNode {
         return -this.child.evaluate(vars);
     }
     simplify(opts) {
-        return new OppositeNode(this.child.simplify(opts));
+        return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), this.child).simplify(opts);
     }
     equals(node) {
         return isOppositeNode(node) && node.child.equals(this.child);

package/lib/tree/nodes/operators/powerNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,qBAAa,SAAU,YAAW,YAAY;IAC5C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,YAAY,IAAI,MAAM;IAItB,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAuBf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA+FrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAO/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAOrC;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAGrD"}
+{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,qBAAa,SAAU,YAAW,YAAY;IAC5C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,YAAY,IAAI,MAAM;IAItB,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAuBf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA+FrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAY/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAOrC;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAGrD"}

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

@@ -157,11 +157,14 @@ class PowerNode {
     //   // puissances négatives ?
     // }
     simplify(opts) {
+        const leftSimplified = this.leftChild.simplify(opts);
+        const rightSimplified = this.rightChild.simplify(opts);
+        const copy = new PowerNode(leftSimplified, rightSimplified, this.opts);
         //! temporaire
-        if ((0, numberNode_1.isNumberNode)(this.rightChild) && this.rightChild.value === 2) {
-            return new multiplyNode_1.MultiplyNode(this.leftChild, this.leftChild).simplify(opts);
+        if ((0, numberNode_1.isNumberNode)(copy.rightChild) && copy.rightChild.value === 2) {
+            return new multiplyNode_1.MultiplyNode(copy.leftChild, copy.leftChild).simplify(opts);
         }
-        return this;
+        return copy;
     }
     equals(node) {
         return (isPowerNode(node) &&

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

@@ -43,7 +43,7 @@ class SubstractNode {
             [operatorNode_1.OperatorIds.add, operatorNode_1.OperatorIds.substract].includes(this.rightChild.id)) ||
             rightTex[0] === "-";
         if (needBrackets)
-            rightTex = `(${rightTex})`;
+            rightTex = `\\left(${rightTex}\\right)`;
         return `${leftTex}-${rightTex}`;
     }
     evaluate(vars) {

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

@@ -1,3 +1,4 @@
 import { AlgebraicNode } from "../nodes/algebraicNode";
+export declare const tokenize: (latex: string) => string[];
 export declare const parseLatex: (latex: string) => AlgebraicNode;
 //# sourceMappingURL=latexParser.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"latexParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/latexParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA2BvD,eAAO,MAAM,UAAU,UAAW,MAAM,kBAgBvC,CAAC"}
+{"version":3,"file":"latexParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/latexParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA0CvD,eAAO,MAAM,QAAQ,UAAW,MAAM,aA4BrC,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,MAAM,kBAavC,CAAC"}