math-exercises 2.2.2 → 2.2.4

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

@@ -50,8 +50,8 @@ class MultiplyNode {
         return `(${this.leftChild.toMathString()})*(${this.rightChild.toMathString()})`;
     }
     toTex(opts) {
-        let leftTex = this.leftChild.toTex();
-        let rightTex = this.rightChild.toTex();
+        let leftTex = this.leftChild.toTex(opts);
+        let rightTex = this.rightChild.toTex(opts);
         if ((0, numberNode_1.isNumberNode)(this.leftChild) &&
             this.leftChild.value === 1 &&
             opts?.scientific === undefined) {
@@ -73,22 +73,24 @@ class MultiplyNode {
             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,7 +270,6 @@ 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, 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 +283,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 +329,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));
+        }
         if (!opts?.keepPowers &&
             (0, numberNode_1.isNumberNode)(copy.rightChild) &&
             copy.rightChild.value === 2) {

package/package.json

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