math-exercises 3.0.90 → 3.0.92

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

@@ -8,7 +8,7 @@ import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { doWhile } from "../../../../utils/doWhile.js";
 const getInstruction = (identifiers) => {
     const { a, b } = identifiers;
-    return `Donner la liste des diviseurs communs à $${a}$ et $${b}$ (séparer les valeurs par des point-virgules).`;
+    return `Donner la liste des diviseurs communs à $${a}$ et $${b}$ (séparer les valeurs par des points-virgules).`;
 };
 const getAnswer = (identifiers) => {
     const { a, b } = identifiers;

package/lib/exercises/math/calcul/arithmetics/isMultipleOrDivisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isMultipleOrDivisor.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/isMultipleOrDivisor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAM7C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AAuHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}
+{"version":3,"file":"isMultipleOrDivisor.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/isMultipleOrDivisor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAM7C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AAmHF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAkBrD,CAAC"}

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

@@ -38,14 +38,9 @@ const getInstruction = (identifiers) => {
 };
 const getHint = (identifiers) => {
     const { a, b } = identifiers;
-    const aValue = reifyAlgebraic(a).evaluate();
-    const bValue = reifyAlgebraic(b).evaluate();
-    if (isMultiple(aValue, bValue)) {
-        return `Un nombre $n$ est un multiple d'un nombre $k$ si on peut l'écrire sous la forme $n = k \\times m$ avec $m \\in \\mathbb{N}$.`;
-    }
-    else {
-        return `Un nombre $n$ est un diviseur d'un nombre $k$ si on peut écrire $k$ sous la forme $k=n \\times m$ avec $m \\in \\mathbb{N}$.`;
-    }
+    return `Un nombre $n$ est un multiple d'un nombre $k$ si on peut l'écrire sous la forme $n = k \\times m$ avec $m \\in \\mathbb{N}$.
+    
+Un nombre $n$ est un diviseur d'un nombre $k$ si on peut écrire $k$ sous la forme $k=n \\times m$ avec $m \\in \\mathbb{N}$.`;
 };
 const getCorrection = (identifiers) => {
     const { a, b } = identifiers;

package/lib/exercises/math/calcul/arithmetics/ppcmCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ppcmCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/ppcmCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4EF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAc5C,CAAC"}
+{"version":3,"file":"ppcmCalcul.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/ppcmCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqHF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAc5C,CAAC"}

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

@@ -4,6 +4,7 @@ import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
 import { lcm } from "../../../../math/utils/arithmetic/lcm.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const getPropositions = (n, { answer, ...identifiers }) => {
@@ -27,10 +28,41 @@ const getInstruction = (identifiers) => {
     return `Déterminer le PPCM (plus petit commun multiple) des nombres $${a}$ et $${b}$.`;
 };
 const getHint = (identifiers) => {
-    return ``;
+    const { a, b } = identifiers;
+    return `Dresse la liste des multiples de $${a}$, et celle des multiples de $${b}$. Puis, identifie le plus petit multiple qu'ils ont en commun.`;
 };
 const getCorrection = (identifiers) => {
-    return ``;
+    const { a, b } = identifiers;
+    const sorted = [a, b].sort((c, d) => c - d);
+    const isMultiple = gcd(a, b) === sorted[0];
+    if (isMultiple) {
+        return `$${sorted[1]}$ est un multiple de $${sorted[0]}$, car : 
+    
+$$
+${sorted[1]} = ${sorted[0]} \\times ${round(sorted[1] / sorted[0], 0)}
+$$
+
+Le plus petit commun multiple de $${a}$ et $${b}$ est donc $${sorted[1]}$.`;
+    }
+    const ppcm = lcm(a, b);
+    const aIndex = round(ppcm / a, 0);
+    const bIndex = round(ppcm / b, 0);
+    const aMultiples = [];
+    const bMultiples = [];
+    for (let i = 1; i <= aIndex; i++) {
+        aMultiples.push(a * i);
+    }
+    for (let i = 1; i <= bIndex; i++) {
+        bMultiples.push(b * i);
+    }
+    return `On dresse la liste des multiples de $${a}$, et celle des multiples de $${b}$, jusqu'à obtenir un multiple commun :
+  
+- ${aMultiples.map((e) => `$${e}$`).join(" ; ")}
+
+- ${bMultiples.map((e) => `$${e}$`).join(" ; ")}
+
+Le plus petit commun multiple de $${a}$ et $${b}$ est donc $${ppcm}$.
+`;
 };
 const getKeys = (identifiers) => {
     return [];
@@ -47,10 +79,17 @@ const getPpcmCalculQuestion = (ops) => {
     const areCoPrimes = coinFlip();
     let a;
     let b;
+    let aIndex = 0;
+    let bIndex = 0;
     do {
         a = randint(2, 40);
         b = randint(2, 40, [a]);
-    } while (areCoPrimes ? gcd(a, b) !== 1 : gcd(a, b) === 1);
+        const ppcm = lcm(a, b);
+        aIndex = round(ppcm / a, 0);
+        bIndex = round(ppcm / b, 0);
+    } while ((areCoPrimes ? gcd(a, b) !== 1 : gcd(a, b) === 1) ||
+        aIndex > 10 ||
+        bIndex > 10);
     const identifiers = {
         a,
         b,
@@ -80,5 +119,5 @@ export const ppcmCalcul = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
-    // hasHintAndCorrection: true,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/arithmetics/primeNumbers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AA0B9B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA0MF,KAAK,OAAO,GAAG;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAWF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBvD,CAAC"}
+{"version":3,"file":"primeNumbers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/arithmetics/primeNumbers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AA2B9B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAyMF,KAAK,OAAO,GAAG;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAWF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBvD,CAAC"}

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

@@ -12,6 +12,7 @@ import { isInt } from "../../../../utils/isInt.js";
 import { primeDecomposition } from "../../../../math/utils/arithmetic/primeDecomposition.js";
 import { divide } from "../../../../tree/nodes/operators/divideNode.js";
 import { alignTex } from "../../../../utils/latex/alignTex.js";
+import { random } from "../../../../utils/alea/random.js";
 const rebuildIdentifiers = (oldIds) => {
     if (oldIds.nb)
         return oldIds;
@@ -57,19 +58,17 @@ const getAnswer = (identifiers, opts) => {
     return operatorComposition(MultiplyNode, nodes).toTex();
 };
 const getPrimeNumbers = (opts) => {
-    const rand = randint(3, 5);
-    let chosenNumbers = [];
-    let elevenCount = 0;
-    for (let i = 0; i < rand; i++) {
-        let temp = randint(0, 5);
-        if (temp === 4)
-            elevenCount++;
-        while (elevenCount >= 2 && temp === 4)
-            temp = randint(0, 5);
-        chosenNumbers.push(primes[temp]);
-    }
+    const rand = randint(2, 5);
+    let nb = 0;
+    do {
+        let chosenNumbers = [];
+        for (let i = 0; i < rand; i++) {
+            chosenNumbers.push(random(primes));
+            nb = chosenNumbers.reduce((acc, curr) => acc * curr);
+        }
+    } while (nb > 100 && rand > 3);
     // chosenNumbers = chosenNumbers.sort((a, b) => a - b);
-    const identifiers = { nb: chosenNumbers.reduce((acc, curr) => acc * curr) };
+    const identifiers = { nb };
     return getQuestionFromIdentifiers(identifiers, opts);
 };
 const getHint = (identifiers) => {

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

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAiJF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAcF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBhE,CAAC"}
+{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAqJF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAcF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBhE,CAAC"}

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

@@ -102,9 +102,13 @@ const getPropositions = (n, { answer, integer, rational }) => {
     addValidProp(propositions, answer);
     const integerObj = new Integer(integer);
     const rationalObj = new Rational(rational[0], rational[1]);
-    tryToAddWrongProp(propositions, new Rational(integerObj.value + rationalObj.num, rationalObj.denum).toTex());
+    tryToAddWrongProp(propositions, new Rational(integerObj.value + rationalObj.num, rationalObj.denum)
+        .toTree()
+        .toTex());
     if (integerObj.value + rationalObj.denum !== 0)
-        tryToAddWrongProp(propositions, new Rational(integerObj.value + rationalObj.num, integerObj.value + rationalObj.denum).toTex());
+        tryToAddWrongProp(propositions, new Rational(integerObj.value + rationalObj.num, integerObj.value + rationalObj.denum)
+            .toTree()
+            .toTex());
     while (propositions.length < n) {
         const rational = RationalConstructor.randomIrreductible();
         const wrongAnswerTree = rational.add(integerObj).toTree();

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"fractionsMix.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsMix.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAYrC,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;CACX,CAAC;AA4OF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAkB9C,CAAC"}

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

@@ -0,0 +1,221 @@
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
+import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
+import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
+import { divide } from "../../../../tree/nodes/operators/divideNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+// a/db +- c/b
+// a/b * b/c * c/d * d/e
+// a / (b/c)
+// a + (b/c)/(d/c)
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    addValidProp(propositions, answer);
+    while (propositions.length < n) {
+        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTree().toTex());
+    }
+    return shuffleProps(propositions, n);
+};
+const getStatement = (identifiers) => {
+    const { type, a, b, c, d, e } = identifiers;
+    switch (type) {
+        case 0:
+            // a/db +- c/b
+            return add(frac(a, d * b), frac(c, b));
+        case 1:
+            // a/b * b/c * c/d * d/e
+            return multiply(multiply(frac(a, b), frac(b, c)), multiply(frac(c, d), frac(d, e)));
+        case 2:
+            // a / (b/c)
+            return frac(a, frac(b, c));
+        case 3:
+        default:
+            // a + (b/c)/(d/c)
+            return add(a, divide(frac(b, c), frac(d, c)));
+    }
+};
+const getAnswer = (identifiers) => {
+    const statement = getStatement(identifiers);
+    return statement.simplify().toTex();
+};
+const getInstruction = (identifiers) => {
+    return `Écrire sous la forme d'une fraction irréductible : 
+  
+$$
+${getStatement(identifiers).toTex()}
+$$`;
+};
+const getHint = (identifiers) => {
+    const { type, a, b, c, d, e } = identifiers;
+    switch (type) {
+        case 0:
+            // a/db +- c/b
+            return `Met les fractions au même dénominateur, puis additionne les numérateurs.`;
+        case 1:
+            // a/b * b/c * c/d * d/e
+            return `Utilise la propriété : 
+      
+$$
+\\frac{k\\times a}{k\\times b} = \\frac{a}{b}
+$$`;
+        case 2:
+            // a / (b/c)
+            return `Diviser par une fraction revient à multiplier par son inverse :
+      
+$$
+k \\div \\frac{a}{b} = k \\times \\frac{b}{a}
+$$`;
+        case 3:
+        default:
+            return `Diviser par une fraction revient à multiplier par son inverse :
+      
+$$
+k \\div \\frac{a}{b} = k \\times \\frac{b}{a}
+$$`;
+    }
+};
+const getCorrection = (identifiers) => {
+    const { type, a, b, c, d, e } = identifiers;
+    const statement = getStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    switch (type) {
+        case 0:
+            // a/db +- c/b
+            return `On met les fractions au même dénominateur : 
+      
+$$
+${frac(Math.abs(c), b).toTex()}=${frac(d * Math.abs(c), b * d).toTex()}
+$$
+
+On a donc : 
+
+$$
+${statement.toTex()} = ${frac(add(a, c * d), d * b).toTex()} = ${answer}
+$$`;
+        case 1:
+            // a/b * b/c * c/d * d/e
+            return `On peut simplifier par les nombres apparaissant aux numérateurs et aux dénominateurs :
+      
+$$
+${multiply(multiply(frac(a, b.toTree({ toTexOptions: { cancel: true } })), frac(b.toTree({ toTexOptions: { cancel: true } }), c.toTree({ toTexOptions: { cancel: true } }))), multiply(frac(c.toTree({ toTexOptions: { cancel: true } }), d.toTree({ toTexOptions: { cancel: true } })), frac(d.toTree({ toTexOptions: { cancel: true } }), e))).toTex()} = ${frac(a, e).toSimplificationTex()}
+$$`;
+        case 2:
+            // a / (b/c)
+            return `Diviser par une fraction revient à multiplier par son inverse :
+      
+$$
+${statement.toTex()} = ${multiply(a, frac(c, b)).toTex({
+                forceNoSimplification: true,
+            })} = ${frac(a * c, b).toSimplificationTex()}
+$$`;
+        case 3:
+        default:
+            const simpDenum = d / gcd(d, b);
+            return `Diviser par une fraction revient à multiplier par son inverse :
+      
+$$
+${divide(frac(b, c), frac(d, c)).toTex()} = ${multiply(frac(b, c), frac(c, d)).toTex({ forceNoSimplification: true })} = ${frac(b, d).toSimplificationTex()}
+$$
+
+On a donc : 
+
+$$
+${statement.toTex()} = ${add(frac(a * simpDenum, simpDenum), frac(b, d).simplify()).toTex()}=${answer}
+$$`;
+        // a + (b/c)/(d/c)
+        // return add(a, divide(frac(b, c), frac(d, c)));
+    }
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        return rationalVEA(ans, answer, { allowNonIrreductible: false });
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
+};
+const getFractionsMixQuestion = (ops) => {
+    let a = 0;
+    let b = 0;
+    let c = 0;
+    let d = 0;
+    let e = 0;
+    const type = randint(0, 4);
+    switch (type) {
+        case 0:
+            // a/db +- c/b
+            a = randint(1, 10);
+            b = randint(2, 10);
+            c = randint(-9, 10, [0]);
+            d = randint(2, 10);
+            break;
+        case 1:
+            // a/b * b/c * c/d * d/e
+            a = randint(1, 10);
+            b = randint(2, 10, [a]);
+            c = randint(2, 10, [b]);
+            d = randint(2, 10, [c]);
+            e = randint(2, 10, [d]);
+            break;
+        case 2:
+            // a / (b/c)
+            a = randint(1, 10);
+            b = randint(1, 10);
+            c = randint(2, 10);
+            break;
+        case 3:
+        default:
+            // a + (b/c)/(d/c)
+            a = randint(1, 10);
+            b = randint(1, 10);
+            c = randint(2, 10);
+            d = randint(1, 10, [c]);
+            break;
+    }
+    const identifiers = {
+        type,
+        a,
+        b,
+        c,
+        d,
+        e,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    return {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+};
+export const fractionsMix = {
+    id: "fractionsMix",
+    connector: "=",
+    label: "Calculs variés avec des fractions",
+    isSingleStep: true,
+    generator: (nb, opts) => getDistinctQuestions(() => getFractionsMixQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

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

@@ -23,7 +23,7 @@ const getAnswer = (identifiers) => {
 };
 const getInstruction = (identifiers) => {
     const statement = NodeConstructor.fromIdentifiers(identifiers.statementIdentifiers);
-    return `Calculer : 
+    return `Écrire sous la forme d'une fraction irréductible : 
   
 $$
 ${statement.toTex({ forceTimesSign: true })}

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

@@ -26,7 +26,7 @@ const getPropositions = (n, { answer, frac1, frac2 }) => {
         allowDivideByZero: true,
     }).toTex());
     while (propositions.length < n) {
-        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTex());
+        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTree().toTex());
     }
     return shuffleProps(propositions, n);
 };

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,EAiBT,MAAM,6BAA6B,CAAC;AAgBrC,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;AA4SF,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,EAiBT,MAAM,6BAA6B,CAAC;AAgBrC,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;AA2SF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAevD,CAAC"}

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

@@ -199,7 +199,9 @@ const getFractionsSum = (opts) => {
 const getPropositions = (n, { answer, rational, rational2 }) => {
     const propositions = [];
     addValidProp(propositions, answer);
-    tryToAddWrongProp(propositions, new Rational(rational[0] + rational2[0], rational[1] + rational2[1]).toTex());
+    tryToAddWrongProp(propositions, new Rational(rational[0] + rational2[0], rational[1] + rational2[1])
+        .toTree()
+        .toTex());
     while (propositions.length < n) {
         const incorrectRational = RationalConstructor.randomIrreductible();
         const incorrectRational2 = RationalConstructor.randomIrreductible();

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

@@ -18,4 +18,5 @@ export * from "./powerNotation.js";
 export * from "./fractionForbiddenValue.js";
 export * from "./simplifyToFraction.js";
 export * from "./evalFractionExpression.js";
+export * from "./fractionsMix.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,6CAA6C,CAAC;AAC5D,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;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,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,6CAA6C,CAAC;AAC5D,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;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC"}

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

@@ -18,3 +18,4 @@ export * from "./powerNotation.js";
 export * from "./fractionForbiddenValue.js";
 export * from "./simplifyToFraction.js";
 export * from "./evalFractionExpression.js";
+export * from "./fractionsMix.js";

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

@@ -3,6 +3,9 @@ type Identifiers = {
     num: number;
     denum: number;
 };
-export declare const simplifyFractionWithPrimeFactorization: Exercise<Identifiers>;
+type Options = {
+    withoutGivenPrimeFactors?: boolean;
+};
+export declare const simplifyFractionWithPrimeFactorization: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=simplifyFractionWithPrimeFactorization.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"simplifyFractionWithPrimeFactorization.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFractionWithPrimeFactorization.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA2GF,eAAO,MAAM,sCAAsC,EAAE,QAAQ,CAAC,WAAW,CAsBxE,CAAC"}
+{"version":3,"file":"simplifyFractionWithPrimeFactorization.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/simplifyFractionWithPrimeFactorization.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAcrC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,OAAO,GAAG;IACb,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAiIF,eAAO,MAAM,sCAAsC,EAAE,QAAQ,CAC3D,WAAW,EACX,OAAO,CAwBR,CAAC"}

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

@@ -1,4 +1,4 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { addValidProp, shuffleProps, tryToAddWrongProp, GeneratorOptionTarget, GeneratorOptionType, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
 import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
@@ -13,7 +13,7 @@ const getPropositions = (n, { answer, ...identifiers }) => {
     const propositions = [];
     addValidProp(propositions, answer);
     while (propositions.length < n) {
-        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTex());
+        tryToAddWrongProp(propositions, RationalConstructor.randomIrreductible().toTree().toTex());
     }
     return shuffleProps(propositions, n);
 };
@@ -21,14 +21,22 @@ const getAnswer = (identifiers) => {
     const { num, denum } = identifiers;
     return frac(num, denum).simplify().toTex();
 };
-const getInstruction = (identifiers) => {
+const getInstruction = (identifiers, opts) => {
     const { num, denum } = identifiers;
+    if (opts?.withoutGivenPrimeFactors) {
+        return `En décomposant le numérateur et le dénominateur en produit de facteurs premiers, simplifier la fraction : 
+
+$$
+${frac(num, denum).toTex()}
+$$
+`;
+    }
     return `On donne la décomposition en produit de facteurs premiers des nombres suivants:
   
 - $${num} = ${new NumberNode(num).toPrimeDecomposition().toTex()}$
 - $${denum} = ${new NumberNode(denum).toPrimeDecomposition().toTex()}$
 
-Simplifiez la fraction $${frac(num, denum).toTex()}$.
+Simplifier la fraction $${frac(num, denum).toTex()}$.
 `;
 };
 const getHint = (identifiers) => {
@@ -62,7 +70,7 @@ ${alignTex([
 const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
-const getSimplifyFractionWithPrimeFactorizationQuestion = (ops) => {
+const getSimplifyFractionWithPrimeFactorizationQuestion = (opts) => {
     let num = 0;
     let denum = 0;
     do {
@@ -72,19 +80,28 @@ const getSimplifyFractionWithPrimeFactorizationQuestion = (ops) => {
         isPrime(denum) ||
         [1, denum].includes(gcd(num, denum)));
     const identifiers = { num, denum };
-    return getQuestionFromIdentifiers(identifiers);
+    return getQuestionFromIdentifiers(identifiers, opts);
 };
-const getQuestionFromIdentifiers = (identifiers) => {
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     return {
-        answer: getAnswer(identifiers),
-        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers, opts),
+        instruction: getInstruction(identifiers, opts),
         keys: [],
         answerFormat: "tex",
         identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
     };
 };
+const options = [
+    {
+        id: "withoutGivenPrimeFactors",
+        label: "Ne pas donner la décomposition en produit de facteurs premiers dans l'énoncé",
+        target: GeneratorOptionTarget.instruction,
+        type: GeneratorOptionType.checkbox,
+        defaultValue: false,
+    },
+];
 export const simplifyFractionWithPrimeFactorization = {
     id: "simplifyFractionWithPrimeFactorization",
     label: "Simplifier une fraction en utilisant la décomposition en nombres premiers",
@@ -102,4 +119,5 @@ export const simplifyFractionWithPrimeFactorization = {
     getQuestionFromIdentifiers,
     hasHintAndCorrection: true,
     shouldHaveCalculator: false,
+    options,
 };

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

@@ -100,7 +100,7 @@ ${alignTex([
     return explanation;
 };
 const getKeys = (identifiers) => {
-    return [];
+    return ["x"];
 };
 const isAnswerValid = (ans, { answer }) => {
     try {

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

@@ -1 +1 @@
-{"version":3,"file":"scaleCalculation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/scaleCalculation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AA+HF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"scaleCalculation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/scaleCalculation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAiIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

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

@@ -27,7 +27,7 @@ const getInstruction = (identifiers) => {
 };
 const getAnswer = (identifiers) => {
     const { scale, isSmallScale, fakeDistance } = identifiers;
-    const answer = new Rational(1, scale).toTex();
+    const answer = new Rational(1, scale).toTree().toTex();
     return answer;
 };
 const getHint = (identifiers) => {
@@ -95,7 +95,9 @@ const getPropositions = (n, { answer, scale, isSmallScale }) => {
     const propositions = [];
     addValidProp(propositions, answer);
     while (propositions.length < n) {
-        tryToAddWrongProp(propositions, new Rational(1, isSmallScale ? randint(1, 5) * 10 : randint(5, 100) * 1000).toTex());
+        tryToAddWrongProp(propositions, new Rational(1, isSmallScale ? randint(1, 5) * 10 : randint(5, 100) * 1000)
+            .toTree()
+            .toTex());
     }
     return shuffleProps(propositions, n);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"scaleUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/scaleUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAkJF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAa5C,CAAC"}
+{"version":3,"file":"scaleUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/scaleUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAoJF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAa5C,CAAC"}