math-exercises 3.0.97 → 3.0.99

package/lib/tests/pdfs/valueTableToLatex.js

@@ -0,0 +1,18 @@
+export const valueTableToLatex = (arr) => {
+    const width = arr[0].length;
+    const alignement = "|c".repeat(width) + "|";
+    let res = `\n \n \\begin{center}\\begin{tabular}{${alignement}} \n ` +
+        arr.map((row, i) => formatRow(row, i)).join(" \\tabularnewline ") +
+        "\\tabularnewline \\hline \\end{tabular}\\end{center} \n \n";
+    return res;
+};
+const dollarize = (s) => {
+    if (s === " " || s === "")
+        return s;
+    if (s[0] === "$" && s[s.length - 1] === "$")
+        return s;
+    return "$" + s + "$";
+};
+const formatRow = (row, i) => {
+    return "\\hline " + row.map((el) => dollarize(el)).join(" & ");
+};

package/lib/tests/pdfs/varTableToLatex.d.ts

@@ -0,0 +1,2 @@
+export declare const varTableToLatex: (arr: string[][], isInput?: boolean) => string;
+//# sourceMappingURL=varTableToLatex.d.ts.map

package/lib/tests/pdfs/varTableToLatex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"varTableToLatex.d.ts","sourceRoot":"","sources":["../../../src/tests/pdfs/varTableToLatex.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,QAAS,MAAM,EAAE,EAAE,8BA2C9C,CAAC"}

package/lib/tests/pdfs/varTableToLatex.js

@@ -0,0 +1,58 @@
+export const varTableToLatex = (arr, isInput = false) => {
+    if (isInput)
+        return getInputVarTable(arr);
+    const formated = arr.map((row) => row.map((e) => (e === "" || e === "\\ " ? " " : e)));
+    const final = [formated[0], [formated[2][0]]];
+    for (let i = 1; i < arr[0].length; i++) {
+        const data = formated[1][i] !== " "
+            ? formated[1][i]
+            : formated[2][i] !== " "
+                ? formated[2][i]
+                : formated[3][i];
+        final[1][i] = data;
+    }
+    const varLine = [];
+    for (let i = 1; i < final[1].length; i++) {
+        const current = final[1][i];
+        if (current === "\\nearrow" || current === "\\searrow")
+            continue;
+        if (i === final[1].length - 1) {
+            const prev = final[1][i - 1];
+            varLine.push(`${prev === "\\nearrow" ? "+" : "-"}/ ${dollarize(current)}`);
+        }
+        else {
+            const next = final[1][i + 1];
+            varLine.push(`${next === "\\nearrow" ? "-" : "+"}/ ${dollarize(current)}`);
+        }
+    }
+    return `\n \n 
+\\begin{tikzpicture}
+   \\tkzTabInit[lgt=1.5,espcl=1.5]{${final
+        .map((row, i) => `${dollarize(row[0])} /${i === 0 ? "1" : "1.5"}`)
+        .join(",")}}{${final[0]
+        .slice(1)
+        .filter((e) => e !== " ")
+        .map((e) => dollarize(e))
+        .join(",")}}
+  \\tkzTabVar{${varLine.join(",")}}
+\\end{tikzpicture} \n \n
+`;
+};
+const dollarize = (s) => {
+    if (s === " " || s === "")
+        return s;
+    if (s[0] === "$" && s[s.length - 1] === "$")
+        return s;
+    return "$" + s + "$";
+};
+const getInputVarTable = (arr) => {
+    const width = arr[0].length;
+    const alignement = "|c|" + "c".repeat(width - 1) + "|";
+    let res = ` \\begin{center}\\begin{tabular}{${alignement}} \n \\hline ` +
+        arr.map((row, i) => formatRow(row, i)).join(" \\tabularnewline ") +
+        "\\tabularnewline \\hline \\end{tabular}\\end{center} ";
+    return res;
+};
+const formatRow = (row, i) => {
+    return ((i === 1 ? "\\hline " : "") + row.map((el) => dollarize(el)).join(" & "));
+};

package/lib/tests/questionTest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questionTest.d.ts","sourceRoot":"","sources":["../../src/tests/questionTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAIjE,eAAO,MAAM,YAAY,QAAS,QAAQ,YAAY,QAAQ;;;CAkN7D,CAAC"}
+{"version":3,"file":"questionTest.d.ts","sourceRoot":"","sources":["../../src/tests/questionTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAIjE,eAAO,MAAM,YAAY,QAAS,QAAQ,YAAY,QAAQ;;;CA4N7D,CAAC"}

package/lib/tests/questionTest.js

@@ -37,6 +37,12 @@ export const questionTest = (exo, question) => {
             throw new Error(`exo ${exo.id} has studentGgbOptions but answerType is not GGB`);
         }
     }
+    if (question.initTable?.length &&
+        exo.answerType !== "valueTable" &&
+        exo.answerType !== "varTable" &&
+        exo.answerType !== "signTable") {
+        throw new Error(`exo ${exo.id} has init table but is not tableExo`);
+    }
     if (exo.answerType === "GGB") {
         if (!question.ggbAnswer?.length)
             throw new Error(`exo ${exo.id} has no ggbAnswer`);
@@ -48,6 +54,8 @@ export const questionTest = (exo, question) => {
         exo.answerType === "signTable") {
         if (!question.answerTable?.length)
             throw new Error(`exo ${exo.id} has no answerTable`);
+        if (!question.initTable?.length)
+            throw new Error(`exo ${exo.id} has no initTable`);
     }
     else if (exo.answerType !== "QCU" && exo.answerType !== "QCM") {
         if (!question.answer)

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

@@ -304,7 +304,6 @@ const addSort = (a, b) => {
         return Number(a.isNumeric) - Number(b.isNumeric);
     }
     if (isMonom(a) && isMonom(b)) {
-        console.log("passed", a.toTex(), b.toTex());
         const parsedA = parseToMonomNode(a);
         const parsedB = parseToMonomNode(b);
         if (parsedA && parsedB) {

package/lib/tree/nodes/sets/intervalNode.d.ts

@@ -53,6 +53,7 @@ export declare class IntervalNode implements SetNode {
     isDisjoint(otherInt: IntervalNode): void;
     intersection(otherInt: IntervalNode): DiscreteSetNode | IntervalNode;
     toClosedForm(): IntervalNode;
+    toClosure(c: ClosureType): IntervalNode;
     union(otherInt: IntervalNode): IntervalNode | UnionIntervalNode;
 }
 //# sourceMappingURL=intervalNode.d.ts.map

package/lib/tree/nodes/sets/intervalNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intervalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/intervalNode.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,eAAe,EAAkB,MAAM,uBAAuB,CAAC;AAOxE,OAAO,EAAW,WAAW,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,eAAe,EAAY,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAa,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,8BAAsB,uBAAuB;IAC3C,MAAM,CAAC,MAAM;IA2Cb,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAYlC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,uBAAuB;CAQpD;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AACF,qBAAa,YAAa,YAAW,OAAO;IAC1C,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,WAAW,CAAC;IACrB,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;gBAGjB,CAAC,EAAE,aAAa,EAChB,CAAC,EAAE,aAAa,EAChB,OAAO,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,WAAW;IAYpB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW;IAMjC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAoBpC,YAAY,CAAC,WAAW,CAAC,EAAE,aAAa;IA4BxC,YAAY;IAIZ,MAAM,CAAC,CAAC,EAAE,aAAa;IASvB,iBAAiB;IAGjB,qBAAqB;IAGrB,sBAAsB;IAGtB,wBAAwB;IAYxB,YAAY;IAkCZ,KAAK;IAWL,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAOvC,aAAa,IAAI,uBAAuB;IAUxC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAiB7C,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAQ/B,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa;IAG3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe;IAG9D,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IASxD,YAAY;IAGZ,aAAa;IAGb,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO;IAanC,UAAU,CAAC,QAAQ,EAAE,YAAY;IAEjC,YAAY,CAAC,QAAQ,EAAE,YAAY;IA0DnC,YAAY;IAIZ,KAAK,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,GAAG,iBAAiB;CAkDhE"}
+{"version":3,"file":"intervalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/intervalNode.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,eAAe,EAAkB,MAAM,uBAAuB,CAAC;AAOxE,OAAO,EAAW,WAAW,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,eAAe,EAAY,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAa,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,8BAAsB,uBAAuB;IAC3C,MAAM,CAAC,MAAM;IA2Cb,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAYlC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,uBAAuB;CAQpD;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AACF,qBAAa,YAAa,YAAW,OAAO;IAC1C,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,WAAW,CAAC;IACrB,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;gBAGjB,CAAC,EAAE,aAAa,EAChB,CAAC,EAAE,aAAa,EAChB,OAAO,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,WAAW;IAYpB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW;IAMjC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAoBpC,YAAY,CAAC,WAAW,CAAC,EAAE,aAAa;IA4BxC,YAAY;IAIZ,MAAM,CAAC,CAAC,EAAE,aAAa;IASvB,iBAAiB;IAGjB,qBAAqB;IAGrB,sBAAsB;IAGtB,wBAAwB;IAYxB,YAAY;IAkCZ,KAAK;IAWL,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAOvC,aAAa,IAAI,uBAAuB;IAUxC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAiB7C,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAQ/B,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa;IAG3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe;IAG9D,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IASxD,YAAY;IAGZ,aAAa;IAGb,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO;IAanC,UAAU,CAAC,QAAQ,EAAE,YAAY;IAEjC,YAAY,CAAC,QAAQ,EAAE,YAAY;IA0DnC,YAAY;IAIZ,SAAS,CAAC,CAAC,EAAE,WAAW;IAGxB,KAAK,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,GAAG,iBAAiB;CAkDhE"}

package/lib/tree/nodes/sets/intervalNode.js

@@ -281,6 +281,9 @@ export class IntervalNode {
     toClosedForm() {
         return new IntervalNode(this.a, this.b, ClosureType.FF, this.opts);
     }
+    toClosure(c) {
+        return new IntervalNode(this.a, this.b, c, this.opts);
+    }
     union(otherInt) {
         const [thisA, thisB] = [this.a.evaluate(), this.b.evaluate()];
         const [otherA, otherB] = [otherInt.a.evaluate(), otherInt.b.evaluate()];

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

@@ -1,7 +1,9 @@
+import { ClosureType } from "../nodes/sets/closure.js";
 import { IntervalNode } from "../nodes/sets/intervalNode.js";
 type Opts = {
     allowCommaInsteadOfSemicolon?: boolean;
     allowNoBrackets?: boolean;
+    expectedClosure?: ClosureType;
 };
 export declare const intervalParser: (ans: string, opts?: Opts) => false | IntervalNode;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"intervalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/intervalParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,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,yBA8CtD,CAAC"}
+{"version":3,"file":"intervalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/intervalParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,KAAK,IAAI,GAAG;IACV,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,WAAW,CAAC;CAC/B,CAAC;AACF,eAAO,MAAM,cAAc,QAAS,MAAM,SAAS,IAAI,yBAkDtD,CAAC"}

package/lib/tree/parsers/intervalParser.js

@@ -33,7 +33,8 @@ export const intervalParser = (ans, opts) => {
         const bParsed = parseAlgebraic(bornes[1]);
         if (!bParsed)
             return false;
-        return new IntervalNode(aParsed, bParsed, Closure.fromBrackets(leftBracket, rightBracket));
+        return new IntervalNode(aParsed, bParsed, opts?.expectedClosure ??
+            Closure.fromBrackets(leftBracket, rightBracket));
     }
     catch (err) {
         return handleVEAError(err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.97",
+  "version": "3.0.99",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [