math-exercises 3.0.29 → 3.0.31

package/lib/exercises/math/calcul/arithmetics/euclideanDivision.js

@@ -17,7 +17,7 @@ const getEuclideanDivisionQuestions = () => {
     const answer = new EqualNode(new NumberNode(dividend), new AddNode(new MultiplyNode(new NumberNode(divisor), new NumberNode(quotient)), new NumberNode(remainder)));
     const answerTex = answer.toTex();
     const question = {
-        instruction: `Ecrire la division euclidienne de $${dividend}$ par $${divisor}$.`,
+        instruction: `Écrire la division euclidienne de $${dividend}$ par $${divisor}$.`,
         answer: answerTex,
         keys: ["equal"],
         answerFormat: "tex",
@@ -45,7 +45,7 @@ const getPropositions = (n, { answer, dividend }) => {
 export const euclideanDivision = {
     id: "euclideanDivision",
     connector: "=",
-    label: "Ecrire une division euclidienne",
+    label: "Écrire une division euclidienne",
     levels: ["6ème", "5ème", "4ème"],
     sections: ["Arithmétique"],
     isSingleStep: true,

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

@@ -1 +1 @@
-{"version":3,"file":"fractionSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6FF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAiBhD,CAAC"}
+{"version":3,"file":"fractionSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAiGF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAkBhD,CAAC"}

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

@@ -74,6 +74,9 @@ const getFractionSquareQuestion = (ops) => {
         num: rational.num,
         denum: rational.denum,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -101,4 +104,5 @@ export const fractionSquare = {
     getCorrection,
     getAnswer,
     hasHintAndCorrection: true,
+    getQuestionFromIdentifiers,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AA2HF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAoB3D,CAAC"}
+{"version":3,"file":"fractionsProduct.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAiIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmB3D,CAAC"}

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

@@ -62,6 +62,9 @@ const getFractionsProduct = (opts) => {
         rationalNum: [rational.num, rational.denum],
         rationalDenum: [rational2.num, rational2.denum],
     };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
         instruction: getInstruction(identifiers, opts),
         startStatement: getStartStatement(identifiers, opts),
@@ -105,8 +108,6 @@ export const fractionsProduct = {
     id: "fractionsProduct",
     connector: "=",
     label: "Produits de fractions",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
-    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb, opts) => getDistinctQuestions(() => getFractionsProduct(opts), nb),
     qcmTimer: 60,
@@ -120,4 +121,5 @@ export const fractionsProduct = {
     getAnswer,
     getHint,
     getCorrection,
+    getQuestionFromIdentifiers,
 };

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

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    frac1: number[];
+    frac2: number[];
+};
+type Options = {
+    allowNonIrreductible?: boolean;
+};
+export declare const fractionsSubstraction: Exercise<Identifiers, Options>;
+export {};
+//# sourceMappingURL=fractionsSubstraction.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fractionsSubstraction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSubstraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AA8GF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkBhE,CAAC"}

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

@@ -0,0 +1,106 @@
+import { addValidProp, shuffleProps, GeneratorOptionType, GeneratorOptionTarget, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { RationalConstructor, } from "../../../../math/numbers/rationals/rational.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { rationalParser } from "../../../../tree/parsers/rationalParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+const options = [
+    {
+        id: "allowNonIrreductible",
+        label: "Autoriser les fractions non réduites",
+        type: GeneratorOptionType.checkbox,
+        target: GeneratorOptionTarget.vea,
+    },
+];
+const getStatementNode = (identifiers) => {
+    const { frac1, frac2 } = identifiers;
+    return substract(frac(frac1[0], frac1[1]), frac(frac2[0], frac2[1]));
+};
+const getPropositions = (n, { answer, frac1, frac2 }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    tryToAddWrongProp(propositions, frac(frac1[0] - frac2[0], frac1[1] - frac2[1], {
+        allowDivideByZero: true,
+    }).toTex());
+    while (propositions.length < n) {
+        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTex());
+    }
+    return shuffleProps(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return getStatementNode(identifiers).simplify().toTex();
+};
+const getInstruction = (identifiers, opts) => {
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+    
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }, opts) => {
+    const allow = opts?.allowNonIrreductible;
+    try {
+        if (allow) {
+            const parsed = rationalParser(ans);
+            if (!parsed)
+                return false;
+            return parsed.simplify({ decimalToFractions: true }).toTex() === answer;
+        }
+        else {
+            return ans === answer;
+        }
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getFractionsSubstractionQuestion = (opts) => {
+    const ratio1 = RationalConstructor.randomIrreductible();
+    let ratio2;
+    do {
+        ratio2 = RationalConstructor.randomIrreductible(12);
+    } while (ratio2.value >= ratio1.value);
+    const identifiers = {
+        frac1: [ratio1.num, ratio1.denum],
+        frac2: [ratio2.num, ratio2.denum],
+    };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers, opts),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+export const fractionsSubstraction = {
+    id: "fractionsSubstraction",
+    connector: "=",
+    label: "Soustraction de fractions",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getFractionsSubstractionQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    // getHint,
+    // getCorrection,
+    getAnswer,
+    options,
+    getQuestionFromIdentifiers,
+};

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

@@ -74,7 +74,7 @@ const options = [
 export const fractionsSumsPrimeDenominators = {
     id: "fractionsSumsPrimeDenominators",
     connector: "=",
-    label: "Sommes de fractions (dénominateurs premiers entre eux)",
+    label: "Sommes de fractions (avec dénominateurs premiers entre eux)",
     levels: [],
     isSingleStep: true,
     sections: [],

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

@@ -101,7 +101,7 @@ const options = [
 export const fractionsSumsSameDenominators = {
     id: "fractionsSumsSameDenominators",
     connector: "=",
-    label: "Sommes de fractions (avec même dénominateurs)",
+    label: "Sommes de fractions (avec même dénominateur)",
     levels: [],
     isSingleStep: true,
     sections: [],

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

@@ -12,4 +12,5 @@ export * from "./fractionsSumsMultiplesDenominators.js";
 export * from "./fractionsSumsPrimeDenominators.js";
 export * from "./fractionsOperations.js";
 export * from "./fractionSquare.js";
+export * from "./fractionsSubstraction.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC"}

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

@@ -12,3 +12,4 @@ export * from "./fractionsSumsMultiplesDenominators.js";
 export * from "./fractionsSumsPrimeDenominators.js";
 export * from "./fractionsOperations.js";
 export * from "./fractionSquare.js";
+export * from "./fractionsSubstraction.js";

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

@@ -34,7 +34,7 @@ const getPeriodicWritingToFractionQuestion = () => {
         .toTex();
     const question = {
         answer,
-        instruction: `Ecrire sous forme de fraction : $${x}$`,
+        instruction: `Écrire sous forme de fraction : $${x}$`,
         keys: [],
         answerFormat: "tex",
         identifiers: { num, denum, leadingPart: leadingPart.value },

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,EAST,MAAM,6BAA6B,CAAC;AASrC,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"}
+{"version":3,"file":"simplifyFraction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAgEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAWlD,CAAC"}

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

@@ -1,25 +1,36 @@
 import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Rational, RationalConstructor, } from "../../../../math/numbers/rationals/rational.js";
-import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const getStatementNode = (identifiers) => {
+    const { num, denum } = identifiers;
+    const rational = new Rational(num, denum).toTree();
+    return rational;
+};
+const getStartStatement = (identifiers) => {
+    const rationalTex = getStatementNode(identifiers).toTex();
+    return rationalTex;
+};
 const getInstruction = (identifiers) => {
-    const rational = frac(identifiers.num, identifiers.denum);
     return `Simplifier le plus possible : 
   
 $$
-${rational.toTex()}
+${getStartStatement(identifiers)}
 $$`;
 };
+const getAnswer = (identifiers) => {
+    const { num, denum } = identifiers;
+    const rational = new Rational(num, denum);
+    const answer = rational.simplify().toTree().toTex();
+    return answer;
+};
 const getSimplifyFraction = () => {
     const rational = 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: getInstruction(identifiers),
-        startStatement: rationalTex,
-        answer,
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
         identifiers,
@@ -46,9 +57,7 @@ const isAnswerValid = (ans, { num, denum }) => {
 export const simplifyFraction = {
     id: "simplifyFrac",
     connector: "=",
-    label: "Simplification de fractions",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
-    sections: ["Fractions"],
+    label: "Simplifier une fraction",
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getSimplifyFraction, nb),
     qcmTimer: 60,

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

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AA0EF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}
+{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AA0FF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAgBtD,CAAC"}

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

@@ -2,6 +2,7 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { IntegerConstructor } from "../../../../math/numbers/integer/integer.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { dollarize } from "../../../../utils/latex/dollarize.js";
 import { mdTable } from "../../../../utils/markdown/mdTable.js";
@@ -15,37 +16,50 @@ ${mdTable([
 
 Déterminer le nombre manquant.`;
 };
+const getAnswer = (identifiers) => {
+    const { randQuation, x1, x2, x3, x4 } = identifiers;
+    const table = [x1, x2, x3, x4].map(Number);
+    switch (randQuation) {
+        case 0:
+            return round((table[1] * table[2]) / table[3], 0).frenchify();
+        case 1:
+            return round((table[0] * table[3]) / table[2], 0).frenchify();
+        case 2:
+            return round((table[3] * table[0]) / table[1], 0).frenchify();
+        case 3:
+        default:
+            return round((table[2] * table[1]) / table[0], 0).frenchify();
+    }
+};
 const getProportionalityTable = () => {
     const fact = randint(2, 10);
     let [x1, x2] = IntegerConstructor.randomDifferents(1, 100 / fact, 2);
     let [x3, x4] = [x1 * fact, x2 * fact];
-    let answer = "";
     const randQuation = randint(0, 4);
     switch (randQuation) {
         case 0:
-            answer = x1 + "";
             x1 = "?";
             break;
         case 1:
-            answer = +x2 + "";
             x2 = "?";
             break;
         case 2:
-            answer = x3 + "";
             x3 = "?";
             break;
         case 3:
-            answer = x4 + "";
             x4 = "?";
             break;
     }
     const identifiers = { x1, x2, x3, x4, randQuation };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
-        answer: answer,
+        answer: getAnswer(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { randQuation, x1, x2, x3, x4 },
+        identifiers,
         style: {
             tableHasNoHeader: true,
         },
@@ -77,4 +91,6 @@ export const proportionalityTable = {
     isAnswerValid,
     subject: "Mathématiques",
     getInstruction,
+    getQuestionFromIdentifiers,
+    getAnswer,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"rectangleSideAfterReduction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/rectangleSideAfterReduction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CAGnB,CAAC;AA8OF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAmB7D,CAAC"}
+{"version":3,"file":"rectangleSideAfterReduction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/rectangleSideAfterReduction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CAGnB,CAAC;AAoPF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAoB7D,CAAC"}

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

@@ -169,6 +169,9 @@ const getRectangleSideAfterReductionQuestion = (ops) => {
     const identifiers = {
         lengths: [a, b, c, d],
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -195,4 +198,5 @@ export const rectangleSideAfterReduction = {
     // getHint,
     // getCorrection,
     getAnswer,
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calcul/sign/signFromAx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signFromAx.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/sign/signFromAx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAwGF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAiB5C,CAAC"}
+{"version":3,"file":"signFromAx.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/sign/signFromAx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA6GF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAkB5C,CAAC"}

package/lib/exercises/math/calcul/sign/signFromAx.js

@@ -80,6 +80,9 @@ const getSignFromAxQuestion = (ops) => {
             [1, 0.45],
         ]),
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),
@@ -107,4 +110,5 @@ export const signFromAx = {
     hasHintAndCorrection: true,
     getAnswer,
     answerType: "QCU",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/calculLitteral/distributivity/allIdentities.js

@@ -1,8 +1,8 @@
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { random } from "../../../../utils/alea/random.js";
-import { getFirstIdentityPropositions, getFirstIdentityQuestion, isFirstIdentityAnswerValid, } from "./firstIdentity.js";
-import { getSecondIdentityPropositions, getSecondIdentityQuestion, isSecondIdentityAnswerValid, } from "./secondIdentity.js";
-import { getThirdIdentityPropositions, getThirdIdentityQuestion, isThirdIdentityAnswerValid, } from "./thirdIdentity.js";
+import { getFirstIdentityPropositions, getFirstIdentityQuestion, isFirstIdentityAnswerValid, } from "./idRmq1.js";
+import { getSecondIdentityPropositions, getSecondIdentityQuestion, isSecondIdentityAnswerValid, } from "./idRmq2.js";
+import { getThirdIdentityPropositions, getThirdIdentityQuestion, isThirdIdentityAnswerValid, } from "./idRmq3.js";
 const getAllIdentitiesQuestion = () => {
     const type = random([1, 2, 3]);
     let question;

package/lib/exercises/math/calculLitteral/distributivity/doubleDistri.d.ts

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    affine1Coeffs: number[];
+    affine2Coeffs: number[];
+};
+export declare const doubleDistributivity: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=doubleDistri.d.ts.map

package/lib/exercises/math/calculLitteral/distributivity/doubleDistri.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doubleDistri.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistri.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA+JF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAmBtD,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/doubleDistri.js

@@ -0,0 +1,155 @@
+import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { Affine, AffineConstructor } from "../../../../math/polynomials/affine.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { operatorComposition } from "../../../../tree/utilities/operatorComposition.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { polynomialParser } from "../../../../tree/parsers/polynomialParser.js";
+const getStatementNode = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affines = [
+        new Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
+    const statementTree = new MultiplyNode(affines[0].toTree(), affines[1].toTree());
+    return statementTree;
+};
+const getStartStatement = (identifiers) => {
+    return getStatementNode(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Développer et réduire : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affines = [
+        new Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
+    const answer = affines[0].multiply(affines[1]).toTree().toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    return "Multiplie chaque terme du premier facteur par chaque terme du second facteur, puis regroupe les termes similaires.";
+};
+const getCorrection = (identifiers) => {
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    const { affine1Coeffs, affine2Coeffs } = identifiers;
+    const affines = [
+        new Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
+    const subTerms = [
+        new MultiplyNode(affines[0].a.toTree(), "x".toTree()),
+        affines[0].b.toTree(),
+        new MultiplyNode(affines[1].a.toTree(), "x".toTree()),
+        affines[1].b.toTree(),
+    ];
+    const subMultiplications = [
+        new MultiplyNode(subTerms[0], subTerms[2], { forceTimesSign: true }),
+        new MultiplyNode(subTerms[0], subTerms[3], { forceTimesSign: true }),
+        new MultiplyNode(subTerms[1], subTerms[2], { forceTimesSign: true }),
+        new MultiplyNode(subTerms[1], subTerms[3], { forceTimesSign: true }),
+    ];
+    return `
+${alignTex([
+        [statementTex, "=", operatorComposition(AddNode, subMultiplications).toTex()],
+        [
+            "",
+            "=",
+            operatorComposition(AddNode, subMultiplications.map((e) => e.simplify())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}
+
+    `;
+};
+const getDoubleDistributivityQuestion = () => {
+    const affines = AffineConstructor.differentRandoms(2, undefined, {
+        excludes: [0],
+    });
+    const statementTree = new MultiplyNode(affines[0].toTree(), affines[1].toTree());
+    const identifiers = {
+        affine1Coeffs: affines[0].coefficients,
+        affine2Coeffs: affines[1].coefficients,
+    };
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: statementTree.toTex(),
+        answer: getAnswer(identifiers),
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    const affines = [
+        new Affine(affine1Coeffs[1], affine1Coeffs[0]),
+        new Affine(affine2Coeffs[1], affine2Coeffs[0]),
+    ];
+    tryToAddWrongProp(propositions, affines[0]
+        .multiply(new Affine(-affines[1].a, randint(-9, 10, [affines[1].b])))
+        .toTree()
+        .toTex());
+    tryToAddWrongProp(propositions, affines[1]
+        .multiply(new Affine(randint(-9, 10, [affines[0].a, 0]), affines[0].b))
+        .toTree()
+        .toTex());
+    while (propositions.length < n) {
+        const affinesTemps = AffineConstructor.differentRandoms(2, undefined, {
+            excludes: [0],
+        });
+        const wrongAnswer = affinesTemps[0].multiply(affinesTemps[1]).toTree();
+        tryToAddWrongProp(propositions, wrongAnswer.toTex());
+    }
+    return shuffle(propositions);
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const parsed = polynomialParser(ans);
+        if (!parsed)
+            return false;
+        return (parsed
+            .simplify({
+            forbidFactorize: true,
+            towardsDistribute: true,
+        })
+            .toTex() === answer);
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+export const doubleDistributivity = {
+    id: "doubleDistri",
+    connector: "=",
+    label: "Distributivité double",
+    levels: ["3ème", "2nde", "1reTech"],
+    sections: ["Calcul littéral"],
+    isSingleStep: false,
+    generator: (nb) => getDistinctQuestions(getDoubleDistributivityQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getCorrection,
+    getHint,
+};

package/lib/exercises/math/calculLitteral/distributivity/idRmq1.d.ts

@@ -0,0 +1,11 @@
+import { Exercise, QCMGenerator, QuestionGenerator, VEA } from "../../../../exercises/exercise.js";
+type Identifiers = {
+    a: number;
+    b: number;
+};
+export declare const getFirstIdentityQuestion: QuestionGenerator<Identifiers>;
+export declare const getFirstIdentityPropositions: QCMGenerator<Identifiers>;
+export declare const isFirstIdentityAnswerValid: VEA<Identifiers>;
+export declare const firstIdentity: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=idRmq1.d.ts.map

package/lib/exercises/math/calculLitteral/distributivity/idRmq1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"idRmq1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/idRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOR,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,6BAA6B,CAAC;AAerC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2EF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAwBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAgBvD,CAAC;AAMF,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAmB/C,CAAC"}