math-exercises 2.0.10 → 2.0.12

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

@@ -1 +1 @@
-{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,qBAAa,SAAU,YAAW,YAAY;IAC5C,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,YAAY,IAAI,MAAM;IAItB,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAuBf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA6CrC,QAAQ;IAGR,MAAM,CAAC,IAAI,EAAE,aAAa;CAO3B;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAGrD"}
+{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,qBAAa,SAAU,YAAW,YAAY;IAC5C,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,YAAY,IAAI,MAAM;IAItB,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,IAAI,MAAM;IAuBf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA+FrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAO/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAOrC;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAGrD"}

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

@@ -77,6 +77,7 @@ class PowerNode {
     // simplify(): AlgebraicNode {
     //   const leftSimplified = this.leftChild.simplify();
     //   const rightSimplified = this.rightChild.simplify();
+    //   const copy = new PowerNode(leftSimplified, rightSimplified, this.opts);
     //   if (isNumberNode(rightSimplified)) {
     //     const value = rightSimplified.value;
     //     if (value === 0) return new NumberNode(1);
@@ -87,6 +88,36 @@ class PowerNode {
     //     if (value === 0) return leftSimplified;
     //     if (value === 1) return leftSimplified;
     //   }
+    //   let externals: AlgebraicNode[] = [];
+    //   //TODO Fractions
+    //   const recursive = (node: AlgebraicNode) => {
+    //     if (isMultiplyNode(node)) {
+    //       recursive(node.leftChild);
+    //       recursive(node.rightChild);
+    //     } else {
+    //       externals.push(node);
+    //     }
+    //   };
+    //   recursive(copy.leftChild)
+    //   const simplifyIteration = () => {
+    //     for (let i = 0; i < externals.length - 1; i++) {
+    //       const left = externals[i];
+    //       for (let j = i + 1; j < externals.length; j++) {
+    //         const right = externals[j];
+    //         const simplified = simplifyExternalNodes(left, right);
+    //         if (simplified) {
+    //           externals[i] = simplified;
+    //           externals.splice(j, 1);
+    //           if (isNumberNode(simplified) && simplified.value === 1) {
+    //             externals.splice(i, 1);
+    //           }
+    //           simplifyIteration();
+    //           return;
+    //         }
+    //       }
+    //     }
+    //   };
+    //   simplifyIteration();
     //   if (isNumberNode(rightSimplified) && isNumberNode(leftSimplified)) {
     //     const value = this.evaluate({});
     //     // à partir de ^21 et de ^-7, javascript returns des écritures scientifiques
@@ -107,11 +138,29 @@ class PowerNode {
     //     ).simplify();
     //   }
     //   if (isSqrtNode(leftSimplified) && isNumberNode(rightSimplified)) {
+    //     const powerValue = rightSimplified.value;
+    //     const powerIsEven = powerValue % 2 === 0;
+    //     if (powerIsEven) {
+    //       return new PowerNode(
+    //         leftSimplified.child,
+    //         new NumberNode(powerValue / 2),
+    //       ).simplify();
+    //     } else {
+    //       const parityPower = Math.floor(powerValue / 2);
+    //       return new MultiplyNode(
+    //         new PowerNode(leftSimplified.child, new NumberNode(parityPower)),
+    //         leftSimplified,
+    //       ).simplify();
+    //     }
     //   }
-    //   //! simplifications possibles :
+    //   return this;
     //   // puissances négatives ?
     // }
-    simplify() {
+    simplify(opts) {
+        //! temporaire
+        if ((0, numberNode_1.isNumberNode)(this.rightChild) && this.rightChild.value === 2) {
+            return new multiplyNode_1.MultiplyNode(this.leftChild, this.leftChild).simplify(opts);
+        }
         return this;
     }
     equals(node) {

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

@@ -1,6 +1,6 @@
 import { Node, NodeType } from "../node";
 import { OperatorIds, OperatorNode } from "./operatorNode";
-import { AlgebraicNode } from "../algebraicNode";
+import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
 export declare function isSubstractNode(a: Node): a is SubstractNode;
 export declare class SubstractNode implements OperatorNode {
     id: OperatorIds;
@@ -14,7 +14,7 @@ export declare class SubstractNode implements OperatorNode {
     toAllValidTexs(): string[];
     toTex(): string;
     evaluate(vars: Record<string, number>): number;
-    simplify(): this;
+    simplify(opts?: SimplifyOptions): AlgebraicNode;
     equals(node: AlgebraicNode): boolean;
 }
 //# sourceMappingURL=substractNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"substractNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/substractNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,wBAAgB,eAAe,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,aAAa,CAE3D;AACD,qBAAa,aAAc,YAAW,YAAY;IAChD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBACP,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa;IAQ/D,YAAY,IAAI,MAAM;IAItB,iBAAiB,IAAI,aAAa,EAAE;IAapC,cAAc,IAAI,MAAM,EAAE;IAG1B,KAAK,IAAI,MAAM;IAef,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMrC,QAAQ;IAGR,MAAM,CAAC,IAAI,EAAE,aAAa;CAO3B"}
+{"version":3,"file":"substractNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/substractNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAG3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,wBAAgB,eAAe,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,aAAa,CAE3D;AACD,qBAAa,aAAc,YAAW,YAAY;IAChD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBACP,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa;IAQ/D,YAAY,IAAI,MAAM;IAItB,iBAAiB,IAAI,aAAa,EAAE;IAapC,cAAc,IAAI,MAAM,EAAE;IAG1B,KAAK,IAAI,MAAM;IAef,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMrC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAM/B,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAOrC"}

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

@@ -52,8 +52,8 @@ class SubstractNode {
     // toMathjs() {
     //   return subtract(this.leftChild.toMathjs(), this.rightChild.toMathjs());
     // }
-    simplify() {
-        return this;
+    simplify(opts) {
+        return new addNode_1.AddNode(this.leftChild, new oppositeNode_1.OppositeNode(this.rightChild)).simplify(opts);
     }
     equals(node) {
         return (isSubstractNode(node) &&

package/lib/utils/randomLetter.d.ts

@@ -1,2 +1,2 @@
-export declare const randomLetter: (isMaj?: boolean) => string;
+export declare const randomLetter: (isMaj?: boolean, excludes?: string[]) => string;
 //# sourceMappingURL=randomLetter.d.ts.map

package/lib/utils/randomLetter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"randomLetter.d.ts","sourceRoot":"","sources":["../../src/utils/randomLetter.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,WAAW,OAAO,WAI1C,CAAC"}
+{"version":3,"file":"randomLetter.d.ts","sourceRoot":"","sources":["../../src/utils/randomLetter.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,WAChB,OAAO,aACJ,MAAM,EAAE,WASnB,CAAC"}

package/lib/utils/randomLetter.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomLetter = void 0;
-const randomLetter = (isMaj = false) => {
-    if (isMaj)
-        return String.fromCharCode(65 + Math.floor(Math.random() * 26));
-    return String.fromCharCode(97 + Math.floor(Math.random() * 26));
+const randomLetter = (isMaj = false, excludes = []) => {
+    let letter = "";
+    do {
+        letter = String.fromCharCode((isMaj ? 65 : 97) + Math.floor(Math.random() * 26));
+    } while (excludes.includes(letter));
+    return letter;
 };
 exports.randomLetter = randomLetter;

package/package.json

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