math-exercises 2.2.69 → 2.2.71

package/lib/math/utils/geometry/pythagoricianTriplets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pythagoricianTriplets = void 0;
+exports.pythagoricianTripletsNiceAngles = exports.pythagoricianTriplets = void 0;
 exports.pythagoricianTriplets = [
     [3, 4, 5],
     [5, 12, 13],
@@ -19,3 +19,16 @@ exports.pythagoricianTriplets = [
     [48, 55, 73],
     [65, 72, 97],
 ];
+exports.pythagoricianTripletsNiceAngles = [
+    [3, 4, 5],
+    [5, 12, 13],
+    [8, 15, 17],
+    [12, 35, 37],
+    [20, 21, 29],
+    [28, 45, 53],
+    [33, 56, 65],
+    [36, 77, 85],
+    [39, 80, 89],
+    [48, 55, 73],
+    [65, 72, 97],
+];

package/lib/math/utils/random/randfloat.d.ts

@@ -1,5 +1,5 @@
 /**
  * @returns random [[a, b[[
  */
-export declare const randfloat: (a: number, b?: number, roundTo?: number, excludes?: number[]) => number;
+export declare const randfloat: (a: number, b?: number, roundTo?: number, excludes?: number[] | ((x: number) => boolean) | undefined) => number;
 //# sourceMappingURL=randfloat.d.ts.map

package/lib/math/utils/random/randfloat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"randfloat.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/random/randfloat.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,eAAO,MAAM,SAAS,MACjB,MAAM,MACL,MAAM,YACA,MAAM,aACL,MAAM,EAAE,KAClB,MAWF,CAAC"}
+{"version":3,"file":"randfloat.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/random/randfloat.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,eAAO,MAAM,SAAS,MACjB,MAAM,MACL,MAAM,YACA,MAAM,6BACW,MAAM,KAAK,OAAO,kBAC5C,MAiBF,CAAC"}

package/lib/math/utils/random/randfloat.js

@@ -10,13 +10,20 @@ const randfloat = (a, b, roundTo, excludes) => {
         return Math.random() * a;
     if (roundTo === undefined)
         return a + Math.random() * (b - a);
-    if (excludes?.length) {
+    if (Array.isArray(excludes)) {
         let res = 0;
         do {
             res = (0, round_1.round)(a + Math.random() * (b - a), roundTo);
         } while (excludes.includes(res));
         return res;
     }
+    else if (excludes) {
+        let res = 0;
+        do {
+            res = (0, round_1.round)(a + Math.random() * (b - a), roundTo);
+        } while (excludes(res));
+        return res;
+    }
     return (0, round_1.round)(a + Math.random() * (b - a), roundTo);
 };
 exports.randfloat = randfloat;

package/lib/math/utils/random/randint.d.ts

@@ -1,5 +1,12 @@
 /**
  * @returns random [[a, b[[
  */
-export declare const randint: (a: number, b?: number, excludes?: number[]) => number;
+type Options = {
+    favor?: {
+        value: number;
+        proba: number;
+    };
+};
+export declare const randint: (a: number, b?: number, excludes?: number[], opts?: Options) => number;
+export {};
 //# sourceMappingURL=randint.d.ts.map

package/lib/math/utils/random/randint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"randint.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/random/randint.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,OAAO,MAAO,MAAM,MAAM,MAAM,aAAa,MAAM,EAAE,KAAG,MAQpE,CAAC"}
+{"version":3,"file":"randint.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/random/randint.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AACF,eAAO,MAAM,OAAO,MACf,MAAM,MACL,MAAM,aACC,MAAM,EAAE,SACZ,OAAO,KACb,MAaF,CAAC"}

package/lib/math/utils/random/randint.js

