math-exercises 2.0.0 → 2.0.2

package/lib/exercises/functions/trinoms/canonicalFromDevForm.d.ts

@@ -1,9 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
+    b: number;
+    c: number;
 };
-type VEAProps = {};
-export declare const canonicalFromDevForm: MathExercise<QCMProps, VEAProps>;
+export declare const canonicalFromDevForm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=canonicalFromDevForm.d.ts.map

package/lib/exercises/functions/trinoms/canonicalFromDevForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canonicalFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/canonicalFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"canonicalFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/canonicalFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2CF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/functions/trinoms/canonicalFromDevForm.js

@@ -12,10 +12,12 @@ const getCanonicalFromDevFormQuestion = () => {
     const answer = trinom.getCanonicalForm().toTex();
     const question = {
         answer,
-        keys: ['x', 'equal', 'alpha', 'beta'],
-        instruction: `Déterminer la forme canonique de la fonction $f$ définie par $f(x) = ${trinom.toTree().toTex()}$`,
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: trinom.a },
+        keys: ["x", "equal", "alpha", "beta"],
+        instruction: `Déterminer la forme canonique de la fonction $f$ définie par $f(x) = ${trinom
+            .toTree()
+            .toTex()}$`,
+        answerFormat: "tex",
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
     };
     return question;
 };
@@ -29,15 +31,22 @@ const getPropositions = (n, { answer, a }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const trinom = new trinom_1.Trinom(a, b, c);
+    const node = trinom.getCanonicalForm();
+    const texs = node.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.canonicalFromDevForm = {
-    id: 'canonicalFromDevForm',
-    connector: '\\iff',
-    label: 'Déterminer la forme canonique à partir de la forme développée',
-    levels: ['1reSpé'],
+    id: "canonicalFromDevForm",
+    connector: "\\iff",
+    label: "Déterminer la forme canonique à partir de la forme développée",
+    levels: ["1reSpé"],
     isSingleStep: false,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCanonicalFromDevFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/functions/trinoms/deltaTrinom.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
     c: number;
 };
-type VEAProps = {};
-export declare const deltaTrinom: MathExercise<QCMProps, VEAProps>;
+export declare const deltaTrinom: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=deltaTrinom.d.ts.map

package/lib/exercises/functions/trinoms/deltaTrinom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deltaTrinom.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/deltaTrinom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYxD,CAAC"}
+{"version":3,"file":"deltaTrinom.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/deltaTrinom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwCF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/functions/trinoms/deltaTrinom.js

@@ -8,13 +8,15 @@ const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
 const getDeltaTrinomQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.random();
-    const answer = trinom.getDelta() + '';
+    const answer = trinom.getDelta() + "";
     const question = {
         answer: answer,
-        instruction: `Soit $f(x) = ${trinom.toTree().toTex()}$. Calculer le discriminant $\\Delta$.`,
+        instruction: `Soit $f(x) = ${trinom
+            .toTree()
+            .toTex()}$. Calculer le discriminant $\\Delta$.`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: trinom.a, b: trinom.b, c: trinom.c },
+        answerFormat: "tex",
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
     };
     return question;
 };
@@ -22,24 +24,29 @@ const getPropositions = (n, { answer, a, b, c }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     const bMinus4ac = b - 4 * a * c;
-    (0, exercise_1.tryToAddWrongProp)(propositions, bMinus4ac + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, bMinus4ac + "");
     const bSquarePlus4ac = b ** 2 + a * c;
-    (0, exercise_1.tryToAddWrongProp)(propositions, bSquarePlus4ac + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, bSquarePlus4ac + "");
     while (propositions.length < n) {
-        const wrongAnswer = (0, randint_1.randint)(-100, 100) + '';
+        const wrongAnswer = (0, randint_1.randint)(-100, 100) + "";
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const delta = b ** 2 - 4 * a * c;
+    return ans === delta.toString();
+};
 exports.deltaTrinom = {
-    id: 'deltaTrinom',
-    connector: '=',
+    id: "deltaTrinom",
+    connector: "=",
     getPropositions,
     label: "Calculer le discriminant d'un trinôme",
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    levels: ["1reSpé", "TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDeltaTrinomQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/functions/trinoms/extremumFromCanonicalForm.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
     c: number;
 };
-type VEAProps = {};
-export declare const extremumFromCanonicalForm: MathExercise<QCMProps, VEAProps>;
+export declare const extremumFromCanonicalForm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=extremumFromCanonicalForm.d.ts.map

package/lib/exercises/functions/trinoms/extremumFromCanonicalForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extremumFromCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/extremumFromCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoCnB,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWtE,CAAC"}
+{"version":3,"file":"extremumFromCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/extremumFromCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiDF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAc/D,CAAC"}

package/lib/exercises/functions/trinoms/extremumFromCanonicalForm.js

@@ -5,18 +5,19 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const trinom_1 = require("../../../math/polynomials/trinom");
 const randint_1 = require("../../../math/utils/random/randint");
+const pointNode_1 = require("../../../tree/nodes/geometry/pointNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getExtremumFromCanonicalFormQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.randomCanonical();
-    const answer = trinom.getSommet();
+    const answer = trinom.getSommet().toTexWithCoords();
     const question = {
         answer: answer,
         instruction: `Soit $f$ la fonction définie par $${trinom
             .getCanonicalForm()
             .toTex()}$. Quelles sont les coordonnées du sommet $S$ de la parabole représentative de $f$ ?`,
-        keys: ['S', 'equal', 'semicolon'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: trinom.a, b: trinom.b, c: trinom.c },
+        keys: ["S", "semicolon"],
+        answerFormat: "tex",
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
     };
     return question;
 };
@@ -26,23 +27,31 @@ const getPropositions = (n, { answer, a, b, c }) => {
     const trinom = new trinom_1.Trinom(a, b, c);
     const alpha = trinom.getAlpha();
     const beta = trinom.getBeta();
-    (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${beta}; ${alpha}\\right)`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${-alpha}; ${beta}\\right)`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${alpha}; ${-beta}\\right)`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${beta};${alpha}\\right)`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${-alpha};${beta}\\right)`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${alpha};${-beta}\\right)`);
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${(0, randint_1.randint)(-10, 11)}; ${(0, randint_1.randint)(-10, 11)} \\right)`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S\\left(${(0, randint_1.randint)(-10, 11)};${(0, randint_1.randint)(-10, 11)}\\right)`);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const trinom = new trinom_1.Trinom(a, b, c);
+    const sommet = trinom.getSommet();
+    const answer = new pointNode_1.PointNode(sommet);
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.extremumFromCanonicalForm = {
-    id: 'extremumFromCanonicalForm',
-    connector: '=',
+    id: "extremumFromCanonicalForm",
+    connector: "=",
     label: "Déterminer les coordonnées du sommet d'une parabole à partir de la forme canonique",
-    levels: ['1reSpé'],
+    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExtremumFromCanonicalFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/functions/trinoms/extremumTypeFromAlgebricForm.d.ts

@@ -1,9 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
+    b: number;
+    c: number;
 };
-type VEAProps = {};
-export declare const extremumTypeFromAlgebricForm: MathExercise<QCMProps, VEAProps>;
+export declare const extremumTypeFromAlgebricForm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=extremumTypeFromAlgebricForm.d.ts.map

