math-exercises 3.0.106 → 3.0.108

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

@@ -118,7 +118,7 @@ export class AddNode {
     // toMathjs() {
     //   return add(this.leftChild.toMathjs(), this.rightChild.toMathjs());
     // }
-    simplify(opts) {
+    simplify(opts, log = false) {
         const leftSimplified = this.leftChild.simplify(opts);
         const rightSimplified = this.rightChild.simplify(opts);
         const copy = new AddNode(leftSimplified, rightSimplified, this.opts);

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

@@ -29,7 +29,7 @@ export declare class FractionNode implements OperatorNode {
     isDecimal(): boolean;
     toTex(texOpts?: ToTexOptions): string;
     evaluate(vars?: Record<string, number>): number;
-    simplify(opts?: SimplifyOptions): AlgebraicNode;
+    simplify(opts?: SimplifyOptions, log?: boolean): AlgebraicNode;
     equals(node: AlgebraicNode): boolean;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): FractionNode;
     toSimplificationTex(): string;

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,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAK9E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,IAAI,MACZ,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AACF,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;IAiBpB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,uBAAuB;IAQxC,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA+BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,SAAS;IAUT,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IA8BrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAuM/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,mBAAmB;IAQnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}
+{"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAK9E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,IAAI,MACZ,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AACF,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;IAiBpB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,uBAAuB;IAQxC,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA+BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,SAAS;IAUT,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IA8BrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,UAAQ,GAAG,aAAa;IA0M5D,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,mBAAmB;IAQnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}

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

@@ -131,9 +131,11 @@ export class FractionNode {
     // toMathjs() {
     //   return fraction(this.leftChild.toMathjs(), this.rightChild.toMathjs());
     // }
-    simplify(opts) {
+    simplify(opts, log = false) {
+        log && console.log(`simplifying ${this.toTex()}`);
         const simplifiedNum = this.leftChild.simplify(opts);
         const simplifiedDenum = this.rightChild.simplify(opts);
+        // console.log(simplifiedNum.toTex(), simplifiedDenum.toTex());
         const copy = new FractionNode(simplifiedNum, simplifiedDenum, this.opts);
         if (isNumberNode(simplifiedNum) && simplifiedNum.value === 0) {
             return new NumberNode(0);

package/lib/tree/nodes/operators/multiplyNode.d.ts

@@ -32,7 +32,7 @@ export declare class MultiplyNode implements CommutativeOperatorNode {
     evaluate(vars?: Record<string, number>): number;
     copy(): MultiplyNode;
     canonicalOrder(): void;
-    simplify(opts?: SimplifyOptions): AlgebraicNode;
+    simplify(opts?: SimplifyOptions, log?: boolean): AlgebraicNode;
     toSimplificationTex(opts?: SimplifyOptions): string;
     equals(node: AlgebraicNode): boolean;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): MultiplyNode;

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

@@ -1 +1 @@
-{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAiB3B,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAe7B,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAChB,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AACF,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAYrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,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,OAAO,qBAGL;IAEF,WAAW,UAAW,eAAe,kBAUnC;IAEF,UAAU,qBAER;IACF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAgFrC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAyFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,aAAa;;;;;;;;;IAYb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,IAAI;IAGJ,cAAc;IACd,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IA2L/C,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe;IAM1C,MAAM,CAAC,IAAI,EAAE,aAAa;IAU1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAQxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
+{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAiB3B,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAe7B,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAChB,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AACF,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAYrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,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,OAAO,qBAGL;IAEF,WAAW,UAAW,eAAe,kBAUnC;IAEF,UAAU,qBAER;IACF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAgFrC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAyFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,aAAa;;;;;;;;;IAYb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,IAAI;IAGJ,cAAc;IACd,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,UAAQ,GAAG,aAAa;IAiK5D,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe;IAM1C,MAAM,CAAC,IAAI,EAAE,aAAa;IAU1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAQxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}

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

@@ -10,7 +10,7 @@ import { NumberNode, isNumberNode } from "../numbers/numberNode.js";
 import { isInt } from "../../../utils/isInt.js";
 import { isVariableNode } from "../variables/variableNode.js";
 import { SqrtNode, isSqrtNode } from "../functions/sqrtNode.js";
-import { isOppositeNode, } from "../functions/oppositeNode.js";
+import { isOppositeNode, opposite, } from "../functions/oppositeNode.js";
 import { FractionNode, isFractionNode } from "./fractionNode.js";
 import { isFunctionNode } from "../functions/functionNode.js";
 import { AddNode, add, isAddNode } from "./addNode.js";
@@ -264,9 +264,10 @@ export class MultiplyNode {
         return new MultiplyNode(this.leftChild, this.rightChild, this.opts);
     }
     canonicalOrder() { }
-    simplify(opts) {
-        const leftSimplified = this.leftChild.simplify(opts);
-        const rightSimplified = this.rightChild.simplify(opts);
+    simplify(opts, log = false) {
+        log && console.log(`simplifying ${this.toTex()}`);
+        const leftSimplified = this.leftChild.simplify(opts, log);
+        const rightSimplified = this.rightChild.simplify(opts, log);
         const copy = new MultiplyNode(leftSimplified, rightSimplified, this.opts);
         /**get externals nodes (= extremités du sous arbre non multiplicatif)
          * les opposites sont supprimés et on ajoute *-1 à la fin si leur nb est impair
@@ -332,7 +333,7 @@ export class MultiplyNode {
                 const denumNode = denums.length === 1
                     ? denums[0]
                     : operatorComposition(MultiplyNode, denums);
-                return new FractionNode(numNode, denumNode).simplify(opts);
+                return new FractionNode(numNode, denumNode).simplify(opts, log);
             }
         const simplifyExternalNodes = (a, b) => {
             if (isVariableNode(a) && isVariableNode(b)) {
@@ -344,44 +345,26 @@ export class MultiplyNode {
                 return new NumberNode(round(a.value * b.value, 10));
             }
             if (isSqrtNode(a) && isSqrtNode(b)) {
-                return new SqrtNode(new MultiplyNode(a.child, b.child)).simplify(opts);
+                return new SqrtNode(new MultiplyNode(a.child, b.child)).simplify(opts, log);
             }
             if (isNumberNode(a) &&
                 (isPowerNode(b) || isSquareNode(b)) &&
                 isNumberNode(b.leftChild) &&
                 a.value === b.leftChild.value) {
-                return new PowerNode(b.leftChild, new AddNode(b.rightChild, (1).toTree())).simplify(opts);
+                return new PowerNode(b.leftChild, new AddNode(b.rightChild, (1).toTree())).simplify(opts, log);
             }
-            if (isNumberNode(a) && isFractionNode(b) && b.isNumeric) {
-                return new FractionNode(multiply(a, b.leftChild), b.rightChild).simplify(opts);
-            }
-            if (isNumberNode(b) && isFractionNode(a) && a.isNumeric) {
-                return new FractionNode(multiply(a.leftChild, b), a.rightChild).simplify(opts);
-            }
-            const aFractionNode = isFractionNode(a) && a.isNumeric
-                ? a
-                : isOppositeNode(a) && isFractionNode(a.child) && a.child.isNumeric
-                    ? a.child
-                    : null;
-            const bFractionNode = isFractionNode(b) && b.isNumeric
-                ? b
-                : isOppositeNode(b) && isFractionNode(b.child) && b.child.isNumeric
-                    ? b.child
-                    : null;
-            if (aFractionNode && bFractionNode) {
-                if (isFractionNode(b) && b.isNumeric) {
-                    return new FractionNode(multiply(aFractionNode.leftChild, bFractionNode.leftChild), multiply(aFractionNode.rightChild, bFractionNode.rightChild)).simplify(opts);
-                }
-            }
-            let powerSimplified = powerSimplify(a, b, opts);
+            let fracSimplified = fractionSimplify(a, b, opts, log);
+            if (fracSimplified)
+                return fracSimplified;
+            let powerSimplified = powerSimplify(a, b, opts, log);
             if (powerSimplified)
                 return powerSimplified;
             if (opts?.towardsDistribute && (isAddNode(a) || isSubstractNode(a))) {
-                return add(multiply(a.leftChild, b), multiply(a.rightChild, b)).simplify(opts);
+                return add(multiply(a.leftChild, b), multiply(a.rightChild, b)).simplify(opts, log);
             }
             else if (opts?.towardsDistribute &&
                 (isAddNode(b) || isSubstractNode(b))) {
-                return add(multiply(a, b.leftChild), multiply(a, b.rightChild)).simplify(opts);
+                return add(multiply(a, b.leftChild), multiply(a, b.rightChild)).simplify(opts, log);
             }
             //! j'aime po
             //! doit etre à la fin
@@ -452,29 +435,52 @@ export class MultiplyNode {
         return add(multiply(this.leftChild.derivative(varName), this.rightChild), multiply(this.leftChild, this.rightChild.derivative(varName)));
     }
 }
-const powerSimplify = (a, b, opts) => {
+const fractionSimplify = (a, b, opts, log = false) => {
+    if (isNumberNode(a) && isFractionNode(b) && b.isNumeric) {
+        return new FractionNode(multiply(a, b.leftChild), b.rightChild).simplify(opts, log);
+    }
+    if (isNumberNode(b) && isFractionNode(a) && a.isNumeric) {
+        return new FractionNode(multiply(a.leftChild, b), a.rightChild).simplify(opts, log);
+    }
+    const aFractionNode = isFractionNode(a) && a.isNumeric
+        ? a
+        : isOppositeNode(a) && isFractionNode(a.child) && a.child.isNumeric
+            ? new FractionNode(opposite(a.child.leftChild), a.child.rightChild)
+            : null;
+    const bFractionNode = isFractionNode(b) && b.isNumeric
+        ? b
+        : isOppositeNode(b) && isFractionNode(b.child) && b.child.isNumeric
+            ? new FractionNode(opposite(b.child.leftChild), b.child.rightChild)
+            : null;
+    if (aFractionNode && bFractionNode) {
+        if (isFractionNode(b) && b.isNumeric) {
+            return new FractionNode(multiply(aFractionNode.leftChild, bFractionNode.leftChild), multiply(aFractionNode.rightChild, bFractionNode.rightChild)).simplify(opts, log);
+        }
+    }
+};
+const powerSimplify = (a, b, opts, log = false) => {
     if ((isPowerNode(a) || isSquareNode(a)) &&
         (isPowerNode(b) || isSquareNode(b))) {
         if (a.leftChild.toTex() === b.leftChild.toTex())
-            return new PowerNode(a.leftChild, new AddNode(a.rightChild, b.rightChild).simplify(opts)).simplify(opts);
+            return new PowerNode(a.leftChild, new AddNode(a.rightChild, b.rightChild).simplify(opts, log)).simplify(opts, log);
     }
     if (isVariableNode(a)) {
         if (isVariableNode(b) && b.toTex() === a.toTex() && opts?.keepPowers)
-            return new PowerNode(a, new NumberNode(2)).simplify(opts);
+            return new PowerNode(a, new NumberNode(2)).simplify(opts, log);
         if ((isPowerNode(b) || isSquareNode(b)) &&
             b.leftChild.toTex() === a.toTex()) {
-            return new PowerNode(a, new AddNode(new NumberNode(1), b.rightChild).simplify(opts)).simplify(opts);
+            return new PowerNode(a, new AddNode(new NumberNode(1), b.rightChild).simplify(opts, log)).simplify(opts, log);
         }
     }
     if (isVariableNode(b)) {
         if (isVariableNode(a) && a.toTex() === b.toTex() && opts?.keepPowers)
-            return new PowerNode(b, new NumberNode(2)).simplify(opts);
+            return new PowerNode(b, new NumberNode(2)).simplify(opts, log);
         if ((isPowerNode(a) || isSquareNode(a)) &&
             a.leftChild.toTex() === b.toTex()) {
-            return new PowerNode(b, new AddNode(new NumberNode(1), a.rightChild).simplify(opts)).simplify(opts);
+            return new PowerNode(b, new AddNode(new NumberNode(1), a.rightChild).simplify(opts, log)).simplify(opts, log);
         }
     }
     if (isExpNode(a) && isExpNode(b)) {
-        return new ExpNode(add(a.child, b.child)).simplify(opts);
+        return new ExpNode(add(a.child, b.child)).simplify(opts, log);
     }
 };

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

@@ -28,7 +28,7 @@ export declare class PowerNode implements OperatorNode {
     toTex(opts?: ToTexOptions): string;
     evaluate(vars?: Record<string, number>): number;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): PowerNode;
-    simplify(opts?: SimplifyOptions): AlgebraicNode;
+    simplify(opts?: SimplifyOptions, log?: boolean): AlgebraicNode;
     equals(node: AlgebraicNode): boolean;
     derivative(varName?: string | undefined): AlgebraicNode;
 }

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,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKrE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AACD,eAAO,MAAM,MAAM,MAAO,aAAa,GAAG,MAAM,GAAG,MAAM,eAKxD,CAAC;AAEF,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,cAOnB,CAAC;AAEF,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;IAGtB,aAAa;;;;;;;;;IAOb,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IAuBlC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IA6D/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAcxD;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAIrD"}
+{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKrE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AACD,eAAO,MAAM,MAAM,MAAO,aAAa,GAAG,MAAM,GAAG,MAAM,eAKxD,CAAC;AAEF,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,cAOnB,CAAC;AAEF,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;IAGtB,aAAa;;;;;;;;;IAOb,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IAuBlC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,UAAQ,GAAG,aAAa;IA6D5D,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAcxD;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAIrD"}

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

@@ -101,7 +101,7 @@ export class PowerNode {
     toDetailedEvaluation(vars) {
         return new PowerNode(this.leftChild.toDetailedEvaluation(vars), this.rightChild.toDetailedEvaluation(vars));
     }
-    simplify(opts) {
+    simplify(opts, log = false) {
         const leftSimplified = this.leftChild.simplify(opts);
         const rightSimplified = this.rightChild.simplify(opts);
         const copy = new PowerNode(leftSimplified, rightSimplified, this.opts);

package/lib/tree/nodes/randomReal.d.ts

@@ -0,0 +1,15 @@
+import { RandfloatProps } from "../../math/utils/random/randfloat.js";
+import { RandintProps } from "../../math/utils/random/randint.js";
+export declare enum RealType {
+    Integer = 0,
+    Decimal = 1,
+    Rational = 2,
+    Irrational = 3
+}
+type RandomGeneratorOptions = {
+    int?: RandintProps;
+    dec?: RandfloatProps;
+};
+export declare const randomReal: (props: RandomGeneratorOptions) => number;
+export {};
+//# sourceMappingURL=randomReal.d.ts.map

package/lib/tree/nodes/randomReal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"randomReal.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/randomReal.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAW,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE3E,oBAAY,QAAQ;IAClB,OAAO,IAAA;IACP,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAED,KAAK,sBAAsB,GAAG;IAC5B,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB,CAAC;AAMF,eAAO,MAAM,UAAU,UAAW,sBAAsB,WA0BvD,CAAC"}

package/lib/tree/nodes/randomReal.js

@@ -0,0 +1,32 @@
+import { randfloat, } from "../../math/utils/random/randfloat.js";
+import { randint } from "../../math/utils/random/randint.js";
+export var RealType;
+(function (RealType) {
+    RealType[RealType["Integer"] = 0] = "Integer";
+    RealType[RealType["Decimal"] = 1] = "Decimal";
+    RealType[RealType["Rational"] = 2] = "Rational";
+    RealType[RealType["Irrational"] = 3] = "Irrational";
+})(RealType || (RealType = {}));
+export const randomReal = (props) => {
+    //!should be done in a type
+    const [type, opts] = Object.entries(props)[0];
+    if (Object.keys(props).length !== 1)
+        throw new Error("misused randomReal");
+    switch (type) {
+        case "int": {
+            return randint(...opts.int);
+        }
+        case "dec": {
+            return randfloat(...opts.dec);
+        }
+        // case "ratio": {
+        // }
+        // case "irratio": {
+        //     //pi, e , sqrt
+        // }
+        // case RealType.Rational:
+        //   return sign * Math.random();
+        // case RealType.Irrational:
+        //   return sign * Math.random();
+    }
+};

package/lib/tree/parsers/latexParser.js

@@ -8,7 +8,7 @@ import { SinNode } from "../nodes/functions/sinNode.js";
 import { SqrtNode } from "../nodes/functions/sqrtNode.js";
 import { InequationNode } from "../nodes/inequations/inequationNode.js";
 import { MinusInfinityNode, PlusInfinityNode, } from "../nodes/numbers/infiniteNode.js";
-import { NumberNode, isNumberNode } from "../nodes/numbers/numberNode.js";
+import { NumberNode } from "../nodes/numbers/numberNode.js";
 import { PiNode } from "../nodes/numbers/piNode.js";
 import { AddNode } from "../nodes/operators/addNode.js";
 import { BinomialCoefficientNode } from "../nodes/operators/binomialCoefficientNode.js";
@@ -432,13 +432,14 @@ const buildTreeForSameDepthTokens = (tokens) => {
         const token = tempTokens[i];
         if (!currentAdd) {
             if (typeof token === "string") {
-                //ici on accepte +3 (mais seulement en début de tree)
+                //ici on accepte +"node" (mais seulement en début de tree)
                 //donc +3 + X est ok
                 //mais pas x \\times +3
                 if (token === "+" &&
                     !!tempTokens[i + 1] &&
-                    typeof tempTokens[i + 1] !== "string" &&
-                    isNumberNode(tempTokens[i + 1])) {
+                    typeof tempTokens[i + 1] !== "string"
+                // && isNumberNode(tempTokens[i + 1] as AlgebraicNode
+                ) {
                     currentAdd = tempTokens[i + 1];
                     i++;
                 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.106",
+  "version": "3.0.108",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [