math-exercises 3.0.126 → 3.0.128

package/lib/exercises/math/calcul/ordering/compareWithSquareRoots.js

@@ -1,6 +1,9 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { sqrt } from "../../../../tree/nodes/functions/sqrtNode.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
 import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
@@ -11,10 +14,10 @@ const getInstruction = (identifiers) => {
 comparer $${b} ${isAdd ? "+" : "-"} \\sqrt{${a}}$ et $${b} ${isAdd ? "+" : "-"} \\sqrt{${a + 1}}$.`;
 };
 const getHint = (identifiers) => {
-    const { a, b, isAdd } = identifiers;
+    const { a } = identifiers;
     return `En partant de $\\sqrt{${a}} < \\sqrt{${a + 1}}$,
   
-essaie de te ramener à $${b} ${isAdd ? "+" : "-"} \\sqrt{${a}}$ <(ou >) $${b} ${isAdd ? "+" : "-"} \\sqrt{${a + 1}}$
+essaie de te ramener aux expressions demandées
 
 par des opérations que l'on effectue à droite et à gauche de l'inégalité. 
 
@@ -22,7 +25,7 @@ Attention si tu multiplies à droite et à gauche d'une inégalité par un nombr
 };
 const getCorrection = (identifiers) => {
     const { a, b, isAdd } = identifiers;
-    return `
+    return `On sait que :
 
 $$
 \\sqrt{${a}} < \\sqrt{${a + 1}}
@@ -45,16 +48,23 @@ $$
 
 `;
 };
+const getAnswerNodes = (identifiers) => {
+    const { a, b, isAdd } = identifiers;
+    const addSub = isAdd ? add : substract;
+    const nodeWithA = addSub(b, sqrt(a));
+    const nodeWithAPlus1 = addSub(b, sqrt(add(a, 1)));
+    return isAdd ? [nodeWithA, nodeWithAPlus1] : [nodeWithAPlus1, nodeWithA];
+};
 const getAnswer = (identifiers) => {
     const { a, b, isAdd } = identifiers;
-    return `${b} ${isAdd ? "+" : "-"} \\sqrt{${a}} ${isAdd ? "<" : ">"} ${b} ${isAdd ? "+" : "-"} \\sqrt{${a + 1}}`;
+    return `${b}${isAdd ? "+" : "-"}\\sqrt{${a}}${isAdd ? "<" : ">"}${b}${isAdd ? "+" : "-"}\\sqrt{${a + 1}}`;
 };
-const isAnswerValid = (ans, { answer }) => {
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
     function getOrderedNodesFromTex(tex, compSymbol) {
         return tex
             .split(compSymbol)
             .map((str) => parseAlgebraic(str))
-            .toSorted(() => (compSymbol === "<" ? -1 : +1));
+            .toSorted(() => (compSymbol === "<" ? +1 : -1));
     }
     try {
         const compSymbol = ans.includes("<")
@@ -64,9 +74,9 @@ const isAnswerValid = (ans, { answer }) => {
                 : undefined;
         if (compSymbol) {
             const [ansNode1, ansNode2] = getOrderedNodesFromTex(ans, compSymbol);
-            const [answerNode1, answerNode2] = getOrderedNodesFromTex(answer, "<");
-            return (ansNode1.simplify().equals(answerNode1.simplify()) &&
-                ansNode2.simplify().equals(answerNode2.simplify()));
+            const [answerNode1, answerNode2] = getAnswerNodes(identifiers);
+            return (substract(ansNode1, answerNode1).simplify().evaluate() === 0 &&
+                substract(ansNode2, answerNode2).simplify().evaluate() === 0);
         }
         else {
             return false;
@@ -79,8 +89,8 @@ const isAnswerValid = (ans, { answer }) => {
 const getPropositions = (nbProps, { answer, ...identifiers }) => {
     const { a, b, isAdd } = identifiers;
     const propositions = [];
-    addValidProp(propositions, `${b} ${isAdd ? "+" : "-"} \\sqrt{${a}} ${isAdd ? "<" : ">"} ${b} ${isAdd ? "+" : "-"} \\sqrt{${a + 1}}`, "tex");
-    tryToAddWrongProp(propositions, `${b} ${!isAdd ? "+" : "-"} \\sqrt{${a}} ${!isAdd ? "<" : ">"} ${b} ${!isAdd ? "+" : "-"} \\sqrt{${a + 1}}`, "tex");
+    addValidProp(propositions, `${b}${isAdd ? "+" : "-"}\\sqrt{${a}}${isAdd ? "<" : ">"}${b}${isAdd ? "+" : "-"}\\sqrt{${a + 1}}`, "tex");
+    tryToAddWrongProp(propositions, `${b}${isAdd ? "+" : "-"}\\sqrt{${a}}${!isAdd ? "<" : ">"}${b}${isAdd ? "+" : "-"}\\sqrt{${a + 1}}`, "tex");
     return shuffleProps(propositions, nbProps);
 };
 const getKeys = (identifiers) => {
@@ -89,8 +99,8 @@ const getKeys = (identifiers) => {
         "inf",
         "sup",
         ...[
-            `${b} ${isAdd ? "+" : "-"} \\sqrt{${a}}`,
-            `${b} ${isAdd ? "+" : "-"} \\sqrt{${a + 1}}`,
+            `${b}${isAdd ? "+" : "-"}\\sqrt{${a}}`,
+            `${b}${isAdd ? "+" : "-"}\\sqrt{${a + 1}}`,
         ].map((tex) => {
             return {
                 id: "custom",
@@ -135,6 +145,5 @@ export const compareWithSquareRoots = {
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
-    answerType: "QCU",
     hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/ordering/decimalOrdering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAuF1D,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}
+{"version":3,"file":"decimalOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAmF1D,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/calcul/ordering/decimalOrdering.js

@@ -76,9 +76,6 @@ const getPropositions = (n, { answer }) => {
     tryToAddWrongProp(propositions, "=");
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
 export const decimalOrdering = {
     id: "decimalOrdering",
     connector: "\\iff",
@@ -88,7 +85,6 @@ export const decimalOrdering = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     answerType: "QCU",
     getQuestionFromIdentifiers,

package/lib/exercises/math/calcul/ordering/decimalOrderingNoRelatives.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalOrderingNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrderingNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAuF1D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"decimalOrderingNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/decimalOrderingNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAmF1D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAa5D,CAAC"}

package/lib/exercises/math/calcul/ordering/decimalOrderingNoRelatives.js

@@ -72,9 +72,6 @@ const getPropositions = (n, { answer }) => {
     tryToAddWrongProp(propositions, "=");
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
 export const decimalOrderingNoRelatives = {
     id: "decimalOrderingNoRelatives",
     connector: "\\iff",
@@ -84,7 +81,6 @@ export const decimalOrderingNoRelatives = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     answerType: "QCU",
     getQuestionFromIdentifiers,

package/lib/exercises/math/calcul/ordering/integerOrdering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integerOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/integerOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}
+{"version":3,"file":"integerOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/integerOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/calcul/ordering/integerOrdering.js

@@ -58,9 +58,6 @@ const getPropositions = (n, { answer }) => {
     tryToAddWrongProp(propositions, "=");
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
 export const integerOrdering = {
     id: "integerOrdering",
     connector: "\\iff",
@@ -70,7 +67,6 @@ export const integerOrdering = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     answerType: "QCU",
     subject: "Mathématiques",
     getQuestionFromIdentifiers,

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA+HF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAuBR,CAAC"}
+{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA+HF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.js

@@ -141,7 +141,6 @@ export const findCoeffInProportionalTableNonIntegers = {
     // getHint,
     // getCorrection,
     getAnswer,
-    answerType: "QCU",
     options,
     getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/proportionality/isTableProportional.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isTableProportional.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/isTableProportional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAoG5D,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAerD,CAAC"}
+{"version":3,"file":"isTableProportional.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/isTableProportional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAgG5D,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

package/lib/exercises/math/calcul/proportionality/isTableProportional.js

@@ -86,9 +86,6 @@ const getPropositions = (n, { answer }) => {
     tryToAddWrongProp(propositions, "On ne peut pas savoir", "raw");
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
 export const isTableProportional = {
     id: "isVTableProportional",
     label: "Reconnaître un tableau de proportionnalité",
@@ -97,7 +94,6 @@ export const isTableProportional = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     answerType: "QCU",
     subject: "Mathématiques",
     hasHintAndCorrection: true,

package/lib/exercises/math/calcul/proportionality/isTableProportionalNonInteger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isTableProportionalNonInteger.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/isTableProportionalNonInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqCF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAmGF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqBxE,CAAC"}
+{"version":3,"file":"isTableProportionalNonInteger.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/isTableProportionalNonInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAkCF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAmGF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBxE,CAAC"}

package/lib/exercises/math/calcul/proportionality/isTableProportionalNonInteger.js

@@ -37,9 +37,6 @@ ${mdTable([xTexs.map((v) => dollarize(v)), yTexs.map((v) => dollarize(v))])}
 const getKeys = () => {
     return [];
 };
-const isAnswerValid = () => {
-    throw Error("VEA not implemented");
-};
 // ["Entier", "Décimal", "Fraction"],
 // ["Entières", "Décimales", "Fractions"],
 const getIsTableProportionalNonIntegerQuestion = (opts) => {
@@ -128,7 +125,6 @@ export const isTableProportionalNonInteger = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     // getHint,
     // getCorrection,

package/lib/exercises/math/calcul/rounding/estimateAroundPow10NTimesAroundPow10N.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"estimateAroundPow10NTimesAroundPow10N.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimateAroundPow10NTimesAroundPow10N.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,qCAAqC,EAAE,QAAQ,CAAC,WAAW,CAoBvE,CAAC"}
+{"version":3,"file":"estimateAroundPow10NTimesAroundPow10N.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimateAroundPow10NTimesAroundPow10N.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,qCAAqC,EAAE,QAAQ,CAAC,WAAW,CAmBvE,CAAC"}

package/lib/exercises/math/calcul/rounding/estimateAroundPow10NTimesAroundPow10N.js

@@ -79,6 +79,5 @@ export const estimateAroundPow10NTimesAroundPow10N = {
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
-    answerType: "QCU",
     hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"estimatePow10NPlusPow10MinusN.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwFF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}
+{"version":3,"file":"estimatePow10NPlusPow10MinusN.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwFF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}

package/lib/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.js

@@ -85,6 +85,5 @@ export const estimatePow10NPlusPow10MinusN = {
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
-    answerType: "QCU",
     hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/rounding/getPhysicalOrderOfMagnitude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPhysicalOrderOfMagnitude.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/getPhysicalOrderOfMagnitude.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AA0HrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmFF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAuB7D,CAAC"}
+{"version":3,"file":"getPhysicalOrderOfMagnitude.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/getPhysicalOrderOfMagnitude.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAwHrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAqGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAsB7D,CAAC"}

package/lib/exercises/math/calcul/rounding/getPhysicalOrderOfMagnitude.js

@@ -1,9 +1,7 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { doWhile } from "../../../../utils/doWhile.js";
-import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const physicalFacts = [
     {
         question: "du diamètre d'un atome d'hydrogène",
@@ -132,7 +130,7 @@ const getPropositions = (n, { answer, factIndex }) => {
 };
 const getAnswer = ({ factIndex }) => {
     const item = physicalFacts[factIndex];
-    const power = Math.floor(Math.log10(item.value));
+    const power = Math.round(Math.log10(item.value));
     return `10^{${power}}\\ ${item.unit}`;
 };
 const getInstruction = ({ factIndex }) => {
@@ -151,16 +149,33 @@ On cherche la puissance de $10$ la plus proche : c'est $10^{${power}}$.
 Un ordre de grandeur ${item.question} est donc $10^{${power}}\\ ${item.unit}$.`;
 };
 const getKeys = () => [];
