math-exercises 3.0.56 → 3.0.58

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

@@ -1 +1 @@
-{"version":3,"file":"angle.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/angle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAMlE,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,8BAAsB,gBAAgB;IACpC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB;CAUrD;AACD,KAAK,UAAU,GAAG;IAChB,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,eAAe,CAAC,EAAE,aAAa,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,qBAAqB,CAAC;CAC/B,CAAC;AACF,qBAAa,KAAK;IAChB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;gBACS,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,EAAE,UAAU;IAmB/C,aAAa,IAAI,gBAAgB;IASjC,WAAW,CAAC,CAAC,EAAE,KAAK;IAIpB,MAAM,CAAC,CAAC,EAAE,KAAK;IAqBf,SAAS,CAAC,CAAC,EAAE,KAAK;IASlB,gBAAgB,CAAC,CAAC,EAAE,KAAK;IAyCzB,MAAM;IAMN,eAAe,CAAC,CAAC,EAAE,KAAK;IAwCxB,gBAAgB,CAAC,CAAC,EAAE,KAAK;IAqBzB,QAAQ,CAAC,QAAQ,UAAQ;IAkBzB,YAAY,CAAC,QAAQ,UAAQ;IAW7B,OAAO;IAIP,KAAK;IAIL,qBAAqB,CAAC,EACpB,IAAI,EACJ,KAAK,EACL,IAAI,GACL,GAAE;QACD,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;KAC7C;IAgBN,UAAU,CAAC,IAAI,CAAC,EAAE;QAChB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB;CA2BF"}
+{"version":3,"file":"angle.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/angle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAMlE,OAAO,EAAE,KAAK,EAAoB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAK7C,8BAAsB,gBAAgB;IACpC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB;CAUrD;AACD,KAAK,UAAU,GAAG;IAChB,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,eAAe,CAAC,EAAE,aAAa,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,qBAAqB,CAAC;CAC/B,CAAC;AACF,qBAAa,KAAK;IAChB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;gBACS,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,EAAE,UAAU;IAmB/C,aAAa,IAAI,gBAAgB;IASjC,WAAW,CAAC,CAAC,EAAE,KAAK;IAIpB,MAAM,CAAC,CAAC,EAAE,KAAK;IAqBf,SAAS,CAAC,CAAC,EAAE,KAAK;IASlB,gBAAgB,CAAC,CAAC,EAAE,KAAK;IAuCzB,MAAM;IAMN,eAAe,CAAC,CAAC,EAAE,KAAK;IAsCxB,gBAAgB,CAAC,CAAC,EAAE,KAAK;IAoBzB,QAAQ,CAAC,QAAQ,UAAQ;IAkBzB,YAAY,CAAC,QAAQ,UAAQ;IAW7B,OAAO;IAIP,KAAK;IAIL,qBAAqB,CAAC,EACpB,IAAI,EACJ,KAAK,EACL,IAAI,GACL,GAAE;QACD,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;KAC7C;IAgBN,UAAU,CAAC,IAAI,CAAC,EAAE;QAChB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB;CA2BF"}

package/lib/math/geometry/angle.js

