math-exercises 3.0.128 → 3.0.130

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

@@ -2,44 +2,38 @@ import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, tryToAddWrong
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { NodeConstructor, } from "../../../../tree/nodes/nodeConstructor.js";
-import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { substract } from "../../../../tree/nodes/operators/substractNode.js";
-import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
-import { random, randomMany } from "../../../../utils/alea/random.js";
+import { random } from "../../../../utils/alea/random.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { permute } from "../../../../utils/arrays/permutations.js";
-const getDecimalFormatTex = (questionParam) => {
-    return NodeConstructor.fromIdentifiers(questionParam.nodeIds)
-        .evaluate()
-        .frenchify();
-};
 const getInstruction = (identifiers, optsIn) => {
-    const { dictFakeNameToQuestionParam } = identifiers;
+    const { questionParams } = identifiers;
     const opts = Object.assign(optsDefault, optsIn);
     return `Voici trois nombres.
   
 ${opts.isUseABC
-        ? Object.entries(dictFakeNameToQuestionParam)
-            .toSorted(([fakeName1], [fakeName2]) => fakeName1.localeCompare(fakeName2))
-            .map(([fakeName, questionParam]) => {
-            return `
+        ? (() => {
+            const entries = questionParams.map((qP) => [qP.letter, qP]);
+            return entries
+                .toSorted(([letter1], [letter2]) => letter1.localeCompare(letter2))
+                .map(([letter, questionParam]) => {
+                return `
   
 $$
-${fakeName} = ${questionParam.tex}
+${letter} = ${questionParam.tex}
 $$
 
 `;
-        })
-            .join("")
+            })
+                .join("");
+        })()
         : `
 
 $$
-${Object.values(dictFakeNameToQuestionParam)
-            .map((questionParam) => questionParam.tex)
-            .join(" ; ")}
+${questionParams.map((questionParam) => questionParam.tex).join(" ; ")}
 $$
 
 `}