-const isAnswerValid = (ans, { answer }) => {
-    try {
-        const ansNode = parseAlgebraic(ans);
-        const answerNode = parseAlgebraic(answer);
-        return ansNode.simplify().equals(answerNode.simplify());
-    }
-    catch (err) {
-        return handleVEAError(err);
-    }
-};
+// const getKeys: GetKeys<Identifiers> = ({ factIndex }) => {
+//   const item = physicalFacts[factIndex];
+//   return [
+//     {
+//       id: "custom",
+//       label: item.unit,
+//       labelType: "tex",
+//       mathfieldInstructions: {
+//         method: "write",
+//         content: `\\ ${item.unit}`,
+//       },
+//     },
+//   ] as KeyProps[];
+// };
+// const isAnswerValid: VEA<Identifiers> = (ans, { answer, factIndex }) => {
+//   const item = physicalFacts[factIndex];
+//   if (!ans.includes(item.unit.replaceAll("textrm", "text"))) {
+//     return false;
+//   }
+//   try {
+//     const ansNode = parseAlgebraic(ans.split("\\")[0]);
+//     const answerNode = parseAlgebraic(answer.split("\\")[0]);
+//     return substract(ansNode, answerNode).simplify().evaluate() === 0;
+//   } catch (err) {
+//     return handleVEAError(err);
+//   }
+// };
 const getGetPhysicalOrderOfMagnitudeQuestion = () => {
     const factIndex = Math.floor(Math.random() * physicalFacts.length);
     const identifiers = { factIndex };
@@ -185,7 +200,6 @@ export const getPhysicalOrderOfMagnitude = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     getInstruction,
     getHint,

package/lib/exercises/math/calcul/sign/signFromAx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signFromAx.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/sign/signFromAx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA6GF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAkB5C,CAAC"}
+{"version":3,"file":"signFromAx.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/sign/signFromAx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsGF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAiB5C,CAAC"}

package/lib/exercises/math/calcul/sign/signFromAx.js

@@ -4,7 +4,6 @@ import { randint } from "../../../../math/utils/random/randint.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { monom } from "../../../../tree/nodes/polynomials/monomNode.js";
 import { probaLawFlip } from "../../../../utils/alea/probaLawFlip.js";
-import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 //-x pos/nég/nul
 //ax pos/nég/nul avec a>0 donné ou <0
 const getPropositions = (n, { answer }) => {
@@ -63,14 +62,6 @@ const getCorrection = (identifiers) => {
 const getKeys = () => {
     return [];
 };
-const isAnswerValid = () => {
-    try {
-        throw Error("VEA not implemented");
-    }
-    catch (err) {
-        return handleVEAError(err);
-    }
-};
 const getSignFromAxQuestion = () => {
     const identifiers = {
         a: randint(-9, 10, [0, 1]),
@@ -102,7 +93,6 @@ export const signFromAx = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     getInstruction,
     getHint,

package/lib/exercises/math/calculLitteral/equation/equationFromProblem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationFromProblem.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationFromProblem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AActE,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACzE,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,YAAY,EAAE,eAAe,CAAC;CAC/B,CAAC;AA0mBF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}
+{"version":3,"file":"equationFromProblem.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationFromProblem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAetE,KAAK,WAAW,GAAG;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACzE,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,YAAY,EAAE,eAAe,CAAC;CAC/B,CAAC;AA6qBF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationFromProblem.js

@@ -10,7 +10,8 @@ import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { substract } from "../../../../tree/nodes/operators/substractNode.js";
 import { random, randomMany } from "../../../../utils/alea/random.js";
 import { isOperatorNode, OperatorIds, } from "../../../../tree/nodes/operators/operatorNode.js";
-import { parseLatex } from "../../../../tree/parsers/latexParser.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 class ProblemConstructor {
     static byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays) {
         const shuffleFuncs = shuffleArrays.map((shuffleArray) => {
@@ -70,6 +71,16 @@ class Problem {
                 .filter((node) => !!node);
         });
     }
+    getExplanationString() {
+        const arrArr = Object.values(this.groups).map((group) => [
+            `\\text{${group.getScalarString(this.mysteryVar).replaceAll("$", "")}}`,
+            `:`,
+            `${group
+                .getNode(this.mysteryVar, this.groups, this.shuffleFuncs)
+                .toTex()}`,
+        ]);
+        return alignTex(arrArr, false);
+    }
 }
 class ProblemVarGroup {
     skeleton;
@@ -84,6 +95,9 @@ class ProblemVarGroup {
     getNode(mysteryVar, groups, shuffleFuncs) {
         return this.skeleton.nodeFunc(this, mysteryVar, groups, shuffleFuncs);
     }
+    getScalarString(mysteryVar) {
+        return `${this.skeleton.strToScalar} ${this.toTex(mysteryVar)}`;
+    }
 }
 class ProblemVar {
     skeleton;
@@ -101,12 +115,14 @@ class ProblemVar {
 }
 class ProblemVarSkeletonGroup {
     vars;
+    strToScalar;
     strFunc;
     nodeFunc;
     isCanBeMysteryGroup;
     isComputed;
-    constructor(vars, strFunc, nodeFunc, isCanBeMysteryGroup, isComputed) {
+    constructor(vars, strToScalar, strFunc, nodeFunc, isCanBeMysteryGroup, isComputed) {
         this.vars = vars;
+        this.strToScalar = strToScalar;
         this.strFunc = strFunc;
         this.nodeFunc = nodeFunc;
         this.isCanBeMysteryGroup = isCanBeMysteryGroup;
@@ -154,14 +170,11 @@ const skeletons = [
 Elle a pris trois pâtes à pizza à 1,95 € l’unité et deux pots de sauce tomate. 
 Elle a payé au total 8,37 €. 
 Quel est le prix, noté a, d'un pot de sauce ?`, (_group, mysteryVar, groups, shuffleFuncs) => {
-        const { pizza, sauce, total } = groups;
-        const [gp1, gp2] = shuffleFuncs[0]([pizza, sauce]);
-        return `Clara a acheté des ingrédients pour réaliser des pizzas. 
-Elle a pris ${gp1.toTex(mysteryVar)} et, dans un autre rayon, ${gp2.toTex(mysteryVar)}. 
-Elle a payé au total $${total
+        const { total, ...groupsWithoutTotal } = groups;
+        const [gp1, gp2] = shuffleFuncs[0](Object.values(groupsWithoutTotal));
+        return `Clara a acheté des ingrédients pour réaliser des pizzas. Elle a pris ${gp1.toTex(mysteryVar)} et, dans un autre rayon, ${gp2.toTex(mysteryVar)}. Elle a payé au total $${total
             .getNode(mysteryVar, groups, shuffleFuncs)
-            .toTex()}$ €. 
-${mysteryVar.skeleton.question}`;
+            .toTex()}$ €. ${mysteryVar.skeleton.question}`;
     }, (_group, mysteryVar, groups, shuffleFuncs) => {
         const { pizza, sauce } = groups;
         const [gp1, gp2] = shuffleFuncs[0]([pizza, sauce]);
@@ -184,7 +197,7 @@ ${mysteryVar.skeleton.question}`;
                     return randfloat(0.5, 4, 2, []).toTree();
                 },
             },
-        }, (group, mysteryVar) => {
+        }, "le coût pour", (group, mysteryVar) => {
             switch (mysteryVar?.skeleton.varName) {
                 case "n":
                     return `des pâtes à pizza à $${group.vars.price.value.toTex()}$ € l’unité`;
@@ -223,7 +236,7 @@ ${mysteryVar.skeleton.question}`;
                     return randfloat(0.5, 4, 2, []).toTree();
                 },
             },
-        }, (group, mysteryVar) => {
+        }, "le coût pour", (group, mysteryVar) => {
             switch (mysteryVar?.skeleton.varName) {
                 case "m":
                     return `des boîtes de sauce tomate à $${group.vars.price.value.toTex()}$ € l’unité`;
@@ -251,11 +264,11 @@ ${mysteryVar.skeleton.question}`;
                 str: "le coût total",
                 question: `Quel est le coût total, noté $t$, de ses achats ?`,
             },
-        }, () => {
-            return "le coût total";
+        }, "le", () => {
+            return "coût total";
         }, (_group, _mysteryVar, groups, shuffleFuncs) => {
-            const { pizza, sauce } = groups;
-            const orderedNodes = shuffleFuncs[0]([pizza, sauce]).map((group) => group.getNode());
+            const { total, ...groupsWithoutTotal } = groups;
+            const orderedNodes = shuffleFuncs[0](Object.values(groupsWithoutTotal)).map((group) => group.getNode());
             // console.log(
             //   "orderedNodes[0].leftChild",
             //   (orderedNodes[0] as MultiplyNode).leftChild,
@@ -278,11 +291,34 @@ const getInstruction = (identifiers) => {
     const { problemSkeletonIndex, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays, } = identifiers;
     const skeleton = skeletons[problemSkeletonIndex];
     const problem = ProblemConstructor.byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays);
-    return `Traduire par une équation le problème suivant : 
-${problem.frenchStr}`;
+    return `${mdTable([[""], [problem.frenchStr]])}
+  
+Parmi les équations suivantes, laquelle modélise cette situation ?`;
+};
+const getHint = (identifiers) => {
+    const { problemSkeletonIndex, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays, } = identifiers;
+    const skeleton = skeletons[problemSkeletonIndex];
+    const problem = ProblemConstructor.byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays);
+    return `${Object.values(problem.groups).map((group) => `Quel est ${group.getScalarString(problem.mysteryVar)} ?`).join(`
+    
+`)}`;
+};
+const getCorrection = (identifiers) => {
+    const { problemSkeletonIndex, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays, } = identifiers;
+    const skeleton = skeletons[problemSkeletonIndex];
+    const problem = ProblemConstructor.byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays);
+    return `On peut former les expressions suivantes: 
+${problem.getExplanationString()}
+
+L'équation qui modélise la situation est donc: 
+
+$$
+${getAnswer(identifiers)}
+$$
+
+`;
 };
 const getAnswerNode = (identifiers) => {
-    console.log("getAnswerNode", identifiers);
     const { problemSkeletonIndex, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays, } = identifiers;
     const skeleton = skeletons[problemSkeletonIndex];
     const problem = ProblemConstructor.byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays);
@@ -333,6 +369,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
@@ -394,11 +432,11 @@ const getPropositions = (n, { answer, ...identifiers }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer, ...identifiers }) => {
-    const answerNode = getAnswerNode(identifiers); //!TODO: this call crashes but it's a mystery
-    const ansNode = parseLatex(ans);
-    return substract(ansNode, answerNode).evaluate() === 0;
-};
+// const isAnswerValid: VEA<Identifiers> = (ans, { answer, ...identifiers }) => {
+//   const answerNode = getAnswerNode(identifiers); //!TODO: this call crashes but it's a mystery
+//   const ansNode = parseLatex(ans);
+//   return substract(ansNode, answerNode).evaluate() === 0;
+// };
 export const equationFromProblem = {
     id: "equationFromProblem",
     label: "Traduire un problème en une équation mathématique",
@@ -407,8 +445,9 @@ export const equationFromProblem = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
+    // isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
     answerType: "QCU",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/inequations/isInequalityTrue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isInequalityTrue.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/isInequalityTrue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAE7C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,eAAe,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAgKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAkBlD,CAAC"}
+{"version":3,"file":"isInequalityTrue.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/isInequalityTrue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAE7C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,eAAe,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAyJF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}

package/lib/exercises/math/calculLitteral/inequations/isInequalityTrue.js

@@ -1,7 +1,6 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { add } from "../../../../tree/nodes/operators/addNode.js";
@@ -106,14 +105,6 @@ Puisque $${leftSimTex} ${isTrue ? sign : reverseSign(sign)} ${rightSimTex}$, l'i
 const getKeys = () => {
     return [];
 };
-const isAnswerValid = (ans, { answer }) => {
-    try {
-        return ans === answer;
-    }
-    catch (err) {
-        return handleVEAError(err);
-    }
-};
 const getIsInequalityTrueQuestion = () => {
     const a = randint(-10, 10, [0]);
     const b = randint(-10, 10, [0]);
@@ -156,7 +147,6 @@ export const isInequalityTrue = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     getInstruction,
     getHint,

package/lib/exercises/math/calculLitteral/isolate/isolateUInInvXPlusInvYEqualsInvU.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isolateUInInvXPlusInvYEqualsInvU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/isolate/isolateUInInvXPlusInvYEqualsInvU.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AA2FF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAmBlE,CAAC;AAUF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAoBpE,CAAC"}
+{"version":3,"file":"isolateUInInvXPlusInvYEqualsInvU.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/isolate/isolateUInInvXPlusInvYEqualsInvU.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAqEF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAmBlE,CAAC;AAUF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAoBpE,CAAC"}