math-exercises 2.0.7 → 2.0.10

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

@@ -6,4 +6,5 @@ export * from "./fractionsDivision";
 export * from "./fractionsProduct";
 export * from "./fractionsSum";
 export * from "./simplifyFraction";
+export * from "./periodicWritingToFraction";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC"}

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

@@ -22,3 +22,4 @@ __exportStar(require("./fractionsDivision"), exports);
 __exportStar(require("./fractionsProduct"), exports);
 __exportStar(require("./fractionsSum"), exports);
 __exportStar(require("./simplifyFraction"), exports);
+__exportStar(require("./periodicWritingToFraction"), exports);

package/lib/exercises/calcul/fractions/periodicWritingToFraction.d.ts

@@ -0,0 +1,9 @@
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    num: number;
+    denum: number;
+    leadingPart: number;
+};
+export declare const periodicWritingToFraction: MathExercise<Identifiers>;
+export {};
+//# sourceMappingURL=periodicWritingToFraction.d.ts.map

package/lib/exercises/calcul/fractions/periodicWritingToFraction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"periodicWritingToFraction.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/fractions/periodicWritingToFraction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA2EF,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,WAAW,CAa/D,CAAC"}

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

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.periodicWritingToFraction = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const decimal_1 = require("../../../math/numbers/decimals/decimal");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const randint_1 = require("../../../math/utils/random/randint");
+/**
+ * méthode : x = 0,123123123
+ * 1000x = 123,123123
+ * 999x = 123
+ */
+const getPeriodicWritingToFractionQuestion = () => {
+    const periodicPartLength = (0, randint_1.randint)(1, 4);
+    const periodicPart = [];
+    for (let i = 0; i < periodicPartLength; i++) {
+        periodicPart.push((0, randint_1.randint)(periodicPartLength === 1 ? 1 : 0, 10, periodicPart));
+    }
+    const num = Number("0." + periodicPart.join("")) * 10 ** periodicPartLength;
+    let denumString = "";
+    for (let i = 0; i < periodicPartLength; i++) {
+        denumString += "9";
+    }
+    const denum = Number(denumString);
+    const leadingPart = decimal_1.DecimalConstructor.random(0, 10, (0, randint_1.randint)(0, 3));
+    let x = leadingPart.toTree().toTex();
+    if (!x.includes(","))
+        x += ",";
+    for (let i = 0; i < 4; i++) {
+        x += periodicPart.join("");
+    }
+    x += "\\ldots";
+    const answer = new rational_1.Rational(num, denum * 10 ** leadingPart.precision)
+        .add(leadingPart.toRational())
+        .toTree()
+        .toTex();
+    const question = {
+        answer,
+        instruction: `Ecrire sous forme de fraction : $${x}$`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { num, denum, leadingPart: leadingPart.value },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, num, denum, leadingPart }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const leadingPartDec = new decimal_1.Decimal(leadingPart);
+    const increments = [-1, 1, 2];
+    for (const i of increments) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(num, denum * 10 ** (leadingPartDec.precision + i))
+            .add(leadingPartDec.toRational())
+            .toTree()
+            .toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { denum, leadingPart, num }) => {
+    const leadingPartDec = new decimal_1.Decimal(leadingPart);
+    const answer = new rational_1.Rational(num, denum * 10 ** leadingPartDec.precision)
+        .add(leadingPartDec.toRational())
+        .toTree();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.periodicWritingToFraction = {
+    id: "periodicWritingToFraction",
+    connector: "=",
+    label: "Passer de l'écriture décimale périodique à l'écriture fractionnaire",
+    levels: ["2nde"],
+    isSingleStep: true,
+    sections: ["Fractions"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPeriodicWritingToFractionQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA6EF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA8EF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.js

@@ -11,7 +11,8 @@ const randint_1 = require("../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const getFactoType1Question = () => {
     const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const affine = affine_1.AffineConstructor.random(interval, interval);
+    const intervalPlus = new intervals_1.Interval("[[1; 10]]");
+    const affine = affine_1.AffineConstructor.random(intervalPlus, interval);
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = affine.multiply(affine2).toTree();
     const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());

package/lib/exercises/complex/argumentFromAlgebraicComplex.d.ts

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

package/lib/exercises/complex/argumentFromAlgebraicComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":""}
+{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AA4CF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/complex/argumentFromAlgebraicComplex.js

@@ -1,52 +1,63 @@
 "use strict";
-// import {
-//   MathExercise,
-//   Proposition,
-//   QCMGenerator,
-//   Question,
-//   QuestionGenerator,
-//   VEA,
-//   addValidProp,
-//   shuffleProps,
-//   tryToAddWrongProp,
-// } from "../../exercises/exercise";
-// import { getDistinctQuestions } from "../../exercises/utils/getDistinctQuestions";
-// import { ComplexConstructor } from "../../math/complex/complex";
-// type Identifiers = {
-//   re: number;
-//   im: number;
-// };
-// const getArgumentFromAlgebraicComplexQuestion: QuestionGenerator<
-//   Identifiers
-// > = () => {
-//   const z = ComplexConstructor.random();
-//   const zTex = z.toTree().toTex();
-//   const answer = z.toModuleTree().toTex();
-//   const question: Question<Identifiers> = {
-//     answer: answer,
-//     instruction: `Soit $z=${zTex}$. Déterminer le module $|z|$ de $z$.`,
-//     keys: [],
-//     answerFormat: "tex",
-//     identifiers: {  re: z.re, im: z.im },
-//   };
-//   return question;
-// };
-// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
-//   const propositions: Proposition[] = [];
-//   addValidProp(propositions, answer);
-//   while (propositions.length < n) {}
-//   return shuffleProps(propositions, n);
-// };
-// export const argumentFromAlgebraicComplex: MathExercise<Identifiers> = {
-//   id: "argumentFromAlgebraicComplex",
-//   connector: "=",
-//   label: "Déterminer l'argument d'un nombre complexe via sa forme algébrique",
-//   levels: ["MathExp"],
-//   isSingleStep: true,
-//   sections: ["Nombres complexes"],
-//   generator: (nb: number) =>
-//     getDistinctQuestions(getArgumentFromAlgebraicComplexQuestion, nb),
-//   qcmTimer: 60,
-//   freeTimer: 60,
-//   getPropositions,
-// };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.argumentFromAlgebraicComplex = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const integer_1 = require("../../math/numbers/integer/integer");
+const rational_1 = require("../../math/numbers/rationals/rational");
+const remarkableValue_1 = require("../../math/trigonometry/remarkableValue");
+const remarkableValues_1 = require("../../math/trigonometry/remarkableValues");
+const randint_1 = require("../../math/utils/random/randint");
+const complexNode_1 = require("../../tree/nodes/complex/complexNode");
+const sqrtNode_1 = require("../../tree/nodes/functions/sqrtNode");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
+const random_1 = require("../../utils/random");
+const getArgumentFromAlgebraicComplexQuestion = () => {
+    const arg = remarkableValue_1.RemarkableValueConstructor.mainInterval();
+    const factor = (0, random_1.random)([
+        new integer_1.Integer((0, randint_1.randint)(-5, 6, [0, 1])).toTree(),
+        rational_1.RationalConstructor.randomIrreductible().toTree(),
+        (0, random_1.random)([new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(2)), new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(3))]),
+    ]);
+    const re = new multiplyNode_1.MultiplyNode(factor, arg.cos).simplify();
+    const im = new multiplyNode_1.MultiplyNode(factor, arg.sin).simplify();
+    const z = new complexNode_1.ComplexNode(re, im);
+    const zTex = z.toTex();
+    const answer = arg.angle.toTex();
+    const question = {
+        answer: answer,
+        instruction: `Soit $z=${zTex}$. Déterminer l'argument principal de $z$.`,
+        keys: ["pi"],
+        answerFormat: "tex",
+        identifiers: { arg: arg.angle.evaluate({}) },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const randomPoint = remarkableValue_1.RemarkableValueConstructor.mainInterval();
+        (0, exercise_1.tryToAddWrongProp)(propositions, randomPoint.angle.toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { arg }) => {
+    const point = remarkableValues_1.remarkableTrigoValues.find((point) => point.angle.evaluate({}) === arg);
+    const texs = point.angle.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.argumentFromAlgebraicComplex = {
+    id: "argumentFromAlgebraicComplex",
+    connector: "=",
+    label: "Déterminer l'argument d'un nombre complexe via sa forme algébrique",
+    levels: ["MathExp"],
+    isSingleStep: true,
+    sections: ["Nombres complexes"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getArgumentFromAlgebraicComplexQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/complex/index.d.ts

@@ -8,4 +8,5 @@ export * from "./linearCombinaisonComplex";
 export * from "./moduloFromAlgebraicComplex";
 export * from "./mutiplyComplex";
 export * from "./reAndIm";
+export * from "./argumentFromAlgebraicComplex";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/complex/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAE7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAE7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,gCAAgC,CAAC"}

package/lib/exercises/complex/index.js

@@ -25,3 +25,4 @@ __exportStar(require("./linearCombinaisonComplex"), exports);
 __exportStar(require("./moduloFromAlgebraicComplex"), exports);
 __exportStar(require("./mutiplyComplex"), exports);
 __exportStar(require("./reAndIm"), exports);
+__exportStar(require("./argumentFromAlgebraicComplex"), exports);

package/lib/exercises/functions/exponential/expEquation.d.ts

@@ -1,4 +1,5 @@
 import { MathExercise } from "../../../exercises/exercise";
+/**ae^x = k */
 type Identifiers = {
     a: number;
     k: number;

package/lib/exercises/functions/exponential/expEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/exponential/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/exponential/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/functions/logarithm/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./logEquation";
 export * from "./logSimplifiying";
 export * from "./log10PowerSimplifying";
+export * from "./logPowerEquation";
+export * from "./log10Simplifying";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/functions/logarithm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC"}

package/lib/exercises/functions/logarithm/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./logEquation"), exports);
 __exportStar(require("./logSimplifiying"), exports);
 __exportStar(require("./log10PowerSimplifying"), exports);
-// export * from "./logPowerEquation";
+__exportStar(require("./logPowerEquation"), exports);
+__exportStar(require("./log10Simplifying"), exports);

package/lib/exercises/functions/logarithm/log10PowerSimplifying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqCF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAa3D,CAAC"}
+{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqCF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

package/lib/exercises/functions/logarithm/log10PowerSimplifying.js

@@ -10,7 +10,7 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const probaFlip_1 = require("../../../utils/probaFlip");
 const getLog10PowerSimplifyingQuestion = () => {
-    const tenthPower = (0, randint_1.randint)(-5, 6, [0]);
+    const tenthPower = (0, randint_1.randint)(-5, 6, [0, 1]);
     const shouldEvaluate = (0, probaFlip_1.probaFlip)(0.7);
     const nb = shouldEvaluate
         ? new decimal_1.Decimal(1).multiplyByPowerOfTen(tenthPower).toTree()
@@ -45,9 +45,10 @@ exports.log10PowerSimplifying = {
     levels: ["TermTech", "MathComp"],
     isSingleStep: true,
     sections: ["Logarithme décimal", "Puissances"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLog10PowerSimplifyingQuestion, nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLog10PowerSimplifyingQuestion, nb, 15),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
+    maxAllowedQuestions: 15,
 };

package/lib/exercises/functions/logarithm/log10Simplifying.d.ts

@@ -0,0 +1,11 @@
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
+    nb: number;
+    powers: number[];
+    signs: number[];
+    isLog10: boolean;
+};
+export declare const log10SumSimplifying: MathExercise<Identifiers>;
+export declare const logSumSimplifying: MathExercise<Identifiers>;
+export {};
+//# sourceMappingURL=log10Simplifying.d.ts.map

package/lib/exercises/functions/logarithm/log10Simplifying.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"log10Simplifying.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/log10Simplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAsFF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAgBzD,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,CAgBvD,CAAC"}

package/lib/exercises/functions/logarithm/log10Simplifying.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logSumSimplifying = exports.log10SumSimplifying = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../math/utils/random/randint");
+const log10Node_1 = require("../../../tree/nodes/functions/log10Node");
+const logNode_1 = require("../../../tree/nodes/functions/logNode");
+const oppositeNode_1 = require("../../../tree/nodes/functions/oppositeNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
+const operatorComposition_1 = require("../../../tree/utilities/operatorComposition");
+const random_1 = require("../../../utils/random");
+const getLog10SumSimplifyingQuestion = (opts) => {
+    const nb = (0, randint_1.randint)(2, 10);
+    const nbTerms = (0, randint_1.randint)(2, 4);
+    const powers = [];
+    const signs = [];
+    for (let i = 0; i < nbTerms; i++) {
+        const power = (0, randint_1.randint)(powers.includes(1) ? 2 : 1, 6, powers);
+        powers.push(power);
+        signs.push((0, random_1.random)([-1, 1]));
+    }
+    const nbNode = new numberNode_1.NumberNode(nb);
+    const LNode = opts?.isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
+    const logs = powers.map((power, index) => nb ** power < 100
+        ? signs[index] > 0
+            ? new LNode(new numberNode_1.NumberNode(nb ** power))
+            : new oppositeNode_1.OppositeNode(new LNode(new numberNode_1.NumberNode(nb ** power)))
+        : signs[index] > 0
+            ? new LNode(new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(power)))
+            : new oppositeNode_1.OppositeNode(new LNode(new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(power)))));
+    const statement = (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, logs);
+    const answer = statement.simplify();
+    const question = {
+        answer: answer.toTex(),
+        instruction: `Simplifier le plus possible l'expression suivante : $${statement.toTex()}$`,
+        keys: [opts?.isLog10 ? "log" : "ln"],
+        answerFormat: "tex",
+        identifiers: { nb, powers, signs, isLog10: opts?.isLog10 ?? false },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, nb, isLog10 }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const LNode = isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, randint_1.randint)(1, 10)), new LNode(new numberNode_1.NumberNode(nb)))
+            .simplify()
+            .toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { nb, powers, signs, isLog10 }) => {
+    const nbNode = new numberNode_1.NumberNode(nb);
+    const LNode = isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
+    const logs = powers.map((power, index) => nb ** power < 100
+        ? signs[index] > 0
+            ? new LNode(new numberNode_1.NumberNode(nb ** power))
+            : new oppositeNode_1.OppositeNode(new LNode(new numberNode_1.NumberNode(nb ** power)))
+        : signs[index] > 0
+            ? new LNode(new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(power)))
+            : new oppositeNode_1.OppositeNode(new LNode(new powerNode_1.PowerNode(nbNode, new numberNode_1.NumberNode(power)))));
+    const statement = (0, operatorComposition_1.operatorComposition)(addNode_1.AddNode, logs);
+    const answer = statement.simplify();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.log10SumSimplifying = {
+    id: "log10SumSimplifying",
+    connector: "=",
+    label: "Simplifer une somme de logarithmes décimaux",
+    levels: ["TermTech"],
+    isSingleStep: true,
+    sections: ["Logarithme décimal"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getLog10SumSimplifyingQuestion({ isLog10: true }), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};
+exports.logSumSimplifying = {
+    id: "logSumSimplifying",
+    connector: "=",
+    label: "Simplifer une somme de logarithmes népériens",
+    levels: ["TermSpé", "MathComp"],
+    isSingleStep: true,
+    sections: ["Logarithme népérien"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getLog10SumSimplifyingQuestion({ isLog10: false }), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/functions/logarithm/logEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAclC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"logEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/logEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAclC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/functions/logarithm/logEquation.js

@@ -56,7 +56,6 @@ const isAnswerValid = (ans, { a, k }) => {
         new expNode_1.ExpNode(new rational_1.Rational(k, a).simplify().toTree({ allowFractionToDecimal: true })),
     ]));
     const texs = answer.toAllValidTexs();
-    console.log(texs);
     return texs.includes(ans);
 };
 exports.logEquation = {

package/lib/exercises/functions/logarithm/logPowerEquation.d.ts

@@ -1,5 +1,11 @@
 import { MathExercise } from "../../../exercises/exercise";
-type Identifiers = {};
+type Identifiers = {
+    a: number;
+    powered: number;
+    c: number;
+    k: number;
+    isLog10: boolean;
+};
 export declare const logPowerEquation: MathExercise<Identifiers>;
 export declare const log10PowerEquation: MathExercise<Identifiers>;
 export {};

package/lib/exercises/functions/logarithm/logPowerEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG,EAAE,CAAC;AAkDtB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAatD,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAgBxD,CAAC"}
+{"version":3,"file":"logPowerEquation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/logarithm/logPowerEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAwGF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAatD,CAAC;AACF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAgBxD,CAAC"}

package/lib/exercises/functions/logarithm/logPowerEquation.js

@@ -7,6 +7,7 @@ const randint_1 = require("../../../math/utils/random/randint");
 const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
 const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const log10Node_1 = require("../../../tree/nodes/functions/log10Node");
+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 fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
@@ -17,41 +18,70 @@ const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 /**a*b^x+c=d */
 const getLogPowerEquationQuestion = (opts) => {
     const powered = (0, randint_1.randint)(2, 8);
-    const a = (0, randint_1.randint)(1, 10);
-    const c = (0, randint_1.randint)(-5, 5);
-    const k = (0, randint_1.randint)(5, 15, [powered, 10]);
+    const a = (0, randint_1.randint)(1, 10, [powered]);
+    const c = (0, randint_1.randint)(-5, 5, [a]);
+    const k = (0, randint_1.randint)(5, 15, [powered]);
     const d = k * a + c;
     const xNode = new variableNode_1.VariableNode("x");
     const poweredNode = new numberNode_1.NumberNode(powered);
+    const LNode = opts?.isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
     const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
-        new fractionNode_1.FractionNode(new log10Node_1.Log10Node(new numberNode_1.NumberNode(k)), new log10Node_1.Log10Node(poweredNode)),
+        new fractionNode_1.FractionNode(new LNode(new numberNode_1.NumberNode(k)), new LNode(poweredNode)).simplify(),
     ])).toTex();
-    const equation = new equalNode_1.EqualNode(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new powerNode_1.PowerNode(poweredNode, xNode)), new numberNode_1.NumberNode(c)), new numberNode_1.NumberNode(d));
+    const equation = new equalNode_1.EqualNode(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new powerNode_1.PowerNode(poweredNode, xNode)), new numberNode_1.NumberNode(c)).simplify(), new numberNode_1.NumberNode(d));
+    const keys = [
+        "log",
+        "x",
+        "equal",
+        "S",
+        "lbrace",
+        "semicolon",
+        "rbrace",
+    ];
+    keys.push(opts?.isLog10 ? "log" : "ln");
     const question = {
         answer,
         instruction: `Résoudre : $${equation.toTex()}$`,
-        keys: ["log", "x", "equal", "lbrace", "semicolon", "rbrace"],
+        keys,
         answerFormat: "tex",
-        identifiers: {},
+        identifiers: { a, c, k, powered, isLog10: opts?.isLog10 ?? false },
     };
     return question;
 };
-const getPropositions = (n, { answer }) => {
+const getPropositions = (n, { answer, isLog10, a, c, k, powered }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    while (propositions.length < n) { }
+    const LNode = isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
+    const withoutLogs = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
+        new fractionNode_1.FractionNode(new numberNode_1.NumberNode(k), new numberNode_1.NumberNode(powered)).simplify(),
+    ]));
+    (0, exercise_1.tryToAddWrongProp)(propositions, withoutLogs.toTex());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
+            new fractionNode_1.FractionNode(new LNode(new numberNode_1.NumberNode((0, randint_1.randint)(2, 10))), new LNode(new numberNode_1.NumberNode((0, randint_1.randint)(2, 10)))).simplify(),
+        ])).toTex());
+    }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return true;
+const isAnswerValid = (ans, { a, c, k, powered, isLog10 }) => {
+    const LNode = isLog10 ? log10Node_1.Log10Node : logNode_1.LogNode;
+    const poweredNode = new numberNode_1.NumberNode(powered);
+    const answerSimp = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
+        new fractionNode_1.FractionNode(new LNode(new numberNode_1.NumberNode(k)), new LNode(poweredNode)).simplify(),
+    ]));
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([
+        new fractionNode_1.FractionNode(new LNode(new numberNode_1.NumberNode(k)), new LNode(poweredNode)),
+    ]));
+    const texs = [...answerSimp.toAllValidTexs(), ...answer.toAllValidTexs()];
+    return texs.includes(ans);
 };
 exports.logPowerEquation = {
     id: "logPowerEquation",
     connector: "\\iff",
-    label: "",
-    levels: [],
+    label: "Résoudre une équation du type $a\\times b^x + c = d$",
+    levels: ["TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: [],
+    sections: ["Logarithme népérien", "Puissances"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLogPowerEquationQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -61,10 +91,10 @@ exports.logPowerEquation = {
 exports.log10PowerEquation = {
     id: "log10PowerEquation",
     connector: "\\iff",
-    label: "",
-    levels: [],
+    label: "Résoudre une équation du type $a\\times b^x + c = d$",
+    levels: ["TermSpé", "MathComp"],
     isSingleStep: true,
-    sections: [],
+    sections: ["Logarithme décimal", "Puissances"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getLogPowerEquationQuestion({ isLog10: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/trigonometry/associatePoint.d.ts

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

package/lib/exercises/trigonometry/associatePoint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"associatePoint.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/associatePoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqDF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAapD,CAAC"}