@@ -52,116 +46,48 @@ const getHint = () => {
 soit les mettre au même dénominateur.`;
 };
 const getCorrection = (identifiers, optsIn) => {
-    const { sign, a, dictFakeNameToQuestionParam } = identifiers;
-    const opts = Object.assign(optsDefault, optsIn);
-    const dictTrueNameToQuestionParam = Object.fromEntries(Object.entries(dictFakeNameToQuestionParam).map(([, questionParam]) => [
-        questionParam.trueName,
-        questionParam,
-    ]));
-    const letters = Object.keys(dictTrueNameToQuestionParam).toSorted((s1, s2) => s1.localeCompare(s2));
-    const [A, B, C] = letters.map((trueName) => {
-        const questionParam = dictTrueNameToQuestionParam[trueName];
-        return opts.isUseABC ? questionParam.fakeName : questionParam.tex;
+    const { questionParams } = identifiers;
+    const opts = optsIn ?? optsDefault;
+    const ascOrderedQuestionParams = questionParams.toSorted((questionParam1, questionParam2) => {
+        const [node1, node2] = [questionParam1, questionParam2].map((questionParam) => NodeConstructor.fromIdentifiers(questionParam.nodeIds));
+        return substract(node1, node2).evaluate();
     });
-    return `
-
-${(() => {
-        if (opts.nbDecimalFormat > 0) {
-            return `On a :
-
-${letters
-                .toSorted((trueName1, trueName2) => {
-                const [fakeName1, fakeName2] = [trueName1, trueName2].map((trueName) => dictTrueNameToQuestionParam[trueName].fakeName);
-                return fakeName1.localeCompare(fakeName2);
-            })
-                .map((trueName) => {
-                const questionParam = dictTrueNameToQuestionParam[trueName];
-                return questionParam.explainTex;
-            })
-                .join("")}`;
-        }
-        else {
-            return `On a :
-
-$$
-${A} = ${sign === +1 ? `` : `-`}\\frac{${a} \\times 20}{5 \\times 20} = ${sign === +1 ? `` : `-`}\\frac{${20 * a}}{100}
-$$
-
-De plus :
-
-$$
-${A} = ${sign === +1 ? `` : `-`}\\frac{${a} \\times 2}{5 \\times 2} = ${sign === +1 ? `` : `-`}\\frac{${2 * a}}{10}
-$$
-
-Ainsi :
-
-${(() => {
-                if (sign === +1) {
-                    return `
-    
-$$
-${dictTrueNameToQuestionParam["C"].tex} > \\frac{${2 * a}}{10} = \\frac{${20 * a}}{100} > ${dictTrueNameToQuestionParam["B"].tex}
-$$
-
-`;
-                }
-                else {
-                    return `
-    
-$$
-${dictTrueNameToQuestionParam["B"].tex} > -\\frac{${20 * a}}{100} = -\\frac{${2 * a}}{10} > ${dictTrueNameToQuestionParam["C"].tex}
-$$
-
-`;
-                }
-            })()}
-`;
-        }
-    })()}
-
+    return `On a : 
+${questionParams
+        .toSorted((qp1, qp2) => qp1.letter.localeCompare(qp2.letter))
+        .map((questionParam) => questionParam.explainTex.length > 0 &&
+        `
 
-Or :
-
-${(() => {
-        if (sign === +1) {
-            return `
-    
 $$
-${getDecimalFormatTex(dictTrueNameToQuestionParam["C"])} 
-> 
-${getDecimalFormatTex(dictTrueNameToQuestionParam["A"])}
-> 
-${getDecimalFormatTex(dictTrueNameToQuestionParam["B"])}
+${questionParam.explainTex}
 $$
 
-Le classement par ordre décroissant est donc :
-
-$$
-${C} > ${A} > ${B}
-$$
+`)
+        .join("")}
+  
+Le classement par ordre décroissant est donc : 
 
-`;
-        }
-        else {
-            return `
-    
 $$
-${getDecimalFormatTex(dictTrueNameToQuestionParam["B"])} 
-> 
-${getDecimalFormatTex(dictTrueNameToQuestionParam["A"])}
-> 
-${getDecimalFormatTex(dictTrueNameToQuestionParam["C"])}
+${ascOrderedQuestionParams
+        .toReversed()
+        .map((questionParam) => questionParam.tex)
+        .join(">")}
 $$
 
-Le classement par ordre décroissant est donc :
-
+${opts.isUseABC
+        ? `
+  
 $$
-${B} > ${A} > ${C}
+${ascOrderedQuestionParams
+            .toReversed()
+            .map((questionParam) => questionParam.letter)
+            .join(">")}
 $$
+  
+`
+        : ``}
 
-`;
-        }
-    })()}`;
+  `;
 };
 const getPropositions = (_, { answer, ...identifiers }) => {
     const { items } = identifiers;
@@ -181,19 +107,14 @@ const getAnswer = (identifiers) => {
     const answer = items.find((item) => item.isValidAnswer).tex;
     return answer;
 };
-const isAnswerValid = (ans, { answer }) => {
-    const [ansNodes, answerNodes] = [ans, answer].map((str) => str.split(">").map((tex) => parseAlgebraic(tex)));
-    return (ansNodes.length === 3 &&
-        [0, 1, 2].every((i) => ansNodes[i].equals(answerNodes[i])));
-};
 const getKeys = (identifiers, optsIn) => {
-    const { dictFakeNameToQuestionParam } = identifiers;
+    const { questionParams } = identifiers;
     const opts = Object.assign(optsDefault, optsIn);
     return [
         "sup",
         "inf",
-        ...Object.values(dictFakeNameToQuestionParam).map((questionParam) => {
-            const tex = opts.isUseABC ? questionParam.fakeName : questionParam.tex;
+        ...questionParams.map((questionParam) => {
+            const tex = opts.isUseABC ? questionParam.letter : questionParam.tex;
             return {
                 id: "custom",
                 label: tex,
@@ -208,85 +129,60 @@ const getKeys = (identifiers, optsIn) => {
 };
 const getCompareFracAndDecQuestion = (optsIn) => {
     const opts = Object.assign(optsDefault, optsIn);
-    const sign = opts.isAllowingNegativeNumbers ? (coinFlip() ? +1 : -1) : +1;
+    function randomSign() {
+        return opts.isAllowingNegativeNumbers ? (coinFlip() ? +1 : -1) : +1;
+    }
     const a = random([...Array(19).keys()].map((i) => i + 1).filter((i) => i % 5 !== 0));
     const b = randint(1, a - 1);
-    const c = random([...Array(99).keys()].map((i) => i + 1));
-    const nodes = {
-        A: frac(a, 5),
-        B: frac(substract(multiply(20, a), b).simplify(), 100),
-        C: frac(add(multiply(2, a), c).simplify(), 10)
-            .evaluate()
-            .toTree(),
-    };
-    Object.keys(nodes).forEach((letter) => {
-        nodes[letter] = multiply(sign, nodes[letter]);
-    });
-    const dictIsInDecimalFormat = Object.fromEntries(randomMany(["A", "C"], opts.nbDecimalFormat).map((letter) => [
-        letter,
-        true,
-    ]));
+    const d = randint(Math.floor(a / 10 + 1), 99);
+    const nodes = [
+        frac(multiply(randomSign(), a).evaluate(), 5),
+        frac(multiply(randomSign(), substract(multiply(20, a), b).evaluate()).simplify(), 100),
+        multiply(randomSign(), `0,${d}`.unfrenchify().toTree()).simplify(),
+    ];
     const nbTotal = 4;
     const nbValid = 1;
     const nbInvalid = nbTotal - nbValid;
-    const letters = Object.keys(nodes).toSorted((s1, s2) => s1.localeCompare(s2));
+    const letters = ["A", "B", "C"];
     const shuffledLetters = shuffle(letters);
-    const dictFakeNameToQuestionParam = Object.fromEntries(letters.map((trueName, i) => {
-        const node = nodes[trueName];
-        const fakeName = shuffledLetters[i];
+    const dictLetterToQuestionParam = Object.fromEntries(shuffledLetters.map((letter, i) => {
+        const node = nodes[i];
         return [
-            fakeName,
+            letter,
             {
-                fakeName: fakeName,
-                trueName: trueName,
+                letter,
                 nodeIds: node.toIdentifiers(),
-                tex: dictIsInDecimalFormat[trueName]
-                    ? node.evaluate().frenchify()
-                    : node.toTex(),
-                explainTex: (() => {
-                    if (opts.isUseABC || !dictIsInDecimalFormat[trueName]) {
-                        return `
-              
-$$
-${opts.isUseABC ? `${fakeName} =` : ``}${dictIsInDecimalFormat[trueName]
-                            ? ``
-                            : (() => {
-                                if (trueName === "A") {
-                                    return `${node.toTex()} = 
-${sign === +1 ? `` : `-`}\\frac{${a} \\times 2}{5 \\times 2} = 
-${sign === +1 ? `` : `-`}\\frac{${2 * a}}{10} =`;
-                                }
-                                else {
-                                    return `${node.toTex()} =`;
-                                }
-                            })()} 
-${node.evaluate().frenchify()}
-$$
-
-`;
+                tex: node.toTex(),
+                explainTex: `${opts.isUseABC ? `${letter} = ` : ``}${(() => {
+                    const isPositive = nodes[i].evaluate() >= 0;
+                    const tex = node.toTex();
+                    const strEv = node.evaluate().frenchify();
+                    if (i === 0) {
+                        return `${node.toTex()} = 
+${isPositive ? `` : `-`}\\frac{${a} \\times 2}{5 \\times 2} = 
+${isPositive ? `` : `-`}\\frac{${2 * a}}{10} = ${strEv}`;
                     }
                     else {
-                        return ``;
+                        return strEv !== tex ? `${tex} = ${strEv}` : ``;
                     }
-                })(),
+                })()}`,
             },
         ];
     }));
-    const dictTrueNameToQuestionParam = Object.fromEntries(Object.values(dictFakeNameToQuestionParam).map((questionParam) => [
-        questionParam.trueName,
-        questionParam,
-    ]));
-    const [A, B, C] = letters.map((trueName) => {
-        const questionParam = dictTrueNameToQuestionParam[trueName];
-        return opts.isUseABC ? questionParam.fakeName : questionParam.tex;
+    const ascOrderedQuestionParams = Object.values(dictLetterToQuestionParam).toSorted((questionParam1, questionParam2) => {
+        const [node1, node2] = [questionParam1, questionParam2].map((questionParam) => NodeConstructor.fromIdentifiers(questionParam.nodeIds));
+        return substract(node1, node2).evaluate();
     });
     const validItems = [
         {
-            tex: sign === +1 ? `{${C}}>{${A}}>{${B}}` : `{${B}}>{${A}}>{${C}}`,
+            tex: ascOrderedQuestionParams
+                .toReversed()
+                .map((questionParam) => opts.isUseABC ? questionParam.letter : questionParam.tex)
+                .join(">"),
             isValidAnswer: true,
         },
     ];
-    const invalidItems = permute([A, B, C])
+    const invalidItems = permute(ascOrderedQuestionParams.map((questionParam) => opts.isUseABC ? questionParam.letter : questionParam.tex))
         .filter(([D, E, F]) => `{${D}}>{${E}}>{${F}}` !== validItems[0].tex)
         .map(([D, E, F]) => {
         return {
@@ -300,11 +196,7 @@ $$
         ...shuffle(invalidItems).slice(0, nbInvalid),
     ]);
     return getQuestionFromIdentifiers({
-        sign,
-        a,
-        b,
-        c,
-        dictFakeNameToQuestionParam,
+        questionParams: shuffle(ascOrderedQuestionParams),
         items,
     });
 };
@@ -334,14 +226,6 @@ const options = [
         type: GeneratorOptionType.checkbox,
         defaultValue: optsDefault.isUseABC,
     },
-    {
-        id: "nbDecimalFormat",
-        label: "Nombre d'écritures décimales",
-        target: GeneratorOptionTarget.generation,
-        type: GeneratorOptionType.select,
-        values: [1, 2],
-        defaultValue: optsDefault.nbDecimalFormat,
-    },
     {
         id: "isAllowingNegativeNumbers",
         label: "Permettre les nombres négatifs",
@@ -359,9 +243,9 @@ export const compareFracAndDec = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    answerType: "QCU",
 };

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

@@ -1 +1 @@
-{"version":3,"file":"compareWithSquareRoots.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/compareWithSquareRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AA+KF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}
+{"version":3,"file":"compareWithSquareRoots.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/compareWithSquareRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAsIF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

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

@@ -1,12 +1,7 @@
 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";
 const getInstruction = (identifiers) => {
     const { a, b, isAdd } = identifiers;
     return `Sachant que  $\\sqrt{${a}} < \\sqrt{${a + 1}}$,
@@ -48,44 +43,10 @@ $$
 
 `;
 };
-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}}`;
 };
