math-exercises 2.0.1 → 2.0.2

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VectorNode = void 0;
+const node_1 = require("../node");
+class VectorNode {
+    constructor(name, opts) {
+        this.type = node_1.NodeType.vector;
+        this.opts = opts;
+        this.name = name;
+    }
+    //   toAllTexs() {
+    //     return [this.segmentName, this.segmentName.split("").reverse().join()];
+    //   }
+    toAllValidTexs() {
+        return this.toEquivalentNodes(this.opts).flatMap((node) => node.toTex());
+    }
+    toEquivalentNodes(opts) {
+        return [this];
+    }
+    toMathString() {
+        return this.toTex();
+    }
+    toMathjs() {
+        return this.toTex();
+    }
+    toTex() {
+        return `\\overrightarrow{${this.name}}`;
+    }
+}
+exports.VectorNode = VectorNode;

package/lib/tree/nodes/inequations/inequationNode.d.ts

@@ -0,0 +1,21 @@
+import { Node, NodeOptions, NodeType } from "../node";
+import { IntervalNode } from "../sets/intervalNode";
+export type InegalitySymbols = "<" | ">" | "\\le" | "\\ge";
+export declare const getInversedInequationSymbol: (s: InegalitySymbols) => InegalitySymbols;
+export declare class InequationNode implements Node {
+    opts?: NodeOptions | undefined;
+    type: NodeType;
+    tex: string;
+    children: Node[];
+    symbols: InegalitySymbols[];
+    constructor(children: Node[], symbols: InegalitySymbols[] | InegalitySymbols);
+    toInterval(): IntervalNode;
+    toReversed(): InequationNode;
+    toAllValidTexs(): string[];
+    toEquivalentNodes(opts?: NodeOptions | undefined): InequationNode[];
+    toMathString(): string;
+    toMathjs(): string;
+    toAllTexs(): string[];
+    toTex(): string;
+}
+//# sourceMappingURL=inequationNode.d.ts.map

package/lib/tree/nodes/inequations/inequationNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inequationNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/inequations/inequationNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEtD,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,MAAM,gBAAgB,GAAG,GAAG,GAAG,GAAG,GAAG,MAAM,GAAG,MAAM,CAAC;AAE3D,eAAO,MAAM,2BAA2B,MACnC,gBAAgB,KAClB,gBAWF,CAAC;AAEF,qBAAa,cAAe,YAAW,IAAI;IACzC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,OAAO,EAAE,gBAAgB,EAAE,CAAC;gBAE1B,QAAQ,EAAE,IAAI,EAAE,EAChB,OAAO,EAAE,gBAAgB,EAAE,GAAG,gBAAgB;IAwBhD,UAAU;IA6CV,UAAU;IAMV,cAAc;IAGd,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAYhD,YAAY;IAGZ,QAAQ;IAGR,SAAS;IAGT,KAAK;CAGN"}

package/lib/tree/nodes/inequations/inequationNode.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InequationNode = exports.getInversedInequationSymbol = void 0;
+const cartesianProducts_1 = require("../../../utils/cartesianProducts");
+const isLetter_1 = require("../../../utils/isLetter");
+const node_1 = require("../node");
+const infiniteNode_1 = require("../numbers/infiniteNode");
+const intervalNode_1 = require("../sets/intervalNode");
+const getInversedInequationSymbol = (s) => {
+    switch (s) {
+        case "<":
+            return ">";
+        case ">":
+            return "<";
+        case "\\ge":
+            return "\\le";
+        case "\\le":
+            return "\\ge";
+    }
+};
+exports.getInversedInequationSymbol = getInversedInequationSymbol;
+class InequationNode {
+    constructor(children, symbols) {
+        if (children.length < 2)
+            throw Error("can't build inequality with unique child");
+        if (Array.isArray(symbols) && symbols.length !== children.length - 1)
+            throw Error("symbols not in adequation with children");
+        this.children = children;
+        this.symbols = Array.isArray(symbols)
+            ? symbols
+            : this.children.slice(1).map((el) => symbols);
+        this.tex = "";
+        for (let i = 0; i < children.length; i++) {
+            this.tex += children[i].toTex();
+            if (i < children.length - 1) {
+                const shouldAddSpace = (this.symbols[i] === "\\le" || this.symbols[i] === "\\ge") &&
+                    (0, isLetter_1.isLetter)(children[i + 1].toTex());
+                this.tex += `${this.symbols[i]}${shouldAddSpace ? " " : ""}`;
+            }
+        }
+        this.type = node_1.NodeType.inequation;
+    }
+    toInterval() {
+        if (this.children.length > 3)
+            throw Error("can't build interval with this inequality");
+        if (this.children.length === 3) {
+            const closure = this.symbols[0] === "<"
+                ? this.symbols[1] === "<"
+                    ? intervalNode_1.ClosureType.OO
+                    : intervalNode_1.ClosureType.OF
+                : this.symbols[1] === "<"
+                    ? intervalNode_1.ClosureType.FO
+                    : intervalNode_1.ClosureType.FF;
+            return new intervalNode_1.IntervalNode(this.children[0], this.children[2], closure);
+        }
+        else {
+            let leftIsInf = false;
+            let rightIsInf = false;
+            let closure;
+            switch (this.symbols[0]) {
+                case "<":
+                    closure = intervalNode_1.ClosureType.OO;
+                    leftIsInf = true;
+                    break;
+                case ">":
+                    closure = intervalNode_1.ClosureType.OO;
+                    rightIsInf = true;
+                    break;
+                case "\\le":
+                    closure = intervalNode_1.ClosureType.OF;
+                    leftIsInf = true;
+                    break;
+                case "\\ge":
+                    closure = intervalNode_1.ClosureType.FO;
+                    rightIsInf = true;
+                    break;
+                default:
+                    throw Error("unrecognized inequation type");
+            }
+            return new intervalNode_1.IntervalNode(leftIsInf ? infiniteNode_1.MinusInfinityNode : this.children[1], rightIsInf ? infiniteNode_1.PlusInfinityNode : this.children[1], closure);
+        }
+    }
+    toReversed() {
+        const newChildren = [...this.children].reverse();
+        const newSymbols = this.symbols.map(exports.getInversedInequationSymbol);
+        return new InequationNode(newChildren, newSymbols);
+    }
+    toAllValidTexs() {
+        return this.toEquivalentNodes().map((node) => node.toTex());
+    }
+    toEquivalentNodes(opts) {
+        const equivs = this.children.map((node) => node.toEquivalentNodes());
+        const cartesians = (0, cartesianProducts_1.getCartesiansProducts)(equivs);
+        const nodes = [];
+        cartesians.forEach((product) => {
+            const newNode = new InequationNode(product, this.symbols);
+            const reversed = newNode.toReversed();
+            nodes.push(newNode);
+            nodes.push(reversed);
+        });
+        return nodes;
+    }
+    toMathString() {
+        return this.tex;
+    }
+    toMathjs() {
+        return this.tex;
+    }
+    toAllTexs() {
+        return [this.toTex()];
+    }
+    toTex() {
+        return this.tex;
+    }
+}
+exports.InequationNode = InequationNode;

package/lib/tree/nodes/inequations/inequationSolutionNode.d.ts

@@ -0,0 +1,21 @@
+import { Node, NodeOptions, NodeType } from "../node";
+import { IntervalNode } from "../sets/intervalNode";
+type InequationSolutionNodeOptions = {
+    variable?: string;
+    opts?: NodeOptions;
+};
+export declare class InequationSolutionNode implements Node {
+    type: NodeType;
+    variable: string;
+    intervalSolution: IntervalNode;
+    opts?: NodeOptions;
+    constructor(intervalSolution: IntervalNode, params?: InequationSolutionNodeOptions);
+    toAllTexs(): string[];
+    toAllValidTexs(): string[];
+    toEquivalentNodes(opts?: NodeOptions): (import("./inequationNode").InequationNode | InequationSolutionNode)[];
+    toMathString(): string;
+    toMathjs(): string;
+    toTex(): string;
+}
+export {};
+//# sourceMappingURL=inequationSolutionNode.d.ts.map

package/lib/tree/nodes/inequations/inequationSolutionNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inequationSolutionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/inequations/inequationSolutionNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,KAAK,6BAA6B,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,WAAW,CAAA;CAAE,CAAC;AAC/E,qBAAa,sBAAuB,YAAW,IAAI;IACjD,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,IAAI,CAAC,EAAE,WAAW,CAAC;gBAEjB,gBAAgB,EAAE,YAAY,EAC9B,MAAM,CAAC,EAAE,6BAA6B;IAcxC,SAAS;IAUT,cAAc;IAId,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAQpC,YAAY;IAGZ,QAAQ;IAGR,KAAK;CAGN"}

package/lib/tree/nodes/inequations/inequationSolutionNode.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InequationSolutionNode = void 0;
+const node_1 = require("../node");
+class InequationSolutionNode {
+    constructor(intervalSolution, params) {
+        this.type = node_1.NodeType.set;
+        this.intervalSolution = intervalSolution;
+        this.variable = params?.variable ?? "x";
+        this.opts = params?.opts
+            ? {
+                ...params.opts,
+                allowRawRightChildAsSolution: params.opts.allowRawRightChildAsSolution ?? true,
+            }
+            : { allowRawRightChildAsSolution: true };
+    }
+    toAllTexs() {
+        const intervalTex = this.intervalSolution.toTex();
+        const res = [
+            this.toTex(),
+            this.intervalSolution.toTex(),
+            `${this.variable}\\in${intervalTex}`,
+        ];
+        return res;
+    }
+    toAllValidTexs() {
+        return this.toEquivalentNodes(this.opts).flatMap((el) => el.toAllTexs());
+    }
+    toEquivalentNodes(opts) {
+        const equivs = this.intervalSolution.toEquivalentNodes(opts ?? this.opts);
+        return equivs.flatMap((equiv) => [
+            new InequationSolutionNode(equiv, { variable: this.variable, opts }),
+            ...equiv.toInequality().toEquivalentNodes(),
+        ]);
+    }
+    toMathString() {
+        return "";
+    }
+    toMathjs() {
+        return `S={${this.intervalSolution.toMathjs()}}`;
+    }
+    toTex() {
+        return `S=${this.intervalSolution.toTex()}`;
+    }
+}
+exports.InequationSolutionNode = InequationSolutionNode;

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

@@ -3,13 +3,32 @@ export declare enum NodeType {
     constant = 1,
     variable = 2,
     operator = 3,
-    function = 4
+    function = 4,
+    set = 5,
+    inequation = 6,
+    point = 7,
+    mesure = 8,
+    equality = 9,
+    belongs = 10,
+    vector = 11
 }
+export type NodeOptions = {
+    forceTimesSign?: boolean;
+    forbidPowerToProduct?: boolean;
+    allowRawRightChildAsSolution?: boolean;
+    allowFractionToDecimal?: boolean;
+    allowMinusAnywhereInFraction?: boolean;
+    useExpNotation?: boolean;
+    allowLnOfOne?: boolean;
+    allowPowerOne?: boolean;
+    allowSimplifySqrt?: boolean;
+};
 export interface Node {
     type: NodeType;
+    opts?: NodeOptions;
     toMathString: () => string;
-    toEquivalentNodes: () => Node[];
-    toAllValidTexs: () => string[];
+    toEquivalentNodes: (opts?: NodeOptions) => Node[];
+    toAllValidTexs: (opts?: NodeOptions) => string[];
     toTex: () => string;
     toMathjs: () => any;
 }

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":"AAAA,oBAAY,QAAQ;IAClB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;CACT;AAED,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,QAAQ,CAAC;IAEf,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,IAAI,EAAE,CAAC;IAChC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;IAC/B,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,CAAC;CAErB"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/node.ts"],"names":[],"mappings":"AAAA,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;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,MAAM,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,CAAC;CAErB"}

package/lib/tree/nodes/node.js

@@ -8,4 +8,11 @@ var NodeType;
     NodeType[NodeType["variable"] = 2] = "variable";
     NodeType[NodeType["operator"] = 3] = "operator";
     NodeType[NodeType["function"] = 4] = "function";
+    NodeType[NodeType["set"] = 5] = "set";
+    NodeType[NodeType["inequation"] = 6] = "inequation";
+    NodeType[NodeType["point"] = 7] = "point";
+    NodeType[NodeType["mesure"] = 8] = "mesure";
+    NodeType[NodeType["equality"] = 9] = "equality";
+    NodeType[NodeType["belongs"] = 10] = "belongs";
+    NodeType[NodeType["vector"] = 11] = "vector";
 })(NodeType = exports.NodeType || (exports.NodeType = {}));

package/lib/tree/nodes/numbers/constantNode.d.ts

