math-exercises 2.0.11 → 2.0.13

package/lib/exercises/calculLitteral/simplifying/index.js

@@ -1,18 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./evaluateExpression"), exports);
-__exportStar(require("./reduceExpression"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./evaluateExpression"), exports);
+__exportStar(require("./reduceExpression"), exports);

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.d.ts

@@ -1,9 +1,4 @@
-import { MathExercise } from "../../../exercises/exercise";
-type Identifiers = {
-    pm: number;
-    a: number;
-    b: number;
-};
-export declare const logSimplifiying: MathExercise<Identifiers>;
-export {};
+import { MathExercise, Question } from '../../../exercises/exercise';
+export declare const logSimplifiying: MathExercise;
+export declare function getExpSimplifiying(): Question;
 //# sourceMappingURL=logSimplifiying.d.ts.map

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAYrD,CAAC"}
+{"version":3,"file":"logSimplifiying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/logSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAY/E,eAAO,MAAM,eAAe,EAAE,YAY7B,CAAC;AAEF,wBAAgB,kBAAkB,IAAI,QAAQ,CA+D7C"}

package/lib/exercises/calculLitteral/simplifying/logSimplifiying.js

@@ -1,77 +1,80 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logSimplifiying = void 0;
-const exercise_1 = require("../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const rational_1 = require("../../../math/numbers/rationals/rational");
-const randint_1 = require("../../../math/utils/random/randint");
-const logNode_1 = require("../../../tree/nodes/functions/logNode");
-const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
-const addNode_1 = require("../../../tree/nodes/operators/addNode");
-const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
-const coinFlip_1 = require("../../../utils/coinFlip");
-const shuffle_1 = require("../../../utils/shuffle");
-const getExpSimplifiying = () => {
-    let expression;
-    let simplifiedExpression;
-    let pm = (0, coinFlip_1.coinFlip)() ? 1 : -1;
-    const a = (0, randint_1.randint)(1, 10);
-    let b;
-    do {
-        b = (0, randint_1.randint)(1, 10);
-    } while (pm === -1 && a === b);
-    const opts = { allowLnOfOne: true };
-    if (pm === 1) {
-        expression = new addNode_1.AddNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts), new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts));
-        simplifiedExpression = new logNode_1.LogNode(new numberNode_1.NumberNode(a * b));
-    }
-    else {
-        expression = new substractNode_1.SubstractNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a), opts), new logNode_1.LogNode(new numberNode_1.NumberNode(b), opts));
-        simplifiedExpression = new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree());
-    }
-    const answer = simplifiedExpression.toTex();
-    const question = {
-        instruction: `Simplifier l'expression $${expression.toTex()}$.`,
-        answer,
-        keys: ["ln"],
-        answerFormat: "tex",
-        identifiers: { pm, a, b },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, pm }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    while (propositions.length < n) {
-        const a = (0, randint_1.randint)(1, 10);
-        const b = (0, randint_1.randint)(1, 10);
-        (0, exercise_1.tryToAddWrongProp)(propositions, pm > 0
-            ? new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex()
-            : new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree()).toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-const isAnswerValid = (ans, { a, b, pm }) => {
-    let answer;
-    if (pm === 1) {
-        answer = new logNode_1.LogNode(new numberNode_1.NumberNode(a * b));
-    }
-    else {
-        answer = new logNode_1.LogNode(new rational_1.Rational(a, b).simplify().toTree({ allowFractionToDecimal: true }));
-    }
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
-};
-exports.logSimplifiying = {
-    id: "logSimplifiying",
-    connector: "\\iff",
-    label: "Simplifier des expressions avec $\\ln$",
-    levels: ["1reSpé", "TermSpé", "MathComp"],
-    sections: ["Logarithme népérien"],
-    isSingleStep: false,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-    isAnswerValid,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExpSimplifiying = exports.logSimplifiying = void 0;
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../math/utils/random/randint");
+const logNode_1 = require("../../../tree/nodes/functions/logNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
+const simplify_1 = require("../../../tree/parsers/simplify");
+const coinFlip_1 = require("../../../utils/coinFlip");
+const shuffle_1 = require("../../../utils/shuffle");
+const uuid_1 = require("uuid");
+exports.logSimplifiying = {
+    id: 'logSimplifiying',
+    connector: '\\iff',
+    instruction: '',
+    label: 'Simplifier des expressions avec $\\ln$',
+    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    sections: ['Logarithme népérien'],
+    isSingleStep: false,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpSimplifiying, nb),
+    keys: ['ln'],
+    qcmTimer: 60,
+    freeTimer: 60,
+};
+function getExpSimplifiying() {
+    const a = (0, randint_1.randint)(1, 10);
+    const b = (0, randint_1.randint)(1, 10);
+    let expression;
+    let simplifiedExpression;
+    let pm = 0;
+    if ((0, coinFlip_1.coinFlip)()) {
+        expression = new addNode_1.AddNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a)), new logNode_1.LogNode(new numberNode_1.NumberNode(b)));
+        simplifiedExpression = new logNode_1.LogNode(new numberNode_1.NumberNode(a * b));
+        pm = 1;
+    }
+    else {
+        expression = new substractNode_1.SubstractNode(new logNode_1.LogNode(new numberNode_1.NumberNode(a)), new logNode_1.LogNode(new numberNode_1.NumberNode(b)));
+        simplifiedExpression = new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b)));
+        pm = -1;
+    }
+    const getPropositions = (numOptions) => {
+        const propositions = [];
+        propositions.push({
+            id: (0, uuid_1.v4)(),
+            statement: simplifiedExpression.toTex(),
+            isRightAnswer: true,
+            format: 'tex',
+        });
+        for (let i = 0; i < numOptions - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                const a = (0, randint_1.randint)(1, 10);
+                const b = (0, randint_1.randint)(1, 10);
+                proposition = {
+                    id: (0, uuid_1.v4)(),
+                    statement: pm > 0
+                        ? new logNode_1.LogNode(new numberNode_1.NumberNode(a * b)).toTex()
+                        : new logNode_1.LogNode((0, simplify_1.simplifyNode)(new numberNode_1.NumberNode(a / b))).toTex(),
+                    isRightAnswer: false,
+                    format: 'tex',
+                };
+                isDuplicate = propositions.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            propositions.push(proposition);
+        }
+        return (0, shuffle_1.shuffle)(propositions);
+    };
+    const question = {
+        instruction: `Simplifier l'expression $${expression.toTex()}$.`,
+        answer: simplifiedExpression.toTex(),
+        keys: ['ln'],
+        getPropositions,
+        answerFormat: 'tex',
+    };
+    return question;
+}
+exports.getExpSimplifiying = getExpSimplifiying;

