math-exercises 2.0.18 → 2.0.19

package/lib/exercises/calculLitteral/equation/firstDegreeEquation.js

@@ -48,7 +48,7 @@ exports.firstDegreeEquation = {
     connector: "=",
     label: "Résoudre une équation du premier degré du type $\\frac{a}{x} = b$",
     levels: ["2nde", "1reESM", "1reSpé"],
-    sections: ["Équations"],
+    sections: ["Équations", "Fonction inverse", "Fonctions de référence"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFirstDegreeEquation, nb),
     getPropositions,

package/lib/exercises/percent/applyPercent.js

@@ -56,7 +56,7 @@ const isAnswerValid = (ans, { answer }) => {
 exports.applyPercent = {
     id: "applyPercent",
     connector: "=",
-    label: "Appliquer un pourcentage d'augmentation ou de diminution.",
+    label: "Appliquer un pourcentage d'augmentation ou de diminution",
     levels: [
         "4ème",
         "3ème",

package/lib/server.js

@@ -35,24 +35,19 @@ const express_1 = __importDefault(require("express"));
 const body_parser_1 = __importDefault(require("body-parser"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const cors_1 = __importDefault(require("cors"));
-const addNode_1 = require("./tree/nodes/operators/addNode");
-const numberNode_1 = require("./tree/nodes/numbers/numberNode");
-const powerNode_1 = require("./tree/nodes/operators/powerNode");
-const sqrtNode_1 = require("./tree/nodes/functions/sqrtNode");
-const multiplyNode_1 = require("./tree/nodes/operators/multiplyNode");
 const jsonParser = body_parser_1.default.json();
 const allExercises = [...exercises];
 const runServer = () => {
     dotenv_1.default.config();
     const app = (0, express_1.default)();
     app.use((0, cors_1.default)());
-    console.log(exercises.length + " exercices");
-    const firstTerm = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(3), new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(3)));
-    const secondTerm = new numberNode_1.NumberNode(5);
-    const answer = new addNode_1.AddNode(new powerNode_1.SquareNode(firstTerm), new addNode_1.AddNode(new powerNode_1.SquareNode(secondTerm), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(2), new multiplyNode_1.MultiplyNode(firstTerm, secondTerm))))
-        .simplify()
-        .toTex();
-    console.log(answer);
+    // const latex = "\\sqrt{3,230982}";
+    // try {
+    //   const res = parseLatex(latex);
+    //   console.log(res.toTex());
+    // } catch (err) {
+    //   throw err;
+    // }
     app.get("/", (req, res) => {
         res.json(allExercises);
     });

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

@@ -0,0 +1,3 @@
+import { AlgebraicNode } from "../nodes/algebraicNode";
+export declare const parseLatex: (latex: string) => AlgebraicNode;
+//# sourceMappingURL=latexParser.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"latexParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/latexParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA2BvD,eAAO,MAAM,UAAU,UAAW,MAAM,kBAgBvC,CAAC"}

package/lib/tree/parsers/latexParser.js

@@ -0,0 +1,180 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLatex = void 0;
+const isLetter_1 = require("../../utils/isLetter");
+const sqrtNode_1 = require("../nodes/functions/sqrtNode");
+const numberNode_1 = require("../nodes/numbers/numberNode");
+const isDyck = (latex) => {
+    const brackets = latex.split("").filter((el) => el === "(" || el === ")");
+    while (brackets.length) {
+        const rightIndex = brackets.findIndex((el) => el == ")");
+        if (rightIndex === -1 || rightIndex === 0)
+            return false;
+        let leftIndex = -1;
+        for (let i = rightIndex - 1; i > -1; i--) {
+            if (brackets[i] === "(") {
+                leftIndex = i;
+            }
+            break;
+        }
+        if (leftIndex === -1)
+            return false;
+        brackets.splice(rightIndex, 1);
+        brackets.splice(leftIndex, 1);
+    }
+    return true;
+};
+const parseLatex = (latex) => {
+    const formattedLatex = latex
+        .replaceAll("\\left", "")
+        .replaceAll("\\right", "");
+    const isWellBracketed = isDyck(latex);
+    if (!isWellBracketed)
+        throw Error("Problème de parenthèses.");
+    let currentTree;
+    let currentItem;
+    const length = formattedLatex.length;
+    try {
+        const parsed = parseString(latex);
+        return parsed.node;
+    }
+    catch (err) {
+        throw err;
+    }
+};
+exports.parseLatex = parseLatex;
+const parseString = (latex) => {
+    let currentTree;
+    let currentItem;
+    let currentAddCandidate;
+    const length = latex.length;
+    let jump = 0;
+    try {
+        for (let i = 0; i < length; i++) {
+            const char = latex[i];
+            const parsed = parseItem(latex);
+            currentItem = parsed.node;
+            currentTree = parsed.node;
+            jump = parsed.jump;
+            i += parsed.jump;
+        }
+        return {
+            node: currentTree,
+            jump,
+        };
+    }
+    catch (err) {
+        throw err;
+    }
+};
+const parseItem = (latex) => {
+    const length = latex.length;
+    const char = latex[0];
+    if (charIsNumber(char)) {
+        return parseNumber(latex);
+    }
+    else if (char === "\\") {
+        const cmdData = parseCommand(latex);
+        switch (cmdData.cmd) {
+            case "sqrt":
+                const childLatex = getChildLatex(latex.substring(cmdData.jump));
+                const parsedChild = parseString(childLatex);
+                return {
+                    node: new sqrtNode_1.SqrtNode(parsedChild.node),
+                    jump: parsedChild.jump,
+                };
+            default:
+                throw Error(`Commande ${cmdData.cmd} non gérée`);
+        }
+    }
+    else if (char === "+") {
+    }
+    throw Error(`Symbole ${char} non géré`);
+};
+/**
+ *
+ * @param latex latex[0] must be {
+ *
+ *
+ * cette fonction extrait le latex d'un child,
+ * par ex elle renverra "x" dans \\sqrt{x}
+ */
+const getChildLatex = (latex) => {
+    const childStartIndex = 1;
+    let leftBracesCount = 0;
+    let childEndIndex = -1;
+    for (let i = childStartIndex; i < latex.length; i++) {
+        if (latex[i] === "{")
+            leftBracesCount++;
+        if (latex[i] === "}") {
+            if (leftBracesCount === 0) {
+                return latex.substring(1, i);
+            }
+            else
+                leftBracesCount--;
+        }
+    }
+    throw Error(`Erreur en récupérant un child dans ${latex}`);
+};
+/**
+ *
+ * @param latex latex[0] must be \
+ */
+const parseCommand = (latex) => {
+    let nextChar = latex[1];
+    const length = latex.length;
+    if (!nextChar)
+        throw Error("Antislash mais pas de nom de commande");
+    let j = 1;
+    let cmd = "";
+    while (j < length && (0, isLetter_1.isLetter)(nextChar)) {
+        cmd += nextChar;
+        j++;
+        nextChar = latex[j];
+    }
+    return {
+        cmd,
+        jump: 1 + cmd.length,
+    };
+};
+/**
+ *
+ * @param latex latex[0] must be a number
+ * @returns
+ */
+const parseNumber = (latex) => {
+    const char = latex[0];
+    const length = latex.length;
+    let numberString = char;
+    let j = 1;
+    let nextChar = latex[j];
+    while (j < length && (charIsNumber(nextChar) || nextChar === ",")) {
+        numberString += nextChar;
+        j++;
+        nextChar = latex[j];
+    }
+    if (numberString[numberString.length - 1] === ",")
+        throw Error(`Nombre ${numberString} avec virgule mais sans partie décimale`);
+    if (numberString.split(",").length > 2)
+        throw Error(`Trop de virgules dans le nombre ${numberString}`);
+    const number = Number(numberString.replace(",", "."));
+    return {
+        node: new numberNode_1.NumberNode(number),
+        jump: numberString.length,
+    };
+};
+/***
+ * Nombres
+ * Constantes
+ * Opérations :
+ *  - +
+ *  - -
+ *  - *
+ *  - /
+ * Fonctions :
+ *  - exp
+ *  - ln
+ */
+const charIsNumber = (s) => {
+    return ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"].includes(s);
+};

package/package.json

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