math-exercises 2.1.14 → 2.1.16

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntegralNode = void 0;
+const variableNode_1 = require("../variables/variableNode");
+class IntegralNode {
+    constructor(functionNode, lowerBound, upperBound, variable) {
+        (this.functionNode = functionNode),
+            (this.lowerBound = lowerBound),
+            (this.upperBound = upperBound),
+            (this.variable = new variableNode_1.VariableNode(variable));
+    }
+    toTex(opts) {
+        return `\\int_{${this.lowerBound.toTex()}}^{${this.upperBound.toTex()}} ${this.functionNode.toTex()} \\, \\mathrm{d}${this.variable.toTex()}`;
+    }
+}
+exports.IntegralNode = IntegralNode;

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

@@ -1,6 +1,6 @@
 import { Node, NodeType } from "../node";
 import { FunctionNode, FunctionsIds } from "./functionNode";
-import { AlgebraicNode } from "../algebraicNode";
+import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
 export declare function isSinNode(a: Node): a is SinNode;
 export declare class SinNode implements FunctionNode {
     id: FunctionsIds;
@@ -12,7 +12,7 @@ export declare class SinNode implements FunctionNode {
     toTex(): string;
     toEquivalentNodes(): AlgebraicNode[];
     toAllValidTexs(): string[];
-    simplify(): AlgebraicNode;
+    simplify(opts?: SimplifyOptions): AlgebraicNode;
     evaluate(vars: Record<string, number>): number;
     equals(node: AlgebraicNode): boolean;
 }

package/lib/tree/nodes/functions/sinNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sinNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/sinNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAmB,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AACD,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa;IAOhC,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAMf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAI1B,QAAQ,IAAI,aAAa;IAkBzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}
+{"version":3,"file":"sinNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/sinNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAmB,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGlE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEP,KAAK,EAAE,aAAa;IAOhC,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAIf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAI1B,QAAQ,CAAC,IAAI,GAAE,eAAoB,GAAG,aAAa;IAsBnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SinNode = exports.isSinNode = void 0;
-// import { sin } from "mathjs";
 const node_1 = require("../node");
 const functionNode_1 = require("./functionNode");
 const remarkableValues_1 = require("../../../math/trigonometry/remarkableValues");
@@ -22,9 +21,6 @@ class SinNode {
     toTex() {
         return `\\sin\\left(${this.child.toTex()}\\right)`;
     }
-    // toMathjs() {
-    //   return sin(this.child.toMathjs());
-    // }
     toEquivalentNodes() {
         const res = [];
         const childNodes = this.child.toEquivalentNodes();
@@ -36,24 +32,27 @@ class SinNode {
     toAllValidTexs() {
         return this.toEquivalentNodes().map((node) => node.toTex());
     }
-    simplify() {
+    simplify(opts = {}) {
         const simplifiedChild = this.child.simplify();
         if (!(0, node_1.hasVariableNode)(simplifiedChild)) {
-            const value = simplifiedChild.evaluate({});
+            let value = simplifiedChild.evaluate({});
+            if (opts.isDegree) {
+                value = (value * Math.PI) / 180;
+            }
             const moduled = Math.abs(value % (2 * Math.PI));
-            const trigoPoint = remarkableValues_1.remarkableTrigoValues.find((value) => value.angle.evaluate({}) === moduled);
+            const trigoPoint = remarkableValues_1.remarkableTrigoValues.find((val) => val.angle.evaluate({}) === moduled);
             if (!trigoPoint)
-                return this;
+                return new SinNode(simplifiedChild);
             else
-                return trigoPoint.cos;
+                return trigoPoint.sin;
         }
         else {
-            //écrire les regles albgeiruqe
-            //chaque simplification doit relancer tout le simplify
-            //cos(x+2PI)
-            //cos(-x)
+            // Écrire les règles algébriques spécifiques à sin ici
+            // Exemples :
+            // sin(x + 2π) -> sin(x)
+            // sin(-x) -> -sin(x)
         }
-        return this;
+        return new SinNode(simplifiedChild);
     }
     evaluate(vars) {
         return Math.sin(this.child.evaluate(vars));

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

@@ -0,0 +1,19 @@
+import { Node, NodeType } from "../node";
+import { FunctionNode, FunctionsIds } from "./functionNode";
+import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
+export declare function isTanNode(a: Node): a is TanNode;
+export declare class TanNode implements FunctionNode {
+    id: FunctionsIds;
+    child: AlgebraicNode;
+    type: NodeType;
+    isNumeric: boolean;
+    constructor(child: AlgebraicNode);
+    toMathString(): string;
+    toTex(): string;
+    toEquivalentNodes(): AlgebraicNode[];
+    toAllValidTexs(): string[];
+    simplify(opts?: SimplifyOptions): AlgebraicNode;
+    evaluate(vars: Record<string, number>): number;
+    equals(node: AlgebraicNode): boolean;
+}
+//# sourceMappingURL=tanNode.d.ts.map

package/lib/tree/nodes/functions/tanNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tanNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/tanNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAmB,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGlE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEP,KAAK,EAAE,aAAa;IAOhC,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAIf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAI1B,QAAQ,CAAC,IAAI,GAAE,eAAoB,GAAG,aAAa;IAsBnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}

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

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TanNode = exports.isTanNode = void 0;
+const node_1 = require("../node");
+const functionNode_1 = require("./functionNode");
+const remarkableValues_1 = require("../../../math/trigonometry/remarkableValues");
+function isTanNode(a) {
+    return (0, functionNode_1.isFunctionNode)(a) && a.id === functionNode_1.FunctionsIds.tan;
+}
+exports.isTanNode = isTanNode;
+class TanNode {
+    constructor(child) {
+        this.id = functionNode_1.FunctionsIds.tan;
+        this.child = child;
+        this.type = node_1.NodeType.function;
+        this.isNumeric = child.isNumeric;
+    }
+    toMathString() {
+        return `tan(${this.child.toMathString()})`;
+    }
+    toTex() {
+        return `\\tan\\left(${this.child.toTex()}\\right)`;
+    }
+    toEquivalentNodes() {
+        const res = [];
+        const childNodes = this.child.toEquivalentNodes();
+        childNodes.forEach((childNode) => {
+            res.push(new TanNode(childNode));
+        });
+        return res;
+    }
+    toAllValidTexs() {
+        return this.toEquivalentNodes().map((node) => node.toTex());
+    }
+    simplify(opts = {}) {
+        const simplifiedChild = this.child.simplify();
+        if (!(0, node_1.hasVariableNode)(simplifiedChild)) {
+            let value = simplifiedChild.evaluate({});
+            if (opts.isDegree) {
+                value = (value * Math.PI) / 180;
+            }
+            const moduled = Math.abs(value % Math.PI);
+            const trigoPoint = remarkableValues_1.remarkableTrigoValues.find((val) => val.angle.evaluate({}) === moduled);
+            if (!trigoPoint)
+                return new TanNode(simplifiedChild);
+            else
+                return trigoPoint.tan;
+        }
+        else {
+            // Écrire les règles algébriques spécifiques à tan ici
+            // Exemples :
+            // tan(x + π) -> tan(x)
+            // tan(-x) -> -tan(x)
+        }
+        return new TanNode(simplifiedChild);
+    }
+    evaluate(vars) {
+        return Math.tan(this.child.evaluate(vars));
+    }
+    equals(node) {
+        return isTanNode(node) && node.child.equals(this.child);
+    }
+}
+exports.TanNode = TanNode;

package/lib/tree/nodes/geometry/degree.d.ts

@@ -0,0 +1,20 @@
+import { Node, NodeType } from "../node";
+import { AlgebraicNode } from "../algebraicNode";
+export declare function isDegreeNode(a: Node): a is DegreeNode;
+export declare class DegreeNode implements AlgebraicNode {
+    tex: string;
+    mathString: string;
+    value: number;
+    type: NodeType;
+    isNumeric: boolean;
+    constructor(value: number, tex?: string, mathString?: string);
+    toMathString(): string;
+    toTex(): string;
+    toMathjs(): string;
+    toAllValidTexs(): string[];
+    toEquivalentNodes(): this[];
+    evaluate(vars: Record<string, number>): number;
+    simplify(): this;
+    equals(node: AlgebraicNode): boolean;
+}
+//# sourceMappingURL=degree.d.ts.map

package/lib/tree/nodes/geometry/degree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"degree.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/geometry/degree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AAED,qBAAa,UAAW,YAAW,aAAa;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAmB;IACjC,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAQ5D,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAGR,cAAc;IAOd,iBAAiB;IAGjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,QAAQ;IAGR,MAAM,CAAC,IAAI,EAAE,aAAa;CAG3B"}

package/lib/tree/nodes/geometry/degree.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DegreeNode = exports.isDegreeNode = void 0;
+const node_1 = require("../node");
+function isDegreeNode(a) {
+    return a.type === node_1.NodeType.number;
+}
+exports.isDegreeNode = isDegreeNode;
+class DegreeNode {
+    constructor(value, tex, mathString) {
+        this.type = node_1.NodeType.number;
+        this.value = value;
+        this.tex =
+            (tex?.replace(".", ",") || (value + "").replace(".", ",")) + `^\\circ`;
+        this.mathString = mathString || this.value + "^\\circ";
+        this.isNumeric = true;
+    }
+    toMathString() {
+        return `${this.mathString}`;
+    }
+    toTex() {
+        return `${this.tex}`;
+    }
+    toMathjs() {
+        return this.toMathString();
+    }
+    toAllValidTexs() {
+        const res = [];
+        res.push(this.tex);
+        //!est-ce vraiment nécessaire sachant que les inputs students n'auront en théorie jamais de "."
+        if (this.tex.includes(","))
+            res.push(this.tex.replace(",", "."));
+        return res;
+    }
+    toEquivalentNodes() {
+        return [this];
+    }
+    evaluate(vars) {
+        return this.value;
+    }
+    simplify() {
+        return this;
+    }
+    equals(node) {
+        return isDegreeNode(node) && node.value === this.value;
+    }
+}
+exports.DegreeNode = DegreeNode;

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

@@ -7,7 +7,8 @@ export declare enum OperatorIds {
     fraction = 3,
     divide = 4,
     power = 5,
-    limit = 6
+    limit = 6,
+    integral = 7
 }
 export interface OperatorNode extends AlgebraicNode {
     id: OperatorIds;

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

@@ -1 +1 @@
-{"version":3,"file":"operatorNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/operatorNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AAEzC,oBAAY,WAAW;IACrB,GAAG,IAAA;IACH,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,KAAK,IAAA;CACN;AAED,MAAM,WAAW,YAAa,SAAQ,aAAa;IACjD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;CAC3B;AACD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;CAC3B"}
+{"version":3,"file":"operatorNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/operatorNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AAEzC,oBAAY,WAAW;IACrB,GAAG,IAAA;IACH,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,KAAK,IAAA;IACL,QAAQ,IAAA;CACT;AAED,MAAM,WAAW,YAAa,SAAQ,aAAa;IACjD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;CAC3B;AACD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;CAC3B"}

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

@@ -11,6 +11,7 @@ var OperatorIds;
     OperatorIds[OperatorIds["divide"] = 4] = "divide";
     OperatorIds[OperatorIds["power"] = 5] = "power";
     OperatorIds[OperatorIds["limit"] = 6] = "limit";
+    OperatorIds[OperatorIds["integral"] = 7] = "integral";
 })(OperatorIds || (exports.OperatorIds = OperatorIds = {}));
 function isOperatorNode(a) {
     return a.type === node_1.NodeType.operator;

package/package.json

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