math-exercises 1.3.47 → 1.3.52

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

@@ -4,5 +4,6 @@ export declare class MultiplyNode extends OperatorNode implements Node {
     constructor(leftChild: Node, rightChild: Node);
     toMathString(): string;
     toTex(): string;
+    toMathjs(): any;
 }
 //# sourceMappingURL=multiplyNode.d.ts.map

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,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,YAAa,SAAQ,YAAa,YAAW,IAAI;gBAChD,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAY7C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;CA6BhB"}
+{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,YAAa,SAAQ,YAAa,YAAW,IAAI;gBAChD,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAY7C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAoCf,QAAQ;CAGT"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiplyNode = void 0;
+const mathjs_1 = require("mathjs");
 const functionNode_1 = require("../functions/functionNode");
 const node_1 = require("../node");
 const operatorNode_1 = require("./operatorNode");
@@ -20,6 +21,11 @@ class MultiplyNode extends operatorNode_1.OperatorNode {
     toTex() {
         let leftTex = this.leftChild.toTex();
         let rightTex = this.rightChild.toTex();
+        if (this.rightChild.type === node_1.NodeType.variable) {
+            if (leftTex === '1') {
+                return rightTex;
+            }
+        }
         if (this.leftChild.type === node_1.NodeType.operator) {
             if ([operatorNode_1.OperatorIds.add, operatorNode_1.OperatorIds.substract, operatorNode_1.OperatorIds.divide].includes(this.leftChild.id))
                 leftTex = `(${leftTex})`;
@@ -39,5 +45,8 @@ class MultiplyNode extends operatorNode_1.OperatorNode {
         }
         return `${leftTex}${showTimesSign ? '\\times ' : ''}${rightTex}`;
     }
+    toMathjs() {
+        return (0, mathjs_1.multiply)(this.leftChild.toMathjs(), this.rightChild.toMathjs());
+    }
 }
 exports.MultiplyNode = MultiplyNode;

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

@@ -4,5 +4,6 @@ export declare class PowerNode extends OperatorNode implements Node {
     constructor(leftChild: Node, rightChild: Node);
     toMathString(): string;
     toTex(): string;
+    toMathjs(): import("mathjs").MathType;
 }
 //# sourceMappingURL=powerNode.d.ts.map

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":"AAAA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,SAAU,SAAQ,YAAa,YAAW,IAAI;gBAC7C,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAI7C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;CAkBhB"}
+{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,SAAU,SAAQ,YAAa,YAAW,IAAI;gBAC7C,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAI7C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAmBf,QAAQ;CAGT"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PowerNode = void 0;
+const mathjs_1 = require("mathjs");
 const node_1 = require("../node");
 const operatorNode_1 = require("./operatorNode");
 class PowerNode extends operatorNode_1.OperatorNode {
@@ -29,5 +30,8 @@ class PowerNode extends operatorNode_1.OperatorNode {
             leftTex = `(${leftTex})`;
         return `${leftTex}^{${rightTex}}`;
     }
+    toMathjs() {
+        return (0, mathjs_1.pow)(this.leftChild.toMathjs(), this.rightChild.toMathjs());
+    }
 }
 exports.PowerNode = PowerNode;

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

@@ -4,5 +4,6 @@ export declare class SubstractNode extends OperatorNode implements Node {
     constructor(leftChild: Node, rightChild: Node);
     toMathString(): string;
     toTex(): string;
+    toMathjs(): any;
 }
 //# sourceMappingURL=substractNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"substractNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/substractNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,aAAc,SAAQ,YAAa,YAAW,IAAI;gBACjD,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAG7C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;CAahB"}
+{"version":3,"file":"substractNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/substractNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,aAAc,SAAQ,YAAa,YAAW,IAAI;gBACjD,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAG7C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAaf,QAAQ;CAGT"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubstractNode = void 0;
+const mathjs_1 = require("mathjs");
 const node_1 = require("../node");
 const operatorNode_1 = require("./operatorNode");
 class SubstractNode extends operatorNode_1.OperatorNode {
@@ -20,5 +21,8 @@ class SubstractNode extends operatorNode_1.OperatorNode {
             rightTex = `(${rightTex})`;
         return `${leftTex} - ${rightTex}`;
     }
+    toMathjs() {
+        return (0, mathjs_1.subtract)(this.leftChild.toMathjs(), this.rightChild.toMathjs());
+    }
 }
 exports.SubstractNode = SubstractNode;

package/lib/tree/nodes/variables/variableNode.d.ts

@@ -5,5 +5,6 @@ export declare class VariableNode implements Node {
     constructor(name: string);
     toTex(): string;
     toMathString(): string;
+    toMathjs(): string;
 }
 //# sourceMappingURL=variableNode.d.ts.map

package/lib/tree/nodes/variables/variableNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variableNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/variables/variableNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,YAAa,YAAW,IAAI;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,WAAqB;gBAEb,IAAI,EAAE,MAAM;IAKxB,KAAK,IAAI,MAAM;IAGf,YAAY,IAAI,MAAM;CAMvB"}
+{"version":3,"file":"variableNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/variables/variableNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,YAAa,YAAW,IAAI;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,WAAqB;gBAEb,IAAI,EAAE,MAAM;IAIxB,KAAK,IAAI,MAAM;IAGf,YAAY,IAAI,MAAM;IAGtB,QAAQ;CAMT"}

package/lib/tree/nodes/variables/variableNode.js

@@ -5,8 +5,6 @@ const node_1 = require("../node");
 class VariableNode {
     constructor(name) {
         this.type = node_1.NodeType.variable;
-        if (name.length !== 1 || !name.match('[a-zA-Z]'))
-            throw Error('variable must be a letter');
         this.name = name;
     }
     toTex() {
@@ -15,5 +13,8 @@ class VariableNode {
     toMathString() {
         return `${this.name}`;
     }
+    toMathjs() {
+        return this.name;
+    }
 }
 exports.VariableNode = VariableNode;

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

@@ -1,3 +1,4 @@
 import { Node } from '../nodes/node';
+export declare const simplifyComplex: (node: Node) => Node;
 export declare const simplifyNode: (node: Node) => Node;
 //# sourceMappingURL=simplify.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"simplify.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/simplify.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAyBrC,eAAO,MAAM,YAAY,SAAU,IAAI,KAAG,IAEzC,CAAC"}
+{"version":3,"file":"simplify.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/simplify.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AA0BrC,eAAO,MAAM,eAAe,SAAU,IAAI,KAAG,IAE5C,CAAC;AAMF,eAAO,MAAM,YAAY,SAAU,IAAI,KAAG,IAEzC,CAAC"}

package/lib/tree/parsers/simplify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simplifyNode = void 0;
+exports.simplifyNode = exports.simplifyComplex = void 0;
 const mathjs_1 = require("mathjs");
 const oppositeNode_1 = require("../nodes/functions/oppositeNode");
 const sqrtNode_1 = require("../nodes/functions/sqrtNode");
@@ -16,6 +16,14 @@ const logNode_1 = require("../nodes/functions/logNode");
 const expNode_1 = require("../nodes/functions/expNode");
 const cosNode_1 = require("../../tree/nodes/functions/cosNode");
 const sinNode_1 = require("../../tree/nodes/functions/sinNode");
+const complexNode_1 = require("../nodes/complex/complexNode");
+const simplifyComplex = (node) => {
+    return mathjsComplexToNode((0, mathjs_1.complex)(node.toMathjs()));
+};
+exports.simplifyComplex = simplifyComplex;
+const mathjsComplexToNode = (complex) => {
+    return new complexNode_1.ComplexNode(complex.re, complex.im);
+};
 const simplifyNode = (node) => {
     return mathjsNodeToNode((0, mathjs_1.simplify)(node.toMathString()));
 };
@@ -60,5 +68,6 @@ const mathjsNodeToNode = (mathjsNode) => {
                 return new sinNode_1.SinNode(mathjsNodeToNode(mathjsNode.args[0]));
         }
     }
+    console.log(mathjsNode);
     throw Error('unrecognized mathjs node');
 };

package/lib/utils/diceFlip.d.ts

@@ -0,0 +1,2 @@
+export declare const diceFlip: (faces: number) => number;
+//# sourceMappingURL=diceFlip.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"diceFlip.d.ts","sourceRoot":"","sources":["../../src/utils/diceFlip.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,QAAQ,UAAW,MAAM,WAMrC,CAAC"}

package/lib/utils/diceFlip.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.diceFlip = void 0;
+const random_1 = require("./random");
+const diceFlip = (faces) => {
+    const arr = [];
+    for (let i = 0; i < faces; i++) {
+        arr.push(i);
+    }
+    return (0, random_1.random)(arr);
+};
+exports.diceFlip = diceFlip;

package/package.json

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