math-exercises 3.0.200 → 3.0.201

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

@@ -38,7 +38,7 @@ const getCorrection = (identifiers) => {
     let technique = "";
     let firstFracFinal = firstFrac;
     let secondFracFinal = secondFrac;
-    const firstProduct = frac(multiply(num1, denom2), multiply(num2, denom2));
+    const firstProduct = frac(multiply(num1, denom2), multiply(denom1, denom2));
     firstFracFinal = firstProduct.simplify({
         forbidRationalSimplification: true,
     });

package/lib/exercises/math/calcul/index.d.ts

@@ -15,4 +15,5 @@ export * from "./decimals/index.js";
 export * from "./rationals/index.js";
 export * from "./sign/index.js";
 export * from "./ratio/index.js";
+export * from "./factorial/index.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC"}

package/lib/exercises/math/calcul/index.js

@@ -16,3 +16,4 @@ export * from "./decimals/index.js";
 export * from "./rationals/index.js";
 export * from "./sign/index.js";
 export * from "./ratio/index.js";
+export * from "./factorial/index.js";

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

@@ -9,4 +9,5 @@ export * from "./minNumberInequality.js";
 export * from "./isInequalityTrue.js";
 export * from "./inverseInequalityWithGraph.js";
 export * from "./exp/index.js";
+export * from "./inequationCenteredInterval.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iCAAiC,CAAC"}

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

@@ -9,3 +9,4 @@ export * from "./minNumberInequality.js";
 export * from "./isInequalityTrue.js";
 export * from "./inverseInequalityWithGraph.js";
 export * from "./exp/index.js";
+export * from "./inequationCenteredInterval.js";

package/lib/exercises/math/calculLitteral/inequations/inequationCenteredInterval.d.ts

@@ -0,0 +1,14 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { InegalitySymbols } from "../../../../math/inequations/inequation.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
+type Identifiers = {
+    nodeIdsCenter: NodeIdentifiers;
+    nodeIdsRadius: NodeIdentifiers;
+    inegSymbol: InegalitySymbols;
+};
+type Options = {
+    nbDigits: string;
+};
+export declare const inequationCenteredInterval: Exercise<Identifiers, Options>;
+export {};
+//# sourceMappingURL=inequationCenteredInterval.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"inequationCenteredInterval.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/inequations/inequationCenteredInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,gBAAgB,EAEjB,MAAM,sCAAsC,CAAC;AAQ9C,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAW7C,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,eAAe,CAAC;IAC/B,aAAa,EAAE,eAAe,CAAC;IAC/B,UAAU,EAAE,gBAAgB,CAAC;CAC9B,CAAC;AA8UF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAgBF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAerE,CAAC"}

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

@@ -0,0 +1,263 @@
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { InequationSymbol, } from "../../../../math/inequations/inequation.js";
+import { randfloat } from "../../../../math/utils/random/randfloat.js";
+import { round } from "../../../../math/utils/round.js";
+import { abs } from "../../../../tree/nodes/functions/absNode.js";
+import { opposite } from "../../../../tree/nodes/functions/oppositeNode.js";
+import { InequationNode } from "../../../../tree/nodes/inequations/inequationNode.js";
+import { InequationSolutionNode } from "../../../../tree/nodes/inequations/inequationSolutionNode.js";
+import { NodeConstructor, } from "../../../../tree/nodes/nodeConstructor.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { UnionIntervalNode } from "../../../../tree/nodes/sets/unionIntervalNode.js";
+import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
+import { unionIntervalParser } from "../../../../tree/parsers/unionIntervalParser.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 { nodeIdsCenter, nodeIdsRadius, inegSymbol } = identifiers;
+    const [nodeCenter, nodeRadius] = [nodeIdsCenter, nodeIdsRadius].map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds));
+    const nodeVarX = new VariableNode("x");
+    const nodeIneqInstr = new InequationNode([abs(substract(nodeVarX, nodeCenter)), nodeRadius], inegSymbol);
+    const nodeIneqSol = (() => {
+        if (inegSymbol === "<" || inegSymbol === "\\le") {
+            const nodeIneqRewritten = new InequationNode([
+                substract(nodeCenter, nodeRadius).simplify(),
+                nodeVarX,
+                add(nodeCenter, nodeRadius).simplify(),
+            ], inegSymbol);
+            return new InequationSolutionNode(nodeIneqRewritten.toInterval());
+        }
+        else {
+            const arrNodeIneqRewritten = [
+                new InequationNode([nodeVarX, substract(nodeCenter, nodeRadius).simplify()], new InequationSymbol(inegSymbol).reversed()),
+                new InequationNode([nodeVarX, add(nodeCenter, nodeRadius).simplify()], inegSymbol),
+            ];
+            return new InequationSolutionNode(new UnionIntervalNode(arrNodeIneqRewritten.map((nodeIneq) => nodeIneq.toInterval())));
+        }
+    })();
+    return {
+        nodeCenter,
+        nodeRadius,
+        nodeIneqInstr,
+        nodeIneqSol,
+        inegSymbol,
+    };
+};
+const getInstruction = (identifiers) => {
+    const { nodeIdsCenter, nodeIdsRadius, inegSymbol } = identifiers;
+    const [nodeCenter, nodeRadius] = [nodeIdsCenter, nodeIdsRadius].map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds));
+    const nodeVarX = new VariableNode("x");
+    const nodeIneqInstr = new InequationNode([abs(substract(nodeVarX, nodeCenter)), nodeRadius], inegSymbol);
+    return `Résoudre l'inéquation suivante : 
+  
+$$
+${nodeIneqInstr.toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { nodeIneqSol } = getHydrated(identifiers);
+    return nodeIneqSol.toTex();
+};
+const getHint = () => {
+    return `Soient $3$ réels $y$, $v$ et $l$.
+
+Si on a :
+
+${alignTex([
+        ["", `\\lvert y - v \\rvert < l`],
+        ["\\Leftrightarrow", `y - v < l  \\ \\ \\text{et} \\ \\  -(y - v) < l`],
+        ["\\Leftrightarrow", `y < l + v  \\ \\ \\text{et} \\ \\  v - l < y`],
+        ["\\Leftrightarrow", `v - l < y < v + l`],
+    ])}
+
+alors, autrement dit, $y$ est strictement dans l'intervalle centré en $v$ et de rayon $l$.
+
+Si on a :
+
+${alignTex([
+        ["", `\\lvert y - v \\rvert > l`],
+        ["\\Leftrightarrow", `y - v > l  \\ \\ \\text{ou} \\ \\  -(y - v) > l`],
+        ["\\Leftrightarrow", `y > l + v  \\ \\ \\text{ou} \\ \\  v - l > y`],
+        ["\\Leftrightarrow", `y < v - l  \\ \\ \\text{ou} \\ \\  v + l < y`],
+    ])}
+
+alors, autrement dit, $y$ est strictement hors de l'intervalle centré en $v$ et de rayon $l$.`;
+};
+const getCorrection = (identifiers) => {
+    const { nodeCenter, nodeRadius, nodeIneqInstr, nodeIneqSol, inegSymbol } = getHydrated(identifiers);
+    const nodeVarX = new VariableNode("x");
+    if (inegSymbol === "<" || inegSymbol === "\\le") {
+        const nodeIneqLhs1 = new InequationNode([substract(nodeVarX, nodeCenter), nodeRadius], inegSymbol);
+        const nodeIneqRhs1 = new InequationNode([opposite(substract(nodeVarX, nodeCenter)), nodeRadius], inegSymbol);
+        const nodeIneqLhs2 = new InequationNode([nodeVarX, add(nodeRadius, nodeCenter)], inegSymbol);
+        const nodeIneqRhs2 = new InequationNode([substract(nodeCenter, nodeRadius), nodeVarX], inegSymbol);
+        const nodeIneq3 = new InequationNode([
+            substract(nodeCenter, nodeRadius),
+            nodeVarX,
+            add(nodeCenter, nodeRadius),
+        ], inegSymbol);
+        return `
+
+${alignTex([
+            ["", `${nodeIneqInstr.toTex()}`],
+            [
+                "\\Leftrightarrow",
+                `${nodeIneqLhs1.toTex()} \\ \\ \\text{et} \\ \\ ${nodeIneqRhs1.toTex()}`,
+            ],
+            [
+                "\\Leftrightarrow",
+                `${nodeIneqLhs2.toTex()} \\ \\ \\text{et} \\ \\ ${nodeIneqRhs2.toTex()}`,
+            ],
+            ["\\Leftrightarrow", nodeIneq3.toTex()],
+        ])}
+
+alors, autrement dit, $x$ est ${inegSymbol === "<" ? "strictement" : ""} dans l'intervalle centré en $${nodeCenter.toTex()}$ et de rayon $${nodeRadius.toTex()}$.
+
+$$
+${nodeIneqSol.toTex()}
+$$
+
+`;
+    }
+    else {
+        const nodeIneqLhs1 = new InequationNode([substract(nodeVarX, nodeCenter), nodeRadius], inegSymbol);
+        const nodeIneqRhs1 = new InequationNode([opposite(substract(nodeVarX, nodeCenter)), nodeRadius], inegSymbol);
+        const nodeIneqLhs2 = new InequationNode([nodeVarX, add(nodeRadius, nodeCenter)], inegSymbol);
+        const nodeIneqRhs2 = new InequationNode([substract(nodeCenter, nodeRadius), nodeVarX], inegSymbol);
+        const inegSymbolReversed = new InequationSymbol(inegSymbol).reversed();
+        const nodeIneqLhs3 = new InequationNode([nodeVarX, substract(nodeCenter, nodeRadius)], inegSymbolReversed);
+        const nodeIneqRhs3 = new InequationNode([add(nodeCenter, nodeRadius), nodeVarX], inegSymbolReversed);
+        return `
+
+${alignTex([
+            ["", `${nodeIneqInstr.toTex()}`],
+            [
+                "\\Leftrightarrow",
+                `${nodeIneqLhs1.toTex()} \\ \\ \\text{ou} \\ \\ ${nodeIneqRhs1.toTex()}`,
+            ],
+            [
+                "\\Leftrightarrow",
+                `${nodeIneqLhs2.toTex()} \\ \\ \\text{ou} \\ \\ ${nodeIneqRhs2.toTex()}`,
+            ],
+            [
+                "\\Leftrightarrow",
+                `${nodeIneqLhs3.toTex()} \\ \\ \\text{ou} \\ \\ ${nodeIneqRhs3.toTex()}`,
+            ],
+        ])}
+
+alors, autrement dit, $x$ est ${inegSymbol === ">" ? "strictement" : ""} hors de l'intervalle centré en $${nodeCenter.toTex()}$ et de rayon $${nodeRadius.toTex()}$.
+
+$$
+${nodeIneqSol.toTex()}
+$$
+
+`;
+    }
+};
+const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const { nodeIdsCenter, nodeIdsRadius, inegSymbol } = identifiers;
+    const [nodeCenter] = [nodeIdsCenter].map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds));
+    //student: > -> <
+    {
+        tryToAddWrongProp(propositions, getAnswer({
+            ...identifiers,
+            inegSymbol: new InequationSymbol(inegSymbol).reversed(),
+        }));
+    }
+    //student: center <-> radius
+    {
+        tryToAddWrongProp(propositions, getAnswer({
+            ...identifiers,
+            nodeIdsCenter: nodeIdsRadius,
+            nodeIdsRadius: abs(nodeCenter).simplify().toIdentifiers(),
+        }));
+    }
+    //student: center -> -center
+    {
+        tryToAddWrongProp(propositions, getAnswer({
+            ...identifiers,
+            nodeIdsCenter: opposite(nodeCenter).simplify().toIdentifiers(),
+        }));
+    }
+    propWhile(propositions, n, () => {
+        const identifiersWrong = createRandomIdentifiers(opts);
+        tryToAddWrongProp(propositions, getAnswer(identifiersWrong));
+    });
+    return shuffleProps(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const parsed = unionIntervalParser(ans.replaceAll("S", "").replaceAll("=", ""));
+        if (!parsed)
+            return false;
+        return "S=\\ " + parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const createRandomIdentifiers = (opts) => {
+    const nbDigits = parseInt(opts.nbDigits);
+    const nodeCenter = randfloat(-10, 10, nbDigits).toTree();
+    const nodeRadius = randfloat(1, 10, nbDigits, [
+        round(abs(nodeCenter).evaluate(), nbDigits),
+    ]).toTree();
+    const inegSymbol = random(["<", "\\le", "\\ge", ">"]);
+    const identifiers = {
+        nodeIdsCenter: nodeCenter.toIdentifiers(),
+        nodeIdsRadius: nodeRadius.toIdentifiers(),
+        inegSymbol,
+    };
+    return identifiers;
+};
+const getInequationCenteredIntervalQuestion = (optsIn) => {
+    const opts = optsIn ?? optsDefault;
+    const identifiers = createRandomIdentifiers(opts);
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
+    const question = {
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: ["S", "equal", "lbracket", "rbracket", "semicolon", "infty", "cup"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
+    };
+    return question;
+};
+const optsDefault = {
+    nbDigits: "0",
+};
+const options = [
+    {
+        id: "nbDigits",
+        label: "Nombre de décimales pour le centre et le rayon",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        values: ["0", "1", "2"],
+        defaultValue: optsDefault.nbDigits,
+    },
+];
+export const inequationCenteredInterval = {
+    id: "inequationCenteredInterval",
+    label: "Résoudre une inéquation du type $ \\lvert x - u \\rvert < d $",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getInequationCenteredIntervalQuestion(opts), nb),
+    options,
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    pdfOptions: { shouldSpreadPropositions: true },
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/combinatory/anagrams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAqGrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAoEF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAY1C,CAAC"}
+{"version":3,"file":"anagrams.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/anagrams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AA2GrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA+IF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAa1C,CAAC"}

package/lib/exercises/math/combinatory/anagrams.js

@@ -1,7 +1,12 @@
 import { shuffleProps, tryToAddWrongProp, addValidProp, propWhile, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../math/utils/random/randint.js";
+import { facto } from "../../../tree/nodes/functions/factorialNode.js";
+import { frac } from "../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../tree/nodes/operators/multiplyNode.js";
 import { random } from "../../../utils/alea/random.js";
+import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 const words = [
     "angle",
     "armoire",
@@ -65,66 +70,93 @@ const words = [
     "toilette",
     "vitre",
 ];
-const letters = [
-    "a",
-    "b",
-    "c",
-    "d",
-    "e",
-    "f",
-    "g",
-    "h",
-    "i",
-    "j",
-    "k",
-    "l",
-    "m",
-    "n",
-    "o",
-    "p",
-    "q",
-    "r",
-    "s",
-    "t",
-    "u",
-    "v",
-    "w",
-    "x",
-    "y",
-    "z",
-    "é",
-    "è",
-    "à",
-    "ç",
-];
 const getInstruction = (identifiers) => {
     const { word } = identifiers;
     return `Combien d'anagrammes mathématiques du mot ${word} sont possibles ?`;
 };
+const getAnswerStuff = (identifiers) => {
+    const { word } = identifiers;
+    const dictOccur = word.split("").reduce((acc, x) => {
+        if (!acc[x]) {
+            acc[x] = 0;
+        }
+        acc[x] += 1;
+        return acc;
+    }, {});
+    const arrArrStrCharAndOcc = Object.entries(dictOccur).filter(([_, count]) => count > 1);
+    const isWithoutDuplicate = arrArrStrCharAndOcc.length === 0;
+    const nodeAnswer = (() => {
+        if (isWithoutDuplicate) {
+            return facto(word.length);
+        }
+        else {
+            return frac(facto(word.length), arrArrStrCharAndOcc
+                .slice(1)
+                .reduce((acc, [_, count]) => multiply(acc, facto(count)), facto(arrArrStrCharAndOcc[0][1].toTree())));
+        }
+    })();
+    return { dictOccur, arrArrStrCharAndOcc, isWithoutDuplicate, nodeAnswer };
+};
 const getAnswer = (identifiers) => {
+    return getAnswerStuff(identifiers).nodeAnswer.evaluate().frenchify();
+};
+const getHint = () => {
+    return `Une anagramme mathématique est une permutation des caractères d'un mot. 
+Si le mot a $n$ caractères distincts, le nombre d'anagrammes est le nombre de permutations d'un ensemble de $n$ éléments.
+Si le mot a des caractères qui sont présents plusieurs fois, on commence par faire comme s'ils étaient tous distincts, puis, 
+pour chaque caractère qui est présent $p$ fois, 
+il faudra penser à diviser par le nombre de permutations d'un ensemble de $p$ éléments, 
+pour éliminer tous les arrangements que l'on aura compté plusieurs fois.`;
+};
+const getCorrection = (identifiers) => {
     const { word } = identifiers;
-    const repeats = [];
-    const wordLetters = word.split("");
-    letters.forEach((letter) => {
-        const nbOfRepeats = wordLetters.filter((l) => l === letter).length;
-        if (nbOfRepeats > 1)
-            repeats.push(nbOfRepeats);
-    });
-    const getFacto = (n) => {
-        if (n === 1)
-            return 1;
-        return n * getFacto(n - 1);
-    };
-    const facto = word
-        .split("")
-        .map((_el, index) => index + 1)
-        .reduce((acc, curr) => acc * curr, 1);
-    let arrangements = 1;
-    repeats.forEach((nbOfRepeats) => {
-        arrangements *= getFacto(nbOfRepeats);
+    const { arrArrStrCharAndOcc, isWithoutDuplicate, nodeAnswer } = getAnswerStuff(identifiers);
+    return `Une anagramme mathématique est une permutation des caractères d'un mot. 
+Ici le mot est "${word}".
+C'est un mot de longueur $${word.length}$.
+${(() => {
+        if (isWithoutDuplicate) {
+            return `Tous les caractères sont distincts. 
+Le nombre d'anagrammes mathématiques est le nombre de permutations d'un ensemble à $${word.length}$ éléments : $${nodeAnswer.toTex()} = ${nodeAnswer
+                .evaluate()
+                .frenchify()}$.`;
+        }
+        else {
+            return `${arrArrStrCharAndOcc.map(([strChar, count]) => `Le caractère "${strChar}" est présent $${count}$ fois.`).join(`
+`)}
+Si tous les caractères étaient distincts, le nombre d'anagrammes mathématiques serait le nombre de permutations d'un ensemble à $${word.length}$ éléments : $${word.length}!$.
+Mais il faut diviser par le nombre de permutations que l'on a comptées en trop.
+${arrArrStrCharAndOcc.map(([strChar, count]) => `On a compté $${count}!$ fois trop de permutations en ce qui concerne le caractère "${strChar}".`).join(`
+`)}
+Le nombre d'anagrammes mathématiques du mot "${word}" est donc : $${nodeAnswer.toTex()} = ${nodeAnswer
+                .evaluate()
+                .frenchify()}$.
+`;
+        }
+    })()}
+`;
+};
+const getPropositions = (n, { answer, word }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    tryToAddWrongProp(propositions, Math.pow(word.length, word.length) + "");
+    tryToAddWrongProp(propositions, (word.length * (word.length + 1)) / 2 + "");
+    tryToAddWrongProp(propositions, word.length * word.length + "");
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, randint(1000, 10000) + "");
     });
-    const answer = facto / arrangements + "";
-    return answer;
+    return shuffleProps(propositions, n);
+};
+const getKeys = () => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return numberVEA(ans, answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 const getAnagramsQuestion = () => {
     const word = random(words);
@@ -135,26 +167,14 @@ const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
-        keys: [],
+        keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
-const getPropositions = (n, { answer, word }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    tryToAddWrongProp(propositions, Math.pow(word.length, word.length) + "");
-    tryToAddWrongProp(propositions, (word.length * (word.length + 1)) / 2 + "");
-    tryToAddWrongProp(propositions, word.length * word.length + "");
-    propWhile(propositions, n, () => {
-        tryToAddWrongProp(propositions, randint(1000, 10000) + "");
-    });
-    return shuffleProps(propositions, n);
-};
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
 export const anagrams = {
     id: "anagrams",
     connector: "=",
@@ -167,4 +187,5 @@ export const anagrams = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/combinatory/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./anagrams.js";
 export * from "./ballsCounting.js";
 export * from "./diceCounting.js";
+export * from "./combination/index.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/combinatory/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/combinatory/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAElC,cAAc,wBAAwB,CAAC"}

package/lib/exercises/math/combinatory/index.js

@@ -1,3 +1,4 @@
 export * from "./anagrams.js";
 export * from "./ballsCounting.js";
 export * from "./diceCounting.js";
+export * from "./combination/index.js";

package/lib/exercises/math/dataRepresentations/index.d.ts

@@ -5,11 +5,11 @@ export * from "./pieChartReading.js";
 export * from "./barChart/barChartInterpreting.js";
 export * from "./dataToGraphGraphToData.js";
 export * from "./cartesianGraphExtremaReading.js";
-export * from "./scatterPlotCommenting.js";
 export * from "./boxPlot/index.js";
 export * from "./graphReading.js";
 export * from "./plausibleGraph.js";
 export * from "./halfPieChartReading.js";
 export * from "./halfPieChartCommenting.js";
 export * from "./histogram/index.js";
+export * from "./scatterPlot/index.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/dataRepresentations/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,oCAAoC,CAAC;AACnD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/dataRepresentations/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,oCAAoC,CAAC;AACnD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AAErC,cAAc,wBAAwB,CAAC"}

package/lib/exercises/math/dataRepresentations/index.js

@@ -5,7 +5,6 @@ export * from "./pieChartReading.js";
 export * from "./barChart/barChartInterpreting.js";
 export * from "./dataToGraphGraphToData.js";
 export * from "./cartesianGraphExtremaReading.js";
-export * from "./scatterPlotCommenting.js";
 export * from "./boxPlot/index.js";
 export * from "./graphReading.js";
 export * from "./plausibleGraph.js";
@@ -13,3 +12,8 @@ export * from "./halfPieChartReading.js";
 export * from "./halfPieChartCommenting.js";
 export * from "./histogram/index.js";
 // export * from "./placePointsFromDataTable.js";
+export * from "./scatterPlot/index.js";
+// export * from "./testGen.js";
+// export * from "./testGenGGB.js";
+// export * from "./testGenStudentGGB.js";
+// export * from "./testGGB.js";

package/lib/exercises/math/dataRepresentations/scatterPlot/index.d.ts

@@ -1,6 +1,4 @@
 export * from "./scatterPlotCommenting.js";
-export * from "./scatterPlotFillDataTableFromScatterPlotData.js";
-export * from "./scatterPlotFillDataTableWithDataClassesFromScatterPlotData.js";
 export * from "./scatterPlotInterpreting.js";
 export * from "./scatterPlotBuildScatterPlotFromDataTable.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/dataRepresentations/scatterPlot/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/dataRepresentations/scatterPlot/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kDAAkD,CAAC;AACjE,cAAc,iEAAiE,CAAC;AAChF,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+CAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/dataRepresentations/scatterPlot/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAG3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+CAA+C,CAAC"}

package/lib/exercises/math/dataRepresentations/scatterPlot/index.js

@@ -1,5 +1,5 @@
 export * from "./scatterPlotCommenting.js";
-export * from "./scatterPlotFillDataTableFromScatterPlotData.js";
-export * from "./scatterPlotFillDataTableWithDataClassesFromScatterPlotData.js";
+// export * from "./scatterPlotFillDataTableFromScatterPlotData.js";
+// export * from "./scatterPlotFillDataTableWithDataClassesFromScatterPlotData.js";
 export * from "./scatterPlotInterpreting.js";
 export * from "./scatterPlotBuildScatterPlotFromDataTable.js";

package/lib/exercises/math/derivation/derivative/trigo/index.d.ts

@@ -2,4 +2,6 @@ export * from "./cosCompositionDerivation.js";
 export * from "./sinCompositionDerivation.js";
 export * from "./sinSecondDegreeDerivative.js";
 export * from "./cosSecondDegreeDerivative.js";
+export * from "./productOfSinAXPlusBCosCXPlusDDerivative.js";
+export * from "./sinAndCosMixedWithSquareDerivative.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/derivation/derivative/trigo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8CAA8C,CAAC;AAC7D,cAAc,yCAAyC,CAAC"}

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

@@ -2,3 +2,6 @@ export * from "./cosCompositionDerivation.js";
 export * from "./sinCompositionDerivation.js";
 export * from "./sinSecondDegreeDerivative.js";
 export * from "./cosSecondDegreeDerivative.js";
+export * from "./productOfSinAXPlusBCosCXPlusDDerivative.js";
+export * from "./sinAndCosMixedWithSquareDerivative.js";
+// export * from "./sinCosDerivativeRewriteUsingCos2PlusSin2Equals1.js";

package/lib/exercises/math/derivation/problems/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./problemMaximizeBoxVolumeFindX.js";
 export * from "./problemProjectileHeightFindAbscissa.js";
-export * from "./problemMaximizeProfitFindProduction.js";
 export * from "./problemMovementOnLineFindSpeedAtPoint.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/derivation/problems/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/problems/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,4CAA4C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/derivation/problems/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AAEzD,cAAc,4CAA4C,CAAC"}