math-exercises 3.0.69 → 3.0.71

package/lib/exercises/math/derivation/derivative/quotientDerivative.js

@@ -41,6 +41,9 @@ const getProductDerivativeQuestion = () => {
         poly1Coeffs: poly1.coefficients,
         poly2Coeffs: poly2.coefficients,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnwer(identifiers),
         instruction: getInstruction(identifiers),
@@ -95,4 +98,5 @@ export const quotientDerivative = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/derivation/derivative/sqrt/rootFunctionDerivative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/sqrt/rootFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+FF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAiBxD,CAAC"}
+{"version":3,"file":"rootFunctionDerivative.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/sqrt/rootFunctionDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoGF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAkBxD,CAAC"}

package/lib/exercises/math/derivation/derivative/sqrt/rootFunctionDerivative.js

@@ -54,6 +54,9 @@ ${alignTex([
 const getRootFunctionDerivative = () => {
     const a = randint(-19, 20, [0, 1]);
     const identifiers = { a };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
         startStatement: `f'(x)`,
@@ -112,4 +115,5 @@ export const rootFunctionDerivative = {
     getInstruction,
     getAnswer,
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/derivation/derivative/sqrt/sqrtCompositionDerivation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqrtCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/sqrt/sqrtCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqFF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"sqrtCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/sqrt/sqrtCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA0FF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAe3D,CAAC"}

package/lib/exercises/math/derivation/derivative/sqrt/sqrtCompositionDerivation.js

@@ -27,6 +27,9 @@ const getAnswer = (identifiers) => {
 const getSqrtCompositionDerivationQuestion = () => {
     const affine = AffineConstructor.random();
     const identifiers = { affineA: affine.a, affineB: affine.b };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -74,4 +77,5 @@ export const sqrtCompositionDerivation = {
     subject: "Mathématiques",
     getAnswer,
     getInstruction,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"cosCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/cosCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmFF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"cosCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/cosCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwFF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}

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

@@ -26,6 +26,9 @@ const getAnswer = (identifiers) => {
 const getCosCompositionDerivationQuestion = () => {
     const affine = AffineConstructor.random(undefined, { excludes: [0] });
     const identifiers = { affineA: affine.a, affineB: affine.b };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -78,4 +81,5 @@ export const cosCompositionDerivation = {
     subject: "Mathématiques",
     getAnswer,
     getInstruction,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"cosSecondDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/cosSecondDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AA+HF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAa3D,CAAC"}
+{"version":3,"file":"cosSecondDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/cosSecondDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAqIF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}

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

@@ -32,6 +32,9 @@ const getCosSecondDegreeDerivativeQuestion = () => {
     const affine = AffineConstructor.random();
     const affinecoeffs = affine.coefficients;
     const identifiers = { affinecoeffs };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -100,4 +103,5 @@ export const cosSecondDegreeDerivative = {
     subject: "Mathématiques",
     getAnswer,
     getInstruction,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"sinCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/sinCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAkFF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"sinCompositionDerivation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/sinCompositionDerivation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwFF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAe1D,CAAC"}

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

@@ -24,6 +24,9 @@ const getAnswer = (identifiers) => {
 const getSinCompositionDerivationQuestion = () => {
     const affine = AffineConstructor.random(undefined, { excludes: [0] });
     const identifiers = { affineA: affine.a, affineB: affine.b };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -67,4 +70,5 @@ export const sinCompositionDerivation = {
     subject: "Mathématiques",
     getInstruction,
     getAnswer,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"sinSecondDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/sinSecondDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAkIF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAa3D,CAAC"}
+{"version":3,"file":"sinSecondDegreeDerivative.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/derivation/derivative/trigo/sinSecondDegreeDerivative.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAwIF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,CAc3D,CAAC"}

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

@@ -30,6 +30,9 @@ const getSinSecondDegreeDerivativeQuestion = () => {
     const affine = AffineConstructor.random();
     const affinecoeffs = affine.coefficients;
     const identifiers = { affinecoeffs };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -88,4 +91,5 @@ export const sinSecondDegreeDerivative = {
     subject: "Mathématiques",
     getAnswer,
     getInstruction,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/equaDiff/equaDiffCheckSolutionFirstOrder.d.ts

@@ -1,9 +1,10 @@
 import { Exercise } from "../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
     type: string;
-    d: number;
-    e: number;
-    f: number | undefined;
+    randFuncIdentifiers: NodeIdentifiers;
+    equaDiffIdentifiers: NodeIdentifiers;
+    isSolution: boolean;
 };
 export declare const equaDiffCheckSolutionFirstOrder: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/equaDiff/equaDiffCheckSolutionFirstOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equaDiffCheckSolutionFirstOrder.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/equaDiff/equaDiffCheckSolutionFirstOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvB,CAAC;AAwHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAejE,CAAC"}
+{"version":3,"file":"equaDiffCheckSolutionFirstOrder.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/equaDiff/equaDiffCheckSolutionFirstOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAcrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAE7C,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,eAAe,CAAC;IACrC,mBAAmB,EAAE,eAAe,CAAC;IACrC,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AA+IF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/equaDiff/equaDiffCheckSolutionFirstOrder.js

@@ -11,11 +11,35 @@ import { VariableNode } from "../../../tree/nodes/variables/variableNode.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
 import { doWhile } from "../../../utils/doWhile.js";
 import { random } from "../../../utils/alea/random.js";
+import { reifyAlgebraic, } from "../../../tree/nodes/nodeConstructor.js";
+const getInstruction = (identifiers) => {
+    const { type, equaDiffIdentifiers, randFuncIdentifiers, isSolution } = identifiers;
+    return `Soit l'équation différentielle suivante : 
+    
+$$
+${reifyAlgebraic(equaDiffIdentifiers).toTex()}
+$$
+  
+La fonction $y = ${reifyAlgebraic(randFuncIdentifiers).toTex()}$ est-elle solution de cette équation ?`;
+};
+const getAnswer = (identifiers) => {
+    const answer = identifiers.isSolution ? "Oui" : "Non";
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "raw",
+        identifiers,
+    };
+    return question;
+};
 const getEquaDiffCheckSolutionFirstOrderQuestion = () => {
     //types : constante, affine, tirnom, exp
     const type = random(["affine", "trinom", "exp"]);
     const isSolution = coinFlip();
-    const answer = isSolution ? "Oui" : "Non";
     let equaDiff;
     let randomFunc;
     let d;
@@ -63,20 +87,13 @@ const getEquaDiffCheckSolutionFirstOrderQuestion = () => {
                 : doWhile(() => new MultiplyNode(randint(-5, 5, [0]).toTree(), new ExpNode(new MultiplyNode(e.toTree(), new VariableNode("x")))), (P) => P.equals(expSolution));
             break;
     }
-    const question = {
-        answer,
-        instruction: `Soit l'équation différentielle suivante : 
-    
-$$
-${equaDiff.toTex()}
-$$
-
-La fonction $y = ${randomFunc.toTex()}$ est-elle solution de cette équation ?`,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { type, d, e, f },
+    const identifiers = {
+        type,
+        isSolution,
+        equaDiffIdentifiers: equaDiff.toIdentifiers(),
+        randFuncIdentifiers: randomFunc.toIdentifiers(),
     };
-    return question;
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -92,9 +109,7 @@ const isAnswerValid = (ans, { answer }) => {
 export const equaDiffCheckSolutionFirstOrder = {
     id: "equaDiffCheckSolutionFirstOrder",
     label: "Vérifier si une fonction est solution d'une équation différentielle du premier ordre",
-    levels: ["TermTech", "MathComp", "TermSpé"],
     isSingleStep: true,
-    sections: ["Équations différentielles"],
     generator: (nb) => getDistinctQuestions(getEquaDiffCheckSolutionFirstOrderQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -102,4 +117,5 @@ export const equaDiffCheckSolutionFirstOrder = {
     isAnswerValid,
     answerType: "QCU",
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/exponential/expFactorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expFactorization.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expFactorization.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAkKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}
+{"version":3,"file":"expFactorization.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expFactorization.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAkKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAkBlD,CAAC"}

package/lib/exercises/math/functions/exponential/expFactorization.js

@@ -150,4 +150,5 @@ export const expFactorization = {
     // getCorrection,
     getAnswer,
     // hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/trinoms/equation/secondDegreeInequation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondDegreeInequation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/equation/secondDegreeInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAgB9C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AAwHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}
+{"version":3,"file":"secondDegreeInequation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/equation/secondDegreeInequation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAoB9C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AAqJF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAcxD,CAAC"}

package/lib/exercises/math/functions/trinoms/equation/secondDegreeInequation.js

@@ -5,20 +5,59 @@ import { Trinom } from "../../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../../math/utils/random/randint.js";
 import { InequationSolutionNode } from "../../../../../tree/nodes/inequations/inequationSolutionNode.js";
 import { MinusInfinityNode, PlusInfinityNode, } from "../../../../../tree/nodes/numbers/infiniteNode.js";
-import { NumberNode } from "../../../../../tree/nodes/numbers/numberNode.js";
-import { ClosureType } from "../../../../../tree/nodes/sets/closure.js";
-import { IntervalNode } from "../../../../../tree/nodes/sets/intervalNode.js";
+import { Closure, ClosureType } from "../../../../../tree/nodes/sets/closure.js";
+import { IntervalNode, } from "../../../../../tree/nodes/sets/intervalNode.js";
 import { UnionIntervalNode } from "../../../../../tree/nodes/sets/unionIntervalNode.js";
 import { unionIntervalParser } from "../../../../../tree/parsers/unionIntervalParser.js";
+import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
 import { handleVEAError } from "../../../../../utils/errors/handleVEAError.js";
-const getAnswer = ({ a, roots, ineqType }) => {
+const getInstruction = (identifiers) => {
+    const { a, b, c, ineqType } = identifiers;
+    const ineq = new InequationSymbol(ineqType);
+    const trinom = new Trinom(a, b, c);
+    return `Soit $f$ la fonction définie par 
+  
+$$
+f(x) = ${trinom.toTree().toTex()}
+$$
+
+Résoudre l'inéquation $f(x) ${ineq.symbol} 0$.`;
+};
+const getAnswer = (identifiers) => {
+    const answer = getAnswerNode(identifiers).toTex();
+    return answer;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [
+            "S",
+            "equal",
+            "lbracket",
+            "semicolon",
+            "rbracket",
+            "cup",
+            "infty",
+            "varnothing",
+        ],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+const getAnswerNode = (identifiers) => {
+    const { a, b, c, ineqType } = identifiers;
+    const ineq = new InequationSymbol(ineqType);
+    const trinom = new Trinom(a, b, c);
+    const roots = trinom.getRootsNode();
     const aPositive = a > 0;
-    const insideInterval = new IntervalNode(roots[0], roots[1], ineqType.isStrict ? ClosureType.OO : ClosureType.FF);
+    const insideInterval = new IntervalNode(roots[0], roots[1], ineq.isStrict ? ClosureType.OO : ClosureType.FF);
     const outsideUnion = new UnionIntervalNode([
-        new IntervalNode(MinusInfinityNode, roots[0], ineqType.isStrict ? ClosureType.OO : ClosureType.OF),
-        new IntervalNode(roots[1], PlusInfinityNode, ineqType.isStrict ? ClosureType.OO : ClosureType.FO),
+        new IntervalNode(MinusInfinityNode, roots[0], ineq.isStrict ? ClosureType.OO : ClosureType.OF),
+        new IntervalNode(roots[1], PlusInfinityNode, ineq.isStrict ? ClosureType.OO : ClosureType.FO),
     ]);
-    const tree = ineqType.isSup
+    const tree = ineq.isSup
         ? aPositive
             ? outsideUnion
             : insideInterval
@@ -31,47 +70,41 @@ const getSecondDegreeInequationQuestion = () => {
     const a = randint(-5, 6, [0]);
     const x1 = randint(-5, 6);
     const x2 = randint(-5, 6, [x1]);
-    const roots = x1 < x2
-        ? [new NumberNode(x1), new NumberNode(x2)]
-        : [new NumberNode(x2), new NumberNode(x1)];
     const c = a * x1 * x2;
     const b = -a * x2 - a * x1;
     const trinom = new Trinom(a, b, c);
     const ineqType = InequationSymbolConstructor.random();
-    const answer = getAnswer({ a: trinom.a, roots, ineqType }).toTex();
-    const question = {
-        answer,
-        instruction: `Soit $f(x) = ${trinom
-            .toTree()
-            .toTex()}$. Résoudre l'inéquation $f(x) ${ineqType.symbol} 0$.`,
-        keys: [
-            "S",
-            "equal",
-            "lbracket",
-            "semicolon",
-            "rbracket",
-            "cup",
-            "infty",
-            "varnothing",
-        ],
-        answerFormat: "tex",
-        identifiers: {
-            a: trinom.a,
-            b: trinom.b,
-            c: trinom.c,
-            ineqType: ineqType.symbol,
-        },
+    const identifiers = {
+        a: trinom.a,
+        b: trinom.b,
+        c: trinom.c,
+        ineqType: ineqType.symbol,
     };
-    return question;
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, a, b, c, ineqType }) => {
     const propositions = [];
     addValidProp(propositions, answer);
-    const roots = new Trinom(a, b, c).getRootsNode();
     const ineq = new InequationSymbol(ineqType);
-    tryToAddWrongProp(propositions, getAnswer({ a: -a, ineqType: ineq, roots }).toTex());
-    tryToAddWrongProp(propositions, getAnswer({ a, ineqType: ineq.toStrictnessToggled(), roots }).toTex());
-    tryToAddWrongProp(propositions, getAnswer({ a: -a, ineqType: ineq.toStrictnessToggled(), roots }).toTex());
+    tryToAddWrongProp(propositions, getAnswerNode({
+        a,
+        ineqType: ineq.toStrictnessToggled().symbol,
+        b,
+        c,
+    }).toTex());
+    while (propositions.length < n) {
+        let x1 = randint(-5, 6, [0]);
+        let x2 = randint(-5, 6, [x1]);
+        if (x1 > x2)
+            [x1, x2] = [x2, x1];
+        const interval = coinFlip()
+            ? new IntervalNode(x1.toTree(), x2.toTree(), Closure.random())
+            : new UnionIntervalNode([
+                new IntervalNode(MinusInfinityNode, x1.toTree(), ClosureType.OF),
+                new IntervalNode(x2.toTree(), PlusInfinityNode, ClosureType.FO),
+            ]);
+        tryToAddWrongProp(propositions, `S=\\ ${interval.toTex()}`);
+    }
     return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer, a, b, c, ineqType }) => {
@@ -89,9 +122,7 @@ export const secondDegreeInequation = {
     id: "secondDegreeInequation",
     connector: "\\iff",
     label: "Résoudre une inéquation du second degré",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Inéquations", "Second degré"],
     generator: (nb) => getDistinctQuestions(getSecondDegreeInequationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -99,4 +130,5 @@ export const secondDegreeInequation = {
     isAnswerValid,
     subject: "Mathématiques",
     pdfOptions: { shouldSpreadPropositions: true },
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/trinoms/summitAndCanonical/alphaBetaInCanonicalForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alphaBetaInCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/summitAndCanonical/alphaBetaInCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA4DF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"alphaBetaInCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/summitAndCanonical/alphaBetaInCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA+EF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/math/functions/trinoms/summitAndCanonical/alphaBetaInCanonicalForm.js

@@ -6,26 +6,43 @@ import { OppositeNode } from "../../../../../tree/nodes/functions/oppositeNode.j
 import { NumberNode } from "../../../../../tree/nodes/numbers/numberNode.js";
 import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../../utils/alea/shuffle.js";
-const getAlphaBetaInCanonicalFormQuestion = () => {
-    const trinom = TrinomConstructor.randomCanonical();
-    const param = coinFlip() ? "\\alpha" : "\\beta";
-    const alpha = trinom.getAlpha();
-    const beta = trinom.getBeta();
-    const alphaTex = trinom.getAlphaNode().toTex();
-    const betaTex = trinom.getBetaNode().toTex();
-    const answer = param === "\\alpha" ? alphaTex : betaTex;
+const getInstruction = (identifiers) => {
+    const { param, a, alpha, beta } = identifiers;
+    const trinom = TrinomConstructor.fromAlphaBeta({ a, alpha, beta });
+    return `Soit $f$ la fonction définie par 
+  
+$$
+f(x) = ${trinom.getCanonicalForm().toTex()}
+$$
+      
+Que vaut $${param}$ ?`;
+};
+const getAnswer = (identifiers) => {
+    const { param, a, alpha, beta } = identifiers;
+    return param === "\\alpha" ? alpha.frenchify() : beta.frenchify();
+};
+const getStartStatement = (identifiers) => {
+    return identifiers.param;
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
-        instruction: `Soit $f$ la fonction définie par $f(x) = ${trinom
-            .getCanonicalForm()
-            .toTex()}$. Que vaut $${param}$ ?`,
-        answer: answer,
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["x", "alpha", "beta"],
         answerFormat: "tex",
-        startStatement: param,
-        identifiers: { param, a: trinom.a, alpha, beta },
+        startStatement: getStartStatement(identifiers),
+        identifiers,
     };
     return question;
 };
+const getAlphaBetaInCanonicalFormQuestion = () => {
+    const trinom = TrinomConstructor.randomCanonical();
+    const param = coinFlip() ? "\\alpha" : "\\beta";
+    const alpha = trinom.getAlpha();
+    const beta = trinom.getBeta();
+    const identifiers = { param, a: trinom.a, alpha, beta };
+    return getQuestionFromIdentifiers(identifiers);
+};
 const getPropositions = (n, { answer, param, alpha, beta, a }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -52,13 +69,12 @@ export const alphaBetaInCanonicalForm = {
     id: "alphaInCanonicalForm",
     connector: "=",
     label: "Identifier $\\alpha$ et $\\beta$ dans la forme canonique",
-    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ["Second degré"],
     generator: (nb) => getDistinctQuestions(getAlphaBetaInCanonicalFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/functions/trinoms/summitAndCanonical/summitReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summitReading.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/summitAndCanonical/summitReading.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,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4EF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAgB/C,CAAC"}
+{"version":3,"file":"summitReading.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/trinoms/summitAndCanonical/summitReading.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,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4EF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAe/C,CAAC"}

package/lib/exercises/math/functions/trinoms/summitAndCanonical/summitReading.js

@@ -63,9 +63,7 @@ const isAnswerValid = (ans, { answer }) => {
 export const summitReading = {
     id: "summitReading",
     label: "Déterminer graphiquement les coordonnées du sommet d'une parabole",
-    levels: ["1rePro", "1reSpé"],
     isSingleStep: true,
-    sections: ["Second degré"],
     generator: (nb) => getDistinctQuestions(getSummitReadingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -76,4 +74,5 @@ export const summitReading = {
     getInstruction,
     getAnswer,
     getGGBOptions,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/geometry/areas/circleRadiusFromArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circleRadiusFromArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/circleRadiusFromArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA+FF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAiBtD,CAAC"}
+{"version":3,"file":"circleRadiusFromArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/circleRadiusFromArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA+FF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAkBtD,CAAC"}

package/lib/exercises/math/geometry/areas/circleRadiusFromArea.js

@@ -106,4 +106,5 @@ export const circleRadiusFromArea = {
     getAnswer,
     hasHintAndCorrection: true,
     shouldHaveCalculator: true,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/geometry/areas/squareSideFromArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"squareSideFromArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/squareSideFromArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAqEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAgBpD,CAAC"}
+{"version":3,"file":"squareSideFromArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/squareSideFromArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAqEF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAiBpD,CAAC"}

package/lib/exercises/math/geometry/areas/squareSideFromArea.js

@@ -73,5 +73,6 @@ export const squareSideFromArea = {
     getHint,
     getCorrection,
     getAnswer,
+    getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/shapes/basicShapesNaming.d.ts

@@ -1,7 +1,10 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { LineIdentifiers } from "../../../../math/geometry/line.js";
+import { RayIdentifiers } from "../../../../math/geometry/ray.js";
+import { SegmentIdentifiers } from "../../../../math/geometry/segment.js";
 type Identifiers = {
     type: number;
-    commands: string[];
+    objIds: SegmentIdentifiers | RayIdentifiers | LineIdentifiers;
 };
 export declare const basicShapesNaming: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/geometry/shapes/basicShapesNaming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicShapesNaming.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/shapes/basicShapesNaming.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AA8FxD,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}
+{"version":3,"file":"basicShapesNaming.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/shapes/basicShapesNaming.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAGL,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAGL,cAAc,EACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,kBAAkB,EACnB,MAAM,gCAAgC,CAAC;AAKxC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,kBAAkB,GAAG,cAAc,GAAG,eAAe,CAAC;CAC/D,CAAC;AA8JF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAenD,CAAC"}