math-exercises 2.0.0 → 2.0.2

package/lib/exercises/sequences/arithmetic/index.js

@@ -0,0 +1,23 @@
+"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("./arithmeticExplicitFormulaUsage"), exports);
+__exportStar(require("./arithmeticFindExplicitFormula"), exports);
+__exportStar(require("./arithmeticFindReason"), exports);
+__exportStar(require("./arithmeticReasonUsage"), exports);
+__exportStar(require("./arithmeticRecurrenceFormulaUsage"), exports);
+__exportStar(require("./arithmeticThresholdFind"), exports);
+__exportStar(require("./firstIntegersSum"), exports);

package/lib/exercises/sequences/explicitFormulaUsage.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     rank: number;
     coeffs: number[];
 };
-type VEAProps = {};
-export declare const explicitFormulaUsage: MathExercise<QCMProps, VEAProps>;
+export declare const explicitFormulaUsage: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=explicitFormulaUsage.d.ts.map

package/lib/exercises/sequences/explicitFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"explicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../src/exercises/sequences/explicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAsBlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAenB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"explicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../src/exercises/sequences/explicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAoCF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/sequences/explicitFormulaUsage.js

@@ -6,17 +6,17 @@ const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestio
 const polynomial_1 = require("../../math/polynomials/polynomial");
 const randint_1 = require("../../math/utils/random/randint");
 const getExplicitFormulaUsageQuestion = () => {
-    const u = polynomial_1.PolynomialConstructor.randomWithOrder(2, 'n');
+    const u = polynomial_1.PolynomialConstructor.randomWithOrder(2, "n");
     const rank = (0, randint_1.randint)(0, 4);
-    const answer = u.calculate(rank) + '';
+    const answer = u.calculate(rank) + "";
     const question = {
         answer: answer,
         instruction: `Soit $u$ la suite définie pour tout $n\\geq 0$ par $u_n = ${u
             .toTree()
             .toTex()}$. Calculer $u_${rank}$.`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, rank, coeffs: u.coefficients },
+        answerFormat: "tex",
+        identifiers: { rank, coeffs: u.coefficients },
     };
     return question;
 };
@@ -24,23 +24,27 @@ const getPropositions = (n, { answer, rank, coeffs }) => {
     const propositions = [];
     const u = new polynomial_1.Polynomial(coeffs);
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, u.calculate(rank - 1) + '');
-    (0, exercise_1.tryToAddWrongProp)(propositions, u.calculate(rank + 1) + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, u.calculate(rank - 1) + "");
+    (0, exercise_1.tryToAddWrongProp)(propositions, u.calculate(rank + 1) + "");
     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, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.explicitFormulaUsage = {
-    id: 'explicitFormulaUsage',
-    connector: '=',
+    id: "explicitFormulaUsage",
+    connector: "=",
     label: "Utiliser la formule explicite d'une suite",
-    levels: ['1reESM', '1reSpé', '1reTech'],
+    levels: ["1reESM", "1reSpé", "1reTech"],
     isSingleStep: true,
-    sections: ['Suites'],
+    sections: ["Suites"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExplicitFormulaUsageQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/sequences/genericSequenceVariations.d.ts

@@ -1,9 +1,7 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
-    root: number;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    coeffs: number[];
 };
-type VEAProps = {};
-export declare const genericSequenceVariations: MathExercise<QCMProps, VEAProps>;
+export declare const genericSequenceVariations: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=genericSequenceVariations.d.ts.map

package/lib/exercises/sequences/genericSequenceVariations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genericSequenceVariations.d.ts","sourceRoot":"","sources":["../../../src/exercises/sequences/genericSequenceVariations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AA6BlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAcnB,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYtE,CAAC"}
+{"version":3,"file":"genericSequenceVariations.d.ts","sourceRoot":"","sources":["../../../src/exercises/sequences/genericSequenceVariations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAmDF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAc/D,CAAC"}

package/lib/exercises/sequences/genericSequenceVariations.js

@@ -6,43 +6,47 @@ const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestio
 const polynomial_1 = require("../../math/polynomials/polynomial");
 const randint_1 = require("../../math/utils/random/randint");
 const getGenericSequenceVariationsQuestion = () => {
-    const u = polynomial_1.PolynomialConstructor.randomWithOrder(2, 'n');
+    const u = polynomial_1.PolynomialConstructor.randomWithOrder(2, "n");
     const [b, a] = u.coefficients.slice(1);
     const root = Math.ceil((-a - b) / (2 * a));
     const answer = root <= 0
         ? a > 0
-            ? 'Croissante'
-            : 'Décroissante'
-        : `${a > 0 ? 'Croissante' : 'Décroissante'} à partir du rang ${root}`;
+            ? "Croissante"
+            : "Décroissante"
+        : `${a > 0 ? "Croissante" : "Décroissante"} à partir du rang ${root}`;
     const question = {
         answer,
-        instruction: `Soit $u$ la suite définie par $u_n = ${u.toTree().toTex()}$. Quel est le sens de variations de $u$ ?`,
+        instruction: `Soit $u$ la suite définie par $u_n = ${u
+            .toTree()
+            .toTex()}$. Quel est le sens de variations de $u$ ?`,
         keys: [],
-        answerFormat: 'raw',
-        qcmGeneratorProps: { answer, root },
+        answerFormat: "raw",
+        identifiers: { coeffs: u.coefficients },
     };
     return question;
 };
-const getPropositions = (n, { answer, root }) => {
+const getPropositions = (n, { answer, coeffs }) => {
+    const [b, a] = coeffs.slice(1);
+    const root = Math.ceil((-a - b) / (2 * a));
     const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer, 'raw');
-    (0, exercise_1.tryToAddWrongProp)(propositions, 'Croissante', 'raw');
-    (0, exercise_1.tryToAddWrongProp)(propositions, 'Décroissante', 'raw');
+    (0, exercise_1.addValidProp)(propositions, answer, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Croissante", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Décroissante", "raw");
     let fakeRoot = root <= 0 ? (0, randint_1.randint)(1, 10) : root;
-    (0, exercise_1.tryToAddWrongProp)(propositions, `Croissante à partir du rang ${fakeRoot}`, 'raw');
-    (0, exercise_1.tryToAddWrongProp)(propositions, `Décroissante à partir du rang ${fakeRoot}`, 'raw');
+    (0, exercise_1.tryToAddWrongProp)(propositions, `Croissante à partir du rang ${fakeRoot}`, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, `Décroissante à partir du rang ${fakeRoot}`, "raw");
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 exports.genericSequenceVariations = {
-    id: 'genericSequenceVariations',
-    connector: '=',
+    id: "genericSequenceVariations",
+    connector: "=",
     label: "Déterminer le sens de variations d'une suite en étudiant la différence de deux termes",
-    levels: ['1reESM', '1rePro', '1reTech'],
+    levels: ["1reESM", "1rePro", "1reTech"],
     isSingleStep: true,
-    sections: ['Suites'],
+    sections: ["Suites"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGenericSequenceVariationsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
-    answerType: 'QCM',
+    answerType: "QCM",
     getPropositions,
 };

package/lib/exercises/sequences/geometric/geometricExplicitFormulaUsage.d.ts

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

package/lib/exercises/sequences/geometric/geometricExplicitFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricExplicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricExplicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1E,CAAC"}
+{"version":3,"file":"geometricExplicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricExplicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4CF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAanE,CAAC"}

package/lib/exercises/sequences/geometric/geometricExplicitFormulaUsage.js

@@ -8,25 +8,27 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
 const getGeometricExplicitFormulaUsage = () => {
     const askedRank = (0, randint_1.randint)(0, 10);
     const firstValue = (0, randint_1.randint)(1, 10);
     const reason = (0, randint_1.randint)(2, 10);
-    const formula = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason), new variableNode_1.VariableNode('n')));
-    const formulaTex = (0, simplify_1.simplifyNode)(formula).toTex();
+    const formula = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason), new variableNode_1.VariableNode("n")));
+    const formulaTex = formula.toTex();
     const answer = (firstValue * Math.pow(reason, askedRank)).toString();
     const question = {
         instruction: `$(u_n)$ est une suite géométrique définie par $u_n = ${formulaTex}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ['n', 'u', 'underscore'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, firstValue, reason, askedRank },
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { firstValue, reason, askedRank },
     };
     return question;
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 const getPropositions = (n, { answer, firstValue, reason, askedRank }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
@@ -36,14 +38,15 @@ const getPropositions = (n, { answer, firstValue, reason, askedRank }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.geometricExplicitFormulaUsage = {
-    id: 'geometricExplicitFormulaUsage',
-    connector: '=',
+    id: "geometricExplicitFormulaUsage",
+    connector: "=",
     label: "Utiliser la formule générale d'une suite géométrique",
-    levels: ['1reESM', '1reSpé', '1reTech', '1rePro', 'TermTech', 'TermPro'],
-    sections: ['Suites'],
+    levels: ["1reESM", "1reSpé", "1reTech", "1rePro", "TermTech", "TermPro"],
+    sections: ["Suites"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricExplicitFormulaUsage, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/sequences/geometric/geometricFindExplicitFormula.d.ts

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

package/lib/exercises/sequences/geometric/geometricFindExplicitFormula.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricFindExplicitFormula.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricFindExplicitFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAgClC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwBnB,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWzE,CAAC"}
+{"version":3,"file":"geometricFindExplicitFormula.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricFindExplicitFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAmEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/sequences/geometric/geometricFindExplicitFormula.js

@@ -5,46 +5,56 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../../tree/parsers/simplify");
 const shuffle_1 = require("../../../utils/shuffle");
 const getGeometricFindExplicitFormula = () => {
     const firstRank = 0;
     const firstValue = (0, randint_1.randint)(1, 10);
     const reason = (0, randint_1.randint)(2, 10);
-    const formula = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason), new variableNode_1.VariableNode('n')));
-    const answer = (0, simplify_1.simplifyNode)(formula).toTex();
+    const formula = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason), new variableNode_1.VariableNode("n")));
+    const answer = "u_n=" + formula.toTex();
     const question = {
         instruction: `$(u_n)$ est une suite géométrique de premier terme $u_{${firstRank}} = ${firstValue}$ et de raison $q = ${reason}$. $\\\\$ Donner l'expression de $u_n$ en fonction de $n$.`,
-        startStatement: 'u_n',
         answer,
-        keys: ['q', 'n', 'u', 'underscore'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, reason, firstValue },
+        keys: ["un", "equal", "q", "n", "u", "underscore"],
+        answerFormat: "tex",
+        identifiers: { reason, firstValue },
     };
     return question;
 };
 const getPropositions = (n, { answer, reason, firstValue }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(reason), new powerNode_1.PowerNode(new numberNode_1.NumberNode(firstValue), new variableNode_1.VariableNode('n')))).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, "u_n=" +
+        new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(reason), new powerNode_1.PowerNode(new numberNode_1.NumberNode(firstValue), new variableNode_1.VariableNode("n"))).toTex());
     while (propositions.length < n) {
-        const wrongAnswer = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue + (0, randint_1.randint)(-firstValue, 2 * firstValue + 1)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason + +(0, randint_1.randint)(-reason + 1, 2 * reason + 1)), new variableNode_1.VariableNode('n')));
-        (0, exercise_1.tryToAddWrongProp)(propositions, (0, simplify_1.simplifyNode)(wrongAnswer).toTex());
+        const wrongAnswer = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue + (0, randint_1.randint)(-firstValue, 2 * firstValue + 1)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason + +(0, randint_1.randint)(-reason + 1, 2 * reason + 1)), new variableNode_1.VariableNode("n")));
+        (0, exercise_1.tryToAddWrongProp)(propositions, "u_n=" + wrongAnswer.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { reason, firstValue }) => {
+    const formula = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(firstValue), new powerNode_1.PowerNode(new numberNode_1.NumberNode(reason), new variableNode_1.VariableNode("n")));
+    const equal = new equalNode_1.EqualNode(new variableNode_1.VariableNode("u_n"), formula, {
+        allowRawRightChildAsSolution: true,
+    });
+    const texs = equal.toAllValidTexs();
+    console.log(ans, texs);
+    return texs.includes(ans);
+};
 exports.geometricFindExplicitFormula = {
-    id: 'geometricFindExplicitFormula',
-    connector: '=',
+    id: "geometricFindExplicitFormula",
+    connector: "=",
     label: "Déterminer la formule générale d'une suite géométrique",
-    levels: ['1reESM', '1reSpé', '1reTech', '1rePro', 'TermTech', 'TermPro'],
-    sections: ['Suites'],
+    levels: ["1reESM", "1reSpé", "1reTech", "1rePro", "TermTech", "TermPro"],
+    sections: ["Suites"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricFindExplicitFormula, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/sequences/geometric/geometricFindReason.d.ts

@@ -1,10 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     value1: number;
-    value2: number;
+    reason: number;
+    rank1: number;
 };
-type VEAProps = {};
-export declare const geometricFindReason: MathExercise<QCMProps, VEAProps>;
+export declare const geometricFindReason: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=geometricFindReason.d.ts.map

package/lib/exercises/sequences/geometric/geometricFindReason.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricFindReason.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricFindReason.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}
+{"version":3,"file":"geometricFindReason.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricFindReason.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA0CF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAYzD,CAAC"}

package/lib/exercises/sequences/geometric/geometricFindReason.js

@@ -14,33 +14,38 @@ const getGeometricFindReason = () => {
     const answer = reason.toString();
     const question = {
         instruction: `$(u_n)$ est une suite géométrique. On sait que $u_{${rank1}} = ${value1}$ et $u_{${rank2}} = ${value2}$. Quelle est la raison de la suite $(u_n)$ ?`,
-        startStatement: 'q',
+        startStatement: "q",
         answer,
-        keys: ['q', 'n', 'u', 'underscore'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, value1, value2 },
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { value1, rank1, reason },
     };
     return question;
 };
-const getPropositions = (n, { answer, value1, value2 }) => {
+const getPropositions = (n, { answer, value1, rank1, reason }) => {
+    const value2 = reason * value1;
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     if (value2 - value1 !== 2)
-        (0, exercise_1.tryToAddWrongProp)(propositions, value2 - value1 + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, value2 - value1 + "");
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, Number(answer) + (0, randint_1.randint)(1, 10) + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, Number(answer) + (0, randint_1.randint)(1, 10) + "");
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.geometricFindReason = {
-    id: 'geometricFindReason',
-    connector: '=',
+    id: "geometricFindReason",
+    connector: "=",
     label: "Déterminer la raison d'une suite géométrique",
-    levels: ['1reESM', '1reSpé', '1reTech', '1rePro', 'TermTech', 'TermPro'],
-    sections: ['Suites'],
+    levels: ["1reESM", "1reSpé", "1reTech", "1rePro", "TermTech", "TermPro"],
+    sections: ["Suites"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricFindReason, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/sequences/geometric/geometricFirstTermsSum.d.ts

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

package/lib/exercises/sequences/geometric/geometricFirstTermsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricFirstTermsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricFirstTermsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAiCnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}
+{"version":3,"file":"geometricFirstTermsSum.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricFirstTermsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA2CF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAqB5D,CAAC"}

package/lib/exercises/sequences/geometric/geometricFirstTermsSum.js

@@ -6,15 +6,15 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const randint_1 = require("../../../math/utils/random/randint");
 const shuffle_1 = require("../../../utils/shuffle");
 const getGeometricFirstTermsSumQuestion = () => {
-    const raison = (0, randint_1.randint)(2, 10);
-    const final = (0, randint_1.randint)(6, 15);
-    const answer = (raison ** (final + 1) - 1) / (raison - 1);
+    const raison = (0, randint_1.randint)(2, 8);
+    const final = (0, randint_1.randint)(5, 10);
+    const answer = (raison ** (final + 1) - 1) / (raison - 1) + "";
     const question = {
-        answer: answer + '',
+        answer: answer,
         instruction: `Calculer la somme suivante : $1 + ${raison} + ${raison}^2 + \\ldots + ${raison}^{${final}}$`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer: answer + '', raison, final },
+        answerFormat: "tex",
+        identifiers: { raison, final },
     };
     return question;
 };
@@ -24,20 +24,32 @@ const getPropositions = (n, { answer, raison, final }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, (raison ** (final + 1) - 1).toString());
     (0, exercise_1.tryToAddWrongProp)(propositions, ((raison ** final - 1) / (raison - 1)).toString());
     while (propositions.length < n) {
-        const wrongAnswer = (0, randint_1.randint)(1000, 10000) + '';
+        const wrongAnswer = (0, randint_1.randint)(1000, 10000) + "";
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.geometricFirstTermsSum = {
-    id: 'geometricFirstTermsSum',
-    connector: '=',
+    id: "geometricFirstTermsSum",
+    connector: "=",
     label: "Somme des termes d'une suite géométrique",
-    levels: ['1reESM', '1rePro', '1reSpé', '1reTech', 'TermPro', 'TermSpé', 'TermTech'],
+    levels: [
+        "1reESM",
+        "1rePro",
+        "1reSpé",
+        "1reTech",
+        "TermPro",
+        "TermSpé",
+        "TermTech",
+    ],
     isSingleStep: true,
-    sections: ['Suites'],
+    sections: ["Suites"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricFirstTermsSumQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/sequences/geometric/geometricReasonUsage.d.ts

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

package/lib/exercises/sequences/geometric/geometricReasonUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricReasonUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricReasonUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA+BnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"geometricReasonUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricReasonUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA0CF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAY1D,CAAC"}

package/lib/exercises/sequences/geometric/geometricReasonUsage.js

@@ -15,9 +15,9 @@ const getGeometricReasonUsage = () => {
         instruction: `$(u_n)$ est une suite géométrique de raison $q = ${reason}$ et on sait que $u_{${startRank}} = ${startValue}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ['q', 'n', 'u', 'underscore'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, startValue, reason },
+        keys: ["q", "n", "u", "underscore"],
+        answerFormat: "tex",
+        identifiers: { startValue, reason, startRank },
     };
     return question;
 };
@@ -27,19 +27,23 @@ const getPropositions = (n, { answer, startValue, reason }) => {
     if (startValue + reason !== 4)
         (0, exercise_1.tryToAddWrongProp)(propositions, (startValue + reason).toString());
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, startValue * (reason + (0, randint_1.randint)(-reason + 1, 6, [0])) + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, startValue * (reason + (0, randint_1.randint)(-reason + 1, 6, [0])) + "");
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.geometricReasonUsage = {
-    id: 'geometricReasonUsage',
-    connector: '=',
+    id: "geometricReasonUsage",
+    connector: "=",
     label: "Utiliser la raison d'une suite géométrique",
-    levels: ['1reESM', '1reSpé', '1reTech', '1rePro', 'TermTech', 'TermPro'],
-    sections: ['Suites'],
+    levels: ["1reESM", "1reSpé", "1reTech", "1rePro", "TermTech", "TermPro"],
+    sections: ["Suites"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricReasonUsage, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.d.ts

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

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAgCnB,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5E,CAAC"}
+{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA6CF,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,WAAW,CAarE,CAAC"}