math-exercises 3.0.184 → 3.0.185

package/lib/exercises/math/functions/exponential/algebraic/approxExpAPlusB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approxExpAPlusB.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/exponential/algebraic/approxExpAPlusB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAY7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAmXF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAmBjD,CAAC"}
+{"version":3,"file":"approxExpAPlusB.d.ts","sourceRoot":"","sources":["../../../../../../src/exercises/math/functions/exponential/algebraic/approxExpAPlusB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAa7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA8cF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAmBjD,CAAC"}

package/lib/exercises/math/functions/exponential/algebraic/approxExpAPlusB.js

@@ -1,7 +1,6 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../../exercises/utils/getDistinctQuestions.js";
 import { nodeBySubstitutingVar } from "../../../../../math/utils/functions/functionComposition.js";
-import { randfloat } from "../../../../../math/utils/random/randfloat.js";
 import { randint } from "../../../../../math/utils/random/randint.js";
 import { round } from "../../../../../math/utils/round.js";
 import { exp } from "../../../../../tree/nodes/functions/expNode.js";
@@ -13,7 +12,8 @@ import { power } from "../../../../../tree/nodes/operators/powerNode.js";
 import { substract } from "../../../../../tree/nodes/operators/substractNode.js";
 import { VariableNode } from "../../../../../tree/nodes/variables/variableNode.js";
 import { parseAlgebraic } from "../../../../../tree/parsers/latexParser.js";
-import { coinFlip } from "../../../../../utils/alea/coinFlip.js";
+import { NodeComparator } from "../../../../../tree/utilities/nodeComparator.js";
+import { probaFlip } from "../../../../../utils/alea/probaFlip.js";
 import { random } from "../../../../../utils/alea/random.js";
 import { shuffle } from "../../../../../utils/alea/shuffle.js";
 const getInstruction = (identifiers) => {
@@ -152,8 +152,8 @@ $$
     }
 };
 const getPropositions = (n, { answer, ...identifiers }) => {
-    const { nodeIdsA, nodeIdsB, expARounded, expBRounded, precision } = identifiers;
-    const [nodeA, nodeB] = [nodeIdsA, nodeIdsB].map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds));
+    const { nodeIdsA, nodeIdsB, nodeIdsAOpB, expARounded, expBRounded, precision, } = identifiers;
+    const [nodeA, nodeB, nodeAOpB] = [nodeIdsA, nodeIdsB, nodeIdsAOpB].map((nodeIds) => NodeConstructor.fromIdentifiers(nodeIds));
     const propositions = [];
     addValidProp(propositions, answer);
     //exp(a)+exp(b)
@@ -188,6 +188,22 @@ const getPropositions = (n, { answer, ...identifiers }) => {
             }
         });
     }
+    //terror: student computes round(exp(aOpB),precision) with their calculator
+    {
+        const nodeAOpBSubstituted = [
+            ["a", nodeA],
+            ["b", nodeB],
+        ]
+            .reduce((acc, [varName, nodeInjected]) => {
+            return nodeBySubstitutingVar(acc, nodeInjected, new VariableNode(varName));
+        }, nodeAOpB)
+            .simplify({ fractionsToDecimal: true });
+        const nodeWrong = round(nodeAOpBSubstituted.evaluate(), 0).toTree();
+        const tex = nodeWrong.toTex();
+        if (tex !== "NaN") {
+            tryToAddWrongProp(propositions, tex);
+        }
+    }
     //filler
     if (propositions.length < n) {
         //exp(b)-exp(a)
@@ -220,33 +236,35 @@ const getPropositions = (n, { answer, ...identifiers }) => {
 const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
+const createRandomIdentifiers = () => {
+    const precision = randint(0);
+    const a = randint(0, 6);
+    const nodeA = a.toTree();
+    const expARounded = round(exp(nodeA).evaluate(), precision);
+    const nodeB = random([
+        // //-1
+        // (-1).toTree(),
+        //1/2
+        frac(1, 2),
+        //int
+        (() => randint(a, a + 5, [nodeA.evaluate()]).toTree())(),
+    ]);
+    const expBRounded = round(exp(nodeB).evaluate(), precision);
+    const nodeAOpB = parseAlgebraic(probaFlip(0.8) ? "a+b" : "a-b");
+    const identifiers = {
+        nodeIdsA: nodeA.toIdentifiers(),
+        nodeIdsB: nodeB.toIdentifiers(),
+        nodeIdsAOpB: nodeAOpB.toIdentifiers(),
+        expARounded,
+        expBRounded,
+        precision,
+        nodeA,
+        nodeB,
+        nodeAOpB,
+    };
+    return identifiers;
+};
 const getApproxExpAPlusBQuestion = () => {
-    function createRandomIdentifiers() {
-        const precision = randint(1, 6);
-        const nodeA = randfloat(0, 3, 2, [0]).toTree();
-        const expARounded = round(exp(nodeA).evaluate(), precision);
-        const nodeB = random([
-            //-1
-            (-1).toTree(),
-            //1/2
-            frac(1, 2),
-            //int
-            (() => randint(2, 11).toTree())(),
-        ]);
-        const expBRounded = round(exp(nodeB).evaluate(), precision);
-        const nodeAOpB = parseAlgebraic(coinFlip() ? "a+b" : "a-b");
-        const identifiers = {
-            nodeIdsA: nodeA.toIdentifiers(),
-            nodeIdsB: nodeB.toIdentifiers(),
-            nodeIdsAOpB: nodeAOpB.toIdentifiers(),
-            expARounded,
-            expBRounded,
-            precision,
-            nodeA,
-            nodeB,
-        };
-        return identifiers;
-    }
     let identifiers;
     let counter = -1;
     let isValid = false;
@@ -254,21 +272,56 @@ const getApproxExpAPlusBQuestion = () => {
         counter++;
         const identifiersCandidate = createRandomIdentifiers();
         isValid = (() => {
-            const { nodeA, nodeB } = identifiersCandidate;
-            return multiply(nodeA, nodeB).evaluate() < 15;
+            const { nodeA, nodeB, nodeAOpB, expARounded, expBRounded } = identifiersCandidate;
+            const nodeAOpBSubstituted = [
+                ["a", nodeA],
+                ["b", nodeB],
+            ]
+                .reduce((acc, [varName, nodeInjected]) => {
+                return nodeBySubstitutingVar(acc, nodeInjected, new VariableNode(varName));
+            }, nodeAOpB)
+                .simplify({ fractionsToDecimal: true });
+            const isAOpBEqualToAorB = () => {
+                return (NodeComparator.isEqualViaSub(nodeB, nodeAOpBSubstituted) ||
+                    NodeComparator.isEqualViaSub(nodeA, nodeAOpBSubstituted));
+            };
+            const isMentallyCalculable = () => {
+                function countDigits(num) {
+                    if (!Number.isFinite(num)) {
+                        throw new Error("Input must be a finite number.");
+                    }
+                    // Remove sign and decimal part
+                    const integerPart = Math.abs(Math.trunc(num));
+                    // Special case for 0
+                    if (integerPart === 0)
+                        return 1;
+                    return integerPart.toString().length;
+                }
+                const product = expARounded * expBRounded;
+                return countDigits(product) <= 4 && product < 5555;
+            };
+            return !isAOpBEqualToAorB() && isMentallyCalculable();
         })();
         if (isValid) {
-            identifiers = identifiersCandidate;
+            const { nodeIdsA, nodeIdsB, nodeIdsAOpB, expARounded, expBRounded, precision, } = identifiersCandidate;
+            identifiers = {
+                nodeIdsA,
+                nodeIdsB,
+                nodeIdsAOpB,
+                expARounded,
+                expBRounded,
+                precision,
+            };
         }
     }
     if (!isValid) {
         const identifiersDefault = {
             nodeIdsA: (2).toTree().toIdentifiers(),
-            nodeIdsB: frac(1, 3).toIdentifiers(),
+            nodeIdsB: (3).toTree().toIdentifiers(),
             nodeIdsAOpB: parseAlgebraic("a+b").toIdentifiers(),
-            precision: 2,
-            expARounded: round(exp(2).evaluate(), 2),
-            expBRounded: round(exp(frac(1, 3)).evaluate(), 2),
+            precision: 0,
+            expARounded: round(exp(2).evaluate(), 0),
+            expBRounded: round(exp(3).evaluate(), 0),
         };
         identifiers = identifiersDefault;
     }
@@ -287,7 +340,7 @@ const getQuestionFromIdentifiers = (identifiers, opts) => {
 };
 export const approxExpAPlusB = {
     id: "approxExpAPlusB",
-    label: "Déterminer une valeur approchée de $\\exp⁡(a \\pm b)$ à partir de $\\exp(a)$ et $\\exp(b)$",
+    label: "Déterminer une valeur approchée de $\\exp⁡(a \\pm b)$ à partir de valeurs approchées de $\\exp(a)$ et de $\\exp(b)$",
     isSingleStep: true,
     generator: (nb, opts) => getDistinctQuestions(() => getApproxExpAPlusBQuestion(opts), nb),
     qcmTimer: 60,

package/lib/exercises/math/probaStat/trees/index.d.ts

@@ -1,4 +1,4 @@
-export { probabilityTree, probabilityTreeIntersection, probabilityTreeTotalProbability, probabilityTreeReadProbability, probabilityTreeInversionProbability, } from "./probabilityTreeV2.js";
+export { probabilityTree, probabilityTreeIntersection, probabilityTreeTotalProbability, probabilityTreeReadProbability, probabilityTreeInversionProbability, } from "./probabilityTree.js";
 export * from "./fillProbaTreeWithComplementaryProbabilities.js";
 export * from "./buildTreeFromSituation.js";
 export * from "./probaTreeSituationTotalProbaFormula.js";

package/lib/exercises/math/probaStat/trees/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/trees/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,+BAA+B,EAC/B,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,wBAAwB,CAAC;AAChC,cAAc,kDAAkD,CAAC;AACjE,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0CAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/trees/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,+BAA+B,EAC/B,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,sBAAsB,CAAC;AAC9B,cAAc,kDAAkD,CAAC;AACjE,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0CAA0C,CAAC"}

package/lib/exercises/math/probaStat/trees/index.js

@@ -1,6 +1,4 @@
-// export * from "./treeInInstruction.js";
-// export * from "./treeInAnswer.js";
-export { probabilityTree, probabilityTreeIntersection, probabilityTreeTotalProbability, probabilityTreeReadProbability, probabilityTreeInversionProbability, } from "./probabilityTreeV2.js";
+export { probabilityTree, probabilityTreeIntersection, probabilityTreeTotalProbability, probabilityTreeReadProbability, probabilityTreeInversionProbability, } from "./probabilityTree.js";
 export * from "./fillProbaTreeWithComplementaryProbabilities.js";
 export * from "./buildTreeFromSituation.js";
 export * from "./probaTreeSituationTotalProbaFormula.js";

package/lib/exercises/math/probaStat/trees/probabilityTree.d.ts

@@ -8,12 +8,18 @@ type Identifiers = {
     BC: NodeIdentifiers;
     BD: NodeIdentifiers;
     probaName: string;
+    useContraryNames?: boolean;
 };
 type Options = {
-    allowApproximate: string;
-    eventTypes: string[];
-    probaType: string;
+    allowApproximate?: string;
+    eventTypes?: string[];
+    probaType?: string;
+    eventsNames?: string;
 };
 export declare const probabilityTree: Exercise<Identifiers, Options>;
+export declare const probabilityTreeIntersection: Exercise<Identifiers, Options>;
+export declare const probabilityTreeTotalProbability: Exercise<Identifiers, Options>;
+export declare const probabilityTreeReadProbability: Exercise<Identifiers, Options>;
+export declare const probabilityTreeInversionProbability: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=probabilityTree.d.ts.map

package/lib/exercises/math/probaStat/trees/probabilityTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/trees/probabilityTree.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAQ7C,OAAO,EACL,QAAQ,EAiBT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IAIjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAkNF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA2CF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe1D,CAAC"}
+{"version":3,"file":"probabilityTree.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/trees/probabilityTree.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAQ7C,OAAO,EACL,QAAQ,EAkBT,MAAM,sBAAsB,CAAC;AAG9B,KAAK,WAAW,GAAG;IAIjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,EAAE,EAAE,eAAe,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAuhBF,KAAK,OAAO,GAAG;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAwDF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe1D,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAwBtE,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAwB1E,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CA2BzE,CAAC;AAEF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CACxD,WAAW,EACX,OAAO,CA0BR,CAAC"}