math-exercises 2.2.52 → 2.2.54

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

@@ -1 +1 @@
-{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA0CF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAqDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

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

@@ -4,18 +4,28 @@ exports.simplifyFraction = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const getInstruction = (identifiers) => {
+    const rational = (0, fractionNode_1.frac)(identifiers.num, identifiers.denum);
+    return `Simplifier le plus possible : 
+  
+$$
+${rational.toTex()}
+$$`;
+};
 const getSimplifyFraction = () => {
     const rational = rational_1.RationalConstructor.randomSimplifiable(10);
     const rationalTex = rational.toTree().toTex();
     const answer = rational.simplify().toTree().toTex();
+    const identifiers = { num: rational.num, denum: rational.denum };
     const question = {
-        instruction: `Mettre sous forme irréductible : $${rationalTex}$`,
+        instruction: getInstruction(identifiers),
         startStatement: rationalTex,
         answer,
         keys: [],
         answerFormat: "tex",
-        identifiers: { num: rational.num, denum: rational.denum },
+        identifiers,
     };
     return question;
 };

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

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    coeffIds: any;
+    xValues: any[];
+    yValues: any[];
+    type: number;
+};
+export declare const findCoeffInProportionalTableNonIntegers: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=findCoeffInProportionalTableNonIntegers.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findCoeffInProportionalTableNonIntegers = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+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 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 propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        switch (type) {
+            case 1:
+                (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(1, 10) + "");
+                break;
+            case 2:
+                (0, exercise_1.tryToAddWrongProp)(propositions, (0, randfloat_1.randfloat)(1, 10, 1).frenchify());
+                break;
+            case 3:
+                (0, exercise_1.tryToAddWrongProp)(propositions, rational_1.RationalConstructor.randomIrreductible().toTree().toTex());
+                break;
+        }
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return nodeConstructor_1.NodeConstructor.fromIdentifiers(identifiers.coeffIds).toTex();
+};
+const getInstruction = (identifiers) => {
+    const { xValues, yValues } = identifiers;
+    const xTexs = xValues.map((x) => nodeConstructor_1.NodeConstructor.fromIdentifiers(x).toTex());
+    const yTexs = yValues.map((y) => nodeConstructor_1.NodeConstructor.fromIdentifiers(y).toTex());
+    return `On considère le tableau de proportionnalité suivant :
+
+${(0, mdTable_1.mdTable)([xTexs.map((v) => (0, dollarize_1.dollarize)(v)), yTexs.map((v) => (0, dollarize_1.dollarize)(v))])}
+
+Quel est le coefficient de proportionnalité ?
+  `;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+    if (!parsed)
+        return false;
+    return parsed.simplify().toTex() === answer;
+};
+const getFindCoeffInProportionalTableNonIntegersQuestion = () => {
+    const type = (0, randint_1.randint)(1, 4);
+    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) => y.equals(x));
+                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) => y.equals(x));
+                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) => y.equals(x));
+                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,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+        style: {
+            tableHasNoHeader: true,
+        },
+    };
+    return question;
+};
+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),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    // getHint,
+    // getCorrection,
+    getAnswer,
+    answerType: "QCU",
+};

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

@@ -2,4 +2,6 @@ export * from "./proportionalityTable";
 export * from "./proportionalityTableCoefficient";
 export * from "./scaleCalculation";
 export * from "./scaleUsage";
+export * from "./isTableProportionalNonInteger";
+export * from "./findCoeffInProportionalTableNonIntegers";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,iCAAiC,CAAC;AAChD,cAAc,2CAA2C,CAAC"}

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

@@ -18,3 +18,5 @@ __exportStar(require("./proportionalityTable"), exports);
 __exportStar(require("./proportionalityTableCoefficient"), exports);
 __exportStar(require("./scaleCalculation"), exports);
 __exportStar(require("./scaleUsage"), exports);
+__exportStar(require("./isTableProportionalNonInteger"), exports);
+__exportStar(require("./findCoeffInProportionalTableNonIntegers"), exports);

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

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    coeffIds: any;
+    xValues: any[];
+    yValues: any[];
+    isProportionnal: boolean;
+    type: number;
+};
+export declare const isTableProportionalNonInteger: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=isTableProportionalNonInteger.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTableProportionalNonInteger = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+const randint_1 = require("../../../../math/utils/random/randint");
+const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+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 }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Non", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "On ne peut pas savoir", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "Oui", "raw");
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return identifiers.isProportionnal ? "Oui" : "Non";
+};
+const getInstruction = (identifiers) => {
+    const { xValues, yValues } = identifiers;
+    const xTexs = xValues.map((x) => nodeConstructor_1.NodeConstructor.fromIdentifiers(x).toTex());
+    const yTexs = yValues.map((y) => nodeConstructor_1.NodeConstructor.fromIdentifiers(y).toTex());
+    return `Le tableau ci-dessous est-il un tableau de proportionnalité ?
+
+${(0, mdTable_1.mdTable)([xTexs.map((v) => (0, dollarize_1.dollarize)(v)), yTexs.map((v) => (0, dollarize_1.dollarize)(v))])}
+
+  `;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    throw Error("VEA not implemented");
+};
+const getIsTableProportionalNonIntegerQuestion = () => {
+    const type = (0, randint_1.randint)(1, 4);
+    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) => y.equals(x));
+                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) => y.equals(x));
+                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) => y.equals(x));
+                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());
+    const identifiers = {
+        coeffIds: coeff.toIdentifiers(),
+        xValues: xValues.map((e) => e.toIdentifiers()),
+        yValues: yValues.map((e) => e.toIdentifiers()),
+        isProportionnal: isProportionnal,
+        type,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "raw",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+        style: {
+            tableHasNoHeader: true,
+        },
+    };
+    return question;
+};
+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),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    // getHint,
+    // getCorrection,
+    getAnswer,
+    answerType: "QCU",
+};

package/lib/exercises/math/calculLitteral/equation/equationWithDistributivity.d.ts

@@ -0,0 +1,16 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    type: number;
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+    e: number;
+    f: number;
+};
+type Options = {
+    integerSolutions: boolean;
+};
+export declare const equationWithDistributivity: Exercise<Identifiers, Options>;
+export {};
+//# sourceMappingURL=equationWithDistributivity.d.ts.map

package/lib/exercises/math/calculLitteral/equation/equationWithDistributivity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"equationWithDistributivity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationWithDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuEF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AA0DF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBrE,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationWithDistributivity.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.equationWithDistributivity = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const dividersOf_1 = require("../../../../math/utils/arithmetic/dividersOf");
+const randint_1 = require("../../../../math/utils/random/randint");
+const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const equationSolutionParser_1 = require("../../../../tree/parsers/equationSolutionParser");
+const random_1 = require("../../../../utils/alea/random");
+const getPropositions = (n, { answer }, opts) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        if (opts?.integerSolutions) {
+            (0, exercise_1.tryToAddWrongProp)(propositions, `x=${(0, randint_1.randint)(-10, 11).toTree().toTex()}`);
+        }
+        else {
+            (0, exercise_1.tryToAddWrongProp)(propositions, `x=${(0, fractionNode_1.frac)((0, randint_1.randint)(-50, 50), (0, randint_1.randint)(-50, 50, [0]))
+                .simplify()
+                .toTex()}`);
+        }
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { type, a, b, c, d, e, f } = identifiers;
+    const sol = type
+        ? (0, fractionNode_1.frac)((0, substractNode_1.substract)((0, multiplyNode_1.multiply)(d, f), (0, multiplyNode_1.multiply)(a, c)), (0, substractNode_1.substract)((0, multiplyNode_1.multiply)(a, b), (0, multiplyNode_1.multiply)(d, e)))
+            .simplify()
+            .toTex()
+        : (0, fractionNode_1.frac)((0, substractNode_1.substract)(e, (0, multiplyNode_1.multiply)(a, c)), (0, substractNode_1.substract)((0, multiplyNode_1.multiply)(a, b), d))
+            .simplify()
+            .toTex();
+    return `x=${sol}`;
+};
+const getInstruction = (identifiers) => {
+    const { type, a, b, c, d, e, f } = identifiers;
+    const left = (0, multiplyNode_1.multiply)(a, (0, addNode_1.add)((0, multiplyNode_1.multiply)(b, "x"), c));
+    const right = type
+        ? (0, multiplyNode_1.multiply)(d, (0, addNode_1.add)((0, multiplyNode_1.multiply)(e, "x"), f))
+        : (0, addNode_1.add)((0, multiplyNode_1.multiply)(d, "x"), e);
+    const equalNode = (0, equalNode_1.equal)(left, right);
+    return `Résoudre l'équation suivante : 
+  
+$$
+${equalNode.toTex()}
+$$`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {
+//   return ``;
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   return ``;
+// };
+const getKeys = (identifiers) => {
+    return ["x", "equal"];
+};
+const isAnswerValid = (ans, { answer }) => {
+    const parsed = (0, equationSolutionParser_1.equationSolutionParser)(ans);
+    if (!parsed)
+        return false;
+    return `x=${parsed.toTex()}` === answer;
+};
+const getEquationWithDistributivityQuestion = (opts) => {
+    const type = (0, random_1.random)([0, 1]);
+    const a = (0, randint_1.randint)(-9, 10, [0, 1]);
+    const b = (0, randint_1.randint)(-9, 10, [0]);
+    const c = (0, randint_1.randint)(-9, 10, [0]);
+    const x = opts?.integerSolutions ? (0, randint_1.randint)(-10, 11) : undefined;
+    const y = opts?.integerSolutions ? a * (b * x + c) : undefined;
+    const d = opts?.integerSolutions && type === 1 && y !== 0
+        ? (0, random_1.random)((0, dividersOf_1.dividersOf)(Math.abs(y)))
+        : (0, randint_1.randint)(-9, 10, type ? [0] : [0, a * b]);
+    const e = opts?.integerSolutions && type === 0
+        ? y - d * x
+        : (0, randint_1.randint)(-9, 10, type ? [0, (a * b) / d] : []);
+    const f = opts?.integerSolutions && type === 1
+        ? (y - d * e * x) / d
+        : (0, randint_1.randint)(-9, 10);
+    const identifiers = {
+        type,
+        a,
+        b,
+        c,
+        d,
+        e,
+        f,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+const options = [
+    {
+        id: "integerSolutions",
+        label: "Solutions entières",
+        type: exercise_1.GeneratorOptionType.checkbox,
+        target: exercise_1.GeneratorOptionTarget.generation,
+    },
+];
+exports.equationWithDistributivity = {
+    id: "equationWithDistributivity",
+    connector: "\\iff",
+    label: "Résoudre une équation du premier degré après développement",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getEquationWithDistributivityQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    // getHint,
+    // getCorrection,
+    getAnswer,
+    options,
+};

package/lib/exercises/math/calculLitteral/equation/index.d.ts

@@ -11,4 +11,5 @@ export * from "./firstDegreeEquationIntType2";
 export * from "./firstDegreeEquationIntType3";
 export * from "./equationFromSentenceExercise";
 export * from "./binomialsTrinomialsProposedSolutions";
+export * from "./equationWithDistributivity";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calculLitteral/equation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wCAAwC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wCAAwC,CAAC;AACvD,cAAc,8BAA8B,CAAC"}

package/lib/exercises/math/calculLitteral/equation/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./firstDegreeEquationIntType2"), exports);
 __exportStar(require("./firstDegreeEquationIntType3"), exports);
 __exportStar(require("./equationFromSentenceExercise"), exports);
 __exportStar(require("./binomialsTrinomialsProposedSolutions"), exports);
+__exportStar(require("./equationWithDistributivity"), exports);

package/lib/exercises/math/calculLitteral/factorisation/factoType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAwHF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4HF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/factoType1Exercise.js

@@ -32,7 +32,11 @@ const getFactoType1Question = () => {
         : new multiplyNode_1.MultiplyNode(affine1.toTree(), affine2.toTree());
     const answer = answerTree.toTex();
     const question = {
-        instruction: `Factoriser : $${statementTree.toTex()}$`,
+        instruction: `Factoriser et réduire : 
+
+$$
+${statementTree.toTex()}
+$$`,
         startStatement: statementTree.toTex(),
         answer,
         keys: ["x"],

package/lib/exercises/math/functions/basics/imageFunctionGeogebra.d.ts

@@ -1,9 +1,10 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
-    rand: boolean;
-    poly1: number[];
-    poly2: number[];
-    xValue: number;
+    /**old */
+    isSpline: boolean;
+    splinePoints: number[][];
+    x: number;
+    y: number;
 };
 export declare const imageFunctionGeogebra: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/functions/basics/imageFunctionGeogebra.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/imageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAyEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"imageFunctionGeogebra.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/imageFunctionGeogebra.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,SAAS;IAIT,QAAQ,EAAE,OAAO,CAAC;IAElB,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;IACzB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}