math-exercises 2.2.3 → 2.2.5

package/lib/tree/nodes/equations/equationSolutionNode.js

@@ -25,6 +25,14 @@ class EquationSolutionNode {
             if (this.opts?.allowRawRightChildAsSolution)
                 res.push(solTex);
         }
+        else {
+            const solTex = this.solutionsSet.elements.map((e) => e.toTex());
+            res.push(solTex.map((e) => `${this.variable}=${e}`).join("\\text{ ou }"));
+            if (this.opts?.allowRawRightChildAsSolution) {
+                res.push(solTex.join(";"));
+                res.push(solTex.join("\\text{ ou }"));
+            }
+        }
         return res;
     }
     toEquivalentNodes(opts) {

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

@@ -25,7 +25,11 @@ export type NodeOptions = {
 };
 export type ToTexOptions = {
     displayStyle?: boolean;
+    forceDotSign?: boolean;
     scientific?: number;
+    hideUnit?: boolean;
+    notScientific?: boolean;
+    forceNoSimplification?: boolean;
 };
 export interface Node {
     type: NodeType;

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

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/node.ts"],"names":[],"mappings":"AAIA,oBAAY,QAAQ;IAClB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,GAAG,IAAA;IACH,UAAU,IAAA;IACV,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,OAAO,KAAA;IACP,MAAM,KAAA;CACP;AACD,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC;IAClD,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IACjD,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,YAAY,KAAK,MAAM,CAAC;CAGxC;AAED,eAAO,MAAM,eAAe,MAAO,IAAI,KAAG,OAMzC,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/node.ts"],"names":[],"mappings":"AAIA,oBAAY,QAAQ;IAClB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,GAAG,IAAA;IACH,UAAU,IAAA;IACV,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,OAAO,KAAA;IACP,MAAM,KAAA;CACP;AACD,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AACF,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC;IAClD,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IACjD,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,YAAY,KAAK,MAAM,CAAC;CAGxC;AAED,eAAO,MAAM,eAAe,MAAO,IAAI,KAAG,OAMzC,CAAC"}

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

@@ -128,8 +128,8 @@ class AddNode {
                 const d = a.rightChild;
                 return new fractionNode_1.FractionNode(new AddNode(c, new multiplyNode_1.MultiplyNode(d, b)), d).simplify(opts);
             }
-            if ((0, fractionNode_1.isFractionNode)(b)) {
-                //c/d + a
+            if ((0, fractionNode_1.isFractionNode)(b) && !opts?.forceDistributeFractions) {
+                //a+c/d
                 const c = b.leftChild;
                 const d = b.rightChild;
                 return new fractionNode_1.FractionNode(new AddNode(c, new multiplyNode_1.MultiplyNode(d, a)), d).simplify(opts);

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,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,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,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IAyDlC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAwFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,IAAI;IAGJ,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAgH/C,MAAM,CAAC,IAAI,EAAE,aAAa;CAU3B"}
+{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,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,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IA4DlC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAwFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,IAAI;IAGJ,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IA0H/C,MAAM,CAAC,IAAI,EAAE,aAAa;CAU3B"}

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

@@ -50,9 +50,10 @@ class MultiplyNode {
         return `(${this.leftChild.toMathString()})*(${this.rightChild.toMathString()})`;
     }
     toTex(opts) {
-        let leftTex = this.leftChild.toTex();
-        let rightTex = this.rightChild.toTex();
-        if ((0, numberNode_1.isNumberNode)(this.leftChild) &&
+        let leftTex = this.leftChild.toTex(opts);
+        let rightTex = this.rightChild.toTex(opts);
+        if (!opts?.forceNoSimplification &&
+            (0, numberNode_1.isNumberNode)(this.leftChild) &&
             this.leftChild.value === 1 &&
             opts?.scientific === undefined) {
             return rightTex;
@@ -68,27 +69,29 @@ class MultiplyNode {
         }
         if (needBrackets)
             rightTex = `\\left(${rightTex}\\right)`;
-        if (leftTex === "-1") {
+        if (leftTex === "-1" && !opts?.forceNoSimplification) {
             // if (!isNumberNode(this.rightChild)) {
             return "-" + rightTex;
             // }
         }
-        let showTimesSign = this.opts?.forceTimesSign ||
-            !isNaN(+rightTex[0]) ||
-            (0, numberNode_1.isNumberNode)(this.rightChild) ||
-            ((0, variableNode_1.isVariableNode)(this.leftChild) &&
-                (0, variableNode_1.isVariableNode)(this.rightChild) &&
-                this.leftChild.name === this.rightChild.name);
+        let showTimesSign = !opts?.forceDotSign &&
+            (this.opts?.forceTimesSign ||
+                !isNaN(+rightTex[0]) ||
+                (0, numberNode_1.isNumberNode)(this.rightChild) ||
+                ((0, variableNode_1.isVariableNode)(this.leftChild) &&
+                    (0, variableNode_1.isVariableNode)(this.rightChild) &&
+                    this.leftChild.name === this.rightChild.name));
         if ((0, operatorNode_1.isOperatorNode)(this.rightChild)) {
             showTimesSign ||= [operatorNode_1.OperatorIds.fraction].includes(this.rightChild.id);
         }
+        const cDotSign = opts?.forceDotSign ? ` \\cdot ` : "";
         const nextIsLetter = rightTex[0].toLowerCase() !== rightTex[0].toUpperCase();
         const prevIsCommand = leftTex.match(/\\[a-z]*$/);
         return `${leftTex}${showTimesSign
             ? `\\times${nextIsLetter ? " " : ""}`
             : prevIsCommand && nextIsLetter
                 ? " "
-                : ""}${rightTex}`;
+                : ""}${cDotSign}${rightTex}`;
     }
     toAllTexs() {
         const res = [];
@@ -268,8 +271,12 @@ class MultiplyNode {
                     : (0, operatorComposition_1.operatorComposition)(MultiplyNode, denums);
                 return new fractionNode_1.FractionNode(numNode, denumNode).simplify(opts);
             }
-        (0, exports.sortMultiplyNodes)(externals);
         const simplifyExternalNodes = (a, b) => {
+            if ((0, variableNode_1.isVariableNode)(a) && (0, variableNode_1.isVariableNode)(b)) {
+                if (a.name === b.name) {
+                    return new powerNode_1.SquareNode(a);
+                }
+            }
             if ((0, numberNode_1.isNumberNode)(a) && (0, numberNode_1.isNumberNode)(b)) {
                 return new numberNode_1.NumberNode((0, round_1.round)(a.value * b.value, 12));
             }
@@ -282,6 +289,12 @@ class MultiplyNode {
                 a.value === b.leftChild.value) {
                 return new powerNode_1.PowerNode(b.leftChild, new addNode_1.AddNode(b.rightChild, (1).toTree())).simplify();
             }
+            let powerSimplified = powerSimplify(a, b, opts);
+            if (powerSimplified)
+                return powerSimplified;
+            powerSimplified = powerSimplify(b, a, opts);
+            if (powerSimplified)
+                return powerSimplified;
             //TODo continue
             return null;
         };
@@ -322,3 +335,18 @@ class MultiplyNode {
     }
 }
 exports.MultiplyNode = MultiplyNode;
+const powerSimplify = (a, b, opts) => {
+    if ((0, powerNode_1.isPowerNode)(a) && (0, powerNode_1.isPowerNode)(b)) {
+        if (a.leftChild.toTex() ===
+            b.leftChild.toTex())
+            return new powerNode_1.PowerNode(a.leftChild, new addNode_1.AddNode(a.rightChild, b.rightChild).simplify(opts)).simplify(opts);
+    }
+    if ((0, variableNode_1.isVariableNode)(a)) {
+        if ((0, variableNode_1.isVariableNode)(b) && b.toTex() === a.toTex() && opts?.keepPowers)
+            return new powerNode_1.PowerNode(a, new numberNode_1.NumberNode(2)).simplify(opts);
+        if ((0, powerNode_1.isPowerNode)(b) &&
+            b.leftChild.toTex() === a.toTex()) {
+            return new powerNode_1.PowerNode(a, new addNode_1.AddNode(new numberNode_1.NumberNode(1), b.rightChild).simplify(opts)).simplify(opts);
+        }
+    }
+};

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;IAgB/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;AAElE,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;IAqC/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

@@ -161,6 +161,18 @@ class PowerNode {
         const rightSimplified = this.rightChild.simplify(opts);
         const copy = new PowerNode(leftSimplified, rightSimplified, this.opts);
         //! temporaire
+        if ((0, numberNode_1.isNumberNode)(rightSimplified) && rightSimplified.value === 0) {
+            return new numberNode_1.NumberNode(1);
+        }
+        if ((0, numberNode_1.isNumberNode)(rightSimplified) && rightSimplified.value === 1) {
+            return leftSimplified;
+        }
+        if (isPowerNode(leftSimplified)) {
+            return new PowerNode(leftSimplified.leftChild, new multiplyNode_1.MultiplyNode(rightSimplified, leftSimplified.rightChild).simplify(opts)).simplify(opts);
+        }
+        if ((0, multiplyNode_1.isMultiplyNode)(leftSimplified)) {
+            return new multiplyNode_1.MultiplyNode(new PowerNode(leftSimplified.leftChild, rightSimplified), new PowerNode(leftSimplified.rightChild, rightSimplified)).simplify(opts);
+        }
         if (!opts?.keepPowers &&
             (0, numberNode_1.isNumberNode)(copy.rightChild) &&
             copy.rightChild.value === 2) {

package/lib/utils/alignTex.d.ts

@@ -0,0 +1,2 @@
+export declare function alignTex(arr: string[][] | string): string;
+//# sourceMappingURL=alignTex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"alignTex.d.ts","sourceRoot":"","sources":["../../src/utils/alignTex.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,UAehD"}

package/lib/utils/alignTex.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.alignTex = void 0;
+function alignTex(arr) {
+    //! le "&" avant les join sert à aligner à gauche
+    //! mais ca crée un manque d'espace moche
+    //! je pense qu'il faut changer d'environnement (align)
+    //! utiliser un autre genre array ou equation je sais pas
+    const aligned = `$$
+\\begin{align*}
+${typeof arr === "string"
+        ? arr
+        : arr.map((el) => "&" + el.join("&")).join(` \\\\`)}
+\\end{align*}
+$$`;
+    return aligned;
+}
+exports.alignTex = alignTex;

package/package.json

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