-const isAnswerValid = (ans, { answer, ...identifiers }) => {
-    function getOrderedNodesFromTex(tex, compSymbol) {
-        return tex
-            .split(compSymbol)
-            .map((str) => parseAlgebraic(str))
-            .toSorted(() => (compSymbol === "<" ? +1 : -1));
-    }
-    try {
-        const compSymbol = ans.includes("<")
-            ? "<"
-            : ans.includes(">")
-                ? ">"
-                : undefined;
-        if (compSymbol) {
-            const [ansNode1, ansNode2] = getOrderedNodesFromTex(ans, compSymbol);
-            const [answerNode1, answerNode2] = getAnswerNodes(identifiers);
-            return (substract(ansNode1, answerNode1).simplify().evaluate() === 0 &&
-                substract(ansNode2, answerNode2).simplify().evaluate() === 0);
-        }
-        else {
-            return false;
-        }
-    }
-    catch (err) {
-        return handleVEAError(err);
-    }
-};
 const getPropositions = (nbProps, { answer, ...identifiers }) => {
     const { a, b, isAdd } = identifiers;
     const propositions = [];
@@ -140,10 +101,10 @@ export const compareWithSquareRoots = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     getAnswer,
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    answerType: "QCU",
 };

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,CAmBvE,CAAC"}
+{"version":3,"file":"estimateAroundPow10NTimesAroundPow10N.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimateAroundPow10NTimesAroundPow10N.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmEF,eAAO,MAAM,qCAAqC,EAAE,QAAQ,CAAC,WAAW,CAmBvE,CAAC"}

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

