math-exercises 2.0.40 → 2.0.42

package/lib/exercises/calculLitteral/distributivity/firstIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAsBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAKvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,WAAW,CAYnD,CAAC"}
+{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAwBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAkClE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAKvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,WAAW,CAYnD,CAAC"}

package/lib/exercises/calculLitteral/distributivity/firstIdentity.js

@@ -10,9 +10,11 @@ const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFirstIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random({
-        excludes: [0],
+        min: 1,
+        max: 11,
     }, {
-        excludes: [0],
+        min: 1,
+        max: 11,
     });
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = affine.multiply(affine).toTree().toTex();

package/lib/exercises/conversion/hoursToDecimal.js

@@ -21,7 +21,7 @@ const getHoursToDecimalQuestion = () => {
         : `${hours},${(0, round_1.round)((mins / 60) * 100, 0)}\\text{h}`;
     const question = {
         answer,
-        instruction: `Convertir la durée suivante en ${isDecimalToHours ? "heures et minutes" : "nombre décimal"} : $${durationTex}$ (arrondir ${isDecimalToHours ? "à la minute près" : "au centième près"})`,
+        instruction: `Convertir la durée suivante en ${isDecimalToHours ? "heures et minutes" : "$\\text{h}$ (nombre décimal)"} : $${durationTex}$ (arrondir ${isDecimalToHours ? "à la minute près" : "au centième près"})`,
         keys: ["hours", "minutes"],
         answerFormat: "tex",
         identifiers: { isDecimalToHours, dec: dec.value },

package/lib/exercises/functions/basics/imageFunction.js

@@ -52,7 +52,7 @@ const isAnswerValid = (ans, { answer }) => {
 exports.imageFunction = {
     id: "imageFunction",
     connector: "=",
-    label: "Image d'une fonction",
+    label: "Calcul d'image par une fonction",
     levels: ["3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
     sections: ["Fonctions"],
     isSingleStep: true,

package/lib/exercises/functions/parity/parityFromAlgebra.js

@@ -105,7 +105,7 @@ const isAnswerValid = (ans, { answer }) => {
 exports.parityFromAlgebra = {
     id: "parityFromAlgebra",
     label: "Déterminer algébriquement la parité d'une fonction",
-    levels: ["2nde"],
+    levels: ["2nde", "1reSpé"],
     isSingleStep: true,
     sections: ["Fonctions"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getParityFromAlgebraQuestion, nb),

package/lib/exercises/functions/parity/parityFromGraph.js

@@ -115,7 +115,7 @@ const isAnswerValid = (ans, { answer }) => {
 exports.parityFromGraph = {
     id: "parityFromGraph",
     label: "Reconnaître graphiquement la parité d'une fonction",
-    levels: ["2nde"],
+    levels: ["2nde", "1reSpé"],
     isSingleStep: true,
     sections: ["Fonctions"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getParityFromGraphQuestion, nb),

package/lib/exercises/sequences/arithmetic/arithmeticExplicitFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticExplicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticExplicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6CF,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,WAAW,CAapE,CAAC"}
+{"version":3,"file":"arithmeticExplicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticExplicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiDF,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,WAAW,CAapE,CAAC"}

package/lib/exercises/sequences/arithmetic/arithmeticExplicitFormulaUsage.js

@@ -18,7 +18,7 @@ const getArithmeticExplicitFormulaUsage = () => {
             .toTex()}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ["r", "n", "u", "underscore"],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { firstValue, askedRank, reason },
     };
@@ -32,8 +32,12 @@ const getPropositions = (n, { answer, firstValue, askedRank, reason }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, askedRank }) => {
+    return [
+        answer,
+        `u_${askedRank}=${answer}`,
+        `u_{${askedRank}}=${answer}`,
+    ].includes(ans);
 };
 exports.arithmeticExplicitFormulaUsage = {
     id: "arithmeticExplicitFormulaUsage",

package/lib/exercises/sequences/arithmetic/arithmeticFindReason.js

@@ -16,7 +16,7 @@ const getArithmeticFindReason = () => {
         instruction: `$(u_n)$ est une suite arithmétique. On sait que $u_{${rank1}} = ${value1}$ et $u_{${rank2}} = ${value2}$. Quelle est la raison de la suite $(u_n)$ ?`,
         startStatement: "r",
         answer,
-        keys: ["r", "n", "u", "underscore"],
+        keys: [],
         answerFormat: "tex",
         identifiers: { rank1, reason, value1 },
     };

package/lib/exercises/sequences/arithmetic/arithmeticReasonUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticReasonUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticReasonUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA+BF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}
+{"version":3,"file":"arithmeticReasonUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticReasonUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAIlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAmCF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAY3D,CAAC"}

package/lib/exercises/sequences/arithmetic/arithmeticReasonUsage.js

@@ -15,7 +15,7 @@ const getArithmeticReasonUsage = () => {
         instruction: `$(u_n)$ est une suite arithmétique de raison $r = ${reason}$ et on sait que $u_{${startRank}} = ${startValue}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ["r", "n", "u", "underscore"],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { reason, startRank, startValue },
     };
@@ -29,8 +29,12 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, startRank }) => {
+    return [
+        answer,
+        `u_${startRank + 1}=${answer}`,
+        `u_{${startRank + 1}}=${answer}`,
+    ].includes(ans);
 };
 exports.arithmeticReasonUsage = {
     id: "arithmeticReasonUsage",

package/lib/exercises/sequences/arithmetic/arithmeticRecurrenceFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arithmeticRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAkCF,eAAO,MAAM,gCAAgC,EAAE,YAAY,CAAC,WAAW,CAatE,CAAC"}
+{"version":3,"file":"arithmeticRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/arithmetic/arithmeticRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAsCF,eAAO,MAAM,gCAAgC,EAAE,YAAY,CAAC,WAAW,CAatE,CAAC"}

package/lib/exercises/sequences/arithmetic/arithmeticRecurrenceFormulaUsage.js

@@ -15,7 +15,7 @@ const getArithmeticRecurrenceFormulaUsage = () => {
         instruction: `$(u_n)$ est une suite définie par $u_{n+1} = ${reason} + u_n$ et $u_{${firstRank}} = ${firstValue}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ["r", "n", "u", "underscore"],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { firstRank, firstValue, reason },
     };
@@ -29,8 +29,12 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, firstRank }) => {
+    return [
+        answer,
+        `u_${firstRank + 1}=${answer}`,
+        `u_{${firstRank + 1}}=${answer}`,
+    ].includes(ans);
 };
 exports.arithmeticRecurrenceFormulaUsage = {
     id: "arithmeticRecurrenceFormulaUsage",

package/lib/exercises/sequences/explicitFormulaUsage.js

@@ -14,7 +14,7 @@ const getExplicitFormulaUsageQuestion = () => {
         instruction: `Soit $u$ la suite définie pour tout $n\\geq 0$ par $u_n = ${u
             .toTree()
             .toTex()}$. Calculer $u_${rank}$.`,
-        keys: [],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { rank, coeffs: u.coefficients },
     };
@@ -32,8 +32,8 @@ const getPropositions = (n, { answer, rank, coeffs }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, rank }) => {
+    return [answer, `u_{${rank}}=${answer}`, `u_${rank}=${answer}`].includes(ans);
 };
 exports.explicitFormulaUsage = {
     id: "explicitFormulaUsage",

package/lib/exercises/sequences/geometric/geometricExplicitFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricExplicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricExplicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4CF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAanE,CAAC"}
+{"version":3,"file":"geometricExplicitFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricExplicitFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CAanE,CAAC"}

package/lib/exercises/sequences/geometric/geometricExplicitFormulaUsage.js

@@ -20,14 +20,18 @@ const getGeometricExplicitFormulaUsage = () => {
         instruction: `$(u_n)$ est une suite géométrique définie par $u_n = ${formulaTex}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: [],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { firstValue, reason, askedRank },
     };
     return question;
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, askedRank }) => {
+    return [
+        answer,
+        `u_{${askedRank}}=${answer}`,
+        `u_${askedRank}=${answer}`,
+    ].includes(ans);
 };
 const getPropositions = (n, { answer, firstValue, reason, askedRank }) => {
     const propositions = [];

package/lib/exercises/sequences/geometric/geometricReasonUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricReasonUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricReasonUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA0CF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAY1D,CAAC"}
+{"version":3,"file":"geometricReasonUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricReasonUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA8CF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAY1D,CAAC"}

package/lib/exercises/sequences/geometric/geometricReasonUsage.js

@@ -15,7 +15,7 @@ const getGeometricReasonUsage = () => {
         instruction: `$(u_n)$ est une suite géométrique de raison $q = ${reason}$ et on sait que $u_{${startRank}} = ${startValue}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ["q", "n", "u", "underscore"],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { startValue, reason, startRank },
     };
@@ -31,8 +31,12 @@ const getPropositions = (n, { answer, startValue, reason }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, startRank }) => {
+    return [
+        answer,
+        `u_{${startRank}}=${answer}`,
+        `u_${startRank}=${answer}`,
+    ].includes(ans);
 };
 exports.geometricReasonUsage = {
     id: "geometricReasonUsage",

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA6CF,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,WAAW,CAarE,CAAC"}
+{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAkDF,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,WAAW,CAarE,CAAC"}

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.js

@@ -15,7 +15,7 @@ const getGeometricRecurrenceFormulaUsage = () => {
         instruction: `$(u_n)$ est une suite définie par $u_{n+1} = ${reason}\\times u_n$ et $u_{${firstRank}} = ${firstValue}$. Calculer : $u_{${askedRank}}$`,
         startStatement: `u_{${askedRank}}`,
         answer,
-        keys: ["q", "n", "u", "underscore"],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { firstValue, reason, firstRank },
     };
@@ -31,7 +31,12 @@ const getPropositions = (n, { answer, firstValue, reason }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { answer }) => {
+const isAnswerValid = (ans, { answer, firstRank }) => {
+    return [
+        answer,
+        `u_{${firstRank + 1}}=${answer}`,
+        `u_${firstRank + 1}=${answer}`,
+    ].includes(ans);
     return ans === answer;
 };
 exports.geometricRecurrenceFormulaUsage = {

package/lib/exercises/sequences/recurrenceFormulaUsage.js

@@ -20,7 +20,7 @@ const getRecurrenceFormulaUsageQuestion = () => {
         instruction: `Soit $u$ la suite définie par $u_0 = ${u0}$ et pour tout $n\\geq 1$, $u_{n+1} = ${u
             .toTree()
             .toTex()}$. Calculer $u_${rank}$.`,
-        keys: [],
+        keys: ["u", "underscore", "equal"],
         answerFormat: "tex",
         identifiers: { rank, u0, coeffs },
     };
@@ -37,8 +37,8 @@ const getPropositions = (n, { answer, rank, u0, coeffs }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, rank }) => {
+    return [answer, `u_{${rank}}=${answer}`, `u_${rank}=${answer}`].includes(ans);
 };
 exports.recurrenceFormulaUsage = {
     id: "recurrenceFormulaUsage",

package/lib/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,CAAC;AAarB,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAgB3D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,EAAE,MAAM,aAAa,CAAC;QAC5B,SAAS,EAAE,MAAM,MAAM,CAAC;KACzB;CACF"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,CAAC;AAarB,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAiB3D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,EAAE,MAAM,aAAa,CAAC;QAC5B,SAAS,EAAE,MAAM,MAAM,CAAC;KACzB;CACF"}

package/lib/server.js

@@ -35,9 +35,10 @@ const express_1 = __importDefault(require("express"));
 const body_parser_1 = __importDefault(require("body-parser"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const cors_1 = __importDefault(require("cors"));
+const multiplyNode_1 = require("./tree/nodes/operators/multiplyNode");
 const numberNode_1 = require("./tree/nodes/numbers/numberNode");
 const infiniteNode_1 = require("./tree/nodes/numbers/infiniteNode");
-const round_1 = require("./math/utils/round");
+const powerNode_1 = require("./tree/nodes/operators/powerNode");
 const jsonParser = body_parser_1.default.json();
 const allExercises = [...exercises];
 Number.prototype.toTree = function () {
@@ -56,7 +57,9 @@ const runServer = () => {
     const app = (0, express_1.default)();
     app.use((0, cors_1.default)());
     console.log(exercises.length);
-    console.log((0, round_1.round)((35 * 10) / 6, 2) * 100);
+    console.log(new multiplyNode_1.MultiplyNode((7).toTree(), new powerNode_1.PowerNode((7).toTree(), (3).toTree()))
+        .simplify()
+        .toTex());
     app.get("/", (req, res) => {
         res.json(allExercises);
     });

package/lib/tree/nodes/operators/multiplyNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAkDf,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAwFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,IAAI;IAGJ,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAqG/C,MAAM,CAAC,IAAI,EAAE,aAAa;CAU3B"}
+{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAkDf,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAwFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,IAAI;IAGJ,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAgH/C,MAAM,CAAC,IAAI,EAAE,aAAa;CAU3B"}

package/lib/tree/nodes/operators/multiplyNode.js

@@ -16,6 +16,7 @@ const sqrtNode_1 = require("../functions/sqrtNode");
 const oppositeNode_1 = require("../functions/oppositeNode");
 const fractionNode_1 = require("./fractionNode");
 const functionNode_1 = require("../functions/functionNode");
+const addNode_1 = require("./addNode");
 function isMultiplyNode(a) {
     return (0, operatorNode_1.isOperatorNode)(a) && a.id === operatorNode_1.OperatorIds.multiply;
 }
@@ -269,6 +270,12 @@ class MultiplyNode {
             if ((0, sqrtNode_1.isSqrtNode)(a) && (0, sqrtNode_1.isSqrtNode)(b)) {
                 return new sqrtNode_1.SqrtNode(new MultiplyNode(a.child, b.child)).simplify(opts);
             }
+            if ((0, numberNode_1.isNumberNode)(a) &&
+                (0, powerNode_1.isPowerNode)(b) &&
+                (0, numberNode_1.isNumberNode)(b.leftChild) &&
+                a.value === b.leftChild.value) {
+                return new powerNode_1.PowerNode(b.leftChild, new addNode_1.AddNode(b.rightChild, (1).toTree())).simplify();
+            }
             //TODo continue
             return null;
         };

package/package.json

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