@@ -4,7 +4,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randint = void 0;
-const randint = (a, b, excludes) => {
+const randint = (a, b, excludes, opts) => {
+    if (opts?.favor) {
+        if (Math.random() < opts.favor.proba) {
+            return opts.favor.value;
+        }
+    }
     if (b === undefined)
         return Math.floor(Math.random() * a);
     if (!excludes)

package/lib/playground.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,UAAU,YAMtB,CAAC"}
+{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAoDA,eAAO,MAAM,UAAU,YAAW,CAAC"}

package/lib/playground.js

@@ -2,14 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.playground = void 0;
 const nodeConstructor_1 = require("./tree/nodes/nodeConstructor");
-const fractionNode_1 = require("./tree/nodes/operators/fractionNode");
-const oppositeNode_1 = require("./tree/nodes/functions/oppositeNode");
-const playground = () => {
-    const fraction = (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(-6), (0, oppositeNode_1.opposite)(4)).toSimplificationString();
-    console.log(fraction);
-    console.log((0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(-6), 4).toTex());
-    console.log((0, oppositeNode_1.opposite)(-6).toTex());
-};
+const playground = () => { };
 exports.playground = playground;
 const logIdentifiers = () => {
     const ids = '{"xA":-3,"yA":-2,"yPrimeA":{"id":31,"child":{"id":3,"leftChild":{"id":7,"value":3},"rightChild":{"id":7,"value":2}}},"trinomCoeffs":[0.3888888888888889,0.833333333333333,-3]}';

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

@@ -19,7 +19,7 @@ export declare class AbsNode implements FunctionNode {
     toTex(): string;
     toEquivalentNodes(): AlgebraicNode[];
     toAllValidTexs(): string[];
-    simplify(): AlgebraicNode | import("../numbers/numberNode").NumberNode | import("../numbers/constantNode").ConstantNode | AbsNode;
+    simplify(): AlgebraicNode | import("../numbers/constantNode").ConstantNode | import("../numbers/numberNode").NumberNode | AbsNode;
     evaluate(vars?: Record<string, number>): number;
     equals(node: AlgebraicNode): boolean;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): AbsNode;

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

@@ -15,8 +15,8 @@ export declare enum FunctionsIds {
     arccos = 10,
     arctan = 11
 }
-export interface FunctionNode extends AlgebraicNode {
+export interface FunctionNode<T = AlgebraicNode> extends AlgebraicNode {
     id: FunctionsIds;
-    child: AlgebraicNode;
+    child: T;
 }
 //# sourceMappingURL=functionNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"functionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/functionNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AAEzC,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,oBAAY,YAAY;IACtB,QAAQ,IAAA;IACR,IAAI,IAAA;IACJ,GAAG,IAAA;IACH,GAAG,IAAA;IACH,GAAG,IAAA;IACH,GAAG,IAAA;IACH,KAAK,IAAA;IACL,GAAG,IAAA;IACH,GAAG,IAAA;IACH,MAAM,IAAA;IACN,MAAM,KAAA;IACN,MAAM,KAAA;CACP;AAED,MAAM,WAAW,YAAa,SAAQ,aAAa;IACjD,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;CAOtB"}
+{"version":3,"file":"functionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/functionNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AAEzC,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,oBAAY,YAAY;IACtB,QAAQ,IAAA;IACR,IAAI,IAAA;IACJ,GAAG,IAAA;IACH,GAAG,IAAA;IACH,GAAG,IAAA;IACH,GAAG,IAAA;IACH,KAAK,IAAA;IACL,GAAG,IAAA;IACH,GAAG,IAAA;IACH,MAAM,IAAA;IACN,MAAM,KAAA;IACN,MAAM,KAAA;CACP;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,aAAa;IACpE,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC;CAOV"}

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

@@ -3,14 +3,14 @@ import { FunctionNode, FunctionsIds } from "./functionNode";
 import { NumberNode } from "../numbers/numberNode";
 import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
 export declare function isOppositeNode(a: Node): a is OppositeNode;
-export declare const opposite: (a: AlgebraicNode | number | string) => OppositeNode;
-export declare class OppositeNode implements FunctionNode {
+export declare const opposite: <T extends AlgebraicNode = AlgebraicNode>(a: string | number | T) => OppositeNode<T>;
+export declare class OppositeNode<T extends AlgebraicNode = AlgebraicNode> implements FunctionNode<T> {
     id: FunctionsIds;
-    child: AlgebraicNode;
+    child: T;
     type: NodeType;
     opts?: NodeOptions;
     isNumeric: boolean;
-    constructor(child: AlgebraicNode, opts?: NodeOptions);
+    constructor(child: T, opts?: NodeOptions);
     toIdentifiers(): {
         id: NodeIds;
         child: {
@@ -29,7 +29,7 @@ export declare class OppositeNode implements FunctionNode {
     evaluate(vars?: Record<string, number>): number;
     simplify(opts?: SimplifyOptions): AlgebraicNode | NumberNode;
     equals(node: AlgebraicNode): boolean;
-    toDetailedEvaluation(vars: Record<string, AlgebraicNode>): OppositeNode;
+    toDetailedEvaluation(vars: Record<string, AlgebraicNode>): OppositeNode<AlgebraicNode>;
     derivative(varName?: string | undefined): AlgebraicNode;
 }
 //# sourceMappingURL=oppositeNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"oppositeNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/oppositeNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM/D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAAO,aAAa,GAAG,MAAM,GAAG,MAAM,iBAI1D,CAAC;AAGF,qBAAa,YAAa,YAAW,YAAY;IAC/C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAef,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAgCtD;;;;OAIG;IACH,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAI/B,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}
+{"version":3,"file":"oppositeNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/oppositeNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM/D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,sFAMpB,CAAC;AAGF,qBAAa,YAAY,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAC/D,YAAW,YAAY,CAAC,CAAC,CAAC;IAE1B,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW;IAQxC,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAef,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAgCtD;;;;OAIG;IACH,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAI/B,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}

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

@@ -11,7 +11,8 @@ export declare enum NodeType {
     belongs = 9,
     vector = 10,
     set = 11,
-    trinom = 12
+    trinom = 12,
+    monom = 13
 }
 export type NodeOptions = {
     forceTimesSign?: boolean;
@@ -38,6 +39,7 @@ export type ToTexOptions = {
     forceNoSimplification?: boolean;
     forceParenthesis?: boolean;
     color?: string;
+    noPropagation?: boolean;
 };
 export declare enum NodeIds {
     add = 0,
@@ -78,7 +80,9 @@ export declare enum NodeIds {
     vector = 35,
     inequation = 36,
     inequationSolution = 37,
-    binomialCoefficient = 38
+    binomialCoefficient = 38,
+    trinom = 39,
+    monom = 40
 }
 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":"AAEA,oBAAY,QAAQ;IAClB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,UAAU,IAAA;IACV,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,MAAM,KAAA;IACN,GAAG,KAAA;IACH,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;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,OAAO;IACjB,GAAG,IAAA;IACH,SAAS,IAAA;IACT,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,KAAK,IAAA;IACL,MAAM,IAAA;IACN,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,QAAQ,KAAA;IACR,OAAO,KAAA;IACP,WAAW,KAAA;IACX,QAAQ,KAAA;IACR,KAAK,KAAA;IACL,OAAO,KAAA;IACP,KAAK,KAAA;IACL,UAAU,KAAA;IACV,gBAAgB,KAAA;IAChB,GAAG,KAAA;IACH,MAAM,KAAA;IACN,MAAM,KAAA;IACN,MAAM,KAAA;IACN,GAAG,KAAA;IACH,GAAG,KAAA;IACH,GAAG,KAAA;IACH,GAAG,KAAA;IACH,KAAK,KAAA;IACL,GAAG,KAAA;IACH,IAAI,KAAA;IACJ,QAAQ,KAAA;IACR,QAAQ,KAAA;IACR,MAAM,KAAA;IACN,MAAM,KAAA;IACN,KAAK,KAAA;IACL,MAAM,KAAA;IACN,UAAU,KAAA;IACV,kBAAkB,KAAA;IAClB,mBAAmB,KAAA;CACpB;AAED,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;IAEvC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,EAAE,MAAM;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5D"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/node.ts"],"names":[],"mappings":"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"}

package/lib/tree/nodes/node.js

@@ -16,6 +16,7 @@ var NodeType;
     NodeType[NodeType["vector"] = 10] = "vector";
     NodeType[NodeType["set"] = 11] = "set";
     NodeType[NodeType["trinom"] = 12] = "trinom";
+    NodeType[NodeType["monom"] = 13] = "monom";
 })(NodeType || (exports.NodeType = NodeType = {}));
 var NodeIds;
 (function (NodeIds) {
@@ -58,4 +59,6 @@ var NodeIds;
     NodeIds[NodeIds["inequation"] = 36] = "inequation";
     NodeIds[NodeIds["inequationSolution"] = 37] = "inequationSolution";
     NodeIds[NodeIds["binomialCoefficient"] = 38] = "binomialCoefficient";
+    NodeIds[NodeIds["trinom"] = 39] = "trinom";
+    NodeIds[NodeIds["monom"] = 40] = "monom";
 })(NodeIds || (exports.NodeIds = NodeIds = {}));

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

@@ -1 +1 @@
-{"version":3,"file":"nodeConstructor.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/nodeConstructor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAwBhD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAmBvC,eAAO,MAAM,cAAc,gBAAiB,eAAe,kBACI,CAAC;AAChE,eAAO,MAAM,SAAS,gBAAiB,eAAe,SACR,CAAC;AAC/C,MAAM,MAAM,eAAe,GAAG;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACpE,8BAAsB,eAAe;IACnC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;CAsR3D"}
+{"version":3,"file":"nodeConstructor.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/nodeConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAwBhD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAoBvC,eAAO,MAAM,cAAc,gBAAiB,eAAe,kBACI,CAAC;AAChE,eAAO,MAAM,SAAS,gBAAiB,eAAe,SACR,CAAC;AAE/C,MAAM,MAAM,eAAe,GAAG;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACpE,8BAAsB,eAAe;IACnC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;CAoS3D"}

package/lib/tree/nodes/nodeConstructor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeConstructor = exports.reifyNode = exports.reifyAlgebraic = void 0;
 const point_1 = require("../../math/geometry/point");
+const trinomNode_1 = require("../../tree/nodes/polynomials/trinomNode");
 const complexNode_1 = require("./complex/complexNode");
 const equalNode_1 = require("./equations/equalNode");
 const equationSolutionNode_1 = require("./equations/equationSolutionNode");
@@ -37,6 +38,7 @@ const limitNode_1 = require("./operators/limitNode");
 const multiplyNode_1 = require("./operators/multiplyNode");
 const powerNode_1 = require("./operators/powerNode");
 const substractNode_1 = require("./operators/substractNode");
+const monomNode_1 = require("./polynomials/monomNode");
 const belongsNode_1 = require("./sets/belongsNode");
 const discreteSetNode_1 = require("./sets/discreteSetNode");
 const intervalNode_1 = require("./sets/intervalNode");
@@ -169,6 +171,12 @@ class NodeConstructor {
             case node_1.NodeIds.limit: {
                 return new limitNode_1.LimitNode(NodeConstructor.fromIdentifiers(identifiers.leftChild), NodeConstructor.fromIdentifiers(identifiers.rightChild), identifiers.from);
             }
+            case node_1.NodeIds.trinom: {
+                return new trinomNode_1.TrinomNode(NodeConstructor.fromIdentifiers(identifiers.a), NodeConstructor.fromIdentifiers(identifiers.b), NodeConstructor.fromIdentifiers(identifiers.c));
+            }
+            case node_1.NodeIds.monom: {
+                return new monomNode_1.MonomNode(NodeConstructor.fromIdentifiers(identifiers.a), identifiers.degree, identifiers.opts);
+            }
             case node_1.NodeIds.binomialCoefficient: {
                 return new binomialCoefficientNode_1.BinomialCoefficientNode(NodeConstructor.fromIdentifiers(identifiers.leftChild), NodeConstructor.fromIdentifiers(identifiers.rightChild));
             }

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

@@ -1,6 +1,8 @@
 import { Node, NodeIds, NodeOptions, NodeType, ToTexOptions } from "../node";
 import { AlgebraicNode } from "../algebraicNode";
+import { OppositeNode } from "../functions/oppositeNode";
 export declare function isNumberNode(a: Node): a is NumberNode;
+export declare function isNumberOrOppositeNumberNode(a: Node): a is NumberNode | OppositeNode<NumberNode>;
 export declare abstract class NumberNodeConstructor {
     static random(min: number, max: number, excludes?: number[]): NumberNode;
 }

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":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AAED,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO;CAGhE;AACD,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;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;gBAEjB,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,WAAW;IASpB,YAAY,IAAI,MAAM;IAGtB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAKrC,QAAQ;IAGR,aAAa;;;;IAMb,cAAc;IAOd,iBAAiB;IAGjB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,QAAQ;IAGR,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;CAGxC"}
+{"version":3,"file":"numberNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/numberNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAkB,MAAM,2BAA2B,CAAC;AACzE,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AACD,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,IAAI,GACN,CAAC,IAAI,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAE5C;AACD,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO;CAGhE;AACD,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;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;gBAEjB,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,WAAW;IASpB,YAAY,IAAI,MAAM;IAGtB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAKrC,QAAQ;IAGR,aAAa;;;;IAMb,cAAc;IAOd,iBAAiB;IAGjB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,QAAQ;IAGR,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;CAGxC"}

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

@@ -1,13 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberNode = exports.NumberNodeConstructor = exports.isNumberNode = void 0;
+exports.NumberNode = exports.NumberNodeConstructor = exports.isNumberOrOppositeNumberNode = exports.isNumberNode = void 0;
 const node_1 = require("../node");
 const randint_1 = require("../../../math/utils/random/randint");
 const colorize_1 = require("../../../utils/latex/colorize");
+const oppositeNode_1 = require("../functions/oppositeNode");
 function isNumberNode(a) {
     return a.type === node_1.NodeType.number;
 }
 exports.isNumberNode = isNumberNode;
+function isNumberOrOppositeNumberNode(a) {
+    return isNumberNode(a) || ((0, oppositeNode_1.isOppositeNode)(a) && isNumberNode(a.child));
+}
+exports.isNumberOrOppositeNumberNode = isNumberOrOppositeNumberNode;
 class NumberNodeConstructor {
     static random(min, max, excludes = []) {
         return new NumberNode((0, randint_1.randint)(min, max, excludes));

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,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AASlE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,GAAG,MACX,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,YAOnC,CAAC;AAEF,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;IACnB,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAoCtD,SAAS,IAAI,MAAM,EAAE;IAIrB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAK5C,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAerC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAoQ/C,aAAa;;;;;;;;;IAOb,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAUpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAMxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
+{"version":3,"file":"addNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/addNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAYlE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,GAAG,MACX,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,YAOnC,CAAC;AAEF,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;IACnB,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAoCtD,SAAS,IAAI,MAAM,EAAE;IAIrB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAK5C,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAerC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAmI/C,aAAa;;;;;;;;;IAOb,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAUpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAMxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}

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

@@ -15,6 +15,7 @@ const multiplyNode_1 = require("./multiplyNode");
 const fractionNode_1 = require("./fractionNode");
 const colorize_1 = require("../../../utils/latex/colorize");
 const round_1 = require("../../../math/utils/round");
+const monomNode_1 = require("../polynomials/monomNode");
 function isAddNode(a) {
     return (0, operatorNode_1.isOperatorNode)(a) && a.id === operatorNode_1.OperatorIds.add;
 }
@@ -130,95 +131,17 @@ class AddNode {
         if (externals.length === 1)
             return externals[0];
         const simplifyExternalNodes = (a, b) => {
-            if (!opts?.towardsDistribute && (0, fractionNode_1.isFractionNode)(a) && (0, fractionNode_1.isFractionNode)(b)) {
-                //c/d + e/f   =  cf+ed / df
-                const c = a.leftChild;
-                const d = a.rightChild;
-                const e = b.leftChild;
-                const f = b.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(c, f), new multiplyNode_1.MultiplyNode(e, d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
-            }
-            if (!opts?.towardsDistribute &&
-                (0, oppositeNode_1.isOppositeNode)(a) &&
-                (0, fractionNode_1.isFractionNode)(a.child) &&
-                (0, fractionNode_1.isFractionNode)(b)) {
-                //-(c/d) + e/f   =  -cf+ed / df
-                const c = a.child.leftChild;
-                const d = a.child.rightChild;
-                const e = b.leftChild;
-                const f = b.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(c), f), new multiplyNode_1.MultiplyNode(e, d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
-            }
-            if (!opts?.towardsDistribute &&
-                (0, oppositeNode_1.isOppositeNode)(b) &&
-                (0, fractionNode_1.isFractionNode)(b.child) &&
-                (0, fractionNode_1.isFractionNode)(a)) {
-                //(c/d) + (-e/f)   =  cf-ed / df
-                const c = a.leftChild;
-                const d = a.rightChild;
-                const e = b.child.leftChild;
-                const f = b.child.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(c, f), new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(e), d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
-            }
-            if (!opts?.towardsDistribute &&
-                (0, oppositeNode_1.isOppositeNode)(b) &&
-                (0, fractionNode_1.isFractionNode)(b.child) &&
-                (0, oppositeNode_1.isOppositeNode)(a) &&
-                (0, fractionNode_1.isFractionNode)(a.child)) {
-                //-(c/d) + (-e/f)   =  -cf-ed / df
-                const c = a.child.leftChild;
-                const d = a.child.rightChild;
-                const e = b.child.leftChild;
-                const f = b.child.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(c), f), new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(e), d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
-            }
-            if (!opts?.towardsDistribute && (0, fractionNode_1.isFractionNode)(a)) {
-                //c/d + b
-                const c = a.leftChild;
-                const d = a.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(c, new multiplyNode_1.MultiplyNode(d, b)), d).simplify(opts);
-            }
-            if (!opts?.towardsDistribute &&
-                (0, oppositeNode_1.isOppositeNode)(a) &&
-                (0, fractionNode_1.isFractionNode)(a.child)) {
-                //-(c/d) + b = (-c+bd)/d
-                const c = a.child.leftChild;
-                const d = a.child.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(new oppositeNode_1.OppositeNode(c), new multiplyNode_1.MultiplyNode(d, b)), d).simplify(opts);
-            }
-            if (!opts?.towardsDistribute &&
-                (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);
-            }
-            if (!opts?.towardsDistribute &&
-                (0, oppositeNode_1.isOppositeNode)(b) &&
-                (0, fractionNode_1.isFractionNode)(b.child) &&
-                !opts?.forceDistributeFractions) {
-                //a+-(c/d) = (da-c)/d
-                const c = b.child.leftChild;
-                const d = b.child.rightChild;
-                return new fractionNode_1.FractionNode(new AddNode(new oppositeNode_1.OppositeNode(c), new multiplyNode_1.MultiplyNode(d, a)), d).simplify(opts);
-            }
-            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));
-            }
-            if ((0, oppositeNode_1.isOppositeNode)(a) && (0, numberNode_1.isNumberNode)(a.child) && (0, numberNode_1.isNumberNode)(b)) {
-                return new numberNode_1.NumberNode(-a.child.value + b.value);
-            }
-            if ((0, oppositeNode_1.isOppositeNode)(b) && (0, numberNode_1.isNumberNode)(b.child) && (0, numberNode_1.isNumberNode)(a)) {
-                return new numberNode_1.NumberNode(-b.child.value + a.value);
-            }
-            if ((0, oppositeNode_1.isOppositeNode)(a) &&
-                (0, numberNode_1.isNumberNode)(a.child) &&
-                (0, oppositeNode_1.isOppositeNode)(b) &&
-                (0, numberNode_1.isNumberNode)(b.child)) {
-                return new numberNode_1.NumberNode(a.child.value + b.child.value);
-            }
-            //gérer opposites, fractions
+            const fracSimplify = addSimplifyFrac(a, b, opts);
+            if (fracSimplify)
+                return fracSimplify;
+            const nbSimplify = addSimplifyNumbers(a, b, opts);
+            if (nbSimplify)
+                return nbSimplify;
+            const monomSimplify = addSimplifyMonoms(a, b, opts);
+            if (monomSimplify)
+                return monomSimplify;
+            //TODO gérer le reste
+            //la suite s'occupe des factorisations
             if (opts?.forbidFactorize)
                 return null;
             const aSubExternals = [];
@@ -337,3 +260,114 @@ class AddNode {
     }
 }
 exports.AddNode = AddNode;
+const addSimplifyFrac = (a, b, opts) => {
+    if (!opts?.towardsDistribute && (0, fractionNode_1.isFractionNode)(a) && (0, fractionNode_1.isFractionNode)(b)) {
+        //c/d + e/f   =  cf+ed / df
+        const c = a.leftChild;
+        const d = a.rightChild;
+        const e = b.leftChild;
+        const f = b.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(c, f), new multiplyNode_1.MultiplyNode(e, d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
+    }
+    if (!opts?.towardsDistribute &&
+        (0, oppositeNode_1.isOppositeNode)(a) &&
+        (0, fractionNode_1.isFractionNode)(a.child) &&
+        (0, fractionNode_1.isFractionNode)(b)) {
+        //-(c/d) + e/f   =  -cf+ed / df
+        const c = a.child.leftChild;
+        const d = a.child.rightChild;
+        const e = b.leftChild;
+        const f = b.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(c), f), new multiplyNode_1.MultiplyNode(e, d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
+    }
+    if (!opts?.towardsDistribute &&
+        (0, oppositeNode_1.isOppositeNode)(b) &&
+        (0, fractionNode_1.isFractionNode)(b.child) &&
+        (0, fractionNode_1.isFractionNode)(a)) {
+        //(c/d) + (-e/f)   =  cf-ed / df
+        const c = a.leftChild;
+        const d = a.rightChild;
+        const e = b.child.leftChild;
+        const f = b.child.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(c, f), new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(e), d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
+    }
+    if (!opts?.towardsDistribute &&
+        (0, oppositeNode_1.isOppositeNode)(b) &&
+        (0, fractionNode_1.isFractionNode)(b.child) &&
+        (0, oppositeNode_1.isOppositeNode)(a) &&
+        (0, fractionNode_1.isFractionNode)(a.child)) {
+        //-(c/d) + (-e/f)   =  -cf-ed / df
+        const c = a.child.leftChild;
+        const d = a.child.rightChild;
+        const e = b.child.leftChild;
+        const f = b.child.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(c), f), new multiplyNode_1.MultiplyNode(new oppositeNode_1.OppositeNode(e), d)), new multiplyNode_1.MultiplyNode(d, f)).simplify(opts);
+    }
+    if (!opts?.towardsDistribute && (0, fractionNode_1.isFractionNode)(a)) {
+        //c/d + b
+        const c = a.leftChild;
+        const d = a.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(c, new multiplyNode_1.MultiplyNode(d, b)), d).simplify(opts);
+    }
+    if (!opts?.towardsDistribute &&
+        (0, oppositeNode_1.isOppositeNode)(a) &&
+        (0, fractionNode_1.isFractionNode)(a.child)) {
+        //-(c/d) + b = (-c+bd)/d
+        const c = a.child.leftChild;
+        const d = a.child.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(new oppositeNode_1.OppositeNode(c), new multiplyNode_1.MultiplyNode(d, b)), d).simplify(opts);
+    }
+    if (!opts?.towardsDistribute &&
+        (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);
+    }
+    if (!opts?.towardsDistribute &&
+        (0, oppositeNode_1.isOppositeNode)(b) &&
+        (0, fractionNode_1.isFractionNode)(b.child) &&
+        !opts?.forceDistributeFractions) {
+        //a+-(c/d) = (da-c)/d
+        const c = b.child.leftChild;
+        const d = b.child.rightChild;
+        return new fractionNode_1.FractionNode(new AddNode(new oppositeNode_1.OppositeNode(c), new multiplyNode_1.MultiplyNode(d, a)), d).simplify(opts);
+    }
+};
+const addSimplifyNumbers = (a, b, opts) => {
+    if ((0, numberNode_1.isNumberNode)(a) && (0, numberNode_1.isNumberNode)(b)) {
+        //geogebra rounds to 12, il faut mettre <12
+        return new numberNode_1.NumberNode((0, round_1.round)(a.value + b.value, 10));
+    }
+    if ((0, oppositeNode_1.isOppositeNode)(a) && (0, numberNode_1.isNumberNode)(a.child) && (0, numberNode_1.isNumberNode)(b)) {
+        return new numberNode_1.NumberNode(-a.child.value + b.value);
+    }
+    if ((0, oppositeNode_1.isOppositeNode)(b) && (0, numberNode_1.isNumberNode)(b.child) && (0, numberNode_1.isNumberNode)(a)) {
+        return new numberNode_1.NumberNode(-b.child.value + a.value);
+    }
+    if ((0, oppositeNode_1.isOppositeNode)(a) &&
+        (0, numberNode_1.isNumberNode)(a.child) &&
+        (0, oppositeNode_1.isOppositeNode)(b) &&
+        (0, numberNode_1.isNumberNode)(b.child)) {
+        return new numberNode_1.NumberNode(a.child.value + b.child.value);
+    }
+};
+const addSimplifyMonoms = (a, b, opts) => {
+    const aMonom = (0, monomNode_1.parseToMonomNode)(a);
+    if (!aMonom)
+        return;
+    const bMonom = (0, monomNode_1.parseToMonomNode)(b);
+    if (!bMonom)
+        return;
+    if (aMonom.degree === bMonom.degree) {
+        if (aMonom.variable !== bMonom.variable)
+            return;
+        const sum = (0, exports.add)(aMonom.a, bMonom.a).simplify(opts);
+        if (sum.evaluate() === 0)
+            return new numberNode_1.NumberNode(0);
+        return new monomNode_1.MonomNode(sum, aMonom.degree, {
+            variable: aMonom.variable,
+        }).toTree();
+    }
+};

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,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAS1B,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAChB,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AACF,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,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAuErC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAyFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,aAAa;;;;;;;;;IAYb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,IAAI;IAGJ,cAAc;IACd,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAoJ/C,MAAM,CAAC,IAAI,EAAE,aAAa;IAU1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAQxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
+{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAS1B,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAChB,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AACF,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,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAwErC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAyFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,aAAa;;;;;;;;;IAYb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,IAAI;IAGJ,cAAc;IACd,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAoJ/C,MAAM,CAAC,IAAI,EAAE,aAAa;IAU1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAQxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}

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

@@ -58,7 +58,7 @@ class MultiplyNode {
         return `(${this.leftChild.toMathString()})*(${this.rightChild.toMathString()})`;
     }
     toTex(options) {
-        const opts = this.opts?.toTexOptions ?? options;
+        const opts = this.opts?.toTexOptions ?? (options?.noPropagation ? undefined : options);
         const color = opts?.color;
         const childOpts = { ...opts };
         if (color)
@@ -330,11 +330,11 @@ class MultiplyNode {
             if (powerSimplified)
                 return powerSimplified;
             if (opts?.towardsDistribute && ((0, addNode_1.isAddNode)(a) || (0, substractNode_1.isSubstractNode)(a))) {
-                return (0, addNode_1.add)((0, exports.multiply)(a.leftChild, b), (0, exports.multiply)(a.rightChild, b)).simplify();
+                return (0, addNode_1.add)((0, exports.multiply)(a.leftChild, b), (0, exports.multiply)(a.rightChild, b)).simplify(opts);
             }
             else if (opts?.towardsDistribute &&
                 ((0, addNode_1.isAddNode)(b) || (0, substractNode_1.isSubstractNode)(b))) {
-                return (0, addNode_1.add)((0, exports.multiply)(a, b.leftChild), (0, exports.multiply)(a, b.rightChild)).simplify();
+                return (0, addNode_1.add)((0, exports.multiply)(a, b.leftChild), (0, exports.multiply)(a, b.rightChild)).simplify(opts);
             }
             //TODo continue
             return null;