math-exercises 3.0.216 → 3.0.218

package/lib/exercises/math/calculLitteral/factorisation/factoByXK.js

@@ -1,190 +1,223 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile, } from "../../../../exercises/exercise.js";
-import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
-import { AffineConstructor } from "../../../../math/polynomials/affine.js";
-import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
-import { randint } from "../../../../math/utils/random/randint.js";
-import { add } from "../../../../tree/nodes/operators/addNode.js";
-import { multiply } from "../../../../tree/nodes/operators/multiplyNode.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";
-import { alignTex } from "../../../../utils/latex/alignTex.js";
-const getHydrated = (identifiers) => {
-    const { a, b, k1, k2 } = identifiers;
-    const nodeMonomA = multiply(a, power("x".toTree(), k1)).simplify();
-    const nodeMonomB = multiply(b, power("x".toTree(), k2)).simplify();
-    const nodeSum = add(nodeMonomA, nodeMonomB);
-    return {
-        nodeMonomA,
-        nodeMonomB,
-        nodeSum,
-    };
-};
-const getStatementNode = (identifiers) => {
-    const { nodeSum } = getHydrated(identifiers);
-    return nodeSum;
-};
-const getInstruction = (identifiers) => {
-    const statement = getStatementNode(identifiers);
-    return `Factoriser : 
-  
-$$
-${statement.toTex()}
-$$`;
-};
-const getAnswerNode = (identifiers) => {
-    const { a, b, k1, k2 } = identifiers;
-    let pgcd = gcd(a, b);
-    if (a < 0 && b < 0)
-        pgcd = -pgcd;
-    const strK1K2 = `${k1}${k2}`;
-    switch (strK1K2) {
-        case "11": {
-            return multiply(a + b, "x");
-        }
-        case "12": {
-            const affine = add(a / pgcd, multiply(b / pgcd, "x"));
-            return multiply(multiply(pgcd, "x"), affine);
-        }
-        case "21": {
-            const affine = add(multiply(a / pgcd, "x"), b / pgcd);
-            return multiply(multiply(pgcd, "x"), affine);
-        }
-        case "22": {
-            return multiply(a + b, power("x", 2));
-        }
-        default:
-            throw new Error("Unsupported strK1K2: " + strK1K2);
-    }
-};
-const getAnswer = (identifiers) => {
-    return getAnswerNode(identifiers).toTex();
-};
-const getHint = (identifiers) => {
-    const { nodeMonomA, nodeMonomB } = getHydrated(identifiers);
-    return `Repère le facteur commun : c'est le terme qui apparaît à la fois dans $${nodeMonomA.toTex()}$ et dans $${nodeMonomB.toTex()}$.`;
-};
-const getCorrection = (identifiers) => {
-    const { a, b, k1, k2 } = identifiers;
-    const { nodeMonomA, nodeMonomB } = getHydrated(identifiers);
-    const answer = getAnswer(identifiers);
-    const statement = getStatementNode(identifiers).toTex();
-    let pgcd = gcd(a, b);
-    if (a < 0 && b < 0)
-        pgcd = -pgcd;
-    const [nodeCommon, nodeDetailed] = (() => {
-        const strK1K2 = `${k1}${k2}`;
-        switch (strK1K2) {
-            case "11": {
-                const nodeCommon = "x".toTree();
-                const nodeDetailed = multiply(nodeCommon, add(a, b));
-                return [nodeCommon, nodeDetailed];
-            }
-            case "12": {
-                const nodeCommon = multiply(pgcd, "x");
-                const nodeDetailed = add(multiply(nodeCommon, a / pgcd), multiply(nodeCommon, multiply(b / pgcd, "x").simplify(), {
-                    toTexOptions: { forceTimesSign: true, noPropagation: true },
-                }));
-                return [nodeCommon, nodeDetailed];
-            }
-            case "21": {
-                const nodeCommon = multiply(pgcd, "x");
-                const nodeDetailed = add(multiply(nodeCommon, multiply(a / pgcd, "x").simplify(), {
-                    toTexOptions: { forceTimesSign: true, noPropagation: true },
-                }), multiply(nodeCommon, b / pgcd));
-                return [nodeCommon, nodeDetailed];
-            }
-            case "22": {
-                const nodeCommon = power("x", 2);
-                const nodeDetailed = multiply(nodeCommon, add(a, b));
-                return [nodeCommon, nodeDetailed];
-            }
-            default:
-                throw new Error("Unsupported strK1K2: " + strK1K2);
-        }
-    })();
-    const detailed = nodeDetailed.toTex();
-    return `Le terme $${nodeCommon.toTex()}$ apparaît à la fois dans $${nodeMonomA.toTex()}$ et dans $${nodeMonomB.toTex()}$. 
-
-On peut donc factoriser l'expression par $${nodeCommon.toTex()}$ :
-
-${alignTex([
-        ["", "", statement],
-        ["", "=", detailed],
-        ["", "=", answer],
-    ])}
-  `;
-};
-const getPropositions = (n, { answer, ...identifiers }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    [
-        [1, 1],
-        [1, 2],
-        [2, 1],
-        [2, 2],
-    ].forEach(([k1, k2]) => {
-        const identifiersWrong = { ...identifiers, k1, k2 };
-        tryToAddWrongProp(propositions, getAnswer(identifiersWrong));
-    });
-    propWhile(propositions, n, () => {
-        tryToAddWrongProp(propositions, multiply("x", AffineConstructor.random().toTree()).toTex());
-    });
-    return shuffleProps(propositions, n);
-};
-const getKeys = () => {
-    return ["x"];
-};
-const isAnswerValid = (ans, { answer }) => {
-    try {
-        const nodeAnswer = parseAlgebraic(answer);
-        return nodeAnswer.toAllValidTexs().some((tex) => ans === tex);
-    }
-    catch (err) {
-        return handleVEAError(err);
-    }
-};
-const getFactoByXKQuestion = () => {
-    const a = randint(-10, 10, [0], { favor: { value: 1, proba: 0.3 } });
-    const b = randint(-10, 10, [0, -a, a], a !== 1 ? { favor: { value: 1, proba: 0.3 } } : undefined);
-    const [k1, k2] = random([
-        [1, 1],
-        [1, 2],
-        [2, 1],
-        [2, 2],
-    ]);
-    const identifiers = {
-        a,
-        b,
-        k1,
-        k2,
-    };
-    return getQuestionFromIdentifiers(identifiers);
-};
-const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
-        keys: getKeys(identifiers),
-        answerFormat: "tex",
-        identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
-    };
-    return question;
-};
-export const factoByXK = {
-    id: "factoByXK",
-    connector: "=",
-    label: "Factorisation du type $ax^k + bx^{k'}$",
-    isSingleStep: false,
-    generator: (nb, opts) => getDistinctQuestions(() => getFactoByXKQuestion(opts), nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-    isAnswerValid,
-    subject: "Mathématiques",
-    getQuestionFromIdentifiers,
-    hasHintAndCorrection: true,
-};
+// import {
+//   Exercise,
+//   Proposition,
+//   QCMGenerator,
+//   Question,
+//   QuestionGenerator,
+//   VEA,
+//   addValidProp,
+//   shuffleProps,
+//   GetAnswer,
+//   GetHint,
+//   GetCorrection,
+//   GetInstruction,
+//   GetKeys,
+//   tryToAddWrongProp,
+//   GetQuestionFromIdentifiers,
+//   propWhile,
+// } from "../../../../exercises/exercise.js";
+// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+// import { AffineConstructor } from "../../../../math/polynomials/affine.js";
+export {};
+// import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
+// import { randint } from "../../../../math/utils/random/randint.js";
+// import { add } from "../../../../tree/nodes/operators/addNode.js";
+// import {
+//   isMultiplyNode,
+//   multiply,
+// } from "../../../../tree/nodes/operators/multiplyNode.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";
+// import { alignTex } from "../../../../utils/latex/alignTex.js";
+// type Identifiers = {
+//   a: number;
+//   k1: number;
+//   b: number;
+//   k2: number;
+// };
+// const getHydrated = (identifiers: Identifiers) => {
+//   const { a, b, k1, k2 } = identifiers;
+//   const nodeMonomA = multiply(a, power("x".toTree(), k1)).simplify();
+//   const nodeMonomB = multiply(b, power("x".toTree(), k2)).simplify();
+//   const nodeSum = add(nodeMonomA, nodeMonomB);
+//   return {
+//     nodeMonomA,
+//     nodeMonomB,
+//     nodeSum,
+//   };
+// };
+// const getStatementNode = (identifiers: Identifiers) => {
+//   const { nodeSum } = getHydrated(identifiers);
+//   return nodeSum;
+// };
+// const getInstruction: GetInstruction<Identifiers> = (identifiers) => {
+//   const statement = getStatementNode(identifiers);
+//   return `Factoriser :
+// $$
+// ${statement.toTex()}
+// $$`;
+// };
+// const getAnswerNode = (identifiers: Identifiers) => {
+//   const { a, b, k1, k2 } = identifiers;
+//   let pgcd = gcd(a, b);
+//   if (a < 0 && b < 0) pgcd = -pgcd;
+//   const strK1K2 = `${k1}${k2}`;
+//   switch (strK1K2) {
+//     case "11": {
+//       return multiply(a + b, "x");
+//     }
+//     case "12": {
+//       const affine = add(a / pgcd, multiply(b / pgcd, "x"));
+//       return multiply(multiply(pgcd, "x"), affine);
+//     }
+//     case "21": {
+//       const affine = add(multiply(a / pgcd, "x"), b / pgcd);
+//       return multiply(multiply(pgcd, "x"), affine);
+//     }
+//     case "22": {
+//       return multiply(a + b, power("x", 2));
+//     }
+//     default:
+//       throw new Error("Unsupported strK1K2: " + strK1K2);
+//   }
+// };
+// const getAnswer: GetAnswer<Identifiers> = (identifiers) => {
+//   return getAnswerNode(identifiers).toTex();
+// };
+// const getHint: GetHint<Identifiers> = (identifiers) => {
+//   const { nodeMonomA, nodeMonomB } = getHydrated(identifiers);
+//   return `Repère le facteur commun : c'est le terme qui apparaît à la fois dans $${nodeMonomA.toTex()}$ et dans $${nodeMonomB.toTex()}$.`;
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   const { a, b, k1, k2 } = identifiers;
+//   const { nodeMonomA, nodeMonomB } = getHydrated(identifiers);
+//   const answer = getAnswer(identifiers);
+//   const statement = getStatementNode(identifiers).toTex();
+//   let pgcd = gcd(a, b);
+//   if (a < 0 && b < 0) pgcd = -pgcd;
+//   const [nodeCommon, nodeDetailed] = (() => {
+//     const strK1K2 = `${k1}${k2}`;
+//     switch (strK1K2) {
+//       case "11": {
+//         const nodeCommon = "x".toTree();
+//         const nodeDetailed = multiply(nodeCommon, add(a, b));
+//         return [nodeCommon, nodeDetailed];
+//       }
+//       case "12": {
+//         const nodeCommon = multiply(pgcd, "x");
+//         const nodeDetailed = add(
+//           multiply(nodeCommon, a / pgcd),
+//           multiply(nodeCommon, multiply(b / pgcd, "x").simplify(), {
+//             toTexOptions: { forceTimesSign: true, noPropagation: true },
+//           }),
+//         );
+//         return [nodeCommon, nodeDetailed];
+//       }
+//       case "21": {
+//         const nodeCommon = multiply(pgcd, "x");
+//         const nodeDetailed = add(
+//           multiply(nodeCommon, multiply(a / pgcd, "x").simplify(), {
+//             toTexOptions: { forceTimesSign: true, noPropagation: true },
+//           }),
+//           multiply(nodeCommon, b / pgcd),
+//         );
+//         return [nodeCommon, nodeDetailed];
+//       }
+//       case "22": {
+//         const nodeCommon = power("x", 2);
+//         const nodeDetailed = multiply(nodeCommon, add(a, b));
+//         return [nodeCommon, nodeDetailed];
+//       }
+//       default:
+//         throw new Error("Unsupported strK1K2: " + strK1K2);
+//     }
+//   })();
+//   const detailed = nodeDetailed.toTex();
+//   return `Le terme $${nodeCommon.toTex()}$ apparaît à la fois dans $${nodeMonomA.toTex()}$ et dans $${nodeMonomB.toTex()}$.
+// On peut donc factoriser l'expression par $${nodeCommon.toTex()}$ :
+// ${alignTex([
+//   ["", "", statement],
+//   ["", "=", detailed],
+//   ["", "=", answer],
+// ])}
+//   `;
+// };
+// const getPropositions: QCMGenerator<Identifiers> = (
+//   n,
+//   { answer, ...identifiers },
+// ) => {
+//   const propositions: Proposition[] = [];
+//   addValidProp(propositions, answer);
+//   [
+//     [1, 1],
+//     [1, 2],
+//     [2, 1],
+//     [2, 2],
+//   ].forEach(([k1, k2]) => {
+//     const identifiersWrong = { ...identifiers, k1, k2 };
+//     tryToAddWrongProp(propositions, getAnswer(identifiersWrong));
+//   });
+//   propWhile(propositions, n, () => {
+//     tryToAddWrongProp(
+//       propositions,
+//       multiply("x", AffineConstructor.random().toTree()).toTex(),
+//     );
+//   });
+//   return shuffleProps(propositions, n);
+// };
+// const getKeys: GetKeys<Identifiers> = () => {
+//   return ["x"];
+// };
+// const getFactoByXKQuestion: QuestionGenerator<Identifiers> = () => {
+//   const a = randint(-10, 10, [0], { favor: { value: 1, proba: 0.3 } });
+//   const b = randint(
+//     -10,
+//     10,
+//     [0, -a, a],
+//     a !== 1 ? { favor: { value: 1, proba: 0.3 } } : undefined,
+//   );
+//   const [k1, k2] = random([
+//     [1, 1],
+//     [1, 2],
+//     [2, 1],
+//     [2, 2],
+//   ]);
+//   const identifiers: Identifiers = {
+//     a,
+//     b,
+//     k1,
+//     k2,
+//   };
+//   return getQuestionFromIdentifiers(identifiers);
+// };
+// const getQuestionFromIdentifiers: GetQuestionFromIdentifiers<Identifiers> = (
+//   identifiers,
+// ) => {
+//   const question: Question<Identifiers> = {
+//     answer: getAnswer(identifiers),
+//     instruction: getInstruction(identifiers),
+//     keys: getKeys(identifiers),
+//     answerFormat: "tex",
+//     identifiers,
+//     hint: getHint(identifiers),
+//     correction: getCorrection(identifiers),
+//   };
+//   return question;
+// };
+// export const factoByXK: Exercise<Identifiers> = {
+//   id: "factoByXK",
+//   connector: "=",
+//   label: "Factorisation du type $ax^k + bx^{k'}$",
+//   isSingleStep: false,
+//   generator: (nb, opts) =>
+//     getDistinctQuestions(() => getFactoByXKQuestion(opts), nb),
+//   qcmTimer: 60,
+//   freeTimer: 60,
+//   getPropositions,
+//   isAnswerValid,
+//   subject: "Mathématiques",
+//   getQuestionFromIdentifiers,
+//   hasHintAndCorrection: true,
+// };

package/lib/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factorizeCanonicalFormWithSqrt.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAoIF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAehE,CAAC"}
+{"version":3,"file":"factorizeCanonicalFormWithSqrt.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAiJF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAehE,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.js

@@ -3,10 +3,12 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { SquareRoot, SquareRootConstructor, } from "../../../../math/numbers/reals/real.js";
 import { Affine } from "../../../../math/polynomials/affine.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { isFactorizedNode } from "../../../../tree/nodes/algebraicNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { SquareNode } from "../../../../tree/nodes/operators/powerNode.js";
 import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { alignTex } from "../../../../utils/latex/alignTex.js";
 //(x-a)^2-b^2 avec b irrational
 const getStatementNode = (identifiers) => {
@@ -25,15 +27,16 @@ $$
 ${getStartStatement(identifiers)}
 $$`;
 };
-const getAnswer = (identifiers) => {
+const getAnswerNode = (identifiers) => {
     const { a, bOperand } = identifiers;
     const affine = new Affine(1, a);
     const b = new SquareRoot(bOperand);
-    const answer = new MultiplyNode(new SubstractNode(affine.toTree(), b.toTree()), new AddNode(affine.toTree(), b.toTree()))
-        .simplify({ forbidFactorize: true })
-        .toTex();
+    const answer = new MultiplyNode(new SubstractNode(affine.toTree(), b.toTree()), new AddNode(affine.toTree(), b.toTree()));
     return answer;
 };
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).simplify({ forbidFactorize: true }).toTex();
+};
 const getHint = () => {
     return `Utilise l'identité remarquable 
     
@@ -95,11 +98,21 @@ const getPropositions = (n, { answer, a, bOperand }) => {
     });
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { a, bOperand }) => {
-    const affine = new Affine(1, a);
-    const b = new SquareRoot(bOperand);
-    const answerTree = new MultiplyNode(new SubstractNode(affine.toTree(), b.toTree()), new AddNode(affine.toTree(), b.toTree())).simplify({ forbidFactorize: true });
-    return answerTree.toAllValidTexs().includes(ans);
+const isAnswerValid = (ans, { answer: _answer, ...identifiers }) => {
+    const parsed = parseAlgebraic(ans);
+    return (isFactorizedNode(parsed) &&
+        parsed
+            .simplify({
+            towardsDistribute: true,
+            forbidFactorize: true,
+        })
+            .toTex() ===
+            getAnswerNode(identifiers)
+                .simplify({
+                towardsDistribute: true,
+                forbidFactorize: true,
+            })
+                .toTex());
 };
 export const factorizeCanonicalFormWithSqrt = {
     id: "factorizeCanonicalFormWithSqrt",

package/lib/exercises/math/calculLitteral/factorisation/index.d.ts

@@ -8,5 +8,4 @@ export * from "./factoType2.js";
 export * from "./factoByX.js";
 export * from "./factoType3.js";
 export * from "./factoType4.js";
-export * from "./factoByXK.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calculLitteral/factorisation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qCAAqC,CAAC;AACpD,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAE9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qCAAqC,CAAC;AACpD,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAE9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/index.js

@@ -9,4 +9,4 @@ export * from "./factoByX.js";
 // export * from "./factorizeAX2PlusBX.js"; //! existe déjà
 export * from "./factoType3.js";
 export * from "./factoType4.js";
-export * from "./factoByXK.js";
+// export * from "./factoByXK.js"; //!existe déjà

package/lib/exercises/math/complex/argumentFromAlgebraicComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAS7C,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AAoJF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}
+{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAW7C,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;CACxB,CAAC;AAuJF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}

package/lib/exercises/math/complex/argumentFromAlgebraicComplex.js

@@ -12,7 +12,9 @@ import { add } from "../../../tree/nodes/operators/addNode.js";
 import { frac } from "../../../tree/nodes/operators/fractionNode.js";
 import { MultiplyNode } from "../../../tree/nodes/operators/multiplyNode.js";
 import { square } 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";
 import { alignTex } from "../../../utils/latex/alignTex.js";
 const getInstruction = (identifiers) => {
     const zTex = identifiers.zTex;
@@ -141,10 +143,14 @@ const getPropositions = (n, { answer }) => {
     });
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { arg }) => {
-    const point = mainTrigoValues.find((point) => point.angle.evaluate({}) === arg);
-    const texs = point.angle.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        return (parsed.simplify().toTex() === parseAlgebraic(answer).simplify().toTex());
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const argumentFromAlgebraicComplex = {
     id: "argumentFromAlgebraicComplex",

package/lib/exercises/math/derivation/derivative/trigo/sinCosDerivativeRewriteUsingCos2PlusSin2Equals1.js

@@ -388,10 +388,10 @@ const getPropositions = (n, { answer: _answer, ...identifiers }) => {
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer, ...identifiers }) => {
+const isAnswerValid = (ans, { answer }) => {
     try {
         const nodeAns = parseAlgebraic(ans);
-        const nodeAnswer = getAnswerNode(identifiers);
+        const nodeAnswer = parseAlgebraic(answer);
         return NodeComparator.isEqualViaRandomSubstitutions(nodeAns, nodeAnswer, 3);
     }
     catch (e) {

package/lib/exercises/math/functions/absolute/absoluteValueEquations.js

@@ -2,11 +2,10 @@ import { shuffleProps, tryToAddWrongProp, addValidProp, propWhile, } from "../..
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Polynomial } from "../../../../math/polynomials/polynomial.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { EquationSolutionNode } from "../../../../tree/nodes/equations/equationSolutionNode.js";
-import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
-import { DiscreteSetNode } from "../../../../tree/nodes/sets/discreteSetNode.js";
+import { discreteSetParser } from "../../../../tree/parsers/discreteSetParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { probaFlip } from "../../../../utils/alea/probaFlip.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const getInstruction = (identifiers) => {
     const { a, b } = identifiers;
     const poly = new Polynomial([-b, 1]);
@@ -59,15 +58,16 @@ const getPropositions = (n, { answer, a, b }) => {
     });
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { a, b }) => {
-    const sols = a === 0
-        ? [new NumberNode(b)]
-        : a < 0
-            ? []
-            : [new NumberNode(b - a), new NumberNode(b + a)];
-    const answer = new EquationSolutionNode(new DiscreteSetNode(sols));
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const parsed = discreteSetParser(ans);
+        if (!parsed)
+            return false;
+        return ("S=" + parsed.simplify({ decimalToFractions: true }).toTex() === answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const absoluteValueEquations = {
     id: "absoluteValueEquation",

package/lib/exercises/math/functions/affines/adjustment/affineAdjustmentRsquared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/affines/adjustment/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqIF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAclE,CAAC"}
+{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/affines/adjustment/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA2GF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAclE,CAAC"}