math-exercises 3.0.189 → 3.0.191

package/lib/exercises/math/geometry/vectors/scalarProduct/scalarProductComputeBH.js

@@ -1,5 +1,6 @@
 import { addValidProp, shuffleProps, GeneratorOptionType, GeneratorOptionTarget, tryToAddWrongProp, propWhile, } from "../../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../../exercises/utils/getDistinctQuestions.js";
+import { defaultArrayedOptsWhereNeeded } from "../../../../../exercises/utils/options/arrayedOptions.js";
 import { orange } from "../../../../../geogebra/colors.js";
 import { GeogebraConstructor } from "../../../../../geogebra/geogebraConstructor.js";
 import { Angle } from "../../../../../math/geometry/angle.js";
@@ -248,10 +249,10 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
     }
 };
 const getScalarProductComputeBHQuestion = (optsIn) => {
-    const arrayedOptions = optsIn ?? optsDefault;
+    const arrayedOpts = defaultArrayedOptsWhereNeeded(optsIn, arrayedOptsDefault);
     const opts = {
-        sectorOfPointH: random(arrayedOptions.sectorOfPointH),
-        isPositiveCoordsOnly: arrayedOptions.isPositiveCoordsOnly,
+        sectorOfPointH: random(arrayedOpts.sectorOfPointH),
+        isPositiveCoordsOnly: arrayedOpts.isPositiveCoordsOnly,
     };
     const { sectorOfPointH, isPositiveCoordsOnly } = opts;
     function createRandomIdentifiers() {
@@ -406,7 +407,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
     };
     return question;
 };
-const optsDefault = {
+const arrayedOptsDefault = {
     sectorOfPointH: ["Entre $B$ et $C$"],
     isPositiveCoordsOnly: true,
 };
@@ -417,14 +418,14 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         values: ["Entre $B$ et $C$", "Après $C$", "Avant $B$"],
-        defaultValue: optsDefault.sectorOfPointH,
+        defaultValue: arrayedOptsDefault.sectorOfPointH,
     },
     {
         id: "isPositiveCoordsOnly",
         label: "Coordonnées positives uniquement",
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.checkbox,
-        defaultValue: optsDefault.isPositiveCoordsOnly,
+        defaultValue: arrayedOptsDefault.isPositiveCoordsOnly,
     },
 ];
 export const scalarProductComputeBH = {

package/lib/exercises/math/percent/percentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA4JF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAsBF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe3D,CAAC"}
+{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA2JF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAsBF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe3D,CAAC"}

package/lib/exercises/math/percent/percentToDecimal.js

@@ -1,5 +1,6 @@
 import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { defaultArrayedOptsWhereNeeded } from "../../../exercises/utils/options/arrayedOptions.js";
 import { Decimal, DecimalConstructor, } from "../../../math/numbers/decimals/decimal.js";
 import { Integer, IntegerConstructor, } from "../../../math/numbers/integer/integer.js";
 import { randint } from "../../../math/utils/random/randint.js";
@@ -82,9 +83,9 @@ const isAnswerValid = (ans, { answer, isPercentToDecimal }) => {
     }
 };
 const getPercentToDecimalQuestion = (optsIn) => {
-    const arrayedOptions = optsIn ?? optsDefault;
+    const arrayedOpts = defaultArrayedOptsWhereNeeded(optsIn, arrayedOptsDefault);
     const opts = {
-        conversionType: random(arrayedOptions.conversionType),
+        conversionType: random(arrayedOpts.conversionType),
     };
     const isPercentToDecimal = opts.conversionType === "Pourcentage vers Décimal";
     const isNatural = coinFlip();
@@ -119,7 +120,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
     };
     return question;
 };
-const optsDefault = {
+const arrayedOptsDefault = {
     conversionType: ["Pourcentage vers Décimal", "Décimal vers Pourcentage"],
 };
 const options = [
@@ -129,7 +130,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         values: ["Pourcentage vers Décimal", "Décimal vers Pourcentage"],
-        defaultValue: optsDefault.conversionType,
+        defaultValue: arrayedOptsDefault.conversionType,
     },
 ];
 export const percentToDecimal = {

package/lib/exercises/math/probaStat/basicStats/calculateFrequencyInList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateFrequencyInList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/basicStats/calculateFrequencyInList.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA8LF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAsBF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBnE,CAAC"}
+{"version":3,"file":"calculateFrequencyInList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/basicStats/calculateFrequencyInList.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA8LF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAsBF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBnE,CAAC"}

package/lib/exercises/math/probaStat/basicStats/calculateFrequencyInList.js

@@ -1,5 +1,6 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, propWhile, GeneratorOptionTarget, GeneratorOptionType, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { defaultArrayedOptsWhereNeeded } from "../../../../exercises/utils/options/arrayedOptions.js";
 import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
@@ -95,8 +96,8 @@ const isAnswerValid = (ans, { answer, ...identifiers }) => {
     }
 };
 const getCalculateFrequencyInListQuestion = (optsIn) => {
-    const opts = optsIn ?? optsDefault;
-    const allowedAnsType = opts.allowedAnsType;
+    const arrayedOpts = defaultArrayedOptsWhereNeeded(optsIn, arrayedOptsDefault);
+    const allowedAnsType = arrayedOpts.allowedAnsType;
     const target = randint(1, 10);
     const length = randint(6, 13);
     const values = [];
@@ -150,7 +151,7 @@ const getAllValidNodes = (identifiers) => {
         return identifiersCopy;
     })()));
 };
-const optsDefault = {
+const arrayedOptsDefault = {
     allowedAnsType: ["exacte", "arrondie à 2 décimales"],
 };
 const options = [
@@ -160,7 +161,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         values: ["exacte", "arrondie à 2 décimales"],
-        defaultValue: optsDefault.allowedAnsType,
+        defaultValue: arrayedOptsDefault.allowedAnsType,
     },
 ];
 export const calculateFrequencyInList = {

package/lib/exercises/math/probaStat/probaFromTableWithContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,uBAAuB,EAAE,MAAM,CAAC;QAChC,uBAAuB,EAAE,MAAM,CAAC;QAChC,mCAAmC,EAAE,MAAM,CAAC;KAC7C,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA+ZF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AA+BF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBpE,CAAC"}
+{"version":3,"file":"probaFromTableWithContext.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/probaStat/probaFromTableWithContext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,uBAAuB,EAAE,MAAM,CAAC;QAChC,uBAAuB,EAAE,MAAM,CAAC;QAChC,mCAAmC,EAAE,MAAM,CAAC;KAC7C,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AA6ZF,KAAK,OAAO,GAAG;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AA+BF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBpE,CAAC"}

package/lib/exercises/math/probaStat/probaFromTableWithContext.js

@@ -1,5 +1,6 @@
 import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { defaultArrayedOptsWhereNeeded } from "../../../exercises/utils/options/arrayedOptions.js";
 import { rationalVEA } from "../../../exercises/vea/rationalVEA.js";
 import { Rational } from "../../../math/numbers/rationals/rational.js";
 import { randint } from "../../../math/utils/random/randint.js";
@@ -74,8 +75,8 @@ const getAnswer = (identifiers) => {
     return getAnswerNode(identifiers).toTex();
 };
 const getProbaFromTableWithContextQuestion = (optsIn) => {
-    const opts = optsIn ?? optsDefault;
-    const allowedAnsType = opts.allowedAnsType;
+    const arrayedOpts = defaultArrayedOptsWhereNeeded(optsIn, arrayedOptsDefault);
+    const allowedAnsType = arrayedOpts.allowedAnsType;
     const aCapB = randint(1, 20);
     const aCapBBarre = randint(1, 20, [aCapB]);
     const aBarreCapB = randint(1, 20, [aCapB, aCapBBarre]);
@@ -93,9 +94,7 @@ const getProbaFromTableWithContextQuestion = (optsIn) => {
     const bBarreTotal = aBarreCapBBarre + aCapBBarre;
     let event = "";
     let proba = [];
-    const frenchType = opts?.probaTypes?.length
-        ? random(opts.probaTypes)
-        : random(["Événement simple", "Intersection", "Union"]);
+    const frenchType = random(arrayedOpts.probaTypes);
     const type = frenchType === "Événement simple"
         ? "singleEvent"
         : frenchType.toLocaleLowerCase();
@@ -284,7 +283,7 @@ const createFormattedNode = (exactNode, strInternalAllowedAnswerTypes) => {
             return exactNode;
     }
 };
-const optsDefault = {
+const arrayedOptsDefault = {
     allowedAnsType: ["exacte", "arrondie à 2 décimales"],
     probaTypes: ["Événement simple", "Intersection", "Union"],
 };
@@ -295,7 +294,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         values: ["exacte", "arrondie à 2 décimales"],
-        defaultValue: optsDefault.allowedAnsType,
+        defaultValue: arrayedOptsDefault.allowedAnsType,
     },
     {
         id: "probaTypes",
@@ -303,7 +302,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         values: ["Événement simple", "Intersection", "Union"],
-        defaultValue: optsDefault.probaTypes,
+        defaultValue: arrayedOptsDefault.probaTypes,
     },
 ];
 export const probaFromTableWithContext = {

package/lib/exercises/math/probaStat/stats1var/medianWithList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"medianWithList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianWithList.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAsBF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBzE,CAAC"}
+{"version":3,"file":"medianWithList.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/medianWithList.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAE9B,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAmJF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAsBF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBzE,CAAC"}

package/lib/exercises/math/probaStat/stats1var/medianWithList.js

@@ -1,3 +1,4 @@
+import { defaultArrayedOptsWhereNeeded } from "../../../../exercises/utils/options/arrayedOptions.js";
 import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { median } from "../../../../math/utils/stats/median.js";
@@ -81,9 +82,9 @@ const isAnswerValid = (ans, { answer, sortedValues }) => {
     }
 };
 const getMedianList = (optsIn) => {
-    const arrayedOptions = optsIn;
+    const arrayedOpts = defaultArrayedOptsWhereNeeded(optsIn, arrayedOptsDefault);
     const opts = {
-        nbValues: random(arrayedOptions.nbValues ?? optsDefault.nbValues),
+        nbValues: random(arrayedOpts.nbValues),
         isOrdered: optsIn?.isOrdered ?? false,
     };
     const length = Number(opts.nbValues);
@@ -123,7 +124,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
     };
     return question;
 };
-const optsDefault = {
+const arrayedOptsDefault = {
     nbValues: ["7", "8"],
 };
 const options = [
@@ -133,7 +134,7 @@ const options = [
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.multiselect,
         values: ["4", "5", "7", "8", "11", "12", "19", "20"],
-        defaultValue: optsDefault.nbValues,
+        defaultValue: arrayedOptsDefault.nbValues,
     },
 ];
 export const medianWithList = {

package/lib/exercises/math/sequences/arithmetic/situations/arithmeticFindRankFromSituation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticFindRankFromSituation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/arithmeticFindRankFromSituation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAEL,2BAA2B,EAC5B,MAAM,wDAAwD,CAAC;AAKhE,OAAO,EAEL,kCAAkC,EAEnC,MAAM,kEAAkE,CAAC;AAM1E,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,kCAAkC,CAAC;IACrD,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA0OF,KAAK,OAAO,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;AAcpE,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmB1E,CAAC"}
+{"version":3,"file":"arithmeticFindRankFromSituation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/arithmeticFindRankFromSituation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAEL,2BAA2B,EAC5B,MAAM,wDAAwD,CAAC;AAKhE,OAAO,EAEL,kCAAkC,EAEnC,MAAM,kEAAkE,CAAC;AAM1E,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,kCAAkC,CAAC;IACrD,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsPF,KAAK,OAAO,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;AAcpE,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmB1E,CAAC"}

package/lib/exercises/math/sequences/arithmetic/situations/arithmeticFindRankFromSituation.js

@@ -24,7 +24,7 @@ const getAnswerNode = (identifiers, opts) => {
     const { situationIndex, initial, reason, valueAsked } = identifiers;
     const situation = situations[situationIndex];
     const rankDecoder = situation.rankDecoder;
-    return situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueAsked, rankDecoder).answerNode;
+    return situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueAsked, rankDecoder, situation.digitsValue, situation.digitsTarget).answerNode;
 };
 const getAnswer = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
@@ -54,12 +54,12 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     const arrNodeWrong = [];
     //student: uses valueAsked as if it were rankAsked
     {
-        const nodeWrong = situation.variationFindRandomTerm.getAnswerNode(initial, reason, firstRank, valueAsked, situation.rankDecoder);
-        tryToAddWrongProp(propositions, nodeWrong.simplify().toTex());
+        const nodeWrong = situation.variationFindRandomTerm.getAnswerNode(initial, reason, firstRank, valueAsked, situation.rankDecoder, situation.digitsValue, situation.digitsTarget);
+        tryToAddWrongProp(propositions, round(nodeWrong.simplify().evaluate(), 0).toTree().toTex());
         arrNodeWrong.push(nodeWrong);
     }
     const rankValid = (() => {
-        const { rankNode } = situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueAsked, situation.rankDecoder);
+        const { rankNode } = situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueAsked, situation.rankDecoder, situation.digitsValue, situation.digitsTarget);
         return round(rankNode.evaluate(), 0);
     })();
     //pseudo terror
@@ -67,7 +67,7 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
         if (coinFlip()) {
             //student: rankValid - 1
             {
-                const nodeWrong = (rankValid - 1).toTree();
+                const nodeWrong = round(rankValid - 1, 0).toTree();
                 tryToAddWrongProp(propositions, nodeWrong.toTex());
                 arrNodeWrong.push(nodeWrong);
             }
@@ -75,7 +75,7 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
         else {
             //student: rankValid + 1
             {
-                const nodeWrong = (rankValid + 1).toTree();
+                const nodeWrong = round(rankValid + 1, 0).toTree();
                 tryToAddWrongProp(propositions, nodeWrong.toTex());
                 arrNodeWrong.push(nodeWrong);
             }
@@ -83,7 +83,7 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     }
     //random around
     {
-        const nodeWrong = Math.max(1, rankValid + randint(-5, 6, [0])).toTree();
+        const nodeWrong = round(Math.max(1, rankValid + randint(-5, 6, [0])), 0).toTree();
         tryToAddWrongProp(propositions, nodeWrong.toTex());
         arrNodeWrong.push(nodeWrong);
     }
@@ -94,7 +94,7 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
             if (coinFlip()) {
                 //student: rankValid - 1
                 {
-                    const nodeWrong = (nodePicked.evaluate() - 1).toTree();
+                    const nodeWrong = round(nodePicked.evaluate() - 1, 0).toTree();
                     tryToAddWrongProp(propositions, nodeWrong.toTex());
                     arrNodeWrong.push(nodeWrong);
                 }
@@ -102,7 +102,7 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
             else {
                 //student: rankValid + 1
                 {
-                    const nodeWrong = (nodePicked.evaluate() + 1).toTree();
+                    const nodeWrong = round(nodePicked.evaluate() + 1, 0).toTree();
                     tryToAddWrongProp(propositions, nodeWrong.toTex());
                     arrNodeWrong.push(nodeWrong);
                 }

package/lib/exercises/math/sequences/geometric/geometricFindNextTermFromTwoConsecutiveTerms.d.ts

@@ -0,0 +1,12 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    rank1: number;
+    value1: number;
+    rank2: number;
+    value2: number;
+    precisionInitial: number;
+    precisionReason: number;
+};
+export declare const geometricFindNextTermFromTwoConsecutiveTerms: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=geometricFindNextTermFromTwoConsecutiveTerms.d.ts.map

package/lib/exercises/math/sequences/geometric/geometricFindNextTermFromTwoConsecutiveTerms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometricFindNextTermFromTwoConsecutiveTerms.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindNextTermFromTwoConsecutiveTerms.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AA2OF,eAAO,MAAM,4CAA4C,EAAE,QAAQ,CAAC,WAAW,CAmB5E,CAAC"}

package/lib/exercises/math/sequences/geometric/geometricFindNextTermFromTwoConsecutiveTerms.js

@@ -0,0 +1,217 @@
+import { addValidProp, tryToAddWrongProp, propWhile, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
+import { randfloat } from "../../../../math/utils/random/randfloat.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { random } from "../../../../utils/alea/random.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getInstruction = (identifiers) => {
+    const { rank1, value1, rank2, value2 } = identifiers;
+    const rankAsked = round(rank2 + 1, 0);
+    return `Soit $u$ une suite géométrique telle que $u_{${rank1.frenchify()}} = ${value1.frenchify()}$ et $u_{${rank2.frenchify()}} = ${value2.frenchify()}$. 
+  
+Que vaut $u_{${rankAsked.frenchify()}}$ ?`;
+};
+const getAnswerStuff = (identifiers) => {
+    const { value1, value2 } = identifiers;
+    const nodeReason = frac(value2, value1).simplify({ towardsDistribute: true });
+    const nodeAnswer = multiply(value2, nodeReason);
+    return {
+        nodeReason,
+        nodeAnswer,
+    };
+};
+const getAnswer = (identifiers) => {
+    return getAnswerStuff(identifiers)
+        .nodeAnswer.simplify({ towardsDistribute: true })
+        .toTex();
+};
+const getHint = (identifiers, _optsIn) => {
+    const { rank2 } = identifiers;
+    const rankAsked = round(rank2 + 1, 0);
+    return `Commence par déterminer la raison $q$ de la suite $u$. 
+  
+Puis, utilise cette raison et un des termes connus de la suite pour déterminer $u_{${rankAsked.frenchify()}}$.`;
+};
+const getCorrection = (identifiers) => {
+    const { rank1, value1, rank2, value2 } = identifiers;
+    const rankAsked = round(rank2 + 1, 0);
+    const { nodeReason, nodeAnswer } = getAnswerStuff(identifiers);
+    return `On commence par déterminer la raison $q$ de la suite $u$.
+
+On a :
+
+${alignTex([
+        ["q", "=", `\\frac{u_{${rank2}}}{u_{${rank1}}}`],
+        ["", "=", `\\frac{${value2.frenchify()}}{${value1.frenchify()}}`],
+        ["", "=", `${nodeReason.toTex()}`],
+    ])}
+
+On peut alors déterminer $u_{${rankAsked.frenchify()}}$ en utilisant $u_{${rank2.frenchify()}}$ et $q$. En effet, on a : 
+
+${alignTex([
+        [
+            `u_{${rankAsked.frenchify()}}`,
+            "=",
+            `u_{${rank2.frenchify()}} \\ \\times \\ q`,
+        ],
+        ["", "=", nodeAnswer.toTex()],
+        ["", "=", nodeAnswer.simplify({ towardsDistribute: true }).toTex()],
+    ])}
+
+`;
+};
+const getPropositions = (n, { answer, ..._identifiers }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    propWhile(propositions, n, () => {
+        const identifiersWrong = createRandomIdentifiersCurated();
+        const texWrong = getAnswer(identifiersWrong);
+        tryToAddWrongProp(propositions, texWrong);
+    });
+    return shuffle(propositions);
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return numberVEA(ans, answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const createRandomIdentifiersRaw = () => {
+    const isDivergent = coinFlip();
+    const isReasonNegative = coinFlip();
+    const signReason = isReasonNegative ? -1 : +1;
+    function createGeometricDivergent() {
+        const precisionInitial = 1;
+        const initial = randfloat(1, 10, precisionInitial, [1]);
+        const precisionReason = 0;
+        const reason = signReason * randint(2, 10);
+        return [initial, precisionInitial, reason, precisionReason];
+    }
+    function createGeometricConvergent() {
+        const poolReasonStuff = [
+            {
+                q: 0.5,
+                precision: 1,
+                invQ: 2,
+            },
+            {
+                q: 0.25,
+                precision: 2,
+                invQ: 4,
+            },
+            {
+                q: 0.2,
+                precision: 1,
+                invQ: 5,
+            },
+            {
+                q: 0.1,
+                precision: 1,
+                invQ: 10,
+            },
+            {
+                q: 0.05,
+                precision: 2,
+                invQ: 20,
+            },
+        ];
+        const { q, invQ, precision: precisionReason } = random(poolReasonStuff);
+        const reason = signReason * q;
+        const precisionInitial = 0;
+        const initial = round(randint(10, 20) * Math.pow(invQ, 8), precisionInitial);
+        return [initial, precisionInitial, reason, precisionReason];
+    }
+    const [initial, precisionInitial, reason, precisionReason] = (() => {
+        if (isDivergent) {
+            return createGeometricDivergent();
+        }
+        else {
+            return createGeometricConvergent();
+        }
+    })();
+    const rank1 = randint(1, 5);
+    const rank2 = rank1 + 1;
+    const rankAsked = rank2 + 1;
+    function valueForRank(initial, reason, rank) {
+        return initial * Math.pow(reason, rank);
+    }
+    const [value1, value2] = [rank1, rank2].map((rank) => round(valueForRank(initial, reason, rank), 4));
+    const identifiers = {
+        rank1,
+        value1,
+        rank2,
+        value2,
+        precisionInitial,
+        precisionReason,
+        rankAsked,
+    };
+    return identifiers;
+};
+const createRandomIdentifiersCurated = () => {
+    let identifiers;
+    let isValid = false;
+    let counter = -1;
+    while (!isValid && counter < 100) {
+        counter++;
+        const identifiersCandidate = createRandomIdentifiersRaw();
+        getAnswerStuff(identifiersCandidate);
+        const answer = getAnswer(identifiersCandidate);
+        isValid = !answer.includes("NaN");
+        if (isValid) {
+            identifiers = identifiersCandidate;
+        }
+    }
+    if (!isValid) {
+        //2.5 * 2^n
+        const identifiersDefault = {
+            rank1: 2,
+            value1: 10,
+            rank2: 5,
+            value2: 40,
+            precisionInitial: 1,
+            precisionReason: 0,
+        };
+        identifiers = identifiersDefault;
+    }
+    return identifiers;
+};
+const getGeometricFindNextTermFromTwoConsecutiveTermsQuestion = () => {
+    const identifiers = createRandomIdentifiersCurated();
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
+    const question = {
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
+        options: opts,
+    };
+    return question;
+};
+export const geometricFindNextTermFromTwoConsecutiveTerms = {
+    id: "geometricFindNextTermFromTwoConsecutiveTerms",
+    connector: "=",
+    label: "Connaissant deux termes consécutifs d'une suite géométrique, calculer le terme suivant",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getGeometricFindNextTermFromTwoConsecutiveTermsQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/sequences/geometric/geometricFindRecurrenceFormula.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { OptionFirstTermRankOne } from "../../../../exercises/options/optionFirstTermRankOne.js";
+type Identifiers = {
+    reason: number;
+    firstValue: number;
+};
+type Options = OptionFirstTermRankOne;
+export declare const geometricFindRecurrenceFormula: Exercise<Identifiers, Options>;
+export {};
+//# sourceMappingURL=geometricFindRecurrenceFormula.d.ts.map

package/lib/exercises/math/sequences/geometric/geometricFindRecurrenceFormula.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometricFindRecurrenceFormula.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindRecurrenceFormula.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAgB3D,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAuNF,KAAK,OAAO,GAAG,sBAAsB,CAAC;AAMtC,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmBzE,CAAC"}