math-exercises 3.0.177 → 3.0.179

package/lib/exercises/math/python/sequences/pySequenceThresholdInstructionCompletion.js

@@ -122,7 +122,7 @@ const getInstruction = (identifiers, optsIn) => {
     const firstRank = opts.firstTermRankOne ? 1 : 0;
     const { isUsePythonList, typeSequence } = opts;
     const { valueLimit } = identifiers;
-    return `On considère une suite $(u_{n})$ positive, strictement croissante et ${typeSequence}.
+    return `On considère une suite $(u_{n})$ positive et strictement croissante.
 ${typeSequence === "convergente"
         ? `Sa limite vaut $${valueLimit.frenchify()}$.`
         : ``}
@@ -420,16 +420,19 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     }
     return shuffleProps(propositions, n);
 };
-const createRandomIdentifiers = (_opts) => {
+const createRandomIdentifiers = (opts) => {
     const valueThreshold = randfloat(100, 200, 1);
     const valueLimit = randfloat(0, 200, 1, [0]);
     const nodeDistanceMax = power(10, randint(-8, -1));
-    const keyIncomplete = random([
-        "strInitialization",
-        "strWhile",
-        "strLoopBody",
-        "strPrint",
-    ]);
+    // const keyIncomplete = random([
+    //   "strInitialization",
+    //   "strWhile",
+    //   "strLoopBody",
+    //   "strPrint",
+    // ]);
+    const keyIncomplete = opts.isUsePythonDef
+        ? random(["strWhile", "strPrint"])
+        : "strWhile";
     const identifiers = {
         valueThreshold,
         valueLimit,

package/lib/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormulaFromTwoTerms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticFindExplicitFormulaFromTwoTerms.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormulaFromTwoTerms.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAiB3D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAwOF,KAAK,OAAO,GAAG,sBAAsB,CAAC;AAMtC,eAAO,MAAM,yCAAyC,EAAE,QAAQ,CAC9D,WAAW,EACX,OAAO,CAoBR,CAAC"}
+{"version":3,"file":"arithmeticFindExplicitFormulaFromTwoTerms.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormulaFromTwoTerms.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAiB3D,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4OF,KAAK,OAAO,GAAG,sBAAsB,CAAC;AAMtC,eAAO,MAAM,yCAAyC,EAAE,QAAQ,CAC9D,WAAW,EACX,OAAO,CAoBR,CAAC"}

package/lib/exercises/math/sequences/arithmetic/arithmeticFindExplicitFormulaFromTwoTerms.js

@@ -117,10 +117,12 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
 const isAnswerValid = (ans, { answer, ...identifiers }, optsIn) => {
     const opts = optsIn ?? optsDefault;
     try {
+        //TODO faire fonctionner parseAlgebraic("u_n=3+2n") (token _ not implemented)
+        const nodeAnswer = getAnswerNode(identifiers, opts);
         if (!ans.includes("=")) {
-            return false;
+            // return false;
+            ans = nodeAnswer.leftChild.toTex() + "=" + ans;
         }
-        //TODO faire fonctionner parseAlgebraic("u_n=3+2n") (token _ not implemented)
         // const nodeAns = parseAlgebraic(ans);
         const nodeAns = (() => {
             const [lhs, rhs] = ans.split("=");
@@ -131,7 +133,6 @@ const isAnswerValid = (ans, { answer, ...identifiers }, optsIn) => {
         if (!isEqualNode(nodeAns)) {
             return false;
         }
-        const nodeAnswer = getAnswerNode(identifiers, opts);
         const isValidLhs = () => nodeAns.leftChild.toTex() === nodeAnswer.leftChild.toTex();
         const isValidRhs = () => {
             const nodeAnsRhs = nodeAns.rightChild;

package/lib/exercises/math/sequences/arithmetic/index.d.ts

@@ -5,17 +5,18 @@ export * from "./arithmeticFindReason.js";
 export * from "./arithmeticReasonUsage.js";
 export * from "./arithmeticRecurrenceFormulaUsage.js";
 export * from "./arithmeticThresholdFind.js";
-export * from "./firstIntegersSum.js";
 export * from "./recognizeArithmeticFromFirstTerms.js";
 export * from "./recognizeReasonFromFirstTerms.js";
 export * from "./recognizeReasonFromGraph.js";
 export * from "./recognizeArithmeticFromGraph.js";
-export * from "./arithmeticFirstTermsSum.js";
 export * from "./arithmeticFindExplicitFormulaFirstTermRandom.js";
 export * from "./arithmeticFindReasonRandomRange.js";
-export * from "./arithmeticFindRandomTermFromTwoTerms.js";
 export * from "./arithmeticFindTerm.js";
 export * from "./arithmeticFindTermFirstRankOne.js";
 export * from "./arithmeticFindAntecedent.js";
+export * from "./arithmeticFindRandomTermFromTwoTerms.js";
+export * from "./arithmeticFindExplicitFormulaFromTwoTerms.js";
+export * from "./situations/index.js";
+export * from "./sum/index.js";
 export * from "./arithmeticVariations.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/sequences/arithmetic/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC;AAEpD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gDAAgD,CAAC;AAE/D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mDAAmD,CAAC;AAClE,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/arithmetic/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC;AAEpD,cAAc,oCAAoC,CAAC;AACnD,cAAc,gDAAgD,CAAC;AAE/D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,oCAAoC,CAAC;AACnD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mDAAmD,CAAC;AAClE,cAAc,sCAAsC,CAAC;AACrD,cAAc,yBAAyB,CAAC;AACxC,cAAc,qCAAqC,CAAC;AACpD,cAAc,+BAA+B,CAAC;AAE9C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,gDAAgD,CAAC;AAE/D,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC"}

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

@@ -5,16 +5,17 @@ export * from "./arithmeticFindReason.js";
 export * from "./arithmeticReasonUsage.js";
 export * from "./arithmeticRecurrenceFormulaUsage.js";
 export * from "./arithmeticThresholdFind.js";
-export * from "./firstIntegersSum.js";
 export * from "./recognizeArithmeticFromFirstTerms.js";
 export * from "./recognizeReasonFromFirstTerms.js";
 export * from "./recognizeReasonFromGraph.js";
 export * from "./recognizeArithmeticFromGraph.js";
-export * from "./arithmeticFirstTermsSum.js";
 export * from "./arithmeticFindExplicitFormulaFirstTermRandom.js";
 export * from "./arithmeticFindReasonRandomRange.js";
-export * from "./arithmeticFindRandomTermFromTwoTerms.js";
 export * from "./arithmeticFindTerm.js";
 export * from "./arithmeticFindTermFirstRankOne.js";
 export * from "./arithmeticFindAntecedent.js";
+export * from "./arithmeticFindRandomTermFromTwoTerms.js";
+export * from "./arithmeticFindExplicitFormulaFromTwoTerms.js";
+export * from "./situations/index.js";
+export * from "./sum/index.js";
 export * from "./arithmeticVariations.js";

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

@@ -1 +1 @@
-{"version":3,"file":"arithmeticFindExplicitFormulaFromSituation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/arithmeticFindExplicitFormulaFromSituation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAEL,2BAA2B,EAC5B,MAAM,wDAAwD,CAAC;AAGhE,OAAO,EAEL,kCAAkC,EAEnC,MAAM,kEAAkE,CAAC;AAgB1E,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,kCAAkC,CAAC;CACtD,CAAC;AA+MF,KAAK,OAAO,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;AAcpE,eAAO,MAAM,0CAA0C,EAAE,QAAQ,CAC/D,WAAW,EACX,OAAO,CAoBR,CAAC"}
+{"version":3,"file":"arithmeticFindExplicitFormulaFromSituation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/arithmeticFindExplicitFormulaFromSituation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAEL,2BAA2B,EAC5B,MAAM,wDAAwD,CAAC;AAGhE,OAAO,EAEL,kCAAkC,EAEnC,MAAM,kEAAkE,CAAC;AAgB1E,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,kCAAkC,CAAC;CACtD,CAAC;AAkNF,KAAK,OAAO,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;AAcpE,eAAO,MAAM,0CAA0C,EAAE,QAAQ,CAC/D,WAAW,EACX,OAAO,CAoBR,CAAC"}

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

@@ -68,8 +68,10 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
 const isAnswerValid = (ans, { answer, ...identifiers }, optsIn) => {
     const opts = optsIn ?? optsDefault;
     try {
+        const nodeAnswer = getAnswerNode(identifiers, opts);
         if (!ans.includes("=")) {
-            return false;
+            // return false;
+            ans = nodeAnswer.leftChild.toTex() + "=" + ans;
         }
         //TODO faire fonctionner parseAlgebraic("u_n=3+2n") (token _ not implemented)
         // const nodeAns = parseAlgebraic(ans);
@@ -82,7 +84,6 @@ const isAnswerValid = (ans, { answer, ...identifiers }, optsIn) => {
         if (!isEqualNode(nodeAns)) {
             return false;
         }
-        const nodeAnswer = getAnswerNode(identifiers, opts);
         const isValidLhs = () => nodeAns.leftChild.toTex() === nodeAnswer.leftChild.toTex();
         const isValidRhs = () => {
             const nodeAnsRhs = nodeAns.rightChild;

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;AAK1E,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;AA6NF,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;AAsOF,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

@@ -17,13 +17,14 @@ const getInstruction = (identifiers, optsIn) => {
     const situation = situations[situationIndex];
     return `${situation.getStrSituation(initial, reason, firstRank, superfluousData)}
 
-${situation.variationFindRank.getStrQuestion(initial, reason, firstRank, valueAsked)}`;
+${situation.variationFindRank.getStrQuestion(initial, reason, firstRank, valueAsked, situation.rankDecoder)}`;
 };
 const getAnswerNode = (identifiers, opts) => {
     const firstRank = opts?.firstTermRankOne ? 1 : 0;
     const { situationIndex, initial, reason, valueAsked } = identifiers;
     const situation = situations[situationIndex];
-    return situation.variationFindRank.getAnswerNode(initial, reason, firstRank, valueAsked);
+    const rankDecoder = situation.rankDecoder;
+    return situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueAsked, rankDecoder).answerNode;
 };
 const getAnswer = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
@@ -41,7 +42,7 @@ const getCorrection = (identifiers, optsIn) => {
     const firstRank = opts?.firstTermRankOne ? 1 : 0;
     const { situationIndex, initial, reason, valueAsked } = identifiers;
     const situation = situations[situationIndex];
-    return situation.variationFindRank.getCorrectionStuff(initial, reason, firstRank, valueAsked).str;
+    return situation.variationFindRank.getCorrectionStuff(initial, reason, firstRank, valueAsked, situation.rankDecoder).str;
 };
 const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     const opts = optsIn ?? optsDefault;
@@ -57,9 +58,10 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
         tryToAddWrongProp(propositions, nodeWrong.simplify().toTex());
         arrNodeWrong.push(nodeWrong);
     }
-    const rankValid = round(situation.variationFindRank
-        .getAnswerNode(initial, reason, firstRank, valueAsked)
-        .evaluate(), 0);
+    const rankValid = (() => {
+        const { rankNode } = situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueAsked);
+        return round(rankNode.evaluate(), 0);
+    })();
     //pseudo terror
     if (coinFlip()) {
         if (coinFlip()) {

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

@@ -1 +1 @@
-{"version":3,"file":"arithmeticFindThresholdFromSituation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/arithmeticFindThresholdFromSituation.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;AAGhE,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,EAEL,kCAAkC,EAEnC,MAAM,kEAAkE,CAAC;AAK1E,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,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B,CAAC;AAyPF,KAAK,OAAO,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;AAcpE,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CACzD,WAAW,EACX,OAAO,CAoBR,CAAC"}
+{"version":3,"file":"arithmeticFindThresholdFromSituation.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/arithmeticFindThresholdFromSituation.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;AAGhE,OAAO,EACL,gBAAgB,EAGjB,MAAM,sCAAsC,CAAC;AAG9C,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,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B,CAAC;AA0PF,KAAK,OAAO,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;AAcpE,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CACzD,WAAW,EACX,OAAO,CAoBR,CAAC"}

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

@@ -26,7 +26,7 @@ const getAnswerNode = (identifiers, opts) => {
     const { situationIndex, initial, reason, valueThreshold, inegSymbol } = identifiers;
     const situation = situations[situationIndex];
     const inequationSymbol = new InequationSymbol(inegSymbol);
-    return situation.variationFindThreshold.getAnswerNode(initial, reason, firstRank, valueThreshold, inequationSymbol);
+    return situation.variationFindThreshold.getAnswerStuff(initial, reason, firstRank, valueThreshold, inequationSymbol, situation.rankDecoder).answerNode;
 };
 const getAnswer = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
@@ -46,7 +46,7 @@ const getCorrection = (identifiers, optsIn) => {
     const { situationIndex, initial, reason, valueThreshold, inegSymbol } = identifiers;
     const situation = situations[situationIndex];
     const inequationSymbol = new InequationSymbol(inegSymbol);
-    return situation.variationFindThreshold.getCorrectionStuff(initial, reason, firstRank, valueThreshold, inequationSymbol).str;
+    return situation.variationFindThreshold.getCorrectionStuff(initial, reason, firstRank, valueThreshold, inequationSymbol, situation.rankDecoder).str;
 };
 const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     const opts = optsIn ?? optsDefault;
@@ -57,9 +57,10 @@ const getPropositions = (n, { answer, ...identifiers }, optsIn) => {
     const propositions = [];
     addValidProp(propositions, answer);
     const arrNodeWrong = [];
-    const rankValid = round(situation.variationFindThreshold
-        .getAnswerNode(initial, reason, firstRank, valueThreshold, inequationSymbol)
-        .evaluate(), 0);
+    const rankValid = (() => {
+        const { rankNode } = situation.variationFindRank.getAnswerStuff(initial, reason, firstRank, valueThreshold, inequationSymbol);
+        return round(rankNode.evaluate(), 0);
+    })();
     //student: gives u[threshold] instead of threshold
     {
         const nodeWrong = situation.variationFindRandomTerm.getAnswerNode(initial, reason, firstRank, rankValid);

package/lib/exercises/math/sequences/arithmetic/situations/index.d.ts

@@ -1,6 +1,4 @@
 export * from "./arithmeticFindExplicitFormulaFromSituation.js";
 export * from "./arithmeticFindRecurrenceFormulaFromSituation.js";
 export * from "./arithmeticFindTermFromSituation.js";
-export * from "./arithmeticFindRankFromSituation.js";
-export * from "./arithmeticFindThresholdFromSituation.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/index.ts"],"names":[],"mappings":"AAAA,cAAc,iDAAiD,CAAC;AAChE,cAAc,mDAAmD,CAAC;AAClE,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/situations/index.ts"],"names":[],"mappings":"AAAA,cAAc,iDAAiD,CAAC;AAChE,cAAc,mDAAmD,CAAC;AAClE,cAAc,sCAAsC,CAAC"}

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

@@ -1,5 +1,5 @@
 export * from "./arithmeticFindExplicitFormulaFromSituation.js";
 export * from "./arithmeticFindRecurrenceFormulaFromSituation.js";
 export * from "./arithmeticFindTermFromSituation.js";
-export * from "./arithmeticFindRankFromSituation.js";
-export * from "./arithmeticFindThresholdFromSituation.js";
+// export * from "./arithmeticFindRankFromSituation.js";
+// export * from "./arithmeticFindThresholdFromSituation.js";

package/lib/exercises/math/sequences/arithmetic/sum/arithmeticComputeSumWithDots.d.ts

@@ -9,6 +9,7 @@ type Identifiers = {
 };
 type Options = OptionFirstTermRankOne & {
     isGiveCount: boolean;
+    isForceWriteSumWithPlusSymbol: boolean;
 };
 export declare const arithmeticComputeSumWithDots: Exercise<Identifiers, Options>;
 export {};

package/lib/exercises/math/sequences/arithmetic/sum/arithmeticComputeSumWithDots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticComputeSumWithDots.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/sum/arithmeticComputeSumWithDots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAwE3D,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AA4NF,KAAK,OAAO,GAAG,sBAAsB,GAAG;IAAE,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC;AAiBjE,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBvE,CAAC"}
+{"version":3,"file":"arithmeticComputeSumWithDots.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/sum/arithmeticComputeSumWithDots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AA0H3D,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAiOF,KAAK,OAAO,GAAG,sBAAsB,GAAG;IACtC,WAAW,EAAE,OAAO,CAAC;IACrB,6BAA6B,EAAE,OAAO,CAAC;CACxC,CAAC;AAyBF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBvE,CAAC"}

package/lib/exercises/math/sequences/arithmetic/sum/arithmeticComputeSumWithDots.js

@@ -8,30 +8,69 @@ import { frac } from "../../../../../tree/nodes/operators/fractionNode.js";
 import { multiply } from "../../../../../tree/nodes/operators/multiplyNode.js";
 import { handleVEAError } from "../../../../../utils/errors/handleVEAError.js";
 import { alignTex } from "../../../../../utils/latex/alignTex.js";
-const strForValue = (v) => {
-    return v < 0 ? `(${v.frenchify()})` : `${v.frenchify()}`;
-};
 const valueForRank = (initial, reason, rank) => {
     return initial + reason * rank;
 };
-const strSumWithDots = (initial, reason, firstRank, lowRankDots, highRankDots, lastRank) => {
+const strSumWithDots = (initial, reason, firstRank, lowRankDots, highRankDots, lastRank, isForcePlusSymbol) => {
     const arrRankStart = [...Array(lowRankDots - firstRank).keys()].map((i) => i + firstRank);
     const arrRankEnd = [...Array(lastRank - highRankDots).keys()].map((i) => i + highRankDots + 1);
-    const [arrValueStart, arrValueEnd] = [arrRankStart, arrRankEnd].map((arrRank) => arrRank.map((rank) => strForValue(valueForRank(initial, reason, rank))));
-    const [strStart, strEnd] = [arrValueStart, arrValueEnd].map((arrValue) => arrValue.join(" + "));
-    const strFlat = [strStart, strEnd].join(` + \\ldots + `);
     const maxStrLength = 40;
-    if (strFlat.length < maxStrLength) {
-        return `
+    if (isForcePlusSymbol) {
+        const strForValue = (v) => {
+            return v < 0 ? `(${v.frenchify()})` : `${v.frenchify()}`;
+        };
+        const [arrStrValueStart, arrStrValueEnd] = [arrRankStart, arrRankEnd].map((arrRank) => arrRank.map((rank) => strForValue(valueForRank(initial, reason, rank))));
+        const [strStart, strEnd] = [arrStrValueStart, arrStrValueEnd].map((arrValue) => arrValue.join(" + "));
+        const strFlat = [strStart, strEnd].join(` + \\ldots + `);
+        if (strFlat.length < maxStrLength) {
+            return `
 
 $$
 ${strFlat}
 $$
 
 `;
+        }
+        else {
+            return `
+
+$$
+${strStart}
+$$
+
+$$
++ \\ldots
+$$
+
+$$
++ \\ ${strEnd}
+$$
+
+`;
+        }
     }
     else {
-        return `
+        const strForValue = (v, isForceShowSymbol) => {
+            return isForceShowSymbol
+                ? v >= 0
+                    ? `+ ${v.frenchify()}`
+                    : `${v.frenchify()}`
+                : v;
+        };
+        const [arrStrValueStart, arrStrValueEnd] = [arrRankStart, arrRankEnd].map((arrRank, j) => arrRank.map((rank, i) => strForValue(valueForRank(initial, reason, rank), i !== 0 || j === 1)));
+        const [strStart, strEnd] = [arrStrValueStart, arrStrValueEnd].map((arrValue) => arrValue.join(" "));
+        const strFlat = [strStart, strEnd].join(` + \\ldots `);
+        if (strFlat.length < maxStrLength) {
+            return `
+
+$$
+${strFlat}
+$$
+
+`;
+        }
+        else {
+            return `
 
 $$
 ${strStart}
@@ -42,15 +81,16 @@ $$
 $$
 
 $$
-+ \\ ${strEnd}
+${strEnd}
 $$
 
 `;
+        }
     }
 };
 const getInstruction = (identifiers, optsIn) => {
     const opts = optsIn ?? optsDefault;
-    const { isGiveCount } = opts;
+    const { isGiveCount, isForceWriteSumWithPlusSymbol } = opts;
     const firstRank = opts.firstTermRankOne ? 1 : 0;
     const { initial, reason, nbTerms, lowRankDots, highRankDots } = identifiers;
     const lastRank = firstRank + nbTerms - 1;
@@ -60,7 +100,7 @@ Calculer la somme des premiers termes de $u$ ${isGiveCount
         ? `(la somme contient en tout $${nbTerms.frenchify()}$ termes)`
         : ""}: 
 
-${strSumWithDots(initial, reason, firstRank, lowRankDots, highRankDots, lastRank)}
+${strSumWithDots(initial, reason, firstRank, lowRankDots, highRankDots, lastRank, isForceWriteSumWithPlusSymbol)}
 
 `;
 };
@@ -97,6 +137,9 @@ const getCorrection = (identifiers, optsIn) => {
     const lastRank = firstRank + nbTerms - 1;
     const lastValue = valueForRank(initial, reason, lastRank);
     const answerNode = getAnswerNode(identifiers, opts);
+    const strForValue = (v) => {
+        return v < 0 ? `(${v.frenchify()})` : `${v.frenchify()}`;
+    };
     return `La somme $S$ des $n$ premiers termes d'une suite arithmétique s'obtient par la formule : 
   
 $$
@@ -205,16 +248,24 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
 const { optsDefaultFirstTermRankOne, generatorOptionFirstTermRankOne } = getOptionFirstTermRankOneStuff(false);
 const optsDefault = Object.assign({}, optsDefaultFirstTermRankOne, {
     isGiveCount: true,
+    isForceWriteSumWithPlusSymbol: false,
 });
 const options = [
     generatorOptionFirstTermRankOne,
     {
         id: "isGiveCount",
-        label: "Donner $n$",
+        label: "Donner le nombre de termes de la somme dans la consigne",
         target: GeneratorOptionTarget.generation,
         type: GeneratorOptionType.checkbox,
         defaultValue: optsDefault.isGiveCount,
     },
+    {
+        id: "isForceWriteSumWithPlusSymbol",
+        label: "Forcer l'écriture de la somme avec des symboles $+$",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.checkbox,
+        defaultValue: optsDefault.isForceWriteSumWithPlusSymbol,
+    },
 ];
 export const arithmeticComputeSumWithDots = {
     id: "arithmeticComputeSumWithDots",

package/lib/exercises/math/sequences/arithmetic/sum/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./firstIntegersSum.js";
 export * from "./arithmeticFirstTermsSum.js";
 export * from "./arithmeticComputeSumWithDots.js";
-export * from "./arithmeticFirstTermsSumThreshold.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/sequences/arithmetic/sum/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/sum/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/sequences/arithmetic/sum/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC"}

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

@@ -1,4 +1,4 @@
 export * from "./firstIntegersSum.js";
 export * from "./arithmeticFirstTermsSum.js";
 export * from "./arithmeticComputeSumWithDots.js";
-export * from "./arithmeticFirstTermsSumThreshold.js";
+// export * from "./arithmeticFirstTermsSumThreshold.js";

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

@@ -3,6 +3,9 @@ type Identifiers = {
     rank: number;
     coeffs: number[];
 };
-export declare const explicitFormulaUsage: Exercise<Identifiers>;
+type Options = {
+    functionType: string[];
+};
+export declare const explicitFormulaUsage: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=explicitFormulaUsage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"explicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/explicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAyDF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"explicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/sequences/explicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AA2FF,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAWF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe/D,CAAC"}

package/lib/exercises/math/sequences/explicitFormulaUsage.js

@@ -1,7 +1,9 @@
-import { shuffleProps, tryToAddWrongProp, addValidProp, propWhile, } from "../../../exercises/exercise.js";
+import { shuffleProps, tryToAddWrongProp, addValidProp, propWhile, GeneratorOptionTarget, GeneratorOptionType, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { AffineConstructor } from "../../../math/polynomials/affine.js";
 import { Polynomial, PolynomialConstructor, } from "../../../math/polynomials/polynomial.js";
 import { randint } from "../../../math/utils/random/randint.js";
+import { random } from "../../../utils/alea/random.js";
 const getInstruction = (identifiers) => {
     const { rank, coeffs } = identifiers;
     const u = new Polynomial(coeffs, "n");
@@ -19,18 +21,44 @@ const getAnswer = (identifiers) => {
     const answer = u.calculate(rank) + "";
     return answer;
 };
+const getHint = (identifiers) => {
+    return `La suite est donnée sous forme explicite. 
+  
+Remplace $n$ par $${identifiers.rank}$ dans la formule donnée.`;
+};
+const getCorrection = (identifiers) => {
+    const { coeffs, rank } = identifiers;
+    const u = new Polynomial(coeffs, "n");
+    return `La suite étant donnée sous forme explicite, il suffit de remplacer $n$ par $${rank}$ dans la formule : 
+  
+$$
+u_{${rank}} = ${u.toTree().toDetailedEvaluation({ n: rank.toTree() }).toTex()}
+$$
+
+donc 
+
+$$
+u_{${rank}} = ${getAnswer(identifiers)}
+$$`;
+};
 const getQuestionFromIdentifiers = (identifiers) => {
-    const question = {
+    return {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
-        keys: ["u", "underscore", "equal"],
+        keys: [],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
-    return question;
 };
-const getExplicitFormulaUsageQuestion = () => {
-    const u = PolynomialConstructor.randomWithOrder(2, "n");
+const getExplicitFormulaUsageQuestion = (opts) => {
+    const type = opts?.functionType?.length
+        ? random(opts.functionType)
+        : random(["Affine", "Second degré"]);
+    const u = type === "Affine"
+        ? AffineConstructor.random()
+        : PolynomialConstructor.randomWithOrder(2, "n");
     const rank = randint(0, 4);
     const identifiers = { rank, coeffs: u.coefficients };
     return getQuestionFromIdentifiers(identifiers);
@@ -50,16 +78,28 @@ const getPropositions = (n, { answer, rank, coeffs }) => {
 const isAnswerValid = (ans, { answer, rank }) => {
     return [answer, `u_{${rank}}=${answer}`, `u_${rank}=${answer}`].includes(ans);
 };
+const options = [
+    {
+        id: "functionType",
+        label: "Type de fonction",
+        values: ["Affine", "Second degré"],
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.multiselect,
+        defaultValue: ["Affine", "Second degré"],
+    },
+];
 export const explicitFormulaUsage = {
     id: "explicitFormulaUsage",
     connector: "=",
     label: "Utiliser la formule explicite d'une suite",
     isSingleStep: true,
-    generator: (nb) => getDistinctQuestions(getExplicitFormulaUsageQuestion, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getExplicitFormulaUsageQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+    options,
 };

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"geometricFindExplicitFormulaFromTwoConsecutiveTerms.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/sequences/geometric/geometricFindExplicitFormulaFromTwoConsecutiveTerms.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,sBAAsB,EACvB,MAAM,mDAAmD,CAAC;AAoB3D,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;AAyVF,KAAK,OAAO,GAAG,sBAAsB,CAAC;AAMtC,eAAO,MAAM,mDAAmD,EAAE,QAAQ,CACxE,WAAW,EACX,OAAO,CAqBR,CAAC"}