math-exercises 2.2.78 → 2.2.79

package/lib/tree/nodes/polynomials/monomNode.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseToMonom = exports.MonomNode = exports.parseToMonomNode = exports.isMonomNode = exports.monom = void 0;
+exports.isMonom = exports.parseToMonom = exports.MonomNode = exports.parseToMonomNode = exports.isMonomNode = exports.monom = void 0;
 const algebraicNode_1 = require("../algebraicNode");
 const oppositeNode_1 = require("../functions/oppositeNode");
 const node_1 = require("../node");
-// import { NodeIdentifiers } from "../nodeConstructor";
 const multiplyNode_1 = require("../operators/multiplyNode");
 const powerNode_1 = require("../operators/powerNode");
 const variableNode_1 = require("../variables/variableNode");
@@ -214,3 +213,128 @@ const parseToMonom = (node, { variable, maxDegree, minDegree } = {
     return false;
 };
 exports.parseToMonom = parseToMonom;
+const isMonom = (node, { variable, maxDegree, minDegree } = {
+    variable: "x",
+    maxDegree: undefined,
+    minDegree: 0,
+}) => {
+    variable = variable ?? "x";
+    maxDegree = maxDegree ?? undefined;
+    minDegree = minDegree ?? 0;
+    if (isMonomNode(node)) {
+        if (node.variable !== variable)
+            return false;
+        if (maxDegree && node.degree > maxDegree)
+            return false;
+        if (minDegree && node.degree < minDegree)
+            return false;
+        return true;
+    }
+    if (node.isNumeric && minDegree === 0)
+        return true;
+    //not monom
+    if ((0, variableNode_1.isVariableNode)(node) && node.name === variable && minDegree < 2)
+        return true;
+    //new MonomNode(1, 1, { variable });
+    if ((0, oppositeNode_1.isOppositeNode)(node) &&
+        (0, variableNode_1.isVariableNode)(node.child) &&
+        node.child.name === variable &&
+        minDegree < 2)
+        return true;
+    // new MonomNode(-1, 1, {variable})
+    if ((0, powerNode_1.isSquareNode)(node)) {
+        if (minDegree > 2)
+            return false;
+        if (maxDegree && maxDegree < 2)
+            return false;
+        return (0, variableNode_1.isVariableNode)(node.leftChild) && node.leftChild.name === "x";
+    }
+    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, powerNode_1.isSquareNode)(node.child)) {
+        if (minDegree > 2)
+            return false;
+        if (maxDegree && maxDegree < 2)
+            return false;
+        return ((0, variableNode_1.isVariableNode)(node.child.leftChild) && node.child.leftChild.name === "x");
+    }
+    if ((0, powerNode_1.isPowerNode)(node)) {
+        if (!node.rightChild.isNumeric)
+            return false;
+        const powerEv = node.rightChild.evaluate();
+        if (maxDegree && powerEv > maxDegree)
+            return false;
+        if (minDegree && powerEv < minDegree)
+            return false;
+        return (0, variableNode_1.isVariableNode)(node.leftChild) && node.leftChild.name === "x";
+    }
+    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, powerNode_1.isPowerNode)(node.child)) {
+        if (!node.child.rightChild.isNumeric)
+            return false;
+        const powerEv = node.child.rightChild.evaluate();
+        if (maxDegree && powerEv > maxDegree)
+            return false;
+        if (minDegree && powerEv < minDegree)
+            return false;
+        return ((0, variableNode_1.isVariableNode)(node.child.leftChild) && node.child.leftChild.name === "x");
+    }
+    if ((0, multiplyNode_1.isMultiplyNode)(node)) {
+        const numericChild = node.leftChild.isNumeric
+            ? "left"
+            : node.rightChild.isNumeric
+                ? "right"
+                : undefined;
+        if (!numericChild)
+            return false;
+        const varChild = numericChild === "left" ? node.rightChild : node.leftChild;
+        if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
+            return true;
+        if ((0, powerNode_1.isSquareNode)(varChild) &&
+            (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
+            varChild.leftChild.name === variable) {
+            if (maxDegree && maxDegree < 2)
+                return false;
+            if (minDegree > 2)
+                return false;
+            // new MonomNode(numericChild, powerEv, { variable });
+            return true;
+        }
+        if ((0, powerNode_1.isPowerNode)(varChild) &&
+            (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
+            varChild.leftChild.name === variable &&
+            varChild.rightChild.isNumeric) {
+            const powerEv = varChild.rightChild.evaluate();
+            if (maxDegree && powerEv > maxDegree)
+                return false;
+            if (powerEv < minDegree)
+                return false;
+            // new MonomNode(numericChild, powerEv, { variable });
+            return true;
+        }
+    }
+    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, multiplyNode_1.isMultiplyNode)(node.child)) {
+        const numericChild = node.child.leftChild.isNumeric
+            ? "left"
+            : node.child.rightChild.isNumeric
+                ? "right"
+                : undefined;
+        if (!numericChild)
+            return false;
+        const varChild = numericChild === "left" ? node.child.rightChild : node.child.leftChild;
+        if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
+            return true;
+        //new MonomNode(numericChild, 1, {variable});
+        if ((0, powerNode_1.isPowerNode)(varChild) &&
+            (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
+            varChild.leftChild.name === variable &&
+            varChild.rightChild.isNumeric) {
+            const powerEv = varChild.rightChild.evaluate();
+            if (maxDegree && powerEv > maxDegree)
+                return false;
+            if (powerEv < minDegree)
+                return false;
+            // new MonomNode(numericChild, powerEv, { variable });
+            return true;
+        }
+    }
+    return false;
+};
+exports.isMonom = isMonom;

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