@@ -93,10 +93,8 @@ export class Angle {
         const line = new Line(this.points[1], a.points[1]);
         const aPointIndexOnLine = a.points.findIndex((p, i) => i !== 1 && line.includes(p, 0.00000001));
         const thisPointIndexOnLine = this.points.findIndex((p, i) => i !== 1 && line.includes(p, 0.00000001));
-        console.log(aPointIndexOnLine, thisPointIndexOnLine);
         if (aPointIndexOnLine < 0 || thisPointIndexOnLine < 0)
             return false;
-        console.log("ok so far");
         const vecs = [
             [
                 VectorConstructor.fromPoints(this.points[1], this.points[thisPointIndexOnLine]),
@@ -123,13 +121,11 @@ export class Angle {
         const line = new Line(this.points[1], a.points[1]);
         const aPointIndexOnLine = a.points.findIndex((p, i) => i !== 1 && line.includes(p, 0.0000001));
         const thisPointIndexOnLine = this.points.findIndex((p, i) => i !== 1 && line.includes(p, 0.0000001));
-        console.log(aPointIndexOnLine, thisPointIndexOnLine);
         if (aPointIndexOnLine < 0 || thisPointIndexOnLine < 0)
             return false;
         //angle non plat
         if (line.includes(a.points[2 - aPointIndexOnLine], 0.0000001))
             return false;
-        console.log("ok so far");
         const vecs = [
             [
                 VectorConstructor.fromPoints(this.points[1], this.points[thisPointIndexOnLine]),
@@ -146,7 +142,6 @@ export class Angle {
     isSummitOpposite(a) {
         if (!this.hasSameApex(a))
             return false;
-        console.log("has same ap");
         const vecs = [
             [
                 VectorConstructor.fromPoints(this.points[1], this.points[0]),

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

@@ -37,6 +37,7 @@ export declare class Vector {
     scalarProduct(v: Vector): AlgebraicNode;
     scalarProductNumber(v: Vector): number;
     toUnited(): Vector;
+    toPrimeColinear(name?: string): Vector;
     add(v: Vector): Vector;
     substract(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,mCAAmC,CAAC;AAGlE,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAkB7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,MAAM;IAOpD,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,MAAM;IAOvD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,MAAM;IAOtD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO;IAGnC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,iBAAiB;CAOtD;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AAEF,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,QAAQ;IAIR,KAAK,IAAI,MAAM;IAIf,aAAa,IAAI,iBAAiB;IAOlC,eAAe,IAAI,MAAM;IAMzB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM;IAG9B,aAAa;IAGb,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;IAIvB,mBAAmB,CAAC,CAAC,EAAE,MAAM;IAO7B,QAAQ;IAGR,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAWtB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAG5B,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;IAIb,MAAM;CAGP"}
+{"version":3,"file":"vector.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAoB7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,MAAM;IAOpD,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,MAAM;IAOvD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,MAAM;IAOtD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO;IAGnC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,iBAAiB;CAOtD;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AAEF,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,QAAQ;IAIR,KAAK,IAAI,MAAM;IAIf,aAAa,IAAI,iBAAiB;IAOlC,eAAe,IAAI,MAAM;IAMzB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM;IAG9B,aAAa;IAGb,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;IAIvB,mBAAmB,CAAC,CAAC,EAAE,MAAM;IAO7B,QAAQ;IAGR,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM;IAwB7B,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAWtB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAG5B,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;IAIb,MAAM;CAGP"}

package/lib/math/geometry/vector.js

@@ -8,6 +8,8 @@ import { frac } from "../../tree/nodes/operators/fractionNode.js";
 import { MultiplyNode, multiply, } from "../../tree/nodes/operators/multiplyNode.js";
 import { SquareNode } from "../../tree/nodes/operators/powerNode.js";
 import { SubstractNode, substract, } from "../../tree/nodes/operators/substractNode.js";
+import { isInt } from "../../utils/isInt.js";
+import { gcd } from "../utils/arithmetic/gcd.js";
 import { randint } from "../utils/random/randint.js";
 import { Point } from "./point.js";
 export class VectorConstructor {
@@ -103,6 +105,23 @@ export class Vector {
     toUnited() {
         return this.times(frac(1, this.x));
     }
+    toPrimeColinear(name) {
+        //si u(x,y) alors renvoit le vecteur v(x',y') ou x'=x/gcd(x,y) et y'=y/gcd(x,y) (both positif)
+        if (!isNumberNode(this.x) ||
+            !isNumberNode(this.y) ||
+            !isInt(this.x.value) ||
+            !isInt(this.y.value)) {
+            throw new Error("toPrimeColinear general unimplemented");
+        }
+        let x = this.x.value;
+        let y = this.y.value;
+        if (x < 0 && y < 0) {
+            x *= -1;
+            y *= -1;
+        }
+        const pgcd = gcd(x, y);
+        return new Vector(name ?? this.name, (x / pgcd).toTree(), (y / pgcd).toTree());
+    }
     add(v) {
         const x = v.x;
         const y = v.y;

package/lib/math/numbers/decimals/decimal.d.ts

@@ -17,6 +17,7 @@ export declare class Decimal implements Nombre {
     precision: number;
     intPart: number;
     decimalPart: string;
+    tenthExponentBelow: number;
     constructor(value: number | string);
     times(n: Nombre | number): Decimal;
     equals(n: Nombre): boolean;

package/lib/math/numbers/decimals/decimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/decimals/decimal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,eAAO,MAAM,iBAAiB,UAAyC,CAAC;AACxE,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,MAAM;IAY1E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMpE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAK/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;CAMrD;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,aAAsB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBACR,KAAK,EAAE,MAAM,GAAG,MAAM;IAQlC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IASxB,MAAM,CAAC,CAAC,EAAE,MAAM;IAIhB;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIhC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAiClC,gBAAgB;IA6BhB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAuCtC,cAAc,CAAC,IAAI,EAAE,MAAM;IAS3B,UAAU;IAMV,MAAM;IAIN,aAAa;IAIb,YAAY,CAAC,UAAU,EAAE,MAAM;IAS/B,YAAY,CAAC,UAAU,EAAE,MAAM;CAShC"}
+{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/decimals/decimal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,eAAO,MAAM,iBAAiB,UAAyC,CAAC;AACxE,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,MAAM;IAY1E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMpE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAK/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;CAMrD;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,aAAsB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;gBACf,KAAK,EAAE,MAAM,GAAG,MAAM;IASlC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IASxB,MAAM,CAAC,CAAC,EAAE,MAAM;IAIhB;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIhC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAiClC,gBAAgB;IA6BhB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAuCtC,cAAc,CAAC,IAAI,EAAE,MAAM;IAS3B,UAAU;IAMV,MAAM;IAIN,aAAa;IAIb,YAAY,CAAC,UAAU,EAAE,MAAM;IAS/B,YAAY,CAAC,UAAU,EAAE,MAAM;CAShC"}

package/lib/math/numbers/decimals/decimal.js

@@ -47,6 +47,7 @@ export class Decimal {
     precision;
     intPart; // can be -0
     decimalPart;
+    tenthExponentBelow;
     constructor(value) {
         this.value = Number(value);
         this.tex = value + "";
@@ -54,6 +55,7 @@ export class Decimal {
         this.intPart = Number(intPartString);
         this.decimalPart = decimalPartString || "";
         this.precision = this.decimalPart.length;
+        this.tenthExponentBelow = Math.floor(Math.log10(this.value));
     }
     times(n) {
         if (typeof n === "number")

package/lib/math/systems/generalSystem.d.ts

@@ -1,4 +1,5 @@
-import { AlgebraicNode } from "../../tree/nodes/algebraicNode.js";
+import { AlgebraicNode, SimplifyOptions } from "../../tree/nodes/algebraicNode.js";
+import { EqualNode } from "../../tree/nodes/equations/equalNode.js";
 import { NodeIdentifiers } from "../../tree/nodes/nodeConstructor.js";
 export declare abstract class GeneralSystemConstructor {
     static random(): GeneralSystem;
@@ -12,11 +13,15 @@ export declare class GeneralSystem {
     coeffs: AlgebraicNode[][];
     constructor(coeffs: (AlgebraicNode | number)[][]);
     toIdentifiers(): GeneralSystemIdentifiers;
+    simplify(opts?: SimplifyOptions): GeneralSystem;
+    getEqualNodes(): EqualNode[];
     checkCouple(x: AlgebraicNode, y: AlgebraicNode): boolean;
+    multiplyEquation(nodes: AlgebraicNode[]): GeneralSystem;
     solve(): {
         x: AlgebraicNode;
         y: AlgebraicNode;
     };
     toTex(): string;
+    toCorrectionTex(): string;
 }
 //# sourceMappingURL=generalSystem.d.ts.map

package/lib/math/systems/generalSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalSystem.d.ts","sourceRoot":"","sources":["../../../src/math/systems/generalSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAgB7C,8BAAsB,wBAAwB;IAC5C,MAAM,CAAC,MAAM;IAeb,MAAM,CAAC,UAAU;IAiBjB,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,wBAAwB;CAKrD;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC;CAChC,CAAC;AAEF,qBAAa,aAAa;IACxB,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC;gBAId,MAAM,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE,EAAE;IAKhD,aAAa,IAAI,wBAAwB;IAKzC,WAAW,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa;IAQ9C,KAAK;;;;IAoDL,KAAK;CAYN"}
+{"version":3,"file":"generalSystem.d.ts","sourceRoot":"","sources":["../../../src/math/systems/generalSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAS,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAkB7C,8BAAsB,wBAAwB;IAC5C,MAAM,CAAC,MAAM;IAeb,MAAM,CAAC,UAAU;IAiBjB,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,wBAAwB;CAKrD;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC;CAChC,CAAC;AAEF,qBAAa,aAAa;IACxB,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC;gBAId,MAAM,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC,EAAE,EAAE;IAKhD,aAAa,IAAI,wBAAwB;IAKzC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAM/B,aAAa;IAQb,WAAW,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa;IAQ9C,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE;IAUvC,KAAK;;;;IAoDL,KAAK;IAaL,eAAe;CAgIhB"}

package/lib/math/systems/generalSystem.js

@@ -1,9 +1,12 @@
+import { equal, EqualNode } from "../../tree/nodes/equations/equalNode.js";
 import { reifyAlgebraic, } from "../../tree/nodes/nodeConstructor.js";
 import { AddNode, add } from "../../tree/nodes/operators/addNode.js";
 import { frac } from "../../tree/nodes/operators/fractionNode.js";
 import { multiply, } from "../../tree/nodes/operators/multiplyNode.js";
 import { substract, } from "../../tree/nodes/operators/substractNode.js";
 import { doWhile } from "../../utils/doWhile.js";
+import { alignTex } from "../../utils/latex/alignTex.js";
+import { lcm } from "../utils/arithmetic/lcm.js";
 import { randint } from "../utils/random/randint.js";
 export class GeneralSystemConstructor {
     static random() {
@@ -48,12 +51,34 @@ export class GeneralSystem {
             coeffsIds: this.coeffs.map((row) => row.map((e) => e.toIdentifiers())),
         };
     }
+    simplify(opts) {
+        const simpCoeffs = this.coeffs.map((row) => row.map((c) => c.simplify(opts)));
+        return new GeneralSystem(simpCoeffs);
+    }
+    getEqualNodes() {
+        const [a, b, c] = this.coeffs[0];
+        const [d, e, f] = this.coeffs[1];
+        return [
+            new EqualNode(add(multiply(a, "x"), multiply(b, "y")), c),
+            new EqualNode(add(multiply(d, "x"), multiply(e, "y")), f),
+        ];
+    }
     checkCouple(x, y) {
         const [a, b, c] = this.coeffs[0];
         const [d, e, f] = this.coeffs[1];
         return (add(multiply(a, x), multiply(b, y)).simplify().equals(c.simplify()) &&
             add(multiply(d, x), multiply(e, y)).simplify().equals(f.simplify()));
     }
+    multiplyEquation(nodes) {
+        return new GeneralSystem([
+            nodes[0].evaluate() !== 1
+                ? this.coeffs[0].map((c) => multiply(c, nodes[0]))
+                : this.coeffs[0],
+            nodes[1].evaluate() !== 1
+                ? this.coeffs[1].map((c) => multiply(c, nodes[1]))
+                : this.coeffs[1],
+        ]);
+    }
     solve() {
         if (this.coeffs.length !== 2)
             throw Error("General system resolution not implemented yet");
@@ -110,4 +135,116 @@ ${add(multiply(this.coeffs[0][0], "x"), multiply(this.coeffs[0][1], "y")).toTex(
 ${new AddNode(multiply(this.coeffs[1][0], "x"), multiply(this.coeffs[1][1], "y")).toTex()}=${this.coeffs[1][2].toTex()}
 \\end{matrix}\\right.`;
     }
+    toCorrectionTex() {
+        let [equa1, equa2] = this.getEqualNodes();
+        const coeffs1 = this.coeffs[0];
+        const coeffs2 = this.coeffs[1];
+        let corr = "";
+        const unitCoeffIndex = [
+            coeffs1[0],
+            coeffs1[1],
+            coeffs2[0],
+            coeffs2[1],
+        ].findIndex((e) => Math.abs(e.evaluate()) === 1);
+        //si une var est à coeff |1|, substitution
+        //sinon, cl :
+        const solveBySub = unitCoeffIndex > -1;
+        if (solveBySub) {
+            const isFirstEqua = unitCoeffIndex < 2;
+            const isX = unitCoeffIndex % 2 === 0;
+            const varName = isX ? "x" : "y";
+            const varName2 = isX ? "y" : "x";
+            const isolated = isFirstEqua
+                ? equa1.isolate(varName)
+                : equa2.isolate(varName);
+            corr += `
+    
+On peut isoler $${varName}$ dans la ${isFirstEqua ? "première" : "deuxième"} équation : 
+
+$$
+${isolated.toTex()}
+$$`;
+            const substituted = (isFirstEqua ? equa2 : equa1).toDetailedEvaluation({
+                [varName]: isolated.rightChild,
+            });
+            const subSimp = substituted.simplify({
+                towardsDistribute: true,
+                forbidFactorize: true,
+            });
+            const isolated2 = subSimp.isolate(isX ? "y" : "x");
+            const varFinal = isolated.toDetailedEvaluation({
+                [varName2]: isolated2.rightChild,
+            });
+            const varFinalSimp = varFinal.simplify();
+            corr += `
+    
+On peut alors remplacer $${varName}$ dans la ${isFirstEqua ? "deuxième" : "première"} équation, pour en déduire $${isX ? "y" : "x"}$ : 
+
+${alignTex([[substituted.toTex()], [subSimp.toTex()], [isolated2.toTex()]])}
+
+On a donc : 
+
+${alignTex([[isolated.toTex()], [varFinal.toTex()], [varFinalSimp.toTex()]])}
+`;
+        }
+        else {
+            const coeffsEv = [coeffs1[0], coeffs1[1], coeffs2[0], coeffs2[1]].map((e) => e.evaluate());
+            const ppcms = [
+                lcm(coeffsEv[0], coeffsEv[2]),
+                lcm(coeffsEv[1], coeffsEv[3]),
+            ];
+            const minPpcm = Math.min(...ppcms);
+            const isX = minPpcm === ppcms[0];
+            let firstEquaMultiple = minPpcm / Math.abs(coeffsEv[isX ? 0 : 1]);
+            let secondEquaMultiple = minPpcm / Math.abs(coeffsEv[isX ? 2 : 3]);
+            const areSameSign = coeffsEv[isX ? 0 : 1] * coeffsEv[isX ? 2 : 3] > 0;
+            if (areSameSign) {
+                firstEquaMultiple *= -1;
+            }
+            const shouldHandleFirst = firstEquaMultiple !== 1;
+            const shouldHandleSecond = secondEquaMultiple !== 1;
+            const sysMultiplied = this.multiplyEquation([
+                firstEquaMultiple.toTree(),
+                secondEquaMultiple.toTree(),
+            ]).simplify();
+            if (shouldHandleFirst || shouldHandleSecond) {
+                corr += `
+    
+On multiple la ${shouldHandleFirst
+                    ? `première équation par $${firstEquaMultiple}$`
+                    : `second équation par $${secondEquaMultiple}$`} ${shouldHandleFirst && shouldHandleSecond
+                    ? ` et la deuxième équation par $${secondEquaMultiple}$`
+                    : ""} :
+
+$$
+${sysMultiplied.toTex()}
+$$
+
+`;
+            }
+            const equaMul = sysMultiplied.getEqualNodes();
+            const added = equal(add(equaMul[0].leftChild, equaMul[1].leftChild), add(equaMul[0].rightChild, equaMul[1].rightChild)).simplify();
+            const varName = isX ? "y" : "x";
+            const isolated = added.isolate(varName);
+            const sub = equa1.toDetailedEvaluation({
+                [varName]: isolated.rightChild,
+            });
+            const subSimp = sub.simplify({
+                forbidFactorize: true,
+                forceDistributeFractions: true,
+                towardsDistribute: true,
+            });
+            const subSimpToIsolateButWeShouldnt = sub.simplify({});
+            const isolated2 = subSimpToIsolateButWeShouldnt.isolate(isX ? "x" : "y");
+            corr += `On peut alors additionner les deux équations pour éliminer une des variables et isoler l'autre : 
+
+${alignTex([[added.toTex()], [isolated.toTex()]])}
+
+On remplace maintenant dans la première équation : 
+
+${alignTex([[sub.toTex()], [subSimp.toTex()], [isolated2.toTex()]])}
+`;
+        }
+        return corr;
+    }
 }

package/lib/math/utils/arithmetic/lcm.js

@@ -1,5 +1,5 @@
 import { gcd } from "./gcd.js";
 export const lcm = (a, b) => {
     const pgcd = gcd(a, b);
-    return (a * b) / pgcd;
+    return Math.abs((a * b) / pgcd);
 };

package/lib/playground.d.ts.map

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

package/lib/playground.js

@@ -1,36 +1,6 @@
+import { parseAlgebraic } from "./tree/parsers/latexParser.js";
 export const playground = () => {
-    // console.log(frac(1.1526241304, 3.5199999999).simplify().toTex());
-    // const ans = "3\\times 4 + 5"
-    // const res = "13"
-    // const allowedNumbers = []
-    // const min = 0
-    // const max = 100
-    // const inAscendingOrder = coinFlip()
-    // try {
-    //   const parsed = parseAlgebraic(ans)
-    //   const parsedRes = valueParser(res)
-    //   if(parsedRes === false){
-    //     return "Résultat incompris"
-    //   }
-    //   const simp = parsed.simplify()
-    //   if(simp.evaluate() !== parsedRes){
-    // //assert résultat est bon
-    //     return "Mauvais calcul"
-    //   }
-    //   if(parsedRes>max || parsedRes < min){
-    //     return "Pas dans l'intervalle"
-    //   }
-    //   const usedNumbers = []
-    //   if(usedNumbers.some((e)=>)){
-    //     return "Vous ne pouvez utiliser chaque nombre qu'une fois"
-    //   }
-    //   if(usedNumbers.length !== allowedNumbers.length){
-    //     return "Vous devez utiliser tous ces nombres et uniquement ceux ci"
-    // }
-    //assert tous les nombres utilisés
-    //assert pas d'autre nombres utilisés
-    //assert utilisés dans l'ordre croissant
-    // } catch(err){
-    //   return "Erreur de syntaxe"
-    // }
+    const a = "AB";
+    const parsed = parseAlgebraic(a);
+    console.log(parsed);
 };

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

@@ -9,6 +9,7 @@ export type SimplifyOptions = {
     decimalToFractionsPrecisionAllowed?: boolean;
     forbidAdditions?: boolean;
     forbidTrigo?: boolean;
+    calculatePowers?: boolean;
 };
 export type EvaluateOptions = {
     degreeMode?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IAC5E,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,aAAa,CAAC;IAC7E,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,KAAK,aAAa,CAAC;IACpD,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,aAAa,CAAC;CACjD;AACD,8BAAsB,cAAc;;IAElC,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGxB;AACD,eAAO,MAAM,eAAe,SAAU,IAAI,KAAG,IAAI,IAAI,aACX,CAAC"}
+{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IAC5E,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,aAAa,CAAC;IAC7E,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,KAAK,aAAa,CAAC;IACpD,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,aAAa,CAAC;CACjD;AACD,8BAAsB,cAAc;;IAElC,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGxB;AACD,eAAO,MAAM,eAAe,SAAU,IAAI,KAAG,IAAI,IAAI,aACX,CAAC"}

package/lib/tree/nodes/equations/equalNode.d.ts

@@ -12,6 +12,10 @@ export declare abstract class EqualNodeConstructor {
     static fromIdentifiers(identifiers: EqualNodeIdentifiers): EqualNode;
 }
 export declare const isEqualNode: (node: AlgebraicNode) => node is EqualNode;
+type IsolateOptions = {
+    simpOpts?: SimplifyOptions;
+    steps?: string[];
+};
 export declare class EqualNode implements AlgebraicNode {
     leftChild: AlgebraicNode;
     rightChild: AlgebraicNode;
@@ -27,11 +31,13 @@ export declare class EqualNode implements AlgebraicNode {
     simplify(opts?: SimplifyOptions): EqualNode;
     shuffle(): EqualNode;
     reverse(): EqualNode;
-    isolate(varName: string): EqualNode;
+    isolate(varName: string, opts?: IsolateOptions): EqualNode;
     derivative(varName?: string): AlgebraicNode;
     equals(node: AlgebraicNode): boolean;
     evaluate(vars?: Record<string, number>, opts?: EvaluateOptions): number;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): EqualNode;
+    isVerified(): boolean;
 }
 export declare const equationResolutionTex: (a: AlgebraicNode, b: AlgebraicNode, c: AlgebraicNode, d: AlgebraicNode) => string | string[];
+export {};
 //# sourceMappingURL=equalNode.d.ts.map

package/lib/tree/nodes/equations/equalNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/equations/equalNode.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAQ/B,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,cAOnC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;IAClB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,8BAAsB,oBAAoB;IACxC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,oBAAoB,GAAG,SAAS;CAOrE;AAED,eAAO,MAAM,WAAW,SAAU,aAAa,KAAG,IAAI,IAAI,SACzB,CAAC;AAElC,qBAAa,SAAU,YAAW,aAAa;IAC7C,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,aAAa,IAAI,oBAAoB;IAQrC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAmBpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAM5C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAIf,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAQ/B,OAAO;IAIP,OAAO;IAIP,OAAO,CAAC,OAAO,EAAE,MAAM;IAiGvB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa;IAG3C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,MAAM;IAGvE,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS;CAMrE;AAED,eAAO,MAAM,qBAAqB,MAC7B,aAAa,KACb,aAAa,KACb,aAAa,KACb,aAAa,sBA2DjB,CAAC"}
+{"version":3,"file":"equalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/equations/equalNode.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAQ/B,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,cAOnC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;IAClB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,8BAAsB,oBAAoB;IACxC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,oBAAoB,GAAG,SAAS;CAOrE;AAED,eAAO,MAAM,WAAW,SAAU,aAAa,KAAG,IAAI,IAAI,SACzB,CAAC;AAElC,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,qBAAa,SAAU,YAAW,aAAa;IAC7C,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,aAAa,IAAI,oBAAoB;IAQrC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAmBpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAM5C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAIf,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAQ/B,OAAO;IAIP,OAAO;IAIP,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc;IAsG9C,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa;IAG3C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,MAAM;IAGvE,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS;IAMpE,UAAU;CAIX;AAED,eAAO,MAAM,qBAAqB,MAC7B,aAAa,KACb,aAAa,KACb,aAAa,KACb,aAAa,sBA2DjB,CAAC"}

package/lib/tree/nodes/equations/equalNode.js

@@ -77,7 +77,7 @@ export class EqualNode {
     reverse() {
         return new EqualNode(this.rightChild, this.leftChild, this.opts);
     }
-    isolate(varName) {
+    isolate(varName, opts) {
         //! bcp d'erreurs ne sont pas gérées, n'utiliser qu'en contexte sain
         //! ne gère que des équations de premier degré
         //!régler le pb des monomNode : faudrait les virer en fait
@@ -91,8 +91,9 @@ export class EqualNode {
         ///simp et recur
         /// si x est dénum, appliquer fct inverse
         ///simp et recur
+        const steps = opts?.steps;
         let right = (0).toTree();
-        const simpOpts = {
+        const simpOpts = opts?.simpOpts ?? {
             towardsDistribute: true,
             forbidFactorize: true,
             forceDistributeFractions: false,
@@ -101,6 +102,9 @@ export class EqualNode {
         // let simp = new EqualNode(left, right);
         let i = 0;
         const recur = () => {
+            if (steps) {
+                steps.push(equal(left, right).toTex());
+            }
             i++;
             if (i > 100)
                 throw new Error("too many iterations in isolate");
@@ -134,12 +138,12 @@ export class EqualNode {
             else if (isMultiplyNode(left)) {
                 const xIsLeft = hasVariableNode(left.leftChild, varName);
                 if (xIsLeft) {
-                    right = frac(right, left.rightChild).simplify();
-                    left = frac(left, left.rightChild).simplify();
+                    right = frac(right, left.rightChild).simplify(simpOpts);
+                    left = frac(left, left.rightChild).simplify(simpOpts);
                 }
                 else {
-                    right = frac(right, left.leftChild).simplify();
-                    left = frac(left, left.leftChild).simplify();
+                    right = frac(right, left.leftChild).simplify(simpOpts);
+                    left = frac(left, left.leftChild).simplify(simpOpts);
                 }
             }
             else if (isFractionNode(left)) {
@@ -161,11 +165,11 @@ export class EqualNode {
                 }
             }
             else if (isOppositeNode(left)) {
-                left = opposite(left).simplify();
-                right = opposite(right).simplify();
+                left = opposite(left).simplify(simpOpts);
+                right = opposite(right).simplify(simpOpts);
             }
             else {
-                throw new Error("Isolation only implemented for basic operations yet");
+                throw new Error(`Isolation only implemented for basic operations yet, var ${varName}, equa ${left.toTex()}=${right.toTex()}`);
             }
             recur();
         };
@@ -190,6 +194,10 @@ export class EqualNode {
     toDetailedEvaluation(vars) {
         return new EqualNode(this.leftChild.toDetailedEvaluation(vars), this.rightChild.toDetailedEvaluation(vars));
     }
+    isVerified() {
+        //!trèèèès basique, ca marhce pour mon cas en cours mais pas en général
+        return this.leftChild.simplify().equals(this.rightChild.simplify());
+    }
 }
 export const equationResolutionTex = (a, b, c, d) => {
     //(+-a)x(+-b) = (+-c)x(+-d)

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

@@ -1,7 +1,6 @@
 // import { log } from "mathjs";
 import { NodeIds, NodeType } from "../node.js";
 import { FunctionsIds, isFunctionNode } from "./functionNode.js";
-import { isAbsNode } from "./absNode.js";
 import { MultiplyNode } from "../operators/multiplyNode.js";
 import { isPowerNode } from "../operators/powerNode.js";
 import { NumberNode, isNumberNode } from "../numbers/numberNode.js";
@@ -38,9 +37,8 @@ export class LogNode {
         if (!this.opts?.allowLnOfOne && tex === "1") {
             return "0";
         }
-        const shouldntUseBrackets = isAbsNode(this.child);
-        if (shouldntUseBrackets)
-            return `\\ln${tex}`;
+        // const shouldntUseBrackets = isAbsNode(this.child);
+        // if (shouldntUseBrackets) return `\\ln${tex}`;
         else
             return `\\ln\\left(${tex}\\right)`;
     }

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

@@ -420,6 +420,6 @@ const addSimplifyMonoms = (a, b, opts) => {
             return new NumberNode(0);
         return new MonomNode(sum, aMonom.degree, {
             variable: aMonom.variable,
-        });
+        }).toTree();
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAK9E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAKxD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,IAAI,MACZ,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AACF,qBAAa,YAAa,YAAW,YAAY;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,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;IAiBpB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,uBAAuB;IAQxC,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA+BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,SAAS;IAUT,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IA6BrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IA2M/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,mBAAmB;IAQnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}
+{"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAK9E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,IAAI,MACZ,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AACF,qBAAa,YAAa,YAAW,YAAY;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,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;IAiBpB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,uBAAuB;IAQxC,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA+BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,SAAS;IAUT,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IA6BrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAgM/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,mBAAmB;IAQnB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}

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

@@ -9,8 +9,9 @@ import { Rational } from "../../../math/numbers/rationals/rational.js";
 import { operatorComposition } from "../../../tree/utilities/operatorComposition.js";
 import { AddNode, isAddNode } from "./addNode.js";
 import { PowerNode, isPowerNode } from "./powerNode.js";
-import { SubstractNode, isSubstractNode } from "./substractNode.js";
+import { SubstractNode, isSubstractNode, substract } from "./substractNode.js";
 import { parseToMonomNode } from "../polynomials/monomNode.js";
+import { ExpNode, isExpNode } from "../functions/expNode.js";
 export function isFractionNode(a) {
     return isOperatorNode(a) && a.id === OperatorIds.fraction;
 }
@@ -225,20 +226,14 @@ export class FractionNode {
             if (opts?.forceDistributeFractions &&
                 isNumberNode(denum) &&
                 parsedMonom) {
-                return new MultiplyNode(new FractionNode(parsedMonom.a, denum), parsedMonom.variable.toTree()).simplify(opts);
+                return new MultiplyNode(new FractionNode(parsedMonom.a, denum), parsedMonom.toTree()).simplify(opts);
             }
             if (isFractionNode(denum) && isFractionNode(num)) {
                 return new MultiplyNode(num, new FractionNode(denum.rightChild, denum.leftChild)).simplify(opts);
             }
-            //!ya mieux à faire pour gérer tous les cas d'un coup
-            //!s'insiprer de multiply
-            if (isPowerNode(num) &&
-                isPowerNode(denum) &&
-                num.rightChild.isNumeric &&
-                denum.rightChild.isNumeric &&
-                num.rightChild.evaluate() === denum.rightChild.evaluate()) {
-                return new PowerNode(new FractionNode(num.leftChild, denum.leftChild), num.rightChild).simplify(opts);
-            }
+            const powerSimp = powerSimplify(num, denum, opts);
+            if (powerSimp)
+                return powerSimp;
             if (num.equals(denum))
                 return new NumberNode(1);
             return null;
@@ -312,3 +307,32 @@ export class FractionNode {
         throw new Error("unimplemented derivative");
     }
 }
+const powerSimplify = (num, denum, opts) => {
+    //!ya mieux à faire pour gérer tous les cas d'un coup
+    //!s'insiprer de multiply
+    if (isPowerNode(num) &&
+        isPowerNode(denum) &&
+        num.leftChild.evaluate() === denum.leftChild.evaluate()) {
+        return new PowerNode(num.leftChild, substract(num.rightChild, denum.rightChild)).simplify(opts);
+    }
+    if (isPowerNode(num) &&
+        isNumberNode(denum) &&
+        num.leftChild.evaluate() === denum.evaluate()) {
+        return new PowerNode(num.leftChild, substract(num.rightChild, 1)).simplify(opts);
+    }
+    if (isPowerNode(denum) &&
+        isNumberNode(num) &&
+        num.evaluate() === denum.leftChild.evaluate()) {
+        return new PowerNode(num, substract(1, denum.rightChild)).simplify(opts);
+    }
+    if (isPowerNode(num) &&
+        isPowerNode(denum) &&
+        num.rightChild.isNumeric &&
+        denum.rightChild.isNumeric &&
+        num.rightChild.evaluate() === denum.rightChild.evaluate()) {
+        return new PowerNode(new FractionNode(num.leftChild, denum.leftChild), num.rightChild).simplify(opts);
+    }
+    if (isExpNode(num) && isExpNode(denum)) {
+        return new ExpNode(substract(num.child, denum.child)).simplify(opts);
+    }
+};

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,YAAY,CAAC;AAChF,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAY3B,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAU7B,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,SAYrD,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,qBAGL;IAEF,WAAW,UAAW,eAAe,kBAUnC;IAEF,UAAU,qBAER;IACF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAgFrC,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;IAsL/C,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe;IAM1C,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,YAAY,CAAC;AAChF,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAY3B,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAW7B,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,SAYrD,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,qBAGL;IAEF,WAAW,UAAW,eAAe,kBAUnC;IAEF,UAAU,qBAER;IACF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAgFrC,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;IAoL/C,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe;IAM1C,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"}