@@ -3,9 +3,7 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { randint } from "../../../../math/utils/random/randint.js";
 import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { power } from "../../../../tree/nodes/operators/powerNode.js";
-import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
-import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 import { toSeperatedThousands } from "../../../../utils/numberPrototype/toSeparatedThousands.js";
 const toPrettyString = (node) => {
     return toSeperatedThousands("" + node.evaluate().toFixed(0));
@@ -28,18 +26,6 @@ const getAnswer = (identifiers) => {
     const { n } = identifiers;
     return `10^{${2 * n}}`;
 };
-const isAnswerValid = (ans, { answer }) => {
-    try {
-        const ansNode = parseAlgebraic(ans);
-        const answerNode = parseAlgebraic(answer);
-        return ansNode
-            .simplify({ calculatePowers: true })
-            .equals(answerNode.simplify({ calculatePowers: true }));
-    }
-    catch (err) {
-        return handleVEAError(err);
-    }
-};
 const getPropositions = (nbProps, { answer, ...identifiers }) => {
     const { n } = identifiers;
     const propositions = [];
@@ -74,10 +60,10 @@ export const estimateAroundPow10NTimesAroundPow10N = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     getAnswer,
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    answerType: "QCU",
 };

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,CAmB/D,CAAC"}
+{"version":3,"file":"estimatePow10NPlusPow10MinusN.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/estimatePow10NPlusPow10MinusN.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA8EF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}

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

@@ -2,9 +2,7 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exer
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { power } from "../../../../tree/nodes/operators/powerNode.js";
-import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { random } from "../../../../utils/alea/random.js";
-import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const getInstruction = (identifiers) => {
     const { n, varName } = identifiers;
     const A = varName;
@@ -34,16 +32,6 @@ const getAnswer = (identifiers) => {
     const { n } = identifiers;
     return `10^{${n}}`;
 };
-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 getPropositions = (nbProps, { answer, ...identifiers }) => {
     const { n } = identifiers;
     const propositions = [];
@@ -80,10 +68,10 @@ export const estimatePow10NPlusPow10MinusN = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     getAnswer,
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    answerType: "QCU",
 };

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,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"}
+{"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;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;AAmrBF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAcrD,CAAC"}

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

@@ -10,7 +10,6 @@ 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 { mdTable } from "../../../../utils/markdown/mdTable.js";
 import { alignTex } from "../../../../utils/latex/alignTex.js";
 class ProblemConstructor {
     static byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays) {
@@ -291,7 +290,13 @@ const getInstruction = (identifiers) => {
     const { problemSkeletonIndex, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays, } = identifiers;
     const skeleton = skeletons[problemSkeletonIndex];
     const problem = ProblemConstructor.byHydratingSkeleton(skeleton, groupNameToVarNameToValue, mysteryVarPath, shuffleArrays);
-    return `${mdTable([[""], [problem.frenchStr]])}
+    return `Voici une situation :
+
+$\\ $ 
+
+${problem.frenchStr}
+
+$\\ $
   
 Parmi les équations suivantes, laquelle modélise cette situation ?`;
 };

package/lib/exercises/math/calculLitteral/ordering/compareAMinusB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compareAMinusB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/ordering/compareAMinusB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAyMF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAchD,CAAC"}
+{"version":3,"file":"compareAMinusB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/ordering/compareAMinusB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAqMF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAchD,CAAC"}

package/lib/exercises/math/calculLitteral/ordering/compareAMinusB.js

@@ -66,9 +66,6 @@ const getAnswer = (identifiers) => {
     const { texsAnswer } = identifiers;
     return texsAnswer[0];
 };
-const isAnswerValid = (ans, { texsAnswer }) => {
-    return texsAnswer.includes(ans);
-};
 const getCompareAMinusBQuestion = () => {
     const namesPool = ["a", "b", "c", "d", "r", "s", "t", "u", "v"];
     const names = randomMany(namesPool, 2);
@@ -175,10 +172,10 @@ export const compareAMinusB = {
     generator: (nb, opts) => getDistinctQuestions(() => getCompareAMinusBQuestion(opts), nb, 30),
     qcmTimer: 60,
     freeTimer: 60,
-    isAnswerValid,
     getPropositions,
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    answerType: "QCU",
 };

package/lib/exercises/math/calculLitteral/ordering/compareFromPiMinusFrac.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compareFromPiMinusFrac.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/ordering/compareFromPiMinusFrac.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAmJF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}
+{"version":3,"file":"compareFromPiMinusFrac.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/ordering/compareFromPiMinusFrac.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AA+IF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

package/lib/exercises/math/calculLitteral/ordering/compareFromPiMinusFrac.js

@@ -50,9 +50,6 @@ const getAnswer = (identifiers) => {
     const { texAnswers } = identifiers;
     return texAnswers[0];
 };
-const isAnswerValid = (ans, { texAnswers }) => {
-    return texAnswers.includes(ans);
-};
 const getCompareFromPiMinusFracQuestion = () => {
     const fracsPool = [
         frac(31, 10),
@@ -134,10 +131,10 @@ export const compareFromPiMinusFrac = {
     generator: (nb, opts) => getDistinctQuestions(() => getCompareFromPiMinusFracQuestion(opts), nb, 30),
     qcmTimer: 60,
     freeTimer: 60,
-    isAnswerValid,
     getPropositions,
     subject: "Mathématiques",
     maxAllowedQuestions: 30,
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
+    answerType: "QCU",
 };

package/lib/exercises/math/calculLitteral/simplifying/compareATimes0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compareATimes0.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/compareATimes0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAwHF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}
+{"version":3,"file":"compareATimes0.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/compareATimes0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf,CAAC;AAqGF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC"}