math-exercises 2.0.20 → 2.0.22

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/math/numbers/reals/extendedRingElement.d.ts

@@ -1,3 +1,4 @@
+import { OppositeNode } from '../../../tree/nodes/functions/oppositeNode';
 import { NumberNode } from '../../../tree/nodes/numbers/numberNode';
 import { MultiplyNode } from '../../../tree/nodes/operators/multiplyNode';
 import { SubstractNode } from '../../../tree/nodes/operators/substractNode';
@@ -11,6 +12,6 @@ export declare class ExtendedRingElement {
     b: number;
     algebraicElement: Nombre;
     constructor(a: number, b: number, algebraicElement: Nombre);
-    toTree(): import("../../../tree/nodes/algebraicNode").AlgebraicNode | NumberNode | MultiplyNode | SubstractNode;
+    toTree(): import("../../../tree/nodes/algebraicNode").AlgebraicNode | NumberNode | MultiplyNode | OppositeNode | SubstractNode;
 }
 //# sourceMappingURL=extendedRingElement.d.ts.map

package/lib/math/numbers/reals/extendedRingElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extendedRingElement.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/extendedRingElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,qBAAa,mBAAmB;IAM9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,gBAAgB,EAAE,MAAM,CAAC;gBACb,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM;IAM1D,MAAM;CAeP"}
+{"version":3,"file":"extendedRingElement.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/reals/extendedRingElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;GAGG;AACH,qBAAa,mBAAmB;IAM9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,gBAAgB,EAAE,MAAM,CAAC;gBACb,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM;IAM1D,MAAM;CAeP"}

package/lib/server.js

@@ -41,16 +41,6 @@ const runServer = () => {
     dotenv_1.default.config();
     const app = (0, express_1.default)();
     app.use((0, cors_1.default)());
-    // 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);
     app.get("/", (req, res) => {
         res.json(allExercises);
     });

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

@@ -1,5 +1,6 @@
 import { Node, NodeOptions, NodeType } from "../node";
 import { FunctionNode, FunctionsIds } from "./functionNode";
+import { NumberNode } from "../numbers/numberNode";
 import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
 export declare function isOppositeNode(a: Node): a is OppositeNode;
 export declare class OppositeNode implements FunctionNode {
@@ -19,7 +20,7 @@ export declare class OppositeNode implements FunctionNode {
      */
     toAllValidTexs(opts?: NodeOptions): string[];
     evaluate(vars: Record<string, number>): number;
-    simplify(opts?: SimplifyOptions): AlgebraicNode;
+    simplify(opts?: SimplifyOptions): AlgebraicNode | NumberNode;
     equals(node: AlgebraicNode): boolean;
 }
 //# sourceMappingURL=oppositeNode.d.ts.map

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,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMtD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAGD,qBAAa,YAAa,YAAW,YAAY;IAC/C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAef,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAgCtD;;;;OAIG;IACH,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAG/B,MAAM,CAAC,IAAI,EAAE,aAAa;CAG3B"}
+{"version":3,"file":"oppositeNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/oppositeNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMtD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAGD,qBAAa,YAAa,YAAW,YAAY;IAC/C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAef,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAgCtD;;;;OAIG;IACH,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAI/B,MAAM,CAAC,IAAI,EAAE,aAAa;CAG3B"}

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

@@ -71,6 +71,8 @@ class OppositeNode {
         return -this.child.evaluate(vars);
     }
     simplify(opts) {
+        if ((0, numberNode_1.isNumberNode)(this.child))
+            return new numberNode_1.NumberNode(-this.child.value);
         return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(-1), this.child).simplify(opts);
     }
     equals(node) {

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

@@ -1 +1 @@
-{"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.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;AAK3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AACD,qBAAa,YAAa,YAAW,YAAY;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,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,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA2BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAI5C,KAAK,IAAI,MAAM;IAaf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAmF/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAOrC"}
+{"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.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;AAK3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AACD,qBAAa,YAAa,YAAW,YAAY;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,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,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA2BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAI5C,KAAK,IAAI,MAAM;IAaf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAyF/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAOrC"}

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

@@ -78,6 +78,12 @@ class FractionNode {
         const simplifiedNum = this.leftChild.simplify(opts);
         const simplifiedDenum = this.rightChild.simplify(opts);
         const copy = new FractionNode(simplifiedNum, simplifiedDenum, this.opts);
+        if ((0, numberNode_1.isNumberNode)(simplifiedDenum) && simplifiedDenum.value === 1) {
+            return simplifiedNum;
+        }
+        if ((0, numberNode_1.isNumberNode)(simplifiedDenum) && simplifiedDenum.value === -1) {
+            return new oppositeNode_1.OppositeNode(simplifiedNum).simplify(opts);
+        }
         const externalsNums = [];
         const externalsDenums = [];
         const recursiveNums = (node) => {

package/package.json

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