@@ -1 +1 @@
-{"version":3,"file":"affineParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/affineParser.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,QAAS,MAAM,aAAY,MAAM,qKAuBzD,CAAC"}
+{"version":3,"file":"affineParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/affineParser.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,YAAY,QAAS,MAAM,aAAY,MAAM,qKAuBzD,CAAC"}

package/lib/tree/parsers/affineParser.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.affineParser = void 0;
 const addNode_1 = require("../nodes/operators/addNode");
 const substractNode_1 = require("../nodes/operators/substractNode");
+const monomNode_1 = require("../nodes/polynomials/monomNode");
 const latexParser_1 = require("./latexParser");
 const monomParser_1 = require("./monomParser");
 const affineParser = (ans, variable = "x") => {
@@ -21,7 +22,7 @@ const affineParser = (ans, variable = "x") => {
             if (!numericChild)
                 return false;
             const varChild = numericChild === "left" ? parsed.rightChild : parsed.leftChild;
-            return (0, monomParser_1.isMonom)(varChild, { variable, maxDegree: 1 }) ? parsed : false;
+            return (0, monomNode_1.isMonom)(varChild, { variable, maxDegree: 1 }) ? parsed : false;
         }
         return false;
     }

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

@@ -0,0 +1,8 @@
+import { IntervalNode } from "../nodes/sets/intervalNode";
+type Opts = {
+    allowCommaInsteadOfSemicolon?: boolean;
+    allowNoBrackets?: boolean;
+};
+export declare const intervalParser: (ans: string, opts?: Opts) => false | IntervalNode;
+export {};
+//# sourceMappingURL=intervalParser.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"intervalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/intervalParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,KAAK,IAAI,GAAG;IACV,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AACF,eAAO,MAAM,cAAc,QAAS,MAAM,SAAS,IAAI,yBAuCtD,CAAC"}

package/lib/tree/parsers/intervalParser.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.intervalParser = void 0;
+const closure_1 = require("../nodes/sets/closure");
+const intervalNode_1 = require("../nodes/sets/intervalNode");
+const latexParser_1 = require("./latexParser");
+const intervalParser = (ans, opts) => {
+    const allowCommaInsteadOfSemicolon = opts?.allowCommaInsteadOfSemicolon ?? false;
+    const allowNoBrackets = opts?.allowNoBrackets ?? false;
+    let formated = ans.replaceAll("\\ ", "");
+    if (allowNoBrackets && !["]", "["].includes(formated[0])) {
+        formated = "[" + formated;
+    }
+    if (allowNoBrackets && !["]", "["].includes(formated[formated.length - 1])) {
+        formated = formated + "]";
+    }
+    const leftBracket = formated[0];
+    const rightBracket = formated[formated.length - 1];
+    if ((!allowNoBrackets && !["]", "["].includes(leftBracket)) ||
+        !["]", "["].includes(rightBracket))
+        return false;
+    let bornes = formated.split(";");
+    if (!allowCommaInsteadOfSemicolon && bornes.length !== 2)
+        return false;
+    if (bornes.length !== 2) {
+        bornes = formated.split(",");
+        if (bornes.length !== 2)
+            return false;
+    }
+    const aParsed = (0, latexParser_1.parseAlgebraic)(bornes[0]);
+    if (!aParsed)
+        return false;
+    const bParsed = (0, latexParser_1.parseAlgebraic)(bornes[1]);
+    if (!bParsed)
+        return false;
+    return new intervalNode_1.IntervalNode(aParsed, bParsed, closure_1.Closure.fromBrackets(leftBracket, rightBracket));
+};
+exports.intervalParser = intervalParser;

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

@@ -1,10 +1,8 @@
-import { AlgebraicNode } from "../nodes/algebraicNode";
 type Opts = {
     variable?: string;
     maxDegree?: number;
     minDegree?: number;
 };
-export declare const monomParser: (str: string, { variable, maxDegree, minDegree }?: Opts) => false | AlgebraicNode;
-export declare const isMonom: (node: AlgebraicNode, { variable, maxDegree, minDegree }?: Opts) => boolean;
+export declare const monomParser: (str: string, { variable, maxDegree, minDegree }?: Opts) => false | import("../nodes/algebraicNode").AlgebraicNode;
 export {};
 //# sourceMappingURL=monomParser.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"monomParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/monomParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,QACjB,MAAM,uCACyB,IAAI,0BAgBzC,CAAC;AAEF,eAAO,MAAM,OAAO,SACZ,aAAa,uCACiB,IAAI,YAoHzC,CAAC"}
+{"version":3,"file":"monomParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/monomParser.ts"],"names":[],"mappings":"AAGA,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,QACjB,MAAM,uCACyB,IAAI,2DAiBzC,CAAC"}

package/lib/tree/parsers/monomParser.js

@@ -1,12 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMonom = exports.monomParser = void 0;
-const oppositeNode_1 = require("../nodes/functions/oppositeNode");
-const fractionNode_1 = require("../nodes/operators/fractionNode");
-const multiplyNode_1 = require("../nodes/operators/multiplyNode");
-const powerNode_1 = require("../nodes/operators/powerNode");
+exports.monomParser = void 0;
 const monomNode_1 = require("../nodes/polynomials/monomNode");
-const variableNode_1 = require("../nodes/variables/variableNode");
 const latexParser_1 = require("./latexParser");
 const monomParser = (str, { variable, maxDegree, minDegree } = {
     variable: "x",
@@ -15,132 +10,15 @@ const monomParser = (str, { variable, maxDegree, minDegree } = {
 }) => {
     try {
         const parsed = (0, latexParser_1.parseAlgebraic)(str);
-        return (0, exports.isMonom)(parsed, { variable, maxDegree, minDegree }) ? parsed : false;
-        if ((0, fractionNode_1.isFractionNode)(parsed)) {
-            //!unimplemented
-            return false;
-        }
-        else
-            return false;
+        // const parsed = (2).toTree();
+        return (0, monomNode_1.isMonom)(parsed, { variable, maxDegree, minDegree }) ? parsed : false;
+        //   if (isFractionNode(parsed)) {
+        // !unimplemented
+        // return false;
+        //   } else return false;
     }
     catch (err) {
         return false;
     }
 };
 exports.monomParser = monomParser;
-const isMonom = (node, { variable, maxDegree, minDegree } = {
-    variable: "x",
-    maxDegree: undefined,
-    minDegree: 0,
-}) => {
-    variable = variable ?? "x";
-    maxDegree = maxDegree ?? undefined;
-    minDegree = minDegree ?? 0;
-    if ((0, monomNode_1.isMonomNode)(node)) {
-        if (node.variable !== variable)
-            return false;
-        if (maxDegree && node.degree > maxDegree)
-            return false;
-        if (minDegree && node.degree < minDegree)
-            return false;
-        return true;
-    }
-    if (node.isNumeric && minDegree === 0)
-        return true;
-    //not monom
-    if ((0, variableNode_1.isVariableNode)(node) && node.name === variable && minDegree < 2)
-        return true;
-    //new MonomNode(1, 1, { variable });
-    if ((0, oppositeNode_1.isOppositeNode)(node) &&
-        (0, variableNode_1.isVariableNode)(node.child) &&
-        node.child.name === variable &&
-        minDegree < 2)
-        return true;
-    // new MonomNode(-1, 1, {variable})
-    if ((0, powerNode_1.isSquareNode)(node)) {
-        if (minDegree > 2)
-            return false;
-        if (maxDegree && maxDegree < 2)
-            return false;
-        return (0, variableNode_1.isVariableNode)(node.leftChild) && node.leftChild.name === "x";
-    }
-    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, powerNode_1.isSquareNode)(node.child)) {
-        if (minDegree > 2)
-            return false;
-        if (maxDegree && maxDegree < 2)
-            return false;
-        return ((0, variableNode_1.isVariableNode)(node.child.leftChild) && node.child.leftChild.name === "x");
-    }
-    if ((0, powerNode_1.isPowerNode)(node)) {
-        if (!node.rightChild.isNumeric)
-            return false;
-        const powerEv = node.rightChild.evaluate();
-        if (maxDegree && powerEv > maxDegree)
-            return false;
-        if (minDegree && powerEv < minDegree)
-            return false;
-        return (0, variableNode_1.isVariableNode)(node.leftChild) && node.leftChild.name === "x";
-    }
-    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, powerNode_1.isPowerNode)(node.child)) {
-        if (!node.child.rightChild.isNumeric)
-            return false;
-        const powerEv = node.child.rightChild.evaluate();
-        if (maxDegree && powerEv > maxDegree)
-            return false;
-        if (minDegree && powerEv < minDegree)
-            return false;
-        return ((0, variableNode_1.isVariableNode)(node.child.leftChild) && node.child.leftChild.name === "x");
-    }
-    if ((0, multiplyNode_1.isMultiplyNode)(node)) {
-        const numericChild = node.leftChild.isNumeric
-            ? "left"
-            : node.rightChild.isNumeric
-                ? "right"
-                : undefined;
-        if (!numericChild)
-            return false;
-        const varChild = numericChild === "left" ? node.rightChild : node.leftChild;
-        if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
-            return true;
-        //new MonomNode(numericChild, 1, {variable});
-        if ((0, powerNode_1.isPowerNode)(varChild) &&
-            (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
-            varChild.leftChild.name === variable &&
-            varChild.rightChild.isNumeric) {
-            const powerEv = varChild.rightChild.evaluate();
-            if (maxDegree && powerEv > maxDegree)
-                return false;
-            if (minDegree && powerEv < minDegree)
-                return false;
-            // new MonomNode(numericChild, powerEv, { variable });
-            return true;
-        }
-    }
-    if ((0, oppositeNode_1.isOppositeNode)(node) && (0, multiplyNode_1.isMultiplyNode)(node.child)) {
-        const numericChild = node.child.leftChild.isNumeric
-            ? "left"
-            : node.child.rightChild.isNumeric
-                ? "right"
-                : undefined;
-        if (!numericChild)
-            return false;
-        const varChild = numericChild === "left" ? node.child.rightChild : node.child.leftChild;
-        if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
-            return true;
-        //new MonomNode(numericChild, 1, {variable});
-        if ((0, powerNode_1.isPowerNode)(varChild) &&
-            (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
-            varChild.leftChild.name === variable &&
-            varChild.rightChild.isNumeric) {
-            const powerEv = varChild.rightChild.evaluate();
-            if (maxDegree && powerEv > maxDegree)
-                return false;
-            if (minDegree && powerEv < minDegree)
-                return false;
-            // new MonomNode(numericChild, powerEv, { variable });
-            return true;
-        }
-    }
-    return false;
-};
-exports.isMonom = isMonom;

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

@@ -1 +1 @@
-{"version":3,"file":"polynomialParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/polynomialParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,eAAO,MAAM,gBAAgB,QAAS,MAAM,8OAmC3C,CAAC"}
+{"version":3,"file":"polynomialParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/polynomialParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAWvD,eAAO,MAAM,gBAAgB,QAAS,MAAM,8OAmC3C,CAAC"}

package/lib/tree/parsers/polynomialParser.js

@@ -4,6 +4,7 @@ exports.polynomialParser = void 0;
 const oppositeNode_1 = require("../nodes/functions/oppositeNode");
 const addNode_1 = require("../nodes/operators/addNode");
 const substractNode_1 = require("../nodes/operators/substractNode");
+const monomNode_1 = require("../nodes/polynomials/monomNode");
 const latexParser_1 = require("./latexParser");
 const monomParser_1 = require("./monomParser");
 const numberParser_1 = require("./numberParser");
@@ -37,7 +38,7 @@ const polynomialParser = (ans) => {
                 }
             };
             recursive(parsed);
-            if (externals.every((node) => (0, monomParser_1.isMonom)(node))) {
+            if (externals.every((node) => (0, monomNode_1.isMonom)(node))) {
                 return parsed;
             }
         }

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

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

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

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

package/lib/tree/parsers/powerParser.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.powerParser = void 0;
+const sqrtNode_1 = require("../nodes/functions/sqrtNode");
 const numberNode_1 = require("../nodes/numbers/numberNode");
 const fractionNode_1 = require("../nodes/operators/fractionNode");
 const powerNode_1 = require("../nodes/operators/powerNode");
@@ -10,7 +11,7 @@ const powerParser = (ans) => {
         const parsed = (0, latexParser_1.parseAlgebraic)(ans);
         if (!parsed)
             return false;
-        if ((0, powerNode_1.isPowerNode)(parsed))
+        if ((0, powerNode_1.isPowerNode)(parsed) || (0, sqrtNode_1.isSqrtNode)(parsed))
             return parsed;
         if ((0, fractionNode_1.isFractionNode)(parsed) &&
             (0, numberNode_1.isNumberNode)(parsed.leftChild) &&

package/lib/tree/parsers/trinomParser.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trinomParser = void 0;
 const addNode_1 = require("../nodes/operators/addNode");
 const substractNode_1 = require("../nodes/operators/substractNode");
+const monomNode_1 = require("../nodes/polynomials/monomNode");
 const latexParser_1 = require("./latexParser");
-const monomParser_1 = require("./monomParser");
 const trinomParser = (ans, variable = "x") => {
     try {
         //! difficile !
@@ -13,7 +13,7 @@ const trinomParser = (ans, variable = "x") => {
         const parsed = (0, latexParser_1.parseAlgebraic)(ans);
         if (!parsed)
             return false;
-        if ((0, monomParser_1.isMonom)(parsed, { variable, maxDegree: 2, minDegree: 2 }))
+        if ((0, monomNode_1.isMonom)(parsed, { variable, maxDegree: 2, minDegree: 2 }))
             return parsed;
         if ((0, addNode_1.isAddNode)(parsed) || (0, substractNode_1.isSubstractNode)(parsed)) {
             const children = [parsed.leftChild, parsed.rightChild];

package/package.json

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