math-exercises 2.2.59 → 2.2.61

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

@@ -1,20 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SquareNode = exports.PowerNode = exports.square = exports.isPowerNode = void 0;
+exports.SquareNode = exports.PowerNode = exports.power = exports.square = exports.isSquareNode = exports.isPowerNode = void 0;
 // import { pow } from "mathjs";
 const node_1 = require("../node");
 const operatorNode_1 = require("./operatorNode");
 const numberNode_1 = require("../numbers/numberNode");
 const multiplyNode_1 = require("./multiplyNode");
+const sqrtNode_1 = require("../functions/sqrtNode");
 function isPowerNode(a) {
     return (0, operatorNode_1.isOperatorNode)(a) && a.id === operatorNode_1.OperatorIds.power;
 }
 exports.isPowerNode = isPowerNode;
+function isSquareNode(a) {
+    return (0, operatorNode_1.isOperatorNode)(a) && a.id === operatorNode_1.OperatorIds.square;
+}
+exports.isSquareNode = isSquareNode;
 const square = (a) => {
     const nodeA = typeof a === "number" ? a.toTree() : typeof a === "string" ? a.toTree() : a;
     return new SquareNode(nodeA);
 };
 exports.square = square;
+const power = (a, b, opts) => {
+    const nodeA = typeof a === "number" ? a.toTree() : typeof a === "string" ? a.toTree() : a;
+    const nodeB = typeof b === "number" ? b.toTree() : typeof b === "string" ? b.toTree() : b;
+    return new PowerNode(nodeA, nodeB, opts);
+};
+exports.power = power;
 class PowerNode {
     constructor(leftChild, rightChild, opts) {
         this.id = operatorNode_1.OperatorIds.power;
@@ -89,93 +100,13 @@ class PowerNode {
     toDetailedEvaluation(vars) {
         return new PowerNode(this.leftChild.toDetailedEvaluation(vars), this.rightChild.toDetailedEvaluation(vars));
     }
-    // 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);
-    //     if (value === 1) return leftSimplified;
-    //   }
-    //   if (isNumberNode(leftSimplified)) {
-    //     const value = leftSimplified.value;
-    //     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
-    //     if (
-    //       Math.abs(value) < Math.pow(10, 21) ||
-    //       Math.abs(value) < Math.pow(10, -7)
-    //     ) {
-    //       return new NumberNode(value);
-    //     } else return this;
-    //   }
-    //   if (isExpNode(leftSimplified) && isLogNode(rightSimplified)) {
-    //     return rightSimplified.child;
-    //   }
-    //   if (isPowerNode(leftSimplified)) {
-    //     return new PowerNode(
-    //       leftSimplified.leftChild,
-    //       new MultiplyNode(leftSimplified.rightChild, rightSimplified),
-    //     ).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();
-    //     }
-    //   }
-    //   return this;
-    //   // puissances négatives ?
-    // }
     simplify(opts) {
         const leftSimplified = this.leftChild.simplify(opts);
         const rightSimplified = this.rightChild.simplify(opts);
         const copy = new PowerNode(leftSimplified, rightSimplified, this.opts);
         //! temporaire
+        if ((0, numberNode_1.isNumberNode)(leftSimplified) && leftSimplified.value === 1)
+            return (1).toTree();
         if ((0, numberNode_1.isNumberNode)(rightSimplified) && rightSimplified.value === 0) {
             return new numberNode_1.NumberNode(1);
         }
@@ -185,9 +116,15 @@ class PowerNode {
         if (isPowerNode(leftSimplified)) {
             return new PowerNode(leftSimplified.leftChild, new multiplyNode_1.MultiplyNode(rightSimplified, leftSimplified.rightChild).simplify(opts)).simplify(opts);
         }
+        if ((0, sqrtNode_1.isSqrtNode)(leftSimplified) &&
+            (0, numberNode_1.isNumberNode)(rightSimplified) &&
+            rightSimplified.value === 2) {
+            return leftSimplified.child;
+        }
         if ((0, multiplyNode_1.isMultiplyNode)(leftSimplified)) {
             return new multiplyNode_1.MultiplyNode(new PowerNode(leftSimplified.leftChild, rightSimplified), new PowerNode(leftSimplified.rightChild, rightSimplified)).simplify(opts);
         }
+        //! j'aime po ce truc
         if (!opts?.keepPowers &&
             (0, numberNode_1.isNumberNode)(copy.rightChild) &&
             copy.rightChild.value === 2) {
@@ -205,6 +142,7 @@ exports.PowerNode = PowerNode;
 class SquareNode extends PowerNode {
     constructor(child, opts) {
         super(child, new numberNode_1.NumberNode(2), opts);
+        this.id = operatorNode_1.OperatorIds.square;
     }
 }
 exports.SquareNode = SquareNode;

package/lib/tree/parsers/powerParser.d.ts

@@ -0,0 +1,2 @@
+export declare const powerParser: (ans: string) => false | import("../nodes/operators/fractionNode").FractionNode | import("../nodes/operators/powerNode").PowerNode;
+//# sourceMappingURL=powerParser.d.ts.map

package/lib/tree/parsers/powerParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"powerParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/powerParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW,QAAS,MAAM,sHAgBtC,CAAC"}

package/lib/tree/parsers/powerParser.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.powerParser = void 0;
+const numberNode_1 = require("../nodes/numbers/numberNode");
+const fractionNode_1 = require("../nodes/operators/fractionNode");
+const powerNode_1 = require("../nodes/operators/powerNode");
+const latexParser_1 = require("./latexParser");
+const powerParser = (ans) => {
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        if ((0, powerNode_1.isPowerNode)(parsed))
+            return parsed;
+        if ((0, fractionNode_1.isFractionNode)(parsed) &&
+            (0, numberNode_1.isNumberNode)(parsed.leftChild) &&
+            parsed.leftChild.value === 1 &&
+            (0, powerNode_1.isPowerNode)(parsed.rightChild))
+            return parsed;
+        return false;
+    }
+    catch (err) {
+        return false;
+    }
+};
+exports.powerParser = powerParser;

package/lib/tree/parsers/rationalParser.d.ts

@@ -1,3 +1,3 @@
 import { FractionNode } from "../nodes/operators/fractionNode";
-export declare const rationalParser: (ans: string) => false | import("../nodes/algebraicNode").AlgebraicNode | FractionNode | undefined;
+export declare const rationalParser: (ans: string) => false | import("../nodes/algebraicNode").AlgebraicNode | FractionNode | import("../nodes/functions/oppositeNode").OppositeNode | undefined;
 //# sourceMappingURL=rationalParser.d.ts.map

package/lib/tree/parsers/rationalParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rationalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/rationalParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D,eAAO,MAAM,cAAc,QAAS,MAAM,sFAyBzC,CAAC"}
+{"version":3,"file":"rationalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/rationalParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAQ,MAAM,iCAAiC,CAAC;AAGrE,eAAO,MAAM,cAAc,QAAS,MAAM,+IA2BzC,CAAC"}

package/lib/tree/parsers/rationalParser.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rationalParser = void 0;
+const oppositeNode_1 = require("../nodes/functions/oppositeNode");
 const fractionNode_1 = require("../nodes/operators/fractionNode");
 const numberParser_1 = require("./numberParser");
 const rationalParser = (ans) => {
     const nb = (0, numberParser_1.numberParser)(ans);
     if (nb !== false) {
-        return nb.toTree();
+        return nb.unfrenchify().toTree();
     }
     if (!ans.includes("\\frac"))
         return false;
@@ -18,15 +19,19 @@ const rationalParser = (ans) => {
         if (parsedFracs.some((e) => e === false))
             return false;
         const nodeFracs = fracs.map((e) => e.unfrenchify().toTree());
-        return new fractionNode_1.FractionNode(nodeFracs[0], nodeFracs[1]);
+        return (0, fractionNode_1.frac)(nodeFracs[0], nodeFracs[1]);
+    }
+    if (ans.startsWith("-")) {
+        const fracString = ans.slice(1);
+        const fracs = fracString.replaceAll("}", "").split("{").slice(1);
+        if (fracs.length !== 2)
+            return false;
+        const parsedFracs = fracs.map((e) => (0, numberParser_1.numberParser)(e));
+        if (parsedFracs.some((e) => e === false))
+            return false;
+        const nodeFracs = fracs.map((e) => e.unfrenchify().toTree());
+        return (0, oppositeNode_1.opposite)((0, fractionNode_1.frac)(nodeFracs[0], nodeFracs[1]));
     }
-    //   if(ans.startsWith("-")){
-    //       const fracs = ans.replaceAll("}","").split('{').slice(1)
-    //       if(fracs.length !== 2) return false
-    //       const parsedFracs = fracs.map((e)=>numberParser(e))
-    //       if(parsedFracs.some((e)=>e===false)) return false
-    //       return ans;
-    //   }
     // const nb = ans.unfrenchify();
     // if (isNaN(nb)) return false;
     // return nb.frenchify();

package/lib/tree/parsers/spacePointParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spacePointParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/spacePointParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,eAAO,MAAM,gBAAgB,QAAS,MAAM,uBAW3C,CAAC"}
+{"version":3,"file":"spacePointParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/spacePointParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAI5D,eAAO,MAAM,gBAAgB,QAAS,MAAM,uBAW3C,CAAC"}

package/lib/tree/parsers/spaceVectorParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spaceVectorParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/spaceVectorParser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,eAAO,MAAM,iBAAiB,QAAS,MAAM,wBAW5C,CAAC"}
+{"version":3,"file":"spaceVectorParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/spaceVectorParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,eAAO,MAAM,iBAAiB,QAAS,MAAM,wBAW5C,CAAC"}

package/package.json

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