math-exercises 3.0.123 → 3.0.125

package/lib/exercises/math/calcul/arithmetics/primeNumbers.d.ts

@@ -3,7 +3,7 @@ type Identifiers = {
     nb: number;
 };
 type Options = {
-    usePowers?: boolean;
+    asPowers?: boolean;
 };
 export declare const primeNumbers: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/calcul/arithmetics/primeNumbers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAmB9B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAmMF,KAAK,OAAO,GAAG;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAWF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBvD,CAAC"}
+{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAmB9B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAsMF,KAAK,OAAO,GAAG;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAcF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBvD,CAAC"}

package/lib/exercises/math/calcul/arithmetics/primeNumbers.js

@@ -26,14 +26,16 @@ const getInstruction = (identifiers) => {
   
 $$
 ${getStartStatement(identifiers)}
-$$`;
+$$
+
+`;
 };
 const getAnswer = (identifiers, opts) => {
     const { nb } = identifiers;
     const decomp = primeDecomposition(nb);
-    const usePowers = opts?.usePowers;
+    const asPowers = opts?.asPowers;
     const nodes = [];
-    if (usePowers) {
+    if (asPowers) {
         for (const d of decomp) {
             if (d.power === 1)
                 nodes.push(d.value.toTree());
@@ -50,7 +52,8 @@ const getAnswer = (identifiers, opts) => {
     }
     return operatorComposition(MultiplyNode, nodes).toTex();
 };
-const getPrimeNumbers = (opts) => {
+const getPrimeNumbers = (optsIn) => {
+    const opts = optsIn ?? optsDefault;
     const rand = randint(2, 5);
     let nb = 0;
     let counter = 0;
@@ -71,16 +74,16 @@ const getPrimeNumbers = (opts) => {
 const getHint = (identifiers) => {
     return `Les premiers nombres premiers sont : $2$, $3$, $5$, $7$, $11$.
   
-Essaie de diviser le nombre $${identifiers.nb}$ par ces nombres.`;
+On peut essayer de diviser le nombre $${identifiers.nb}$ par ces nombres.`;
 };
 const getCorrection = (identifiers, opts) => {
     const { nb } = identifiers;
     let n = nb;
     const list = [];
-    const usePowers = opts?.usePowers;
-    const answerPowers = usePowers ? getAnswer(identifiers, opts) : undefined;
-    const answerNoPowers = getAnswer(identifiers, { usePowers: false });
-    const powerIsDifferent = !usePowers ? false : answerPowers !== answerNoPowers;
+    const asPowers = opts?.asPowers;
+    const answerPowers = asPowers ? getAnswer(identifiers, opts) : undefined;
+    const answerNoPowers = getAnswer(identifiers, { asPowers: false });
+    const powerIsDifferent = !asPowers ? false : answerPowers !== answerNoPowers;
     for (const k of [2, 3, 5, 7, 11]) {
         let counter = 0;
         while (n % k === 0) {
@@ -98,7 +101,7 @@ ${alignTex(list)}
 On prend alors la liste des quotients : 
 
 $$
-${nb.frenchify()} = ${answerNoPowers} ${powerIsDifferent ? `=${answerPowers}` : ""}
+${nb.frenchify()} = ${answerNoPowers} ${powerIsDifferent && asPowers ? `=${answerPowers}` : ""}
 $$
 `;
 };
@@ -152,7 +155,7 @@ const isAnswerValid = (ans, { nb }) => {
     try {
         //? aucune idée de comment, mais les élèves envoient parfois des espaces
         const parsed = parseAlgebraic(ans.replaceAll("\\ ", ""));
-        if (!isMultiplyNode(parsed))
+        if (!(isMultiplyNode(parsed) || isPowerNode(parsed)))
             return false;
         const externals = [];
         const recur = (node) => {
@@ -192,13 +195,16 @@ const isAnswerValid = (ans, { nb }) => {
         return handleVEAError(err);
     }
 };
+const optsDefault = {
+    asPowers: true,
+};
 const options = [
     {
-        id: "usePowers",
-        label: "Utiliser des puissances",
+        id: "asPowers",
+        label: "correction avec des puissances",
         target: GeneratorOptionTarget.answer,
         type: GeneratorOptionType.checkbox,
-        defaultValue: false,
+        defaultValue: optsDefault.asPowers,
     },
 ];
 export const primeNumbers = {

package/lib/exercises/math/calcul/fractions/fractionsMix.js

@@ -44,7 +44,7 @@ const getAnswer = (identifiers) => {
     return statement.simplify().toTex();
 };
 const getInstruction = (identifiers) => {
-    return `Écrire sous la forme d'une fraction irréductible : 
+    return `Écrire sous la forme d'une fraction irréductible ou d'un entier : 
   
 $$
 ${getStatement(identifiers).toTex()}

package/lib/exercises/math/conversion/volumeConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/volumeConversion.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,QAAQ,EAcT,MAAM,mBAAmB,CAAC;AAE3B,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAgIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}
+{"version":3,"file":"volumeConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/volumeConversion.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,QAAQ,EAcT,MAAM,mBAAmB,CAAC;AAE3B,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAwIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAclD,CAAC"}

package/lib/exercises/math/conversion/volumeConversion.js

@@ -2,6 +2,8 @@ import { Decimal, DecimalConstructor, } from "../../../math/numbers/decimals/dec
 import { randint } from "../../../math/utils/random/randint.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 { shuffle } from "../../../utils/alea/shuffle.js";
 import { doWhile } from "../../../utils/doWhile.js";
 import { alignTex } from "../../../utils/latex/alignTex.js";
@@ -99,7 +101,11 @@ const getPropositions = (n, { answer, randomUnitIndex, randomUnitInstructionInde
     return shuffle(propositions);
 };
 const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+    return (ans === answer ||
+        (() => {
+            const [nodeAns, nodeAnswer] = [ans, answer].map((tex) => parseAlgebraic(tex));
+            return substract(nodeAns, nodeAnswer).evaluate() === 0;
+        })());
 };
 export const volumeConversion = {
     id: "volumeConversion",

package/lib/exercises/math/derivation/derivative/exp/expDerivativeFour.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/exp/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAmFF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAenD,CAAC"}
+{"version":3,"file":"expDerivativeFour.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/exp/expDerivativeFour.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA2FF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAenD,CAAC"}

package/lib/exercises/math/derivation/derivative/exp/expDerivativeFour.js

@@ -18,12 +18,15 @@ f(x) = ${fct.toTex()}
 $$`;
 };
 const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).toTex();
+};
+const getAnswerNode = (identifiers) => {
     const { affine1Coeffs, affine2Coeffs } = identifiers;
     const affine1 = new Affine(affine1Coeffs[1], affine1Coeffs[0]);
     const affine2 = new Affine(affine2Coeffs[1], affine2Coeffs[0]);
     const exp = new ExpNode(affine2.toTree());
     const deriv = new MultiplyNode(new Affine(affine2.a * affine1.a, affine1.a + affine2.a * affine1.b).toTree(), exp);
-    return deriv.simplify().toTex();
+    return deriv.simplify();
 };
 const getExpDerivativeFourQuestion = () => {
     const affine1 = AffineConstructor.random();
@@ -53,12 +56,15 @@ const getPropositions = (n, { answer }) => {
     });
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
         const parsed = parseAlgebraic(ans);
         if (!parsed)
             return false;
-        return parsed.simplify().toTex() === answer;
+        // return parsed.simplify().toTex() === answer;
+        const ansTex = parsed.simplify().toTex();
+        const ansNode = getAnswerNode(identifiers);
+        return ansNode.toAllValidTexs().includes(ansTex);
     }
     catch (err) {
         return handleVEAError(err);

package/lib/exercises/math/functions/affines/affineFromExercise.d.ts

@@ -1,6 +1,6 @@
 import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
-    phrase: number;
+    situationIndex: number;
     initial: number;
     growth: number;
 };

package/lib/exercises/math/functions/affines/affineFromExercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineFromExercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineFromExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAuHF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAiBpD,CAAC"}
+{"version":3,"file":"affineFromExercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineFromExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAoNF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAiBpD,CAAC"}

package/lib/exercises/math/functions/affines/affineFromExercise.js

@@ -6,6 +6,114 @@ import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
 import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+const situations = [
+    {
+        instruction: (initial, growth) => `On suppose qu'une plante, d'une hauteur initiale de 
+      $${initial.frenchify()}\\ \\textrm{cm}$, croît chaque jour de $${growth.frenchify()}\\ \\textrm{cm}$. 
+      Quelle est sa hauteur (en $\\textrm{cm}$) après $x$ jours ?`,
+        hint: `Quel calcul permet de trouver la hauteur de la plante au bout de $10$ jours ?
+    
+Inspire toi de ce calcul pour déterminer la hauteur de la plante au bout de $x$ jours.`,
+        correction: (initial, growth, answer) => `Chaque jour, la plante gagne $${growth.frenchify()}\\ \\textrm{cm}$. Au bout de $x$ jours, la plante a donc gagné $x\\times ${growth.frenchify()}\\ \\textrm{cm}$.
+
+La hauteur initiale de la plante est de $${initial}\\ \\textrm{cm}$.
+
+Au bout de $x$ jours, la plante a donc une hauteur de :
+
+$$
+${answer}\\ \\textrm{cm}
+$$`,
+        randInitial: () => randint(2, 20),
+        randGrowth: () => randfloat(0, 4, 2, [0]),
+    },
+    {
+        instruction: (initial, growth) => `Une compagnie de taxis propose un tarif qui inclut un
+      montant fixe de $${initial.frenchify()}\\ €$ et un montant variable de $${growth.frenchify()}\\ €$
+      par kilomètre parcouru.
+      Quel est le prix payé (en $€$) pour $x \\ \\textrm{km}$ parcourus ?`,
+        hint: `Quel calcul permet de trouver le prix payé pour $10$ kilomètres parcourus ?
+
+Inspire toi de ce calcul pour déterminer le prix payé pour $x$ kilomètres parcourus.
+  `,
+        correction: (initial, growth, answer) => `Pour chaque kilomètre parcouru, le prix augmente de $${growth.frenchify()}\\ €$. Au bout de $x$ kilomètres, le prix augmente donc de $x\\times ${growth.frenchify()}\\ \\ €$.
+
+Le montant fixe initial du trajet est de $${initial}\\ €$.
+
+Pour $x$ kilomètres parcourus, le prix du trajet est donc de : 
+
+$$
+${answer}\\ €
+$$`,
+        randInitial: () => randint(2, 20),
+        randGrowth: () => randfloat(0, 4, 2, [0]),
+    },
+    {
+        instruction: (initial, growth) => `Pour l’électricité de sa maison, Jimmy paye 
+un abonnement fixe de $${initial.frenchify()}\\ €$ 
+puis il paye $${growth.frenchify()}\\ €$ par kWh consommé.
+      Quelle sera la facture (en $€$) pour $x \\ \\textrm{kWh}$ consommés ?`,
+        hint: `Quel calcul permet de trouver la facture pour $10$ kWh consommés ?
+
+Inspire toi de ce calcul pour déterminer la facture pour $x$ kWh consommés.
+  `,
+        correction: (initial, growth, answer) => `Pour chaque kWh consommé, le prix augmente de $${growth.frenchify()}\\ €$. 
+Au bout de $x$ kWh, le prix augmente donc de $x\\times ${growth.frenchify()}\\ \\ €$.
+
+Le montant de l'abonnement fixe est de $${initial}\\ €$.
+
+Pour $x$ kWh consommés, la facture sera donc de : 
+
+$$
+${answer}\\ €
+$$`,
+        randInitial: () => randint(10, 20),
+        randGrowth: () => randfloat(0, 0.5, 2, [0]),
+    },
+    {
+        instruction: (initial, growth) => `Dany décide de partir au Sud de la France. 
+Il part de Valenciennes où il fait $${initial.frenchify()}$°C.
+La température augmente de $${growth.frenchify()}$°C à chaque centaine de km vers le Sud.
+      Quelle sera la température (en °C) pour $x$ centaines de km parcourus vers le Sud ?`,
+        hint: `Quel calcul permet de trouver la température pour $2$ centaines de km parcourus ?
+
+Inspire toi de ce calcul pour déterminer la température pour $x$ centaines de km parcourus.
+  `,
+        correction: (initial, growth, answer) => `Pour chaque centaine de km parcourue, la température augmente de $${growth.frenchify()}$ °C. 
+Au bout de $x$ centaines de km, la température augmente donc de $x\\times ${growth.frenchify()}$ °C.
+
+Au départ, la température est de $${initial}$ °C.
+
+Pour $x$ centaines de km parcourus, la température sera donc de : 
+
+$$
+${answer}\\ \\textrm{°C}
+$$`,
+        randInitial: () => randint(0, 10),
+        randGrowth: () => randfloat(0.5, 1, 2),
+    },
+    {
+        instruction: (initial, growth) => `Emma est salariée. Son salaire net était
+de $${initial.frenchify()}\\ €$ à son entrée dans l'entreprise,
+et augmente de $${growth.frenchify()}$ € tous les ans.
+      Quel sera son salaire net (en €) quand elle aura $x$ années d'ancienneté ?`,
+        hint: `Quel calcul permet de trouver son salaire net pour $10$ années d'ancienneté ?
+
+Inspire toi de ce calcul pour déterminer son salaire net pour $x$ années d'ancienneté.
+  `,
+        correction: (initial, growth, answer) => `Chaque année, son salaire net augmente de $${growth.frenchify()}$ €. 
+Au bout de $x$ années, son salaire net aura augmenté de $x\\times ${growth.frenchify()}$ €.
+
+Au départ, son salaire net était de $${initial}$ €.
+
+Pour $x$ années d'ancienneté, son salaire net sera donc de : 
+
+$$
+${answer}\\ \\textrm{€}
+$$`,
+        randInitial: () => randint(12, 17) * 100,
+        randGrowth: () => randfloat(20, 50, 2),
+    },
+];
 const getPropositions = (n, { answer, ...identifiers }) => {
     const propositions = [];
     const { initial, growth } = identifiers;
@@ -20,54 +128,20 @@ const getAnswer = (identifiers) => {
     return add(multiply(identifiers.growth, new VariableNode("x")), identifiers.initial).toTex();
 };
 const getInstruction = (identifiers) => {
-    const { phrase, initial, growth } = identifiers;
-    switch (phrase) {
-        case 0:
-            return `On suppose qu'une plante, d'une hauteur initiale de 
-      $${initial}\\ \\textrm{cm}$, croît chaque jour de $${growth.frenchify()}\\ \\textrm{cm}$. 
-      Quelle est sa hauteur (en $\\textrm{cm}$) après $x$ jours ?`;
-        case 1:
-        default:
-            return `Une compagnie de taxis propose un tarif qui inclut un
-      montant fixe de $${initial}\\ €$ et un montant variable de $${growth.frenchify()}\\ €$
-      par kilomètre parcouru.
-      Quel est le prix payé (en $€$) pour $x \\ \\textrm{km}$ parcourus ?`;
-    }
+    const { situationIndex, initial, growth } = identifiers;
+    const situation = situations[situationIndex];
+    return situation.instruction(initial, growth);
 };
 const getHint = (identifiers) => {
-    const { phrase } = identifiers;
-    if (phrase === 0) {
-        return `Quel calcul permet de trouver la hauteur de la plante au bout de $10$ jours ?
-    
-Inspire toi de ce calcul pour déterminer la hauteur de la plante au bout de $x$ jours.`;
-    }
-    return `Quel calcul permet de trouver le prix payé pour $10$ kilomètres parcourus ?
-
-Inspire toi de ce calcul pour déterminer le prix payé pour $x$ kilomètres parcourus.
-  `;
+    const { situationIndex } = identifiers;
+    const situation = situations[situationIndex];
+    return situation.hint;
 };
 const getCorrection = (identifiers) => {
-    const { growth, initial, phrase } = identifiers;
-    if (phrase === 0) {
-        return `Chaque jour, la plante gagne $${growth.frenchify()}\\ \\textrm{cm}$. Au bout de $x$ jours, la plante a donc gagné $x\\times ${growth.frenchify()}\\ \\textrm{cm}$.
-
-La hauteur initiale de la plante est de $${initial}\\ \\textrm{cm}$.
-
-Au bout de $x$ jours, la plante a donc une hauteur de :
-
-$$
-${getAnswer(identifiers)}\\ \\textrm{cm}
-$$`;
-    }
-    return `Pour chaque kilomètre parcouru, le prix augmente de $${growth.frenchify()}\\ €$. Au bout de $x$ kilomètres, le prix augmente donc de $x\\times ${growth.frenchify()}\\ \\ €$.
-
-Le montant fixe initial du trajet est de $${initial}\\ €$.
-
-Pour $x$ kilomètres parcourus, le prix du trajet est donc de : 
-
-$$
-${getAnswer(identifiers)}\\ €
-$$`;
+    const { situationIndex, initial, growth } = identifiers;
+    const situation = situations[situationIndex];
+    const answer = getAnswer(identifiers);
+    return situation.correction(initial, growth, answer);
 };
 const isAnswerValid = (ans, { answer }) => {
     return parseAlgebraic(ans)
@@ -75,10 +149,11 @@ const isAnswerValid = (ans, { answer }) => {
         .equals(parseAlgebraic(answer).simplify());
 };
 const getAffineFromExerciseQuestion = () => {
-    const phrase = randint(0, 2);
-    const initial = randint(2, 20);
-    const growth = randfloat(0, 4, 2, [0]);
-    const identifiers = { phrase, initial, growth };
+    const situationIndex = randint(0, situations.length);
+    const situation = situations[situationIndex];
+    const initial = situation.randInitial();
+    const growth = situation.randGrowth();
+    const identifiers = { situationIndex, initial, growth };
     return getQuestionFromIdentifiers(identifiers);
 };
 const getQuestionFromIdentifiers = (identifiers) => {

package/lib/exercises/math/functions/affines/drawAffineFromLitExp.js

@@ -1,13 +1,13 @@
-import { isGGBLine } from "../../../../exercises/utils/geogebra/isGGBLine.js";
-import { isGGBPoint } from "../../../../exercises/utils/geogebra/isGGBPoint.js";
 import { toolBarConstructor } from "../../../../exercises/utils/geogebra/toolBarConstructor.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
-import { deleteObjectNamesFromAnswer } from "../../../../geogebra/deleteObjectNamesFromAnswer.js";
 import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
-import { approxEqual } from "../../../../geogebra/parsers/approxEqual.js";
-import { Point } from "../../../../math/geometry/point.js";
 import { Affine, AffineConstructor } from "../../../../math/polynomials/affine.js";
 import { random } from "../../../../utils/alea/random.js";
+import { isGGBLine } from "../../../../exercises/utils/geogebra/isGGBLine.js";
+import { isGGBPoint } from "../../../../exercises/utils/geogebra/isGGBPoint.js";
+import { deleteObjectNamesFromAnswer } from "../../../../geogebra/deleteObjectNamesFromAnswer.js";
+import { approxEqual } from "../../../../geogebra/parsers/approxEqual.js";
+import { Point } from "../../../../math/geometry/point.js";
 import { arrayEqual } from "../../../../utils/arrays/arrayEqual.js";
 const getInstruction = (identifiers) => {
     const { correctA, correctB, nameFunc } = identifiers;

package/lib/exercises/math/functions/affines/recognizeAffineGraph.d.ts

@@ -7,9 +7,10 @@ type ColorProps = {
 type FunctionProps = {
     fName: string;
     colorProps: ColorProps;
+    nodeIds: NodeIdentifiers;
+    isAnswer: boolean;
 };
 type Identifiers = {
-    arrNodeIds: NodeIdentifiers[];
     arrFProps: FunctionProps[];
     isLinear: boolean;
 };

package/lib/exercises/math/functions/affines/recognizeAffineGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recognizeAffineGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/recognizeAffineGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,UAAU,GAAG;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AA+IF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAgBtD,CAAC"}
+{"version":3,"file":"recognizeAffineGraph.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/recognizeAffineGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,UAAU,GAAG;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAgKF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAgBtD,CAAC"}

package/lib/exercises/math/functions/affines/recognizeAffineGraph.js

@@ -19,10 +19,6 @@ const DISPLAY_PROPS = {
     yMax: +5,
 };
 const arrColorProps = [
-    {
-        strFrench: "rouge",
-        hashRgb: red,
-    },
     {
         strFrench: "bleu",
         hashRgb: blueDark,
@@ -31,6 +27,10 @@ const arrColorProps = [
         strFrench: "orange",
         hashRgb: orange,
     },
+    {
+        strFrench: "rouge",
+        hashRgb: red,
+    },
 ];
 const arrFName = ["f", "g", "h"];
 const getInstruction = (identifiers) => {
@@ -41,7 +41,7 @@ const getInstruction = (identifiers) => {
   Quelle fonction est ${isLinear ? "linéaire" : "affine"} ?`;
 };
 const getGGBOptions = (identifiers) => {
-    const { arrNodeIds, arrFProps } = identifiers;
+    const { arrFProps } = identifiers;
     function createFunctionCommands(nodeIds, fName, color) {
         const nodeF = NodeConstructor.fromIdentifiers(nodeIds);
         const expr = nodeF.toMathString();
@@ -52,7 +52,7 @@ const getGGBOptions = (identifiers) => {
             `SetColor(${fName}, "${color}")`,
         ];
     }
-    const commands = arrNodeIds.flatMap((_, i) => createFunctionCommands(arrNodeIds[i], arrFProps[i].fName, arrFProps[i].colorProps.hashRgb));
+    const commands = arrFProps.flatMap((fProps) => createFunctionCommands(fProps.nodeIds, fProps.fName, fProps.colorProps.hashRgb));
     const ggb = new GeogebraConstructor({
         commands,
     });
@@ -66,35 +66,52 @@ const getHint = () => {
 };
 const getCorrection = (identifiers) => {
     const { isLinear, arrFProps } = identifiers;
-    const strFName = arrFProps[0].fName;
-    const strColor = arrFProps[0].colorProps.strFrench;
+    const fPropsAnswer = arrFProps.find((fProps) => fProps.isAnswer);
+    const strFName = fPropsAnswer.fName;
+    const strColor = fPropsAnswer.colorProps.strFrench;
     return `Une fonction ${isLinear ? "linéaire" : "affine"} est représentée par une droite ${isLinear ? "passant par l'origine" : ""}.
 La seule droite ici est la courbe en ${strColor}.
 La fonction ${isLinear ? "linéaire" : "affine"} est donc $${strFName}$.`;
 };
 const getAnswer = (identifiers) => {
     const { arrFProps } = identifiers;
-    return arrFProps[0].fName;
+    const fPropsAnswer = arrFProps.find((fProps) => fProps.isAnswer);
+    return fPropsAnswer.fName;
 };
 const getRecognizeAffineGraphQuestion = () => {
     const isLinear = coinFlip();
     const { xMin, xMax, yMin, yMax } = DISPLAY_PROPS;
-    const arrNodeIds = [
-        AffineConstructor.random({ min: -10, max: 10 }, { min: isLinear ? 0 : -10, max: isLinear ? 0 : 10 }, "x").toTree(),
-        add(multiply(randint(-0.5, 0.5, [0]), exp("x")), randint(-5, 5)),
-        (() => {
-            const rootsPool = [...Array(xMax - xMin).keys()].map((i) => i + xMin);
-            const roots = randomMany(rootsPool, 2).toSorted((i1, i2) => i1 - i2);
-            const ySummit = randint(yMin, yMax, [0]);
-            return TrinomConstructor.fromRootsAndSummitY(roots, ySummit).toTree();
-        })(),
-    ].map((node) => node.toIdentifiers());
-    const arrFNameShuffled = shuffle(arrFName);
-    const arrColorPropsShuffled = shuffle(arrColorProps);
-    const arrFProps = arrFNameShuffled.map((_, i) => {
-        return { fName: arrFName[i], colorProps: arrColorPropsShuffled[i] };
+    const arrItem = [
+        {
+            node: AffineConstructor.random({ min: -10, max: 10 }, { min: isLinear ? 0 : -10, max: isLinear ? 0 : 10 }, "x").toTree(),
+            isAnswer: true,
+        },
+        {
+            node: add(multiply(randint(-0.5, 0.5, [0]), exp("x")), randint(-5, 5)),
+            isAnswer: false,
+        },
+        {
+            node: (() => {
+                const rootsPool = [...Array(xMax - xMin).keys()].map((i) => i + xMin);
+                const roots = randomMany(rootsPool, 2).toSorted((i1, i2) => i1 - i2);
+                const ySummit = randint(yMin, yMax, [0]);
+                return TrinomConstructor.fromRootsAndSummitY(roots, ySummit).toTree();
+            })(),
+            isAnswer: false,
+        },
+    ];
+    const arrFProps = shuffle(arrItem).map((item, i) => {
+        return {
+            fName: arrFName[i],
+            colorProps: arrColorProps[i],
+            nodeIds: item.node.toIdentifiers(),
+            isAnswer: item.isAnswer,
+        };
     });
-    const identifiers = { arrNodeIds, arrFProps, isLinear };
+    const identifiers = {
+        arrFProps,
+        isLinear,
+    };
     return getQuestionFromIdentifiers(identifiers);
 };
 const getQuestionFromIdentifiers = (identifiers) => {

package/lib/exercises/math/functions/basics/findZeroesProductQuotient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findZeroesProductQuotient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/findZeroesProductQuotient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAsBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ,CAAC;AAkOF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAkB3D,CAAC"}
+{"version":3,"file":"findZeroesProductQuotient.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/findZeroesProductQuotient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAuBrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ,CAAC;AA6QF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAkB3D,CAAC"}

package/lib/exercises/math/functions/basics/findZeroesProductQuotient.js

@@ -153,17 +153,44 @@ $$
 const getKeys = () => {
     return ["S", "equal", "lbrace", "semicolon", "rbrace"];
 };
-const isAnswerValid = (ans, { answer }) => {
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
         const parsed = discreteSetParser(ans);
         if (!parsed)
             return false;
-        return "S=" + parsed.simplify().toTex() === answer;
+        const roots = getRoots(identifiers).map((r) => r.simplify());
+        return isArrayOfNodesValid(parsed.elements, roots);
     }
     catch (err) {
         return handleVEAError(err);
     }
 };
+const isArrayOfNodesValid = (arrAns, arrAnswer) => {
+    //tried with toAllValidTexs() but there is always an unhandled case
+    function isNodesEqual(node1, node2) {
+        return [1, 1_000, 1_000_000].every((factor) => substract(multiply(factor, node1), multiply(factor, node2)).evaluate() === 0);
+    }
+    const dictAnswer = Object.fromEntries(arrAnswer.map((node, i) => [i, node]));
+    let isValid = true;
+    for (let i = 0; i < arrAns.length; i++) {
+        const nodeAns = arrAns[i];
+        let isFound = false;
+        const keys = Object.keys(dictAnswer);
+        for (let j = 0; j < keys.length; j++) {
+            const key = keys[j];
+            const answerNode = dictAnswer[key];
+            if (isNodesEqual(nodeAns, answerNode)) {
+                isFound = true;
+                delete dictAnswer[key]; //one-to-one correspondence
+                break;
+            }
+        }
+        isValid = isValid && isFound;
+        if (!isValid)
+            break;
+    }
+    return isValid;
+};
 const getFindZeroesProductQuotientQuestion = () => {
     const type = randint(0, 3);
     let a = 0;

package/lib/exercises/math/functions/basics/inverseImageFunctionGeogebra.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IAEjB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,CAAC;AAuNF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAkB9D,CAAC"}
+{"version":3,"file":"inverseImageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IAEjB,MAAM,EAAE,MAAM,CAAC;IAIf,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,CAAC;AAyOF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAkB9D,CAAC"}