@@ -1,5 +1,7 @@
-import { Node, NodeType } from '../node';
-export declare class ConstantNode implements Node {
+import { Node, NodeType } from "../node";
+import { AlgebraicNode } from "../algebraicNode";
+export declare function isConstantNode(a: Node): a is ConstantNode;
+export declare class ConstantNode implements AlgebraicNode {
     tex: string;
     mathString: string;
     type: NodeType;

package/lib/tree/nodes/numbers/constantNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constantNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/constantNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,YAAa,YAAW,IAAI;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAqB;gBAEvB,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAK3C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAGR,cAAc;IAGd,iBAAiB;CAGlB"}
+{"version":3,"file":"constantNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/constantNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AACD,qBAAa,YAAa,YAAW,aAAa;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAqB;gBAEvB,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAK3C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAGR,cAAc;IAGd,iBAAiB;CAGlB"}

package/lib/tree/nodes/numbers/constantNode.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConstantNode = void 0;
+exports.ConstantNode = exports.isConstantNode = void 0;
 const mathjs_1 = require("mathjs");
 const node_1 = require("../node");
+function isConstantNode(a) {
+    return a.type === node_1.NodeType.constant;
+}
+exports.isConstantNode = isConstantNode;
 class ConstantNode {
     constructor(tex, mathString) {
         this.type = node_1.NodeType.constant;

package/lib/tree/nodes/numbers/infiniteNode.d.ts

@@ -0,0 +1,5 @@
+import { ConstantNode } from "./constantNode";
+export declare const InfinityNode: ConstantNode;
+export declare const PlusInfinityNode: ConstantNode;
+export declare const MinusInfinityNode: ConstantNode;
+//# sourceMappingURL=infiniteNode.d.ts.map

package/lib/tree/nodes/numbers/infiniteNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"infiniteNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/infiniteNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,YAAY,cAA0C,CAAC;AACpE,eAAO,MAAM,gBAAgB,cAA2C,CAAC;AACzE,eAAO,MAAM,iBAAiB,cAA4C,CAAC"}

package/lib/tree/nodes/numbers/infiniteNode.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MinusInfinityNode = exports.PlusInfinityNode = exports.InfinityNode = void 0;
+const constantNode_1 = require("./constantNode");
+exports.InfinityNode = new constantNode_1.ConstantNode("\\infty", "infinity");
+exports.PlusInfinityNode = new constantNode_1.ConstantNode("+\\infty", "infinity");
+exports.MinusInfinityNode = new constantNode_1.ConstantNode("-\\infty", "-infinity");

package/lib/tree/nodes/numbers/numberNode.d.ts

@@ -1,5 +1,7 @@
-import { Node, NodeType } from '../node';
-export declare class NumberNode implements Node {
+import { Node, NodeType } from "../node";
+import { AlgebraicNode } from "../algebraicNode";
+export declare function isNumberNode(a: Node): a is NumberNode;
+export declare class NumberNode implements AlgebraicNode {
     tex: string;
     mathString: string;
     value: number;

package/lib/tree/nodes/numbers/numberNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"numberNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/numberNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,UAAW,YAAW,IAAI;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAmB;gBAErB,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAGR,cAAc;IAOd,iBAAiB;CAGlB"}
+{"version":3,"file":"numberNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/numberNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,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;gBAErB,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAM5D,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAGR,cAAc;IAOd,iBAAiB;CAGlB"}

package/lib/tree/nodes/numbers/numberNode.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberNode = void 0;
+exports.NumberNode = exports.isNumberNode = void 0;
 const node_1 = require("../node");
+function isNumberNode(a) {
+    return a.type === node_1.NodeType.number;
+}
+exports.isNumberNode = isNumberNode;
 class NumberNode {
     constructor(value, tex, mathString) {
         this.type = node_1.NodeType.number;
         this.value = value;
-        this.tex = tex || (value + '').replace('.', ',');
-        this.mathString = mathString || this.value + '';
+        this.tex = tex || (value + "").replace(".", ",");
+        this.mathString = mathString || this.value + "";
     }
     toMathString() {
         return `${this.mathString}`;
@@ -22,8 +26,8 @@ class NumberNode {
         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(',', '.'));
+        if (this.tex.includes(","))
+            res.push(this.tex.replace(",", "."));
         return res;
     }
     toEquivalentNodes() {

package/lib/tree/nodes/numbers/percentNode.d.ts

@@ -0,0 +1,12 @@
+import { Node, NodeType } from "../node";
+export declare class PercentNode implements Node {
+    value: number;
+    type: NodeType;
+    constructor(value: number);
+    toMathString(): string;
+    toTex(): string;
+    toMathjs(): string;
+    toAllValidTexs(): string[];
+    toEquivalentNodes(): this[];
+}
+//# sourceMappingURL=percentNode.d.ts.map

package/lib/tree/nodes/numbers/percentNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"percentNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/percentNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,WAAY,YAAW,IAAI;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;gBAEH,KAAK,EAAE,MAAM;IAKzB,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAGR,cAAc;IAGd,iBAAiB;CAGlB"}

package/lib/tree/nodes/numbers/percentNode.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PercentNode = void 0;
+const node_1 = require("../node");
+class PercentNode {
+    constructor(value) {
+        this.value = value;
+        this.type = node_1.NodeType.number;
+    }
+    toMathString() {
+        return `${this.value}%`;
+    }
+    toTex() {
+        return `${(this.value + "").replace(".", ",")}\\%`;
+    }
+    toMathjs() {
+        return this.toMathString();
+    }
+    toAllValidTexs() {
+        return [this.toTex()];
+    }
+    toEquivalentNodes() {
+        return [this];
+    }
+}
+exports.PercentNode = PercentNode;

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

@@ -1,10 +1,19 @@
-import { Node } from '../node';
-import { OperatorNode } from './operatorNode';
-export declare class AddNode extends OperatorNode implements Node {
-    constructor(leftChild: Node, rightChild: Node);
+import { Node, NodeOptions, NodeType } from "../node";
+import { CommutativeOperatorNode, OperatorIds } from "./operatorNode";
+import { AlgebraicNode } from "../algebraicNode";
+export declare function isAddNode(a: Node): a is AddNode;
+export declare class AddNode implements CommutativeOperatorNode {
+    id: OperatorIds;
+    leftChild: AlgebraicNode;
+    rightChild: AlgebraicNode;
+    type: NodeType;
+    opts?: NodeOptions;
+    constructor(leftChild: AlgebraicNode, rightChild: AlgebraicNode, opts?: NodeOptions);
+    shuffle: () => void;
     toMathString(): string;
-    toEquivalentNodes(): Node[];
-    toAllValidTexs(): string[];
+    toEquivalentNodes(opts?: NodeOptions): Node[];
+    toAllTexs(): string[];
+    toAllValidTexs(opts?: NodeOptions): string[];
     toTex(): string;
     toMathjs(): any;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"addNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/addNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK3D,qBAAa,OAAQ,SAAQ,YAAa,YAAW,IAAI;gBAC3C,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAK7C,YAAY,IAAI,MAAM;IAItB,iBAAiB,IAAI,IAAI,EAAE;IAa3B,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAIf,QAAQ;CAGT"}
+{"version":3,"file":"addNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/addNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EACL,uBAAuB,EACvB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAKD,qBAAa,OAAQ,YAAW,uBAAuB;IACrD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAQpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,IAAI,EAAE;IAoC7C,SAAS,IAAI,MAAM,EAAE;IAIrB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAK5C,KAAK,IAAI,MAAM;IAIf,QAAQ;CAGT"}

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

@@ -1,34 +1,73 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddNode = void 0;
+exports.AddNode = exports.isAddNode = void 0;
 const mathjs_1 = require("mathjs");
+const node_1 = require("../node");
 const operatorNode_1 = require("./operatorNode");
+const coinFlip_1 = require("../../../utils/coinFlip");
+const permutations_1 = require("../../../utils/permutations");
+const cartesianProducts_1 = require("../../../utils/cartesianProducts");
+const operatorComposition_1 = require("../../../tree/utilities/operatorComposition");
+function isAddNode(a) {
+    return (0, operatorNode_1.isOperatorNode)(a) && a.id === operatorNode_1.OperatorIds.add;
+}
+exports.isAddNode = isAddNode;
 const addNodeToTex = (leftTex, rightTex) => {
-    return `${leftTex}${rightTex[0] === '-' ? '' : '+'}${rightTex}`;
+    return `${leftTex}${rightTex[0] === "-" ? "" : "+"}${rightTex}`;
 };
-class AddNode extends operatorNode_1.OperatorNode {
-    constructor(leftChild, rightChild) {
-        super(operatorNode_1.OperatorIds.add, leftChild, rightChild, true, '+');
+class AddNode {
+    constructor(leftChild, rightChild, opts) {
+        this.shuffle = () => {
+            if ((0, coinFlip_1.coinFlip)())
+                [this.leftChild, this.rightChild] = [this.rightChild, this.leftChild];
+        };
+        this.id = operatorNode_1.OperatorIds.add;
         this.leftChild = leftChild;
         this.rightChild = rightChild;
+        this.type = node_1.NodeType.operator;
+        this.opts = opts;
     }
     toMathString() {
         return `${this.leftChild.toMathString()} + (${this.rightChild.toMathString()})`;
     }
-    toEquivalentNodes() {
+    toEquivalentNodes(opts) {
+        const options = opts ?? this.opts;
         const res = [];
-        const rightNodes = this.rightChild.toEquivalentNodes();
-        const leftNodes = this.leftChild.toEquivalentNodes();
-        rightNodes.forEach((rightNode) => {
-            leftNodes.forEach((leftNode) => {
-                res.push(new AddNode(leftNode, rightNode));
-                res.push(new AddNode(rightNode, leftNode));
+        const addTree = [];
+        //ce seront des nodes qui ne sont pas des AddNode
+        //1: choper le sous arbre de type Non AddNode (ie les enfants nonAddNode des AddNode)
+        const recursive = (node) => {
+            if ((0, operatorNode_1.isOperatorNode)(node)) {
+                if (isAddNode(node)) {
+                    recursive(node.leftChild);
+                    recursive(node.rightChild);
+                }
+                else
+                    addTree.push(node);
+            }
+            else
+                addTree.push(node);
+        };
+        recursive(this);
+        //2: pour tous les nodes qui ne sont pas Add, on génère les equiv node
+        const equivNodesArr = addTree.map((node) => node.toEquivalentNodes(options));
+        //3: créer toutes les permutations de tous kes nodes equiv
+        let equivNodesPermutations = (0, permutations_1.permute)(equivNodesArr);
+        equivNodesPermutations.forEach((permutation) => {
+            //4: créé les produits cartésiens des nodes equiv puis nodify
+            const cartesiansProducts = (0, cartesianProducts_1.getCartesiansProducts)(permutation);
+            cartesiansProducts.forEach((product) => {
+                res.push((0, operatorComposition_1.operatorComposition)(AddNode, product));
             });
         });
         return res;
     }
-    toAllValidTexs() {
-        return this.toEquivalentNodes().map((node) => node.toTex());
+    toAllTexs() {
+        return [this.toTex()];
+    }
+    toAllValidTexs(opts) {
+        const options = opts ?? this.opts;
+        return this.toEquivalentNodes(options).map((node) => node.toTex());
     }
     toTex() {
         const rightTex = this.rightChild.toTex();

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

@@ -1,13 +1,19 @@
-import { Node } from '../node';
-import { OperatorNode } from './operatorNode';
-export declare class DivideNode extends OperatorNode implements Node {
+import { Node, NodeOptions, NodeType } from "../node";
+import { OperatorIds, OperatorNode } from "./operatorNode";
+import { AlgebraicNode } from "../algebraicNode";
+export declare function isDivideNode(a: Node): a is DivideNode;
+export declare class DivideNode implements OperatorNode {
+    id: OperatorIds;
+    leftChild: AlgebraicNode;
+    rightChild: AlgebraicNode;
+    type: NodeType;
     /**
      * @param leftChild num
      * @param rightChild denum
      */
-    constructor(leftChild: Node, rightChild: Node);
+    constructor(leftChild: AlgebraicNode, rightChild: AlgebraicNode);
     toMathString(): string;
-    toEquivalentNodes(): Node[];
+    toEquivalentNodes(opts?: NodeOptions): Node[];
     toAllValidTexs(): string[];
     toTex(): string;
     toMathjs(): number | import("mathjs").Unit;

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

@@ -1 +1 @@
-{"version":3,"file":"divideNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/divideNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAsB3D,qBAAa,UAAW,SAAQ,YAAa,YAAW,IAAI;IAC1D;;;OAGG;gBACS,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAI7C,YAAY,IAAI,MAAM;IAItB,iBAAiB;IAYjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAGf,QAAQ;CAGT"}
+{"version":3,"file":"divideNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/divideNode.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;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AA0BD,qBAAa,UAAW,YAAW,YAAY;IAC7C,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf;;;OAGG;gBAES,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa;IAO/D,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAYpC,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAGf,QAAQ;CAGT"}