package/lib/exercises/calculLitteral/simplifying/reduceExpression.d.ts

@@ -1,9 +1,9 @@
-import { MathExercise } from "../../../exercises/exercise";
-type Identifiers = {
-    rand: number;
-    polynome1Coeffs: number[];
-    polynome2Coeffs: number[];
-};
-export declare const reduceExpression: MathExercise<Identifiers>;
-export {};
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    rand: number;
+    polynome1Coeffs: number[];
+    polynome2Coeffs: number[];
+};
+export declare const reduceExpression: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=reduceExpression.d.ts.map

package/lib/exercises/calculLitteral/simplifying/reduceExpression.js

@@ -1,114 +1,114 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceExpression = void 0;
-const exercise_1 = require("../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const polynomial_1 = require("../../../math/polynomials/polynomial");
-const randint_1 = require("../../../math/utils/random/randint");
-const addNode_1 = require("../../../tree/nodes/operators/addNode");
-const shuffle_1 = require("../../../utils/shuffle");
-const getReduceExpression = () => {
-    const rand = (0, randint_1.randint)(0, 7);
-    let polynome1;
-    let polynome2;
-    switch (rand) {
-        case 0: // ax + b + cx + d
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 1:
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 2:
-            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 3:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 4:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, 0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 5:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        case 6:
-            polynome1 = new polynomial_1.Polynomial([
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10),
-                (0, randint_1.randint)(-9, 10, [0]),
-            ]);
-            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
-            break;
-        default:
-            throw Error("something went wrong");
-    }
-    const statement = new addNode_1.AddNode(polynome1.toTree(), polynome2.toTree());
-    statement.shuffle();
-    const statementTex = statement.toTex();
-    const answer = polynome1.add(polynome2).toTree().toTex();
-    const question = {
-        instruction: `Réduire l'expression suivante : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
-        answerFormat: "tex",
-        identifiers: {
-            rand,
-            polynome1Coeffs: polynome1.coefficients,
-            polynome2Coeffs: polynome2.coefficients,
-        },
-    };
-    return question;
-};
-const getPropositions = (n, { answer, rand, polynome1Coeffs }) => {
-    const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
-    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
-    while (propositions.length < n) {
-        const polynome2 = new polynomial_1.Polynomial(rand < 3
-            ? [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]
-            : [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]);
-        (0, exercise_1.tryToAddWrongProp)(propositions, polynome1.add(polynome2).toTree().toTex());
-    }
-    return (0, shuffle_1.shuffle)(propositions);
-};
-const isAnswerValid = (ans, { polynome1Coeffs, polynome2Coeffs, rand }) => {
-    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
-    const polynome2 = new polynomial_1.Polynomial(polynome2Coeffs);
-    const answer = polynome1
-        .add(polynome2)
-        .toTree({ forbidPowerToProduct: true });
-    const texs = answer.toAllValidTexs();
-    console.log(texs);
-    return texs.includes(ans);
-};
-exports.reduceExpression = {
-    id: "reduceExpression",
-    connector: "=",
-    isSingleStep: false,
-    label: "Réduire une expression",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro"],
-    sections: ["Calcul littéral"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getReduceExpression, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
-    getPropositions,
-    isAnswerValid,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reduceExpression = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const polynomial_1 = require("../../../math/polynomials/polynomial");
+const randint_1 = require("../../../math/utils/random/randint");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const shuffle_1 = require("../../../utils/shuffle");
+const getReduceExpression = () => {
+    const rand = (0, randint_1.randint)(0, 7);
+    let polynome1;
+    let polynome2;
+    switch (rand) {
+        case 0: // ax + b + cx + d
+            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        case 1:
+            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        case 2:
+            polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10, [0])]);
+            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        case 3:
+            polynome1 = new polynomial_1.Polynomial([
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10, [0]),
+            ]);
+            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6), (0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        case 4:
+            polynome1 = new polynomial_1.Polynomial([
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10, [0]),
+            ]);
+            polynome2 = new polynomial_1.Polynomial([0, 0, (0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        case 5:
+            polynome1 = new polynomial_1.Polynomial([
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10, [0]),
+            ]);
+            polynome2 = new polynomial_1.Polynomial([0, (0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        case 6:
+            polynome1 = new polynomial_1.Polynomial([
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10),
+                (0, randint_1.randint)(-9, 10, [0]),
+            ]);
+            polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-5, 6, [0])]);
+            break;
+        default:
+            throw Error("something went wrong");
+    }
+    const statement = new addNode_1.AddNode(polynome1.toTree(), polynome2.toTree());
+    statement.shuffle();
+    const statementTex = statement.toTex();
+    const answer = polynome1.add(polynome2).toTree().toTex();
+    const question = {
+        instruction: `Réduire l'expression suivante : $${statementTex}$`,
+        startStatement: statementTex,
+        answer,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            rand,
+            polynome1Coeffs: polynome1.coefficients,
+            polynome2Coeffs: polynome2.coefficients,
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, rand, polynome1Coeffs }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
+    while (propositions.length < n) {
+        const polynome2 = new polynomial_1.Polynomial(rand < 3
+            ? [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]
+            : [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6, [0])]);
+        (0, exercise_1.tryToAddWrongProp)(propositions, polynome1.add(polynome2).toTree().toTex());
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { polynome1Coeffs, polynome2Coeffs, rand }) => {
+    const polynome1 = new polynomial_1.Polynomial(polynome1Coeffs);
+    const polynome2 = new polynomial_1.Polynomial(polynome2Coeffs);
+    const answer = polynome1
+        .add(polynome2)
+        .toTree({ forbidPowerToProduct: true });
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
+exports.reduceExpression = {
+    id: "reduceExpression",
+    connector: "=",
+    isSingleStep: false,
+    label: "Réduire une expression",
+    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro"],
+    sections: ["Calcul littéral"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getReduceExpression, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/combinatory/anagrams.d.ts

@@ -1,7 +1,7 @@
-import { MathExercise } from "../../exercises/exercise";
-type Identifiers = {
-    word: string;
-};
-export declare const anagrams: MathExercise<Identifiers>;
-export {};
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    word: string;
+};
+export declare const anagrams: MathExercise<Identifiers>;
+export {};
 //# sourceMappingURL=anagrams.d.ts.map