math-exercises 2.2.59 → 2.2.61

package/lib/exercises/math/calcul/fractions/fractionsProduct.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fractionsProduct = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
+const allowNonIrreductibleFractions_1 = require("../../../../exercises/options/allowNonIrreductibleFractions");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const getFractionsProduct = () => {
+const getFractionsProduct = (opts) => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
     const rational2 = rational_1.RationalConstructor.randomIrreductible();
     const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), rational2.toTree());
@@ -14,7 +16,13 @@ const getFractionsProduct = () => {
     const answer = answerTree.toTex();
     const beforeSimplification = new rational_1.Rational(rational.num * rational2.num, rational.denum * rational2.denum);
     const question = {
-        instruction: `Calculer et donner le résultat sous la forme d'une fraction irréductible : $${statementTree.toTex()}$`,
+        instruction: `Calculer ${opts?.allowNonIrreductible
+            ? ""
+            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+    
+$$
+${statementTree.toTex()}
+$$`,
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
@@ -36,7 +44,7 @@ ${!beforeSimplification.isIrreductible()
 $$
 ${beforeSimplification.toTree().toTex()} = ${answer}
 $$`
-            : "Cette fraction est déjà sous forme irréductible."}
+            : "Cette fraction est déjà simplifiée."}
 
 Ainsi, le résultat attendu est $${answer}$.
     `,
@@ -54,15 +62,24 @@ const getPropositions = (n, { answer, rationalNum, rationalDenum }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { rationalDenum, rationalNum }) => {
+const isAnswerValid = (ans, { rationalDenum, rationalNum }, opts) => {
     const rational = new rational_1.Rational(rationalNum[0], rationalNum[1]);
     const rational2 = new rational_1.Rational(rationalDenum[0], rationalDenum[1]);
     const answerTree = rational
         .multiply(rational2)
         .toTree({ allowFractionToDecimal: true });
     const texs = answerTree.toAllValidTexs();
-    return texs.includes(ans);
+    if (opts?.allowNonIrreductible) {
+        const parsed = (0, rationalParser_1.rationalParser)(ans);
+        if (!parsed)
+            return false;
+        return texs.includes(parsed.simplify().toTex());
+    }
+    else {
+        return texs.includes(ans);
+    }
 };
+const options = [allowNonIrreductibleFractions_1.allowNonIrreductibleOption];
 exports.fractionsProduct = {
     id: "fractionsProduct",
     connector: "=",
@@ -70,11 +87,12 @@ exports.fractionsProduct = {
     levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
     sections: ["Fractions"],
     isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFractionsProduct(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    options,
 };

package/lib/exercises/math/calcul/fractions/fractionsSum.d.ts

@@ -1,7 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
-    rational: [number, number];
-    rational2: [number, number];
+    rational: number[];
+    rational2: number[];
 };
 type Options = {
     allowNonIrreductible?: boolean;

package/lib/exercises/math/calcul/fractions/fractionsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAyFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAevD,CAAC"}
+{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAyGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBvD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSum.js

@@ -7,28 +7,36 @@ const rational_1 = require("../../../../math/numbers/rationals/rational");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const getInstruction = (identifiers, opts) => {
+    const { rational, rational2 } = identifiers;
+    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
+    const rationalObj2 = new rational_1.Rational(rational2[0], rational2[1]);
+    const statementTree = new addNode_1.AddNode(rationalObj.toTree(), rationalObj2.toTree());
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+    
+$$
+${statementTree.toTex()}
+$$`;
+};
 const getFractionsSum = (opts) => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
     const rational2 = rational_1.RationalConstructor.randomIrreductible();
     const statementTree = new addNode_1.AddNode(rational.toTree(), rational2.toTree());
     const answerTree = rational.add(rational2).toTree();
     const answer = answerTree.toTex();
+    const identifiers = {
+        rational: [rational.num, rational.denum],
+        rational2: [rational2.num, rational2.denum],
+    };
     const question = {
-        instruction: `Calculer ${opts?.allowNonIrreductible
-            ? ""
-            : "et donner le résultat sous la forme d'une fraction irréductible"} : 
-    
-$$
-${statementTree.toTex()}
-$$`,
+        instruction: getInstruction(identifiers, opts),
         startStatement: statementTree.toTex(),
         answer,
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            rational: [rational.num, rational.denum],
-            rational2: [rational2.num, rational2.denum],
-        },
+        identifiers,
     };
     return question;
 };
@@ -86,4 +94,5 @@ exports.fractionsSum = {
     isAnswerValid,
     subject: "Mathématiques",
     options,
+    getInstruction,
 };

package/lib/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.js

@@ -23,7 +23,7 @@ const getFractionsSumsMultiplesDenominatorsQuestion = (opts) => {
         answer,
         instruction: `Calculer ${opts?.allowNonIrreductible
             ? ""
-            : "et donner le résultat sous la forme d'une fraction irréductible"} : 
+            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
     
 $$
 ${statement}

package/lib/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.js

@@ -24,7 +24,7 @@ const getFractionsSumsPrimeDenominatorsQuestion = (opts) => {
         answer,
         instruction: `Calculer ${opts?.allowNonIrreductible
             ? ""
-            : "et donner le résultat sous la forme d'une fraction irréductible"} : 
+            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
     
 $$
 ${statement}

package/lib/exercises/math/calcul/fractions/fractionsSumsSameDenominators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsSameDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsSameDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}
+{"version":3,"file":"fractionsSumsSameDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsSameDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSumsSameDenominators.js

@@ -25,7 +25,7 @@ const getFractionsSumsSameDenominatorsQuestion = (opts) => {
         answer,
         instruction: `Calculer ${opts?.allowNonIrreductible
             ? ""
-            : "et donner le résultat sous la forme d'une fraction irréductible"} : 
+            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
     
 $$
 ${statement}
@@ -44,7 +44,7 @@ ${(0, alignTex_1.alignTex)([
         ])}
 
 ${answerRatio.isSimplified && answerRatio.denum !== 1
-            ? "Cette fraction est bien irréductible."
+            ? "Cette fraction est bien simplifiée."
             : `Puis, on simplifie la fraction : 
     
 ${(0, alignTex_1.alignTex)([

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.d.ts

@@ -3,8 +3,13 @@ type Identifiers = {
     coeffIds: any;
     xValues: any[];
     yValues: any[];
-    type: number;
+    coeffType: string;
+    valuesType: string;
 };
-export declare const findCoeffInProportionalTableNonIntegers: Exercise<Identifiers>;
+type Options = {
+    coeffNumberTypes: string[];
+    valuesNumberTypes: string[];
+};
+export declare const findCoeffInProportionalTableNonIntegers: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=findCoeffInProportionalTableNonIntegers.d.ts.map

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAkIF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAAC,WAAW,CAoBzE,CAAC"}
+{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqHF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.js

@@ -9,22 +9,22 @@ const randint_1 = require("../../../../math/utils/random/randint");
 const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const latexParser_1 = require("../../../../tree/parsers/latexParser");
-const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const random_1 = require("../../../../utils/alea/random");
 const doWhile_1 = require("../../../../utils/doWhile");
 const dollarize_1 = require("../../../../utils/latex/dollarize");
 const mdTable_1 = require("../../../../utils/markdown/mdTable");
-const getPropositions = (n, { answer, type }) => {
+const getPropositions = (n, { answer, coeffType }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
-        switch (type) {
-            case 1:
+        switch (coeffType) {
+            case "Entier":
                 (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(1, 10) + "");
                 break;
-            case 2:
+            case "Décimal":
                 (0, exercise_1.tryToAddWrongProp)(propositions, (0, randfloat_1.randfloat)(1, 10, 1).frenchify());
                 break;
-            case 3:
+            case "Fraction":
                 (0, exercise_1.tryToAddWrongProp)(propositions, rational_1.RationalConstructor.randomIrreductible().toTree().toTex());
                 break;
         }
@@ -56,51 +56,40 @@ const isAnswerValid = (ans, { answer }) => {
         return false;
     return parsed.simplify().toTex() === answer;
 };
-const getFindCoeffInProportionalTableNonIntegersQuestion = () => {
-    const type = (0, randint_1.randint)(1, 4);
+const getFindCoeffInProportionalTableNonIntegersQuestion = (opts) => {
     let coeff;
     let xValues = [];
-    switch (type) {
-        case 1:
-            //coeff entier, valeurs décimal/frac
-            coeff = (0, randint_1.randint)(2, 10).toTree();
-            for (let i = 0; i < 3; i++) {
-                let x = (0, doWhile_1.doWhile)(() => (0, coinFlip_1.coinFlip)()
-                    ? (0, randfloat_1.randfloat)(1.1, 10, 1).toTree()
-                    : rational_1.RationalConstructor.randomIrreductible().toTree(), (y) => xValues.some((x) => x.equals(y)));
-                xValues.push(x);
-            }
-            xValues.sort((a, b) => a.evaluate() - b.evaluate());
-            break;
-        case 2:
-            //coeff décimal, valeurs entieres/décimal
-            coeff = (0, randfloat_1.randfloat)(1.1, 10, 1).toTree();
-            for (let i = 0; i < 3; i++) {
-                let x = (0, doWhile_1.doWhile)(() => (0, coinFlip_1.coinFlip)()
-                    ? (0, randint_1.randint)(1, 10).toTree()
-                    : (0, randfloat_1.randfloat)(1.1, 10, 1).toTree(), (y) => xValues.some((x) => x.equals(y)));
-                xValues.push(x);
-            }
-            xValues.sort((a, b) => a.evaluate() - b.evaluate());
-            break;
-        case 3:
-        //coeff frac, valeurs frac / entieres
-        default:
-            coeff = rational_1.RationalConstructor.randomPureRational().toTree();
-            for (let i = 0; i < 3; i++) {
-                let x = (0, doWhile_1.doWhile)(() => (0, coinFlip_1.coinFlip)()
-                    ? (0, randint_1.randint)(1, 10).toTree()
-                    : rational_1.RationalConstructor.randomIrreductible().toTree(), (y) => xValues.some((x) => x.equals(y)));
-                xValues.push(x);
-            }
-            xValues.sort((a, b) => a.evaluate() - b.evaluate());
+    const coeffType = (0, random_1.random)(opts?.coeffNumberTypes ?? ["Entier", "Décimal", "Fraction"]);
+    if (!coeffType)
+        throw Error("No Coeff Type");
+    const valuesType = (0, random_1.random)(opts?.valuesNumberTypes ?? ["Entières", "Décimales", "Fractions"]);
+    if (!valuesType)
+        throw Error("No value type");
+    coeff =
+        coeffType === "Entier"
+            ? (0, randint_1.randint)(2, 10).toTree()
+            : coeffType === "Décimal"
+                ? (0, randfloat_1.randfloat)(1.1, 10, 1).toTree()
+                : rational_1.RationalConstructor.randomPureRational(10).toTree();
+    const getX = () => {
+        return valuesType === "Entières"
+            ? (0, randint_1.randint)(1, 10).toTree()
+            : valuesType === "Décimales"
+                ? (0, randfloat_1.randfloat)(1.1, 10, 1).toTree()
+                : rational_1.RationalConstructor.randomIrreductible().toTree();
+    };
+    for (let i = 0; i < 3; i++) {
+        let x = (0, doWhile_1.doWhile)(getX, (y) => xValues.some((x) => x.equals(y)));
+        xValues.push(x);
     }
+    xValues.sort((a, b) => a.evaluate() - b.evaluate());
     const yValues = xValues.map((x) => (0, multiplyNode_1.multiply)(x, coeff).simplify());
     const identifiers = {
         coeffIds: coeff.toIdentifiers(),
         xValues: xValues.map((e) => e.toIdentifiers()),
         yValues: yValues.map((e) => e.toIdentifiers()),
-        type,
+        coeffType,
+        valuesType,
     };
     const question = {
         answer: getAnswer(identifiers),
@@ -116,12 +105,30 @@ const getFindCoeffInProportionalTableNonIntegersQuestion = () => {
     };
     return question;
 };
+const options = [
+    {
+        id: "coeffNumberTypes",
+        label: "Type du coefficient",
+        type: exercise_1.GeneratorOptionType.multiselect,
+        target: exercise_1.GeneratorOptionTarget.generation,
+        values: ["Entier", "Décimal", "Fraction"],
+        defaultValue: ["Entier", "Décimal", "Fraction"],
+    },
+    {
+        id: "valuesNumberTypes",
+        label: "Type des valeurs",
+        type: exercise_1.GeneratorOptionType.multiselect,
+        target: exercise_1.GeneratorOptionTarget.generation,
+        values: ["Entières", "Décimales", "Fractions"],
+        defaultValue: ["Entier", "Décimal", "Fraction"],
+    },
+];
 exports.findCoeffInProportionalTableNonIntegers = {
     id: "findCoeffInProportionalTableNonIntegers",
     connector: "=",
     label: "Calculer un coefficient de proportionnalité à partir d'un tableau (valeurs non entières)",
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFindCoeffInProportionalTableNonIntegersQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFindCoeffInProportionalTableNonIntegersQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -131,4 +138,5 @@ exports.findCoeffInProportionalTableNonIntegers = {
     // getCorrection,
     getAnswer,
     answerType: "QCU",
+    options,
 };

package/lib/exercises/math/calcul/proportionality/isTableProportionalNonInteger.d.ts

@@ -4,8 +4,13 @@ type Identifiers = {
     xValues: any[];
     yValues: any[];
     isProportionnal: boolean;
-    type: number;
+    coeffType: string;
+    valuesType: string;
 };
-export declare const isTableProportionalNonInteger: Exercise<Identifiers>;
+type Options = {
+    coeffNumberTypes: string[];
+    valuesNumberTypes: string[];
+};
+export declare const isTableProportionalNonInteger: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=isTableProportionalNonInteger.d.ts.map

package/lib/exercises/math/calcul/proportionality/isTableProportionalNonInteger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isTableProportionalNonInteger.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/isTableProportionalNonInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA0HF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}
+{"version":3,"file":"isTableProportionalNonInteger.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/isTableProportionalNonInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqCF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AA8FF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoBxE,CAAC"}

package/lib/exercises/math/calcul/proportionality/isTableProportionalNonInteger.js

@@ -43,59 +43,50 @@ const getKeys = (identifiers) => {
 const isAnswerValid = (ans, { answer }) => {
     throw Error("VEA not implemented");
 };
-const getIsTableProportionalNonIntegerQuestion = () => {
-    const type = (0, randint_1.randint)(1, 4);
+// ["Entier", "Décimal", "Fraction"],
+// ["Entières", "Décimales", "Fractions"],
+const getIsTableProportionalNonIntegerQuestion = (opts) => {
+    const coeffType = (0, random_1.random)(opts?.coeffNumberTypes ?? ["Entier", "Décimal", "Fraction"]);
+    if (!coeffType)
+        throw Error("No Coeff Type");
+    const valuesType = (0, random_1.random)(opts?.valuesNumberTypes ?? ["Entières", "Décimales", "Fractions"]);
+    if (!valuesType)
+        throw Error("No value type");
     let coeff;
     let xValues = [];
     const isProportionnal = (0, coinFlip_1.coinFlip)();
-    switch (type) {
-        case 1:
-            //coeff entier, valeurs décimal/frac
-            coeff = (0, randint_1.randint)(2, 10).toTree();
-            for (let i = 0; i < 3; i++) {
-                let x = (0, doWhile_1.doWhile)(() => (0, coinFlip_1.coinFlip)()
-                    ? (0, randfloat_1.randfloat)(1.1, 10, 1).toTree()
-                    : rational_1.RationalConstructor.randomIrreductible().toTree(), (y) => xValues.some((x) => x.equals(y)));
-                xValues.push(x);
-            }
-            xValues.sort((a, b) => a.evaluate() - b.evaluate());
-            break;
-        case 2:
-            //coeff décimal, valeurs entieres/décimal
-            coeff = (0, randfloat_1.randfloat)(1.1, 10, 1).toTree();
-            for (let i = 0; i < 3; i++) {
-                let x = (0, doWhile_1.doWhile)(() => (0, coinFlip_1.coinFlip)()
-                    ? (0, randint_1.randint)(1, 10).toTree()
-                    : (0, randfloat_1.randfloat)(1.1, 10, 1).toTree(), (y) => xValues.some((x) => x.equals(y)));
-                xValues.push(x);
-            }
-            xValues.sort((a, b) => a.evaluate() - b.evaluate());
-            break;
-        case 3:
-        //coeff frac, valeurs frac / entieres
-        default:
-            coeff = rational_1.RationalConstructor.randomPureRational().toTree();
-            for (let i = 0; i < 3; i++) {
-                let x = (0, doWhile_1.doWhile)(() => (0, coinFlip_1.coinFlip)()
-                    ? (0, randint_1.randint)(1, 10).toTree()
-                    : rational_1.RationalConstructor.randomIrreductible().toTree(), (y) => xValues.some((x) => x.equals(y)));
-                xValues.push(x);
-            }
-            xValues.sort((a, b) => a.evaluate() - b.evaluate());
+    coeff =
+        coeffType === "Entier"
+            ? (0, randint_1.randint)(2, 10).toTree()
+            : coeffType === "Décimal"
+                ? (0, randfloat_1.randfloat)(1.1, 10, 1).toTree()
+                : rational_1.RationalConstructor.randomPureRational(10).toTree();
+    const getX = () => {
+        return valuesType === "Entières"
+            ? (0, randint_1.randint)(1, 10).toTree()
+            : valuesType === "Décimales"
+                ? (0, randfloat_1.randfloat)(1.1, 10, 1).toTree()
+                : rational_1.RationalConstructor.randomIrreductible().toTree();
+    };
+    for (let i = 0; i < 3; i++) {
+        let x = (0, doWhile_1.doWhile)(getX, (y) => xValues.some((x) => x.equals(y)));
+        xValues.push(x);
     }
+    xValues.sort((a, b) => a.evaluate() - b.evaluate());
     const yValues = isProportionnal
         ? xValues.map((x) => (0, multiplyNode_1.multiply)(x, coeff).simplify())
-        : xValues.map((x) => (0, multiplyNode_1.multiply)((0, addNode_1.add)(x, (0, random_1.random)([-1, 1])), coeff).simplify());
+        : xValues.map((x) => (0, multiplyNode_1.multiply)((0, addNode_1.add)(x, 1), coeff).simplify());
     const identifiers = {
         coeffIds: coeff.toIdentifiers(),
         xValues: xValues.map((e) => e.toIdentifiers()),
         yValues: yValues.map((e) => e.toIdentifiers()),
         isProportionnal: isProportionnal,
-        type,
+        valuesType,
+        coeffType,
     };
     const question = {
         answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
+        instruction: getInstruction(identifiers, opts),
         keys: getKeys(identifiers),
         answerFormat: "raw",
         identifiers,
@@ -107,12 +98,35 @@ const getIsTableProportionalNonIntegerQuestion = () => {
     };
     return question;
 };
+// const validateOptions : ValidateOptions<Options> = (opts) => {
+//   if(!opts.coeffNumberTypes)
+//   return {
+//     valid: !!opts?.coeffNumberTypes,
+//     message: "Veuillez choisir un type de consigne.",
+//   };
+// },
+const options = [
+    {
+        id: "coeffNumberTypes",
+        label: "Type du coefficient",
+        type: exercise_1.GeneratorOptionType.multiselect,
+        target: exercise_1.GeneratorOptionTarget.generation,
+        values: ["Entier", "Décimal", "Fraction"],
+    },
+    {
+        id: "valuesNumberTypes",
+        label: "Type des valeurs",
+        type: exercise_1.GeneratorOptionType.multiselect,
+        target: exercise_1.GeneratorOptionTarget.generation,
+        values: ["Entières", "Décimales", "Fractions"],
+    },
+];
 exports.isTableProportionalNonInteger = {
     id: "isTableProportionalNonInteger",
     connector: "=",
     label: "Reconnaître un tableau de proportionnalité (valeurs non entières)",
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getIsTableProportionalNonIntegerQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getIsTableProportionalNonIntegerQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
@@ -122,4 +136,5 @@ exports.isTableProportionalNonInteger = {
     // getCorrection,
     getAnswer,
     answerType: "QCU",
+    options,
 };

package/lib/exercises/math/calculLitteral/systems/basicSystemResolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicSystemResolution.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/systems/basicSystemResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AA0DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"basicSystemResolution.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/systems/basicSystemResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AA8DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}

package/lib/exercises/math/calculLitteral/systems/basicSystemResolution.js

@@ -14,16 +14,19 @@ const getBasicSystemResolutionQuestion = () => {
     const isXAsked = (0, coinFlip_1.coinFlip)();
     const variable = isXAsked ? "x" : "y";
     const answer = isXAsked ? x.toTex() : y.toTex();
+    const identifiers = { coeffs: sys.coeffs, isXAsked };
     const question = {
         answer,
         instruction: `Soit le système d'équations suivant :
 
-$${sys.toTex()}$
+$$
+${sys.toTex()}
+$$
 
 Que vaut $${variable}$ ?`,
         keys: [],
         answerFormat: "tex",
-        identifiers: { coeffs: sys.coeffs, isXAsked },
+        identifiers,
     };
     return question;
 };

package/lib/exercises/math/functions/affines/signFunction.js

@@ -33,7 +33,7 @@ const getSignFunction = () => {
         instruction,
         startStatement: "S",
         answer,
-        keys: ["S", "equal", "lbracket", "rbracket", "semicolon", "infty"],
+        keys: ["lbracket", "semicolon", "rbracket", "infty"],
         answerFormat: "tex",
         identifiers: { a, askingPositive, b },
     };

package/lib/exercises/math/functions/trinoms/factorizedFormFromRoots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factorizedFormFromRoots.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/factorizedFormFromRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"factorizedFormFromRoots.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/factorizedFormFromRoots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+EF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}

package/lib/exercises/math/functions/trinoms/factorizedFormFromRoots.js

@@ -71,4 +71,5 @@ exports.factorizedFormFromRoots = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
 };

package/lib/exercises/math/geometry/thales/thalesCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thalesCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAqBT,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAoB,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAGL,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAUtC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,uBAAuB,EAAE,gBAAgB,EAAE,CAAC;IAC5C,YAAY,EAAE,kBAAkB,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAsKF,KAAK,OAAO,GAAG;IACb,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAiEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBvD,CAAC"}
+{"version":3,"file":"thalesCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/thales/thalesCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAqBT,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAoB,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAGL,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AAUtC,KAAK,WAAW,GAAG;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,uBAAuB,EAAE,gBAAgB,EAAE,CAAC;IAC5C,YAAY,EAAE,kBAAkB,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAsKF,KAAK,OAAO,GAAG;IACb,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAiEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAwBvD,CAAC"}

package/lib/exercises/math/geometry/thales/thalesCalcul.js

@@ -196,4 +196,10 @@ exports.thalesCalcul = {
     getGGBOptions,
     options,
     hasGeogebra: true,
+    validateOptions: (opts) => {
+        return {
+            valid: !!opts?.configurationType,
+            message: "Veuillez choisir un type de figure.",
+        };
+    },
 };

package/lib/exercises/math/powers/powersDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersDivision.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAyFF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CA6BhD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}
+{"version":3,"file":"powersDivision.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/powers/powersDivision.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAKxB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8FF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CA6BhD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}