math-exercises 3.0.145 → 3.0.146

package/lib/exercises/math/calcul/addAndSub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addAndSub.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/addAndSub.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,QAAQ,EAgBT,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AAEH,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAgBzC,KAAK,OAAO,GAAG;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AA0FF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiB5D,CAAC"}
+{"version":3,"file":"addAndSub.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/addAndSub.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,QAAQ,EAkBT,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AAEH,KAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAgBzC,KAAK,OAAO,GAAG;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAmHF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAkB5D,CAAC"}

package/lib/exercises/math/calcul/addAndSub.js

@@ -2,7 +2,7 @@ import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuesti
 import { numberVEA } from "../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
-import { AddNode } from "../../../tree/nodes/operators/addNode.js";
+import { add, AddNode } from "../../../tree/nodes/operators/addNode.js";
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
 import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, propWhile, tryToAddWrongProp, } from "../../exercise.js";
@@ -66,6 +66,22 @@ const getAddAndSubQuestions = (opts) => {
     const identifiers = { numbers };
     return getQuestionFromIdentifiers(identifiers, opts);
 };
+const getHint = () => {
+    return `Fais les calculs de gauche à droite, en respectant bien les signes.`;
+};
+const getCorrection = (identifiers) => {
+    const { numbers } = identifiers;
+    return `On effectue les opérations dans l'ordre : 
+  
+${numbers
+        .slice(1)
+        .map((n, i) => `$$
+${add(numbers.slice(0, i + 1).reduce((acc, curr) => acc + curr, 0), n).toSimplificationTex()} 
+$$`)
+        .join("\n \n")}
+
+Le résultat est donc $${getAnswer(identifiers)}$.`;
+};
 const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
         instruction: getInstruction(identifiers, opts),
@@ -74,6 +90,8 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -106,4 +124,5 @@ export const addAndSubExercise = {
     getStartStatement,
     options,
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

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

@@ -14,4 +14,5 @@ export * from "./ordering/index.js";
 export * from "./decimals/index.js";
 export * from "./rationals/index.js";
 export * from "./sign/index.js";
+export * from "./ratio/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/calcul/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}

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

@@ -15,3 +15,4 @@ export * from "./decimals/index.js";
 // export * from "./writing";
 export * from "./rationals/index.js";
 export * from "./sign/index.js";
+export * from "./ratio/index.js";

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

@@ -5,4 +5,6 @@ export * from "./mentalPercentage.js";
 export * from "./mentalAddAndSubNoRelative.js";
 export * from "./mentalMultiplicationsNoRelative.js";
 export * from "./mentalProgramSolve.js";
+export * from "./mentalFractionageOfInteger.js";
+export * from "./mentalFractionageOfQuantity.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC"}

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

@@ -5,3 +5,5 @@ export * from "./mentalPercentage.js";
 export * from "./mentalAddAndSubNoRelative.js";
 export * from "./mentalMultiplicationsNoRelative.js";
 export * from "./mentalProgramSolve.js";
+export * from "./mentalFractionageOfInteger.js";
+export * from "./mentalFractionageOfQuantity.js";

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA+FF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAyHF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSub.js