package/lib/exercises/functions/trinoms/extremumTypeFromAlgebricForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extremumTypeFromAlgebricForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/extremumTypeFromAlgebricForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA6BnB,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzE,CAAC"}
+{"version":3,"file":"extremumTypeFromAlgebricForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/extremumTypeFromAlgebricForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiCF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/functions/trinoms/extremumTypeFromAlgebricForm.js

@@ -8,33 +8,35 @@ const coinFlip_1 = require("../../../utils/coinFlip");
 const shuffle_1 = require("../../../utils/shuffle");
 const getExtremumTypeFromAlgebricFormQuestion = () => {
     const isDevForm = (0, coinFlip_1.coinFlip)();
-    const trinom = isDevForm ? trinom_1.TrinomConstructor.random() : trinom_1.TrinomConstructor.randomCanonical();
-    const answer = trinom.a > 0 ? 'Un minimum' : 'Un maximum';
+    const trinom = isDevForm
+        ? trinom_1.TrinomConstructor.random()
+        : trinom_1.TrinomConstructor.randomCanonical();
+    const answer = trinom.a > 0 ? "Un minimum" : "Un maximum";
     const question = {
         answer: answer,
         instruction: `La fonction $f$ définie par $f(x) = ${isDevForm ? trinom.toTree().toTex() : trinom.getCanonicalForm().toTex()}$ admet-elle un maximum ou un minimum ?`,
-        answerFormat: 'raw',
+        answerFormat: "raw",
         keys: [],
-        qcmGeneratorProps: { answer, a: trinom.a },
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
     };
     return question;
 };
 const getPropositions = (n, { answer, a }) => {
     const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer, 'raw');
-    (0, exercise_1.tryToAddWrongProp)(propositions, a < 0 ? 'Un minimum' : 'Un maximum', 'raw');
-    (0, exercise_1.addWrongProp)(propositions, "Ni l'un ni l'autre", 'raw');
-    (0, exercise_1.addWrongProp)(propositions, 'On ne peut pas savoir', 'raw');
+    (0, exercise_1.addValidProp)(propositions, answer, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, a < 0 ? "Un minimum" : "Un maximum", "raw");
+    (0, exercise_1.addWrongProp)(propositions, "Ni l'un ni l'autre", "raw");
+    (0, exercise_1.addWrongProp)(propositions, "On ne peut pas savoir", "raw");
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.extremumTypeFromAlgebricForm = {
-    id: 'extremumTypeFromAlgebricForm',
+    id: "extremumTypeFromAlgebricForm",
     label: "Déterminer le type d'extremum d'une fonction du second degré via sa forme algébrique",
-    levels: ['1reSpé'],
+    levels: ["1reSpé"],
     isSingleStep: true,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExtremumTypeFromAlgebricFormQuestion, nb),
-    answerType: 'QCM',
+    answerType: "QCM",
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

package/lib/exercises/functions/trinoms/index.d.ts

@@ -0,0 +1,11 @@
+export * from "./alphaBetaFromDevForm";
+export * from "./alphaBetaInCanonicalForm";
+export * from "./canonicalFromDevForm";
+export * from "./deltaTrinom";
+export * from "./extremumFromCanonicalForm";
+export * from "./extremumTypeFromAlgebricForm";
+export * from "./niceRootsFromDevForm";
+export * from "./rootsFromDevForm";
+export * from "./rootsFromFactorizedForm";
+export * from "./variationsFromAlgebricForm";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/functions/trinoms/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC"}

package/lib/exercises/functions/trinoms/index.js

@@ -0,0 +1,26 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./alphaBetaFromDevForm"), exports);
+__exportStar(require("./alphaBetaInCanonicalForm"), exports);
+__exportStar(require("./canonicalFromDevForm"), exports);
+__exportStar(require("./deltaTrinom"), exports);
+__exportStar(require("./extremumFromCanonicalForm"), exports);
+__exportStar(require("./extremumTypeFromAlgebricForm"), exports);
+__exportStar(require("./niceRootsFromDevForm"), exports);
+__exportStar(require("./rootsFromDevForm"), exports);
+__exportStar(require("./rootsFromFactorizedForm"), exports);
+__exportStar(require("./variationsFromAlgebricForm"), exports);

package/lib/exercises/functions/trinoms/niceRootsFromDevForm.d.ts

@@ -1,8 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    b: number;
+    c: number;
 };
