math-exercises 3.0.61 → 3.0.63

package/lib/exercises/math/python/pyForLoop1Exercise.js

@@ -1,141 +1,100 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
 import { randint } from "../../../math/utils/random/randint.js";
-import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
-import { MultiplyNode } from "../../../tree/nodes/operators/multiplyNode.js";
-import { coinFlip } from "../../../utils/alea/coinFlip.js";
-import { random } from "../../../utils/alea/random.js";
-const getPythonForLoop1ExerciseQuestion = () => {
-    const exercise = generateRandomExercise();
-    const correctAnswer = getCorrectAnswer(exercise.exoVariable);
-    const question = {
-        answer: correctAnswer + "",
-        instruction: exercise.instruction,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { exercise: exercise.exoVariable },
-    };
-    return question;
-};
-const generateRandomExercise = () => {
-    const isType5 = coinFlip();
-    return isType5 ? generateType5Exercise() : generateType6Exercise();
+const operations = [
+    { name: "+", func: (x, step) => x + step },
+    { name: "-", func: (x, step) => x - step },
+    { name: "*", func: (x, step) => x * step },
+    // { name: "//", func: (x: number, step: number) => Math.floor(x / step) }
+];
+const getInstruction = (identifiers) => {
+    const { initialValue, step, iterations, opIndex } = identifiers;
+    const op = operations[opIndex];
+    return `Qu'affichera le programme suivant, si l'utilisateur entre $${step}$ ?
+\`\`\`
+x = ${initialValue}
+y = int(input("Entrez un nombre"))
+for i in range(1, ${iterations + 1}):
+  x = x ${op.name} y
+print(x)
+\`\`\`
+`;
 };
-const getPropositions = (n, { answer, exercise }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    generatePropostion(exercise).forEach((value) => tryToAddWrongProp(propositions, value));
-    while (propositions.length < n) {
-        let correctAnswer = getCorrectAnswer(exercise);
-        let random = randint(correctAnswer - 15, correctAnswer + 16, [
-            correctAnswer,
-        ]);
-        tryToAddWrongProp(propositions, random + "");
-    }
-    return shuffleProps(propositions, n);
-};
-const generatePropostion = (exercise) => {
-    if (exercise.b !== undefined) {
-        return generateType6Proposition(exercise.a, exercise.b, exercise.nbIteration);
-    }
-    else {
-        return generateType5Proposition(exercise.a, exercise.op, exercise.nbIteration);
+const getAnswer = (identifiers) => {
+    const { initialValue, step, iterations, opIndex } = identifiers;
+    const op = operations[opIndex];
+    let value = initialValue;
+    for (let i = 0; i < iterations; i++) {
+        value = op.func(value, step);
     }
+    const answer = value.toString();
+    return answer;
 };
-const generateType5Exercise = () => {
-    const a = randint(-10, 11);
-    const operands = ["+", "-"];
-    const nbIterations = [1000, 100, 10];
-    const nbIteration = random(nbIterations);
-    let op = random(operands);
-    const exoVariable = {
-        a,
-        nbIteration,
-        op,
-    };
-    const instruction = `Qu'affichera le programme suivant ?
-  \`\`\`
-  a=${a}
-  for i in range (1,${nbIteration + 1}):
-      a=a${op}0.5
-  print(a)
-  \`\`\`
-  `;
-    return { instruction, exoVariable };
+const getForLoopQuestion = () => {
+    const initialValue = randint(-10, 10, [0, 1]);
+    const opIndex = randint(0, operations.length);
+    const step = randint(0, 10, [0, 1]);
+    const iterations = randint(1, 6, [1]);
+    const identifiers = { initialValue, step, iterations, opIndex };
+    return getQuestionFromIdentifiers(identifiers);
 };
-const generateType6Exercise = () => {
-    const a = randint(-4, 4, [0]);
-    const b = randint(1, 4);
-    const nbIteration = randint(3, 6);
-    const exoVariable = {
-        a,
-        nbIteration,
-        op: "*",
-        b,
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: ["a", "equal"],
+        answerFormat: "tex",
+        identifiers,
     };
-    const instruction = `Qu'affiche le programme suivant, si l'utilisateur entre $${a}$ ?
-  \`\`\`
-  b=${b}
-  a=int(input("Entrez un nombre"))
-  for i in range(1,${nbIteration + 1}):
-      b=b*a  
-  print(b)
-  \`\`\`
-  `;
-    return { instruction, exoVariable };
-};
-const generateType5Proposition = (a, op, nbIteration) => {
-    let firstPropostion = new NumberNode(getType5CorrectAnswer(a, op, nbIteration) + 0.5);
-    let secondProposition = new NumberNode(getType5CorrectAnswer(a, op, nbIteration) - 0.5);
-    return [firstPropostion.toTex(), secondProposition.toTex()];
-};
-const generateType6Proposition = (a, b, nbIteration) => {
-    const aNode = new NumberNode(a);
-    const bNode = new NumberNode(b);
-    const firstPropostion = new MultiplyNode(bNode, aNode);
-    const secondProposition = getType6CorrectAnswer(a, b, nbIteration + 1);
-    const thirdProposition = getType6CorrectAnswer(a, b, nbIteration - 1);
-    return [
-        firstPropostion.simplify().toTex(),
-        secondProposition + "",
-        thirdProposition + "",
-    ];
+    return question;
 };
-const getCorrectAnswer = (exercise) => {
-    if (exercise.b !== undefined) {
-        return getType6CorrectAnswer(exercise.a, exercise.b, exercise.nbIteration);
+const getPropositions = (n, { answer, initialValue, step, iterations, opIndex }) => {
+    const propositions = [];
+    const correctAnswer = answer;
+    addValidProp(propositions, correctAnswer);
+    const op = operations[opIndex];
+    // Une itération en moins
+    let valueOneLess = initialValue;
+    for (let i = 0; i < iterations - 1; i++) {
+        valueOneLess = op.func(valueOneLess, step);
     }
-    else {
-        return getType5CorrectAnswer(exercise.a, exercise.op, exercise.nbIteration);
+    const wrongAnswerOneLess = valueOneLess.toString();
+    tryToAddWrongProp(propositions, wrongAnswerOneLess);
+    // Une itération en plus
+    let valueOneMore = initialValue;
+    for (let i = 0; i < iterations + 1; i++) {
+        valueOneMore = op.func(valueOneMore, step);
     }
-};
-const getType5CorrectAnswer = (a, op, nbIteration) => {
-    const multiplied = nbIteration * 0.5;
-    switch (op) {
-        case "+":
-            return a + multiplied;
-        case "-":
-            return a - multiplied;
+    const wrongAnswerOneMore = valueOneMore.toString();
+    tryToAddWrongProp(propositions, wrongAnswerOneMore);
+    // Erreur sur le négatif
+    const valueNegative = parseInt(answer) * -1;
+    const wrongAnswerNegative = valueNegative.toString();
+    tryToAddWrongProp(propositions, wrongAnswerNegative);
+    // Troisième proposition aléatoire
+    while (propositions.length < n) {
+        let randomValue = initialValue;
+        const randomIterations = randint(1, 10);
+        for (let i = 0; i < randomIterations; i++) {
+            randomValue = op.func(randomValue, step);
+        }
+        const randomWrongAnswer = randomValue.toString();
+        tryToAddWrongProp(propositions, randomWrongAnswer);
     }
-    return 1;
-};
-const getType6CorrectAnswer = (a, b, nbIteration) => {
-    const multiplier = Math.pow(a, nbIteration);
-    return multiplier * b;
+    return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { exercise }) => {
-    return getCorrectAnswer(exercise) + "" === ans;
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
 };
 export const pythonForLoop1Exercise = {
     id: "pyForLoop1Exercise",
-    label: "Boucles for $1$",
-    levels: ["2nde"],
+    label: "Boucle for (avec entrée utilisateur)",
     isSingleStep: true,
-    sections: ["Python"],
-    generator: (nb) => getDistinctQuestions(getPythonForLoop1ExerciseQuestion, nb),
+    generator: (nb) => getDistinctQuestions(getForLoopQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/python/pyNestedForLoopExercise.d.ts

@@ -1,8 +1,5 @@
 import { Exercise } from "../../../exercises/exercise.js";
 type Identifiers = {
-    exercise: PyExoVariables;
-};
-type PyExoVariables = {
     op: string;
     n: number;
     p: number;

package/lib/exercises/math/python/pyNestedForLoopExercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pyNestedForLoopExercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/pyNestedForLoopExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC;AAOF,KAAK,cAAc,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqFF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAazD,CAAC"}
+{"version":3,"file":"pyNestedForLoopExercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/pyNestedForLoopExercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CAGX,CAAC;AA+EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAazD,CAAC"}

package/lib/exercises/math/python/pyNestedForLoopExercise.js

@@ -1,55 +1,25 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } 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 { random } from "../../../utils/alea/random.js";
-const operators = ["+", "-"];
-const getPyNestedForLoopExerciseQuestion = () => {
-    const exercise = generateExercise();
-    const correctAnswer = getCorrectAnswer(exercise.exoVariables);
-    const question = {
-        answer: correctAnswer + "",
-        instruction: exercise.instruction,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { exercise: exercise.exoVariables },
+const rebuildIdentifiers = (oldIds) => {
+    if (oldIds.op)
+        return oldIds;
+    return {
+        op: oldIds.exercise.op,
+        n: oldIds.exercise.n,
+        p: oldIds.exercise.p,
     };
-    return question;
 };
-const getPropositions = (n, { answer, exercise }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    generateProposition(exercise).forEach((value) => tryToAddWrongProp(propositions, value + ""));
-    while (propositions.length < n) {
-        tryToAddWrongProp(propositions, randint(+answer - 10, +answer + 11, [+answer]) + "");
-    }
-    return shuffleProps(propositions, n);
-};
-const generateProposition = (exo) => {
-    const exoProposition = {
-        op: exo.op,
-        n: exo.n + 1,
-        p: exo.p + 1,
-    };
-    const firstProposition = getCorrectAnswer(exoProposition);
-    exoProposition.p = exo.p - 1;
-    exoProposition.n = exo.n - 1;
-    const secondProposition = getCorrectAnswer(exoProposition);
-    const thridProposition = exo.op === "+" ? exo.n : -exo.n;
-    return [firstProposition, secondProposition, thridProposition];
-};
-const isAnswerValid = (ans, { exercise }) => {
-    return getCorrectAnswer(exercise) + "" === ans;
+const getAnswer = (identifiers) => {
+    const { n, p, op } = identifiers;
+    const nbIteration = p * n;
+    return (op == "+" ? nbIteration : -nbIteration).frenchify();
 };
-const generateExercise = () => {
-    const op = random(operators);
-    const n = randint(2, 11);
-    const p = randint(2, 11);
-    const exoVariables = {
-        op,
-        n,
-        p,
-    };
-    const instruction = `Qu'affichera le programme suivant ?
+const getInstruction = (identifiers) => {
+    const { n, p, op } = identifiers;
+    return `Qu'affichera le programme suivant ?
   \`\`\`
   s=0
   n=${n}
@@ -60,22 +30,51 @@ const generateExercise = () => {
   print(s) 
   \`\`\`
   `;
-    return { instruction, exoVariables };
 };
-const getCorrectAnswer = (exo) => {
-    const nbIteration = exo.p * exo.n;
-    return exo.op == "+" ? nbIteration : -nbIteration;
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+const getPyNestedForLoopExerciseQuestion = () => {
+    const op = random(["+", "-"]);
+    const n = randint(2, 11);
+    const p = randint(2, 11);
+    const identifiers = { n, op, p };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getPropositions = (nb, { answer, n, op, p }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const firstProposition = getAnswer({ n: n + 1, p: p + 1, op });
+    const secondProposition = getAnswer({ n: n - 1, p: p + 1, op });
+    const thridProposition = op === "+" ? n : -n;
+    tryToAddWrongProp(propositions, firstProposition + "");
+    tryToAddWrongProp(propositions, secondProposition + "");
+    tryToAddWrongProp(propositions, thridProposition + "");
+    while (propositions.length < nb) {
+        tryToAddWrongProp(propositions, randint(+answer - 10, +answer + 11, [+answer]) + "");
+    }
+    return shuffleProps(propositions, nb);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return numberVEA(ans, answer);
 };
 export const pyNestedForLoopExercise = {
     id: "pyNestedForLoopExercise",
     label: "Boucles for imbriquées",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Python"],
     generator: (nb) => getDistinctQuestions(getPyNestedForLoopExerciseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    rebuildIdentifiers,
 };

package/lib/exercises/math/python/pyWhileLoop1Exercise.d.ts

@@ -1,11 +1,9 @@
 import { Exercise } from "../../../exercises/exercise.js";
 type Identifiers = {
-    exercise: PyExoVariables;
-};
-type PyExoVariables = {
     a: number;
     b: number;
     op: string;
+    withInput: boolean;
 };
 export declare const pyWhileLoop1Exercise: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/python/pyWhileLoop1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pyWhileLoop1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/pyWhileLoop1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC;AAOF,KAAK,cAAc,GAAG;IACpB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA8IF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"pyWhileLoop1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/pyWhileLoop1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;CAGpB,CAAC;AAyGF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}

package/lib/exercises/math/python/pyWhileLoop1Exercise.js

@@ -1,78 +1,34 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } 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 { coinFlip } from "../../../utils/alea/coinFlip.js";
 import { random } from "../../../utils/alea/random.js";
-const exoTypes = ["16", "17"];
-const operators = ["+", "*"];
-const getPyWhileLoop1ExerciseQuestion = () => {
-    const exercise = generateRandomExercise();
-    const correctAnswer = getCorrectAnswer(exercise.exoVariables);
-    const question = {
-        answer: correctAnswer + "",
-        instruction: exercise.instruction,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { exercise: exercise.exoVariables },
+const rebuildIdentifiers = (oldIds) => {
+    if (oldIds.op)
+        return oldIds;
+    return {
+        a: oldIds.exercise.a,
+        b: oldIds.exercise.b,
+        op: oldIds.exercise.op,
+        withInput: coinFlip(),
     };
-    return question;
-};
-const getPropositions = (n, { answer, exercise }) => {
-    const propositions = [];
-    addValidProp(propositions, answer);
-    generateProposition(answer, exercise).forEach((value) => tryToAddWrongProp(propositions, value + ""));
-    const correctAnswer = getCorrectAnswer(exercise);
-    while (propositions.length < n) {
-        tryToAddWrongProp(propositions, randint(correctAnswer - 11, correctAnswer + 11, [correctAnswer, 0]) + "");
-    }
-    return shuffleProps(propositions, n);
-};
-const isAnswerValid = (ans, { exercise }) => {
-    const correctAnswer = getCorrectAnswer(exercise);
-    return "" + correctAnswer === ans;
-};
-const generateProposition = (answer, exercise) => {
-    const firstProposition = exercise.op === "*" ? +answer * exercise.b : +answer + exercise.b;
-    const secondProposition = exercise.op === "*" ? +answer / exercise.b : +answer - exercise.b;
-    return [firstProposition, secondProposition];
-};
-const getCorrectAnswer = (exercise) => {
-    switch (exercise.op) {
-        case "*":
-            return Math.pow(exercise.b, Math.ceil(Math.log(exercise.a) / Math.log(exercise.b)));
-        case "+":
-            return 1 + exercise.b * Math.ceil(exercise.a / exercise.b);
-    }
-    return exercise.b;
-};
-const generateRandomExercise = () => {
-    const combination = {
-        times: [
-            { minB: 2, maxB: 2, maxIter: 10 },
-            { minB: 3, maxB: 5, maxIter: 5 },
-        ],
-        plus: [{ minB: 2, maxB: 8, maxIter: 10 }],
-    };
-    const op = random(operators);
-    const randCombination = op === "*" ? random(combination.times) : combination.plus[0];
-    const b = randint(randCombination.minB, randCombination.maxB + 1);
-    const nbIter = randint(2, randCombination.maxIter + 1);
-    const aA = op === "+" ? Math.ceil(b * nbIter) : Math.pow(b, nbIter);
-    const a = randint(aA / b, aA);
-    const randomType = random(exoTypes);
-    const instruction = generateInstruction(randomType, a, b, op);
-    return { instruction, exoVariables: { a, b, op } };
 };
-const generateInstruction = (exoType, a, n, op) => {
-    switch (exoType) {
-        case "16":
-            return generateType16Instruction(a, n, op);
-        case "17":
-            return generateType17Instruction(a, n, op);
+const getAnswer = (identifiers) => {
+    const { a, b, withInput, op } = identifiers;
+    let n = 1;
+    while (n <= a) {
+        if (op === "+")
+            n = b + n;
+        else
+            n = b * n;
     }
-    return "";
+    return n.frenchify();
 };
-const generateType16Instruction = (a, b, op) => {
-    const instruction = `Qu'affichera le programme suivant ?
+const getInstruction = (identifiers) => {
+    const { a, b, op, withInput } = identifiers;
+    if (!withInput)
+        return `Qu'affichera le programme suivant ?
   \`\`\`
   a=${a}
   n=1
@@ -81,10 +37,7 @@ const generateType16Instruction = (a, b, op) => {
   print(n)
   \`\`\`
   `;
-    return instruction;
-};
-const generateType17Instruction = (a, b, op) => {
-    const instruction = `Qu'affichera le programme suivant, si l'utilisateur entre $${a}$ ?
+    return `Qu'affichera le programme suivant, si l'utilisateur entre $${a}$ ?
   \`\`\`
   a=input("Entrez un entier naturel non nul.")
   a=int(a)
@@ -94,18 +47,61 @@ const generateType17Instruction = (a, b, op) => {
   print(n) 
   \`\`\`
   `;
-    return instruction;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+const getPyWhileLoop1ExerciseQuestion = () => {
+    const combination = {
+        times: [
+            { minB: 2, maxB: 2, maxIter: 10 },
+            { minB: 3, maxB: 5, maxIter: 5 },
+        ],
+        plus: [{ minB: 2, maxB: 8, maxIter: 10 }],
+    };
+    const op = random(["+", "*"]);
+    const randCombination = op === "*" ? random(combination.times) : combination.plus[0];
+    const b = randint(randCombination.minB, randCombination.maxB + 1);
+    const nbIter = randint(2, randCombination.maxIter + 1);
+    const aA = op === "+" ? Math.ceil(b * nbIter) : Math.pow(b, nbIter);
+    const a = randint(aA / b, aA);
+    const withInput = coinFlip();
+    const identifiers = { a, b, op, withInput };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getPropositions = (n, { answer, a, b, withInput, op }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const firstProposition = op === "*" ? +answer * b : +answer + b;
+    tryToAddWrongProp(propositions, firstProposition + "");
+    const secondProposition = op === "*" ? +answer / b : +answer - b;
+    tryToAddWrongProp(propositions, secondProposition + "");
+    const correctAnswer = Number(getAnswer({ a, b, withInput, op }));
+    while (propositions.length < n) {
+        tryToAddWrongProp(propositions, randint(correctAnswer - 11, correctAnswer + 11, [correctAnswer, 0]) + "");
+    }
+    return shuffleProps(propositions, n);
+};
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    return numberVEA(ans, answer);
 };
 export const pyWhileLoop1Exercise = {
     id: "pyWhileLoop1Exercise",
     label: "Boucles while $1$",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Python"],
     generator: (nb) => getDistinctQuestions(getPyWhileLoop1ExerciseQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    rebuildIdentifiers,
 };

package/lib/exercises/math/python/pythonFunctionTrinom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pythonFunctionTrinom.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/pythonFunctionTrinom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoDF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"pythonFunctionTrinom.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/pythonFunctionTrinom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAsEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAYtD,CAAC"}

package/lib/exercises/math/python/pythonFunctionTrinom.js

@@ -1,17 +1,15 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
-import { TrinomConstructor } from "../../../math/polynomials/trinom.js";
+import { Trinom, TrinomConstructor } from "../../../math/polynomials/trinom.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { EqualNode } from "../../../tree/nodes/equations/equalNode.js";
 import { VariableNode } from "../../../tree/nodes/variables/variableNode.js";
-const getPythonFunctionTrinomQuestion = () => {
-    const trinom = TrinomConstructor.random();
-    const x = randint(-5, 5);
-    const image = trinom.calculate(x);
-    const equation = trinom.toPython();
-    const question = {
-        answer: image.toString(),
-        instruction: `Qu'affichera le programme suivant ?
+const getInstruction = (identifiers) => {
+    const { x, trinom } = identifiers;
+    const tri = new Trinom(trinom[0], trinom[1], trinom[2]);
+    const image = tri.calculate(x);
+    const equation = tri.toPython();
+    return `Qu'affichera le programme suivant ?
 \`\`\`
 def f(x):
     y = ${equation}
@@ -19,10 +17,26 @@ def f(x):
 y = f(${x})
 print(y)
 \`\`\`
-`,
+`;
+};
+const getAnswer = (identifiers) => {
+    const { image } = identifiers;
+    return image.frenchify();
+};
+const getPythonFunctionTrinomQuestion = () => {
+    const trinom = TrinomConstructor.random();
+    const x = randint(-5, 5);
+    const image = trinom.calculate(x);
+    const identifiers = { x, trinom: [trinom.a, trinom.b, trinom.c], image };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["f", "x", "y", "equal"],
         answerFormat: "tex",
-        identifiers: { x, trinom: [trinom.a, trinom.b, trinom.c], image },
+        identifiers,
     };
     return question;
 };
@@ -48,13 +62,12 @@ const isAnswerValid = (ans, { answer }) => {
 export const pythonFunctionTrinom = {
     id: "pythonFunctionTrinom",
     label: "Valeur de retour d'une fonction",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Python"],
     generator: (nb) => getDistinctQuestions(getPythonFunctionTrinomQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/python/whileLoop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whileLoop.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/whileLoop.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8EF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAY3C,CAAC"}
+{"version":3,"file":"whileLoop.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/python/whileLoop.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAIrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6FF,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAW3C,CAAC"}