@@ -34,6 +34,25 @@ const getAnswer = (identifiers) => {
 //   [getStartStatement(identifiers), "=", add(numbers[])],
 // ])}`
 // }
+// const getHint: GetHint<Identifiers> = () => {
+//   return `Fais les calculs de gauche à droite, en respectant bien les signes.`;
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   const { numbers } = identifiers;
+//   return `On effectue les opérations dans l'ordre :
+// ${numbers
+//   .slice(1)
+//   .map(
+//     (n, i) => `$$
+// ${add(
+//   numbers.slice(0, i + 1).reduce((acc, curr) => acc + curr, 0),
+//   n,
+// ).toSimplificationTex()}
+// $$`,
+//   )
+//   .join("\n \n")}
+// Le résultat est donc $${getAnswer(identifiers)}$.`;
+// };
 const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
@@ -42,6 +61,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: [],
         answerFormat: "tex",
         identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -91,4 +112,5 @@ export const mentalAddAndSub = {
     isAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers,
+    // hasHintAndCorrection: true,
 };

package/lib/exercises/math/calcul/mentalCaluls/mentalFractionageOfInteger.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
+type Identifiers = {
+    nodeIdsFrac: NodeIdentifiers;
+    b: number;
+};
+export declare const mentalFractionageOfInteger: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=mentalFractionageOfInteger.d.ts.map

package/lib/exercises/math/calcul/mentalCaluls/mentalFractionageOfInteger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mentalFractionageOfInteger.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalFractionageOfInteger.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAU7C,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,eAAe,CAAC;IAC7B,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmLF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalFractionageOfInteger.js

@@ -0,0 +1,152 @@
+import { addValidProp, propWhile, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { rationalVEA } from "../../../../exercises/vea/rationalVEA.js";
+import { dividersOf } from "../../../../math/utils/arithmetic/dividersOf.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { NodeConstructor, } from "../../../../tree/nodes/nodeConstructor.js";
+import { frac, isFractionNode, } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { random, randomMany } from "../../../../utils/alea/random.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
+const getInstruction = (identifiers) => {
+    const { nodeIdsFrac, b } = identifiers;
+    const fractionNode = NodeConstructor.fromIdentifiers(nodeIdsFrac);
+    return `Combien valent les $${fractionNode.toTex()}$ de $${b}$ ?`;
+};
+const getAnswerNode = (identifiers) => {
+    const { nodeIdsFrac, b } = identifiers;
+    const fractionNode = NodeConstructor.fromIdentifiers(nodeIdsFrac);
+    return multiply(fractionNode, b).simplify();
+};
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).toTex();
+};
+const getHint = (identifiers) => {
+    const { b } = identifiers;
+    if (b !== 20) {
+        return `Voici un exemple : pour calculer les $\\frac{3}{4}$ de $20$, on multiplie $\\frac{3}{4}$ par $20$ :
+  
+$$
+\\frac{3}{4} \\times 20 = 3 \\times 5 = 15
+$$
+
+`;
+    }
+    else {
+        return `Voici un exemple : pour calculer les $\\frac{3}{4}$ de $24$, on multiplie $\\frac{3}{4}$ par $24$ :
+  
+$$
+\\frac{3}{4} \\times 24 = 3 \\times 6 = 18
+$$
+
+`;
+    }
+};
+const getCorrection = (identifiers) => {
+    const { nodeIdsFrac, b } = identifiers;
+    const fractionNode = NodeConstructor.fromIdentifiers(nodeIdsFrac);
+    const nodeNum = fractionNode.leftChild;
+    const nodeDen = fractionNode.rightChild;
+    const node1OverDen = frac(1, nodeDen);
+    const nodeBOverDen = frac(b, nodeDen);
+    const answerNode = multiply(fractionNode, b).simplify();
+    return `Prendre la fraction d'un nombre, c'est multiplier le nombre par cette fraction.
+
+${alignTex([
+        [
+            `${fractionNode.toTex()} \\times ${b.frenchify()}`,
+            "=",
+            `${nodeNum.toTex()} \\times ${node1OverDen.toTex()} \\times ${b.frenchify()}`,
+        ],
+        [``, "=", `${nodeNum.toTex()} \\times ${nodeBOverDen.toTex()}`],
+        [``, "=", `${nodeNum.toTex()} \\times ${nodeBOverDen.simplify().toTex()}`],
+        [``, "=", `${answerNode.toTex()}`],
+    ])}
+
+`;
+};
+const getPropositions = (n, { answer, ...identifiers }) => {
+    const { nodeIdsFrac, b } = identifiers;
+    const propositions = [];
+    const fractionNode = NodeConstructor.fromIdentifiers(nodeIdsFrac);
+    const nodeNum = fractionNode.leftChild;
+    const nodeDen = fractionNode.rightChild;
+    const answerNode = multiply(fractionNode, b).simplify();
+    addValidProp(propositions, answer);
+    //num * b
+    tryToAddWrongProp(propositions, multiply(nodeNum, b).simplify().toTex());
+    //b / den
+    tryToAddWrongProp(propositions, frac(b, nodeDen).simplify().toTex());
+    //around answer
+    const valueAnswer = answerNode.evaluate();
+    //in tables
+    const numbersOneToTen = [...Array(10).keys()].map((i) => i + 1);
+    const tableNumbersSortedAsc = [
+        ...new Set(numbersOneToTen.flatMap((n1) => numbersOneToTen.map((n2) => n1 * n2))),
+    ].toSorted((n1, n2) => n1 - n2);
+    const tableNumbersCloseToAnswer = tableNumbersSortedAsc.filter((n) => Math.abs(valueAnswer - n) <= 10);
+    randomMany(tableNumbersCloseToAnswer, Math.min(5, tableNumbersCloseToAnswer.length)).forEach((n) => {
+        tryToAddWrongProp(propositions, n.frenchify());
+    });
+    //fuzzy
+    propWhile(propositions, n, () => {
+        tryToAddWrongProp(propositions, Math.max(2, valueAnswer + randint(-5, 5, [0])).frenchify());
+    });
+    return shuffleProps(propositions, n);
+};
+const isAnswerValid = (studentAns, { answer }) => {
+    return rationalVEA(studentAns, answer, {
+        allowNonIrreductible: true,
+        allowDecimal: true,
+    });
+};
+const getMentalFractionageOfInteger = () => {
+    const bDefault = 21;
+    const fractionNodeDefault = frac(4, 7);
+    let b = bDefault;
+    let fractionNode = fractionNodeDefault;
+    let counter = -1;
+    let isValid = false;
+    while (!isValid && counter < 100) {
+        counter++;
+        const bCandidate = randint(2, 11) * randint(2, 11);
+        const den = random(dividersOf(bCandidate).filter((n) => n !== 1 && n !== bCandidate));
+        const num = randint(2, Math.max(Math.sqrt(120 - bCandidate), 3), [den]);
+        const fractionNodeCandidate = frac(num, den).simplify();
+        isValid =
+            isFractionNode(fractionNodeCandidate) &&
+                fractionNodeCandidate.leftChild.evaluate() !== 1;
+        if (isValid) {
+            b = bCandidate;
+            fractionNode = fractionNodeCandidate;
+        }
+    }
+    const identifiers = { b, nodeIdsFrac: fractionNode.toIdentifiers() };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+        answer: getAnswer(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
+export const mentalFractionageOfInteger = {
+    id: "mentalFractionageOfInteger",
+    connector: "=",
+    label: "Prendre la fraction d'un nombre entier",
+    isSingleStep: true,
+    generator: (nb) => getDistinctQuestions(getMentalFractionageOfInteger, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calcul/mentalCaluls/mentalFractionageOfQuantity.d.ts

@@ -0,0 +1,15 @@
+import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
+type Identifiers = {
+    quantityType: string;
+    situationIndex: number;
+    nodeIdsFrac: NodeIdentifiers;
+    a: number;
+    coeff: number;
+};
+type Options = {
+    quantityTypes: string[];
+};
+export declare const mentalFractionageOfQuantity: Exercise<Identifiers, Options>;
+export {};
+//# sourceMappingURL=mentalFractionageOfQuantity.d.ts.map

package/lib/exercises/math/calcul/mentalCaluls/mentalFractionageOfQuantity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mentalFractionageOfQuantity.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalFractionageOfQuantity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAsgB7C,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,eAAe,CAAC;IAC7B,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA0FF,KAAK,OAAO,GAAG;IACb,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAiBF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAetE,CAAC"}