-type VEAProps = {};
-export declare const niceRootsFromDevForm: MathExercise<QCMProps, VEAProps>;
+export declare const niceRootsFromDevForm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=niceRootsFromDevForm.d.ts.map

package/lib/exercises/functions/trinoms/niceRootsFromDevForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"niceRootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/niceRootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgCnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYjE,CAAC"}
+{"version":3,"file":"niceRootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/niceRootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0CF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/functions/trinoms/niceRootsFromDevForm.js

@@ -5,23 +5,27 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const trinom_1 = require("../../../math/polynomials/trinom");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getRootsFromDevFormQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.randomFactorized();
     const answer = trinom.getRootsEquationSolutionTex();
     const question = {
         answer: answer,
-        instruction: `Soit $f(x) = ${trinom.toTree().toTex()}$. Résoudre l'équation $f(x) = 0$.`,
-        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
-        qcmGeneratorProps: { answer },
-        answerFormat: 'tex',
+        instruction: `Soit $f(x) = ${trinom
+            .toTree()
+            .toTex()}$. Résoudre l'équation $f(x) = 0$.`,
+        keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "emptyset"],
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
+        answerFormat: "tex",
     };
     return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, 'S=\\emptyset');
+    (0, exercise_1.tryToAddWrongProp)(propositions, "S=\\emptyset");
     while (propositions.length < n) {
         let wrongX1 = (0, randint_1.randint)(-19, 0);
         let wrongX2 = (0, randint_1.randint)(0, 20);
@@ -30,14 +34,22 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const trinom = new trinom_1.Trinom(a, b, c);
+    const roots = trinom.getRootsNode();
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots));
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.niceRootsFromDevForm = {
-    id: 'niceRootsFromDevForm',
-    connector: '\\iff',
+    id: "niceRootsFromDevForm",
+    connector: "\\iff",
     getPropositions,
-    label: 'Résoudre une équation du second degré (solutions entières)',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    isAnswerValid,
+    label: "Résoudre une équation du second degré (solutions entières)",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRootsFromDevFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/functions/trinoms/rootsFromDevForm.d.ts

@@ -1,8 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    b: number;
+    c: number;
 };
-type VEAProps = {};
-export declare const rootsFromDevForm: MathExercise<QCMProps, VEAProps>;
+export declare const rootsFromDevForm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=rootsFromDevForm.d.ts.map

package/lib/exercises/functions/trinoms/rootsFromDevForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/rootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY7D,CAAC"}
+{"version":3,"file":"rootsFromDevForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/rootsFromDevForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2CF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/functions/trinoms/rootsFromDevForm.js

@@ -5,23 +5,27 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const trinom_1 = require("../../../math/polynomials/trinom");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getRootsFromDevFormQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.random();
     const answer = trinom.getRootsEquationSolutionTex();
     const question = {
         answer: answer,
-        instruction: `Soit $f(x) = ${trinom.toTree().toTex()}$. Résoudre l'équation $f(x) = 0$.`,
-        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        instruction: `Soit $f(x) = ${trinom
+            .toTree()
+            .toTex()}$. Résoudre l'équation $f(x) = 0$.`,
+        keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "emptyset"],
+        answerFormat: "tex",
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
     };
     return question;
 };
 const getPropositions = (n, { answer }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, 'S=\\emptyset');
+    (0, exercise_1.tryToAddWrongProp)(propositions, "S=\\emptyset");
     while (propositions.length < n) {
         let wrongX1 = (0, randint_1.randint)(-19, 0);
         let wrongX2 = (0, randint_1.randint)(0, 20);
@@ -30,15 +34,23 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const trinom = new trinom_1.Trinom(a, b, c);
+    const roots = trinom.getRootsNode();
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots));
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.rootsFromDevForm = {
-    id: 'rootsFromDevForm',
-    connector: '\\iff',
+    id: "rootsFromDevForm",
+    connector: "\\iff",
     getPropositions,
-    label: 'Résoudre une équation du second degré',
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    label: "Résoudre une équation du second degré",
+    levels: ["1reSpé", "TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRootsFromDevFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/functions/trinoms/rootsFromFactorizedForm.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
     c: number;
 };
-type VEAProps = {};
-export declare const rootsFromFactorizedForm: MathExercise<QCMProps, VEAProps>;
+export declare const rootsFromFactorizedForm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=rootsFromFactorizedForm.d.ts.map

package/lib/exercises/functions/trinoms/rootsFromFactorizedForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsFromFactorizedForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/rootsFromFactorizedForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWpE,CAAC"}
+{"version":3,"file":"rootsFromFactorizedForm.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/trinoms/rootsFromFactorizedForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}

package/lib/exercises/functions/trinoms/rootsFromFactorizedForm.js

@@ -5,18 +5,22 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const trinom_1 = require("../../../math/polynomials/trinom");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const oppositeNode_1 = require("../../../tree/nodes/functions/oppositeNode");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getRootsFromFactorizedFormQuestion = () => {
     const trinom = trinom_1.TrinomConstructor.randomFactorized();
     const answer = trinom.getRootsEquationSolutionTex();
     const question = {
         answer: answer,
-        instruction: `Soit $f(x) = ${trinom.getFactorizedForm().toTex()}$. Résoudre l'équation $f(x) = 0$.`,
-        keys: ['S', 'equal', 'lbrace', 'semicolon', 'rbrace', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: trinom.a, b: trinom.b, c: trinom.c },
+        instruction: `Soit $f(x) = ${trinom
+            .getFactorizedForm()
+            .toTex()}$. Résoudre l'équation $f(x) = 0$.`,
+        keys: ["S", "equal", "lbrace", "semicolon", "rbrace", "emptyset"],
+        answerFormat: "tex",
+        identifiers: { a: trinom.a, b: trinom.b, c: trinom.c },
     };
     return question;
 };
@@ -26,32 +30,41 @@ const getPropositions = (n, { answer, a, b, c }) => {
     const trinom = new trinom_1.Trinom(a, b, c);
     const roots = trinom.getRoots();
     if (roots.length === 1 && roots[0] !== 0) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[0]))}\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[0])).toTex()}\\right\\}`);
     }
     if (roots.length === 2 && roots[0] !== 0) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[0])).toTex()};${roots[1]}\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[0])).toTex()};${roots[1]}\\right\\}`);
     }
     if (roots.length === 2 && roots[1] !== 0) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{${roots[0]};${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[1])).toTex()}\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${roots[0]};${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[1])).toTex()}\\right\\}`);
     }
     if (roots.length === 2 && roots[0] !== 0 && roots[1] !== 0) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\{${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[0])).toTex()};${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[1])).toTex()}\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[0])).toTex()};${new oppositeNode_1.OppositeNode(new numberNode_1.NumberNode(roots[1])).toTex()}\\right\\}`);
     }
     while (propositions.length < n) {
-        const wrongAnswer = `S=\\{${(0, randint_1.randint)(-10, 11)};${(0, randint_1.randint)(-10, 11)}\\}`;
+        const wrongAnswer = `S=\\left\\{${(0, randint_1.randint)(-10, 11)};${(0, randint_1.randint)(-10, 11)}\\right\\}`;
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const trinom = new trinom_1.Trinom(a, b, c);
+    const roots = trinom.getRootsNode();
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(roots));
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.rootsFromFactorizedForm = {
-    id: 'rootsFromFactorizedForm',
-    connector: '=',
+    id: "rootsFromFactorizedForm",
+    connector: "=",
     label: "Déterminer les racines d'un trinôme à partir de sa forme factorisée",
-    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    levels: ["1reSpé", "TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: ['Second degré'],
+    sections: ["Second degré"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRootsFromFactorizedFormQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };