math-exercises 2.2.70 → 2.2.72

package/lib/math/geometry/point.js

@@ -136,5 +136,9 @@ class Point {
         const sin = Math.sin(angle);
         return new Point(this.name, (0, substractNode_1.substract)((0, multiplyNode_1.multiply)(cos, this.x).simplify(), (0, multiplyNode_1.multiply)(sin, this.y).simplify()).simplify(), (0, addNode_1.add)((0, multiplyNode_1.multiply)(sin, this.x).simplify(), (0, multiplyNode_1.multiply)(cos, this.y).simplify()).simplify());
     }
+    centralSymetric(center, name = this.name + "'") {
+        const vec = vector_1.VectorConstructor.fromPoints(this, center).opposite();
+        return vec.getEndPoint(center, name);
+    }
 }
 exports.Point = Point;

package/lib/math/geometry/vector.d.ts

@@ -14,8 +14,11 @@ export declare class Vector {
     toTexWithCoords(): string;
     toInlineCoordsTex(): string;
     isColinear(v: Vector): boolean;
+    hasOppositeOrientation(v: Vector): boolean;
+    hasSameOrientation(v: Vector): boolean;
     determinant(v: Vector): AlgebraicNode;
     times(k: AlgebraicNode, name?: string): Vector;
+    opposite(): Vector;
     scalarProduct(v: Vector): AlgebraicNode;
     add(v: Vector): Vector;
     getNorm(): AlgebraicNode;

package/lib/math/geometry/vector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vector.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAgB/D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,MAAM;IAOpD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAO,GAAG,MAAM;CAOtD;AAED,qBAAa,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;gBACL,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa;IAO5D,KAAK,IAAI,MAAM;IAIf,eAAe,IAAI,MAAM;IAMzB,iBAAiB,IAAI,MAAM;IAM3B,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAK9B,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa;IAIrC,KAAK,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAOrC,aAAa,CAAC,CAAC,EAAE,MAAM;IAgBvB,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAYtB,OAAO,IAAI,aAAa;IAUxB,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM;IAO5C,MAAM,CAAC,CAAC,EAAE,MAAM;IAIhB,YAAY;IAMZ,YAAY;IAOZ,aAAa;CAGd"}
+{"version":3,"file":"vector.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAgB/D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,MAAM;IAOpD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAO,GAAG,MAAM;CAOtD;AAED,qBAAa,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;gBACL,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa;IAO5D,KAAK,IAAI,MAAM;IAIf,eAAe,IAAI,MAAM;IAMzB,iBAAiB,IAAI,MAAM;IAM3B,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAK9B,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAI1C,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAItC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa;IAIrC,KAAK,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAOrC,QAAQ;IAGR,aAAa,CAAC,CAAC,EAAE,MAAM;IAgBvB,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAYtB,OAAO,IAAI,aAAa;IAUxB,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,MAAM;IAO5C,MAAM,CAAC,CAAC,EAAE,MAAM;IAIhB,YAAY;IAMZ,YAAY;IAOZ,aAAa;CAGd"}

package/lib/math/geometry/vector.js

@@ -44,12 +44,21 @@ class Vector {
         const ev = det.evaluate();
         return Math.abs(ev) < 0.000001;
     }
+    hasOppositeOrientation(v) {
+        return this.isColinear(v) && this.scalarProduct(v).evaluate() < 0;
+    }
+    hasSameOrientation(v) {
+        return this.isColinear(v) && this.scalarProduct(v).evaluate() > 0;
+    }
     determinant(v) {
         return (0, substractNode_1.substract)((0, multiplyNode_1.multiply)(this.x, v.y), (0, multiplyNode_1.multiply)(this.y, v.x)).simplify();
     }
     times(k, name) {
         return new Vector(name ?? "v", new multiplyNode_1.MultiplyNode(this.x, k).simplify(), new multiplyNode_1.MultiplyNode(this.y, k).simplify());
     }
+    opposite() {
+        return this.times((-1).toTree());
+    }
     scalarProduct(v) {
         // if (
         //   [this.x.type, this.y.type, v.x.type, v.y.type].some(

package/lib/math/polynomials/generalAffine.d.ts

@@ -2,6 +2,9 @@ import { AlgebraicNode } from "../../tree/nodes/algebraicNode";
 import { NodeIdentifiers } from "../../tree/nodes/nodeConstructor";
 export declare abstract class GeneralAffineConstructor {
     static fromIdentifiers(identifiers: GeneralAffineIdentifiers): GeneralAffine;
+    static randomInts({ allowBNull }: {
+        allowBNull?: boolean | undefined;
+    }, variable?: string): GeneralAffine;
 }
 export type GeneralAffineIdentifiers = {
     id: "affine";

package/lib/math/polynomials/generalAffine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalAffine.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/generalAffine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAEL,eAAe,EAEhB,MAAM,kCAAkC,CAAC;AAQ1C,8BAAsB,wBAAwB;IAC5C,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,wBAAwB;CAM7D;AACD,MAAM,MAAM,wBAAwB,GAAG;IACrC,EAAE,EAAE,QAAQ,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,qBAAa,aAAa;IACxB,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;gBAGf,CAAC,EAAE,MAAM,GAAG,aAAa,EACzB,CAAC,EAAE,MAAM,GAAG,aAAa,EACzB,QAAQ,GAAE,MAAY;IAUxB,aAAa,IAAI,wBAAwB;IAQzC,OAAO,IAAI,aAAa;IAIxB,MAAM;IAMN,UAAU,CAAC,GAAG,EAAE,aAAa;IAI7B,QAAQ;CAMT"}
+{"version":3,"file":"generalAffine.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/generalAffine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAEL,eAAe,EAEhB,MAAM,kCAAkC,CAAC;AAS1C,8BAAsB,wBAAwB;IAC5C,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,wBAAwB;IAM5D,MAAM,CAAC,UAAU,CAAC,EAAE,UAAiB,EAAE;;KAAA,EAAE,QAAQ,SAAM;CAOxD;AACD,MAAM,MAAM,wBAAwB,GAAG;IACrC,EAAE,EAAE,QAAQ,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,qBAAa,aAAa;IACxB,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;gBAGf,CAAC,EAAE,MAAM,GAAG,aAAa,EACzB,CAAC,EAAE,MAAM,GAAG,aAAa,EACzB,QAAQ,GAAE,MAAY;IAUxB,aAAa,IAAI,wBAAwB;IAQzC,OAAO,IAAI,aAAa;IAIxB,MAAM;IAMN,UAAU,CAAC,GAAG,EAAE,aAAa;IAI7B,QAAQ;CAMT"}

package/lib/math/polynomials/generalAffine.js

@@ -7,10 +7,14 @@ const addNode_1 = require("../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const substractNode_1 = require("../../tree/nodes/operators/substractNode");
+const randint_1 = require("../utils/random/randint");
 class GeneralAffineConstructor {
     static fromIdentifiers(identifiers) {
         return new GeneralAffine((0, nodeConstructor_1.reifyAlgebraic)(identifiers.a), (0, nodeConstructor_1.reifyAlgebraic)(identifiers.b));
     }
+    static randomInts({ allowBNull = true }, variable = "x") {
+        return new GeneralAffine((0, randint_1.randint)(-10, 11, [0]), (0, randint_1.randint)(-10, 11, allowBNull ? [] : [0]), variable);
+    }
 }
 exports.GeneralAffineConstructor = GeneralAffineConstructor;
 class GeneralAffine {

package/lib/math/utils/quartiles.d.ts

@@ -0,0 +1,3 @@
+export declare const firstQuartile: (values: number[], effectifs?: number[]) => number;
+export declare const thirdQuartile: (values: number[], effectifs?: number[]) => number;
+//# sourceMappingURL=quartiles.d.ts.map

package/lib/math/utils/quartiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quartiles.d.ts","sourceRoot":"","sources":["../../../src/math/utils/quartiles.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,WAAY,MAAM,EAAE,cAAc,MAAM,EAAE,WAkBnE,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,MAAM,EAAE,cAAc,MAAM,EAAE,WAkBnE,CAAC"}

package/lib/math/utils/quartiles.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.thirdQuartile = exports.firstQuartile = void 0;
+const firstQuartile = (values, effectifs) => {
+    if (!values.length)
+        throw Error("Malformed data in firstQuartile");
+    if (!effectifs?.length) {
+        const N = values.length;
+        const rank = Math.ceil(N / 4);
+        return values[rank - 1];
+    }
+    else {
+        const N = effectifs.reduce((acc, curr) => acc + curr, 0);
+        const rank = Math.ceil(N / 4);
+        let s = 0;
+        for (let i = 0; i < effectifs.length; i++) {
+            s += effectifs[i];
+            if (rank <= s) {
+                return values[i];
+            }
+        }
+        return values[values.length - 1];
+    }
+};
+exports.firstQuartile = firstQuartile;
+const thirdQuartile = (values, effectifs) => {
+    if (!values.length)
+        throw Error("Malformed data in thirdQuartile");
+    if (!effectifs?.length) {
+        const N = values.length;
+        const rank = Math.ceil((3 * N) / 4);
+        return values[rank - 1];
+    }
+    else {
+        const N = effectifs.reduce((acc, curr) => acc + curr, 0);
+        const rank = Math.ceil((3 * N) / 4);
+        let s = 0;
+        for (let i = 0; i < effectifs.length; i++) {
+            s += effectifs[i];
+            if (rank <= s) {
+                return values[i];
+            }
+        }
+        return values[values.length - 1];
+    }
+};
+exports.thirdQuartile = thirdQuartile;

package/lib/math/utils/standardDeviation.d.ts

@@ -0,0 +1,3 @@
+export declare const standardDeviation: (values: number[]) => number;
+export declare const standardDeviationWithEffectifs: (values: number[], effectifs: number[]) => number;
+//# sourceMappingURL=standardDeviation.d.ts.map

package/lib/math/utils/standardDeviation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"standardDeviation.d.ts","sourceRoot":"","sources":["../../../src/math/utils/standardDeviation.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB,WAAY,MAAM,EAAE,WAEjD,CAAC;AACF,eAAO,MAAM,8BAA8B,WACjC,MAAM,EAAE,aACL,MAAM,EAAE,WAGpB,CAAC"}

package/lib/math/utils/standardDeviation.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.standardDeviationWithEffectifs = exports.standardDeviation = void 0;
+const average_1 = require("../../utils/average");
+const variance_1 = require("./variance");
+const standardDeviation = (values) => {
+    return Math.sqrt((0, variance_1.variance)(values, (0, average_1.average)(values)));
+};
+exports.standardDeviation = standardDeviation;
+const standardDeviationWithEffectifs = (values, effectifs) => {
+    return Math.sqrt((0, variance_1.varianceWithEffectifs)(values, effectifs));
+};
+exports.standardDeviationWithEffectifs = standardDeviationWithEffectifs;

package/lib/math/utils/variance.d.ts

@@ -1,4 +1,5 @@
 import { AlgebraicNode } from "../../tree/nodes/algebraicNode";
 export declare function varianceAsNode(xValues: number[], avgX: AlgebraicNode): AlgebraicNode;
 export declare function variance(xValues: number[], avgX: number): number;
+export declare const varianceWithEffectifs: (values: number[], effectifs: number[]) => number;
 //# sourceMappingURL=variance.d.ts.map

package/lib/math/utils/variance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variance.d.ts","sourceRoot":"","sources":["../../../src/math/utils/variance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO/D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,aAAa,GAClB,aAAa,CAgBf;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhE"}
+{"version":3,"file":"variance.d.ts","sourceRoot":"","sources":["../../../src/math/utils/variance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO/D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,aAAa,GAClB,aAAa,CAgBf;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhE;AAED,eAAO,MAAM,qBAAqB,WACxB,MAAM,EAAE,aACL,MAAM,EAAE,WAapB,CAAC"}

package/lib/math/utils/variance.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.variance = exports.varianceAsNode = void 0;
+exports.varianceWithEffectifs = exports.variance = exports.varianceAsNode = void 0;
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../tree/nodes/operators/addNode");
 const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
@@ -25,3 +25,11 @@ function variance(xValues, avgX) {
     return variance / xValues.length;
 }
 exports.variance = variance;
+const varianceWithEffectifs = (values, effectifs) => {
+    if (!values.length || !effectifs.length || values.length !== effectifs.length)
+        throw Error("Malformed data in variance");
+    const N = effectifs.reduce((acc, curr) => acc + curr, 0);
+    const avg = values.reduce((acc, value, index) => acc + value * effectifs[index], 0) / N;
+    return (values.reduce((acc, value, index) => acc + Math.pow(value - avg, 2) * effectifs[index], 0) / N);
+};
+exports.varianceWithEffectifs = varianceWithEffectifs;

package/lib/playground.d.ts.map

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

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;
@@ -80,7 +81,8 @@ export declare enum NodeIds {
     inequation = 36,
     inequationSolution = 37,
     binomialCoefficient = 38,
-    trinom = 39
+    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":"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"}
+{"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) {
@@ -59,4 +60,5 @@ var NodeIds;
     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":"AAEA,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;CA6R3D"}
+{"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

@@ -38,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");
@@ -173,6 +174,9 @@ class NodeConstructor {
             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/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;IAqQ/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,96 +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)) {
-                //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);
-            }
-            //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 = [];
@@ -338,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,
+        });
+    }
+};

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;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"}
+{"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;IAiK/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

@@ -281,6 +281,8 @@ class MultiplyNode {
             return new numberNode_1.NumberNode(1);
         if (externals.length === 1)
             return externals[0];
+        //tout ca est un peu bordelique
+        //forceDistributeFractions sert à avoir par exemple (a/b)*x plutot que (ax/b)
         if (!opts?.forceDistributeFractions)
             if (externals.some((node) => (0, fractionNode_1.isFractionNode)(node))) {
                 //s'il y a une fraction on transforme en fracNode
@@ -323,6 +325,12 @@ class MultiplyNode {
                 a.value === b.leftChild.value) {
                 return new powerNode_1.PowerNode(b.leftChild, new addNode_1.AddNode(b.rightChild, (1).toTree())).simplify();
             }
+            if ((0, fractionNode_1.isFractionNode)(a) &&
+                a.isNumeric &&
+                (0, fractionNode_1.isFractionNode)(b) &&
+                b.isNumeric) {
+                return new fractionNode_1.FractionNode((0, exports.multiply)(a.leftChild, b.leftChild), (0, exports.multiply)(a.rightChild, b.rightChild)).simplify(opts);
+            }
             let powerSimplified = powerSimplify(a, b, opts);
             if (powerSimplified)
                 return powerSimplified;

package/lib/tree/nodes/polynomials/monomNode.d.ts

@@ -0,0 +1,47 @@
+import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
+import { Node, NodeIds, NodeOptions, NodeType } from "../node";
+export declare const monom: (a: AlgebraicNode | number | string, degree: number, opts?: MonomNodeOptions) => MonomNode;
+export declare function isMonomNode(a: Node): a is MonomNode;
+export declare function parseToMonomNode(a: Node, variable?: string): false | MonomNode;
+type MonomNodeOptions = {
+    variable: string;
+};
+/**
+ * un monom est une expression du type ax^degree
+ * avec a réel !==0 et degree > 0 (convention)
+ */
+export declare class MonomNode implements AlgebraicNode {
+    a: AlgebraicNode;
+    degree: number;
+    isNumeric: boolean;
+    variable: string;
+    type: NodeType;
+    constructor(a: AlgebraicNode | number, degree: number, opts?: MonomNodeOptions);
+    derivative(varName?: string | undefined): AlgebraicNode;
+    equals(node: AlgebraicNode): boolean;
+    evaluate(vars?: Record<string, number>): number;
+    toDetailedEvaluation(vars: Record<string, AlgebraicNode>): AlgebraicNode;
+    simplify(opts?: SimplifyOptions): AlgebraicNode;
+    toAllValidTexs(opts?: NodeOptions | undefined): string[];
+    toEquivalentNodes(opts?: NodeOptions | undefined): AlgebraicNode[];
+    toMathString(): string;
+    toTree(): AlgebraicNode;
+    toTex(): string;
+    toIdentifiers(): {
+        id: NodeIds;
+        a: {
+            id: NodeIds;
+        } & Record<string, any>;
+        degree: number;
+        opts: {
+            variable: string;
+        };
+    };
+}
+export declare const parseToMonom: (node: AlgebraicNode, { variable, maxDegree, minDegree }?: {
+    variable: string;
+    maxDegree: undefined;
+    minDegree: number;
+}) => false | MonomNode;
+export {};
+//# sourceMappingURL=monomNode.d.ts.map

package/lib/tree/nodes/polynomials/monomNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"monomNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/polynomials/monomNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO/D,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,UAC1B,MAAM,SACP,gBAAgB,cAMxB,CAAC;AACF,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,SAAM,qBAGvD;AACD,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAO7C;;;GAGG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C,CAAC,EAAE,aAAa,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAkB;gBAG9B,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,gBAAgB;IAUzB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;IAMvC,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAG/B,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAG7C,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAGhD,YAAY;IAIZ,MAAM;IAMN,KAAK;IAIL,aAAa;;;;;;;;;;CAQd;AAED,eAAO,MAAM,YAAY,SACjB,aAAa;;;;uBAyIpB,CAAC"}