math-exercises 2.0.22 → 2.0.23

package/lib/exercises/equaDiff/equaDiffCheckSolutionFirstOrderTrinom.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=equaDiffCheckSolutionFirstOrderTrinom.d.ts.map

package/lib/exercises/equaDiff/equaDiffCheckSolutionFirstOrderTrinom.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"equaDiffCheckSolutionFirstOrderTrinom.d.ts","sourceRoot":"","sources":["../../../src/exercises/equaDiff/equaDiffCheckSolutionFirstOrderTrinom.ts"],"names":[],"mappings":""}

package/lib/exercises/equaDiff/equaDiffCheckSolutionFirstOrderTrinom.js

@@ -0,0 +1,53 @@
+"use strict";
+// import {
+//   MathExercise,
+//   Proposition,
+//   QCMGenerator,
+//   Question,
+//   QuestionGenerator,
+//   VEA,
+//   addValidProp,
+//   shuffleProps,
+//   tryToAddWrongProp,
+// } from "../../exercises/exercise";
+// import { getDistinctQuestions } from "../../exercises/utils/getDistinctQuestions";
+// import { TrinomConstructor } from "../../math/polynomials/trinom";
+// type Identifiers = {};
+// /**y = y' + dx^2+ex+f, alors y = ax^2+bx+c */
+// const getEquaDiffCheckSolutionFirstOrderQuestion: QuestionGenerator<
+//   Identifiers
+// > = () => {
+//   const trinom = TrinomConstructor.random();
+//   const d = trinom.a;
+//   const e = trinom.b - 2 * trinom.a;
+//   const f = trinom.c - trinom.b;
+//   const question: Question<Identifiers> = {
+//     answer,
+//     instruction: ``,
+//     keys: [],
+//     answerFormat: "tex",
+//     identifiers: {},
+//   };
+//   return question;
+// };
+// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
+//   const propositions: Proposition[] = [];
+//   addValidProp(propositions, answer);
+//   while (propositions.length < n) {}
+//   return shuffleProps(propositions, n);
+// };
+// const isAnswerValid: VEA<Identifiers> = (ans, { answer }) => {};
+// export const equaDiffCheckSolutionFirstOrder: MathExercise<Identifiers> = {
+//   id: "equaDiffCheckSolutionFirstOrder",
+//   connector: "",
+//   label: "",
+//   levels: [],
+//   isSingleStep: true,
+//   sections: [],
+//   generator: (nb: number) =>
+//     getDistinctQuestions(getEquaDiffCheckSolutionFirstOrderQuestion, nb),
+//   qcmTimer: 60,
+//   freeTimer: 60,
+//   getPropositions,
+//   isAnswerValid,
+// };

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

@@ -1 +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"}
+{"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;AA0FF,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

@@ -15,6 +15,7 @@ const operatorComposition_1 = require("../../../tree/utilities/operatorCompositi
 const random_1 = require("../../../utils/random");
 const getLog10SumSimplifyingQuestion = (opts) => {
     const nb = (0, randint_1.randint)(2, 10);
+    const trueNb = [2, 4, 8].includes(nb) ? 2 : [3, 9].includes(nb) ? 3 : nb;
     const nbTerms = (0, randint_1.randint)(2, 4);
     const powers = [];
     const signs = [];
@@ -36,7 +37,7 @@ const getLog10SumSimplifyingQuestion = (opts) => {
     const answer = statement.simplify();
     const question = {
         answer: answer.toTex(),
-        instruction: `Simplifier le plus possible l'expression suivante : $${statement.toTex()}$`,
+        instruction: `Exprimer le nombre suivant sous la forme $a${opts?.isLog10 ? "\\log" : "\\ln"}\\left(${trueNb}\\right)$ : $\\newline ${statement.toTex()}$`,
         keys: [opts?.isLog10 ? "log" : "ln"],
         answerFormat: "tex",
         identifiers: { nb, powers, signs, isLog10: opts?.isLog10 ?? false },

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

@@ -31,7 +31,7 @@ const getExpSimplifiying = () => {
     }
     const answer = simplifiedExpression.toTex();
     const question = {
-        instruction: `Simplifier l'expression suivante : $${expression.toTex()}$.`,
+        instruction: `Ecrire le nombre suivant sous la forme $\\ln\\left(a\\right)$ : $\\newline ${expression.toTex()}$.`,
         answer,
         keys: ["ln"],
         answerFormat: "tex",

package/lib/geogebra/geogebraConstructor.d.ts

@@ -0,0 +1,7 @@
+export declare class GeogebraConstructor {
+    commands: string[];
+    constructor();
+    addCommand(...s: string[]): void;
+    getCommands(): string[];
+}
+//# sourceMappingURL=geogebraConstructor.d.ts.map

package/lib/geogebra/geogebraConstructor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geogebraConstructor.d.ts","sourceRoot":"","sources":["../../src/geogebra/geogebraConstructor.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAmB;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAM;;IAIxB,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE;IAGzB,WAAW;CAGZ"}

package/lib/geogebra/geogebraConstructor.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeogebraConstructor = void 0;
+class GeogebraConstructor {
+    constructor() {
+        this.commands = [];
+    }
+    addCommand(...s) {
+        this.commands.push(...s);
+    }
+    getCommands() {
+        return this.commands;
+    }
+}
+exports.GeogebraConstructor = GeogebraConstructor;

package/lib/math/utils/arithmetic/maxPowerDecomposition.d.ts

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param n
+ * eg for n = 36 will return 6^2
+ * for n = 12 will return 2^2*3
+ */
+export declare const maxPowerDecomposition: (n: number) => {
+    value: number;
+    power: number;
+}[];
+//# sourceMappingURL=maxPowerDecomposition.d.ts.map

package/lib/math/utils/arithmetic/maxPowerDecomposition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"maxPowerDecomposition.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/arithmetic/maxPowerDecomposition.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,MAAO,MAAM;WAEzB,MAAM;WAAS,MAAM;GAW1C,CAAC"}

package/lib/math/utils/arithmetic/maxPowerDecomposition.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maxPowerDecomposition = void 0;
+const primeDecomposition_1 = require("./primeDecomposition");
+/**
+ *
+ * @param n
+ * eg for n = 36 will return 6^2
+ * for n = 12 will return 2^2*3
+ */
+const maxPowerDecomposition = (n) => {
+    const decomposition = (0, primeDecomposition_1.primeDecomposition)(n);
+    const res = [];
+    for (const item of decomposition) {
+        const { value, power } = item;
+        const matchingPower = res.find((el) => el.power === power);
+        if (matchingPower) {
+            matchingPower.value *= value;
+        }
+        else {
+            res.push(item);
+        }
+    }
+    return res;
+};
+exports.maxPowerDecomposition = maxPowerDecomposition;

package/lib/math/utils/arithmetic/primeDecomposition.d.ts

@@ -0,0 +1,5 @@
+export declare const primeDecomposition: (n: number) => {
+    value: number;
+    power: number;
+}[];
+//# sourceMappingURL=primeDecomposition.d.ts.map

package/lib/math/utils/arithmetic/primeDecomposition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"primeDecomposition.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/arithmetic/primeDecomposition.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,kBAAkB,MAAO,MAAM;WAEtB,MAAM;WAAS,MAAM;GAa1C,CAAC"}

package/lib/math/utils/arithmetic/primeDecomposition.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.primeDecomposition = void 0;
+const primeFactors_1 = require("./primeFactors");
+const primeDecomposition = (n) => {
+    const factors = (0, primeFactors_1.primeFactors)(n);
+    const res = [];
+    for (const factor of factors) {
+        const data = res.find((el) => el.value === factor);
+        if (data) {
+            data.power++;
+        }
+        else {
+            res.push({
+                value: factor,
+                power: 1,
+            });
+        }
+    }
+    return res;
+};
+exports.primeDecomposition = primeDecomposition;

package/lib/tree/nodes/functions/log10Node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log10Node.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/log10Node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AACD,qBAAa,SAAU,YAAW,YAAY;IAC5C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAQpD,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,IAAI,aAAa;IA0BzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}
+{"version":3,"file":"log10Node.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/log10Node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AACD,qBAAa,SAAU,YAAW,YAAY;IAC5C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAQpD,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,IAAI,aAAa;IAgCzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}

package/lib/tree/nodes/functions/log10Node.js

@@ -9,7 +9,7 @@ const numberNode_1 = require("../numbers/numberNode");
 const isInt_1 = require("../../../utils/isInt");
 const powerNode_1 = require("../operators/powerNode");
 const multiplyNode_1 = require("../operators/multiplyNode");
-const primeFactors_1 = require("../../../math/utils/arithmetic/primeFactors");
+const maxPowerDecomposition_1 = require("../../../math/utils/arithmetic/maxPowerDecomposition");
 function isLog10Node(a) {
     return (0, functionNode_1.isFunctionNode)(a) && a.id === functionNode_1.FunctionsIds.log10;
 }
@@ -58,11 +58,18 @@ class Log10Node {
             if ((0, isInt_1.isInt)(log10))
                 return new numberNode_1.NumberNode(log10);
             if ((0, isInt_1.isInt)(value)) {
-                const factors = (0, primeFactors_1.primeFactors)(value);
-                if (factors.length === 1)
-                    return this; //isPrime
-                if (factors.every((nb) => nb === factors[0])) {
-                    return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(factors.length), new Log10Node(new numberNode_1.NumberNode(factors[0]))).simplify();
+                const decomposition = (0, maxPowerDecomposition_1.maxPowerDecomposition)(value);
+                if (decomposition.length === 1) {
+                    const el = decomposition[0];
+                    if (el.power === 1)
+                        return this; //isPrime
+                    else
+                        return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(el.power), new Log10Node(new numberNode_1.NumberNode(el.value)));
+                }
+                else {
+                    //! things like log(6) will return themselves
+                    //! even true for log(12). Should they be simplified into 2ln(2)+ln(3) ?
+                    return new Log10Node(simplifiedChild);
                 }
             }
         }

package/lib/tree/nodes/functions/logNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/logNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAOjD,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AACD,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAQpD,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,IAAI,aAAa;IA6BzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}
+{"version":3,"file":"logNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/logNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AACD,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAQpD,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IASpC,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,IAAI,aAAa;IAmCzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGrC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;CAGrC"}

package/lib/tree/nodes/functions/logNode.js

@@ -9,8 +9,8 @@ const multiplyNode_1 = require("../operators/multiplyNode");
 const powerNode_1 = require("../operators/powerNode");
 const numberNode_1 = require("../numbers/numberNode");
 const isInt_1 = require("../../../utils/isInt");
-const primeFactors_1 = require("../../../math/utils/arithmetic/primeFactors");
 const expNode_1 = require("./expNode");
+const maxPowerDecomposition_1 = require("../../../math/utils/arithmetic/maxPowerDecomposition");
 function isLogNode(a) {
     return (0, functionNode_1.isFunctionNode)(a) && a.id === functionNode_1.FunctionsIds.log;
 }
@@ -55,15 +55,22 @@ class LogNode {
         const simplifiedChild = this.child.simplify();
         if ((0, numberNode_1.isNumberNode)(simplifiedChild)) {
             const value = simplifiedChild.value;
-            const log = Math.log(value);
-            if ((0, isInt_1.isInt)(log))
-                return new numberNode_1.NumberNode(log);
+            const log10 = Math.log10(value);
+            if ((0, isInt_1.isInt)(log10))
+                return new numberNode_1.NumberNode(log10);
             if ((0, isInt_1.isInt)(value)) {
-                const factors = (0, primeFactors_1.primeFactors)(value);
-                if (factors.length === 1)
-                    return this; //isPrime
-                if (factors.every((nb) => nb === factors[0])) {
-                    return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(factors.length), new LogNode(new numberNode_1.NumberNode(factors[0]))).simplify();
+                const decomposition = (0, maxPowerDecomposition_1.maxPowerDecomposition)(value);
+                if (decomposition.length === 1) {
+                    const el = decomposition[0];
+                    if (el.power === 1)
+                        return this; //isPrime
+                    else
+                        return new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(el.power), new LogNode(new numberNode_1.NumberNode(el.value)));
+                }
+                else {
+                    //! things like log(6) will return themselves
+                    //! even true for log(12). Should they be simplified into 2ln(2)+ln(3) ?
+                    return new LogNode(simplifiedChild);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.0.22",
+  "version": "2.0.23",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [