math-exercises 2.2.26 → 2.2.27

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

@@ -28,3 +28,4 @@ __exportStar(require("./digitRankNumber"), exports);
 __exportStar(require("./digitDecimalRankNumber"), exports);
 __exportStar(require("./ordering"), exports);
 __exportStar(require("./decimals"), exports);
+// export * from "./writing";

package/lib/exercises/math/calcul/rounding/rounding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AA2ElC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAe7C,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAkB9C,CAAC"}
+{"version":3,"file":"rounding.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/rounding/rounding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AA8ElC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAe7C,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAehD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC;AACF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAkB9C,CAAC"}

package/lib/exercises/math/calcul/rounding/rounding.js

@@ -6,6 +6,7 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const decimal_1 = require("../../../../math/numbers/decimals/decimal");
 const randint_1 = require("../../../../math/utils/random/randint");
 const round_1 = require("../../../../math/utils/round");
+const numberParser_1 = require("../../../../tree/parsers/numberParser");
 const shuffle_1 = require("../../../../utils/shuffle");
 /**
  * arrondi à l'unité
@@ -19,6 +20,7 @@ const instructions = [
     "Arrondir au millième :",
 ];
 const getRoundQuestions = (opts) => {
+    244.8895;
     const precisionAsked = opts?.precisionAsked || 0;
     const precision = (0, randint_1.randint)(precisionAsked + 1, precisionAsked + 5);
     const dec = decimal_1.DecimalConstructor.random(0, 1000, precision);
@@ -76,11 +78,8 @@ const getPropositions = (n, { answer, precisionAsked, decimal, precision }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { decimal, precisionAsked }) => {
-    const dec = new decimal_1.Decimal(decimal);
-    const answer = dec.round(precisionAsked).toTree();
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
+const isAnswerValid = (ans, { answer, decimal, precisionAsked }) => {
+    return (0, numberParser_1.numberParser)(ans) === answer;
 };
 exports.roundToUnit = {
     id: "roundToUnit",

package/lib/exercises/math/calcul/writing/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./numberToFrenchWriting";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/writing/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/writing/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}

package/lib/exercises/math/calcul/writing/index.js

@@ -0,0 +1,17 @@
+"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("./numberToFrenchWriting"), exports);

package/lib/exercises/math/calcul/writing/numberToFrenchWriting.d.ts

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

package/lib/exercises/math/calcul/writing/numberToFrenchWriting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"numberToFrenchWriting.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/writing/numberToFrenchWriting.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AAOlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAqDF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}

package/lib/exercises/math/calcul/writing/numberToFrenchWriting.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.numberToFrenchWriting = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const integer_1 = require("../../../../math/numbers/integer/integer");
+const randint_1 = require("../../../../math/utils/random/randint");
+const toSeparatedThousands_1 = require("../../../../utils/numberPrototype/toSeparatedThousands");
+const numberToFrenchWord_1 = require("../../../../utils/strings/numberToFrenchWord");
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        throw Error("QCM not implemented");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    return (0, numberToFrenchWord_1.numberToFrenchWord)(identifiers.nb);
+};
+const getInstruction = (identifiers) => {
+    return `Écrire le nombre $${(0, toSeparatedThousands_1.toSeperatedThousands)(identifiers.nb + "")}$ en lettres.`;
+};
+const getHint = (identifiers) => {
+    return ``;
+};
+const getCorrection = (identifiers) => {
+    return ``;
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+const getNumberToFrenchWritingQuestion = () => {
+    const nb = integer_1.IntegerConstructor.random((0, randint_1.randint)(2, 8));
+    const identifiers = {
+        nb,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "raw",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.numberToFrenchWriting = {
+    id: "numberToFrenchWriting",
+    connector: "=",
+    label: "Écrire un nombre entier en lettres",
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getNumberToFrenchWritingQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    ggbTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getHint,
+    getCorrection,
+    getAnswer,
+};

package/lib/exercises/math/geometry/cartesian/readAbscissOnLine.d.ts

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

package/lib/exercises/math/geometry/cartesian/readAbscissOnLine.d.ts.map

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

package/lib/exercises/math/geometry/cartesian/readAbscissOnLine.js

@@ -0,0 +1,92 @@
+"use strict";
+// import {
+//   Exercise,
+//   Proposition,
+//   QCMGenerator,
+//   Question,
+//   QuestionGenerator,
+//   VEA,
+//   GGBVEA,
+//   addValidProp,
+//   shuffleProps,
+//   tryToAddWrongProp,
+//   GetAnswer,
+//   GetHint,
+//   GetCorrection,
+//   GetInstruction,
+//   GetKeys,
+//   GetGGBOptions,
+//   GetStudentGGBOptions,
+//   GetGGBAnswer,
+// } from "../../../../exercises/exercise";
+// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions";
+// type Identifiers = {
+//   axisUnit: number; //for ggb
+//   oneUnitTex: string;
+//   absciss: number | [number, number];
+// };
+// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
+//   const propositions: Proposition[] = [];
+//   addValidProp(propositions, answer);
+//   while (propositions.length < n) {
+//     throw Error("QCM not implemented");
+//   }
+//   return shuffleProps(propositions, n);
+// };
+// const getAnswer: GetAnswer<Identifiers> = (identifiers) => {};
+// const getInstruction: GetInstruction<Identifiers> = (identifiers) => {};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+// const getGGBAnswer: GetGGBAnswer<Identifiers> = (identifiers) => {};
+// const getGGBOptions: GetGGBOptions<Identifiers> = (identifiers) => {};
+// const getStudentGGBOptions: GetStudentGGBOptions<Identifiers> = (
+//   identifiers,
+// ) => {};
+// const getKeys: GetKeys<Identifiers> = (identifiers) => {
+//   return [];
+// };
+// const isAnswerValid: VEA<Identifiers> = (ans, { answer }) => {
+//   throw Error("VEA not implemented");
+// };
+// const isGGBAnswerValid: GGBVEA<Identifiers> = (ans, { ggbAnswer }) => {
+//   throw Error("GGBVea not implemented");
+// };
+// const getReadAbscissOnLineQuestion: QuestionGenerator<Identifiers> = () => {
+//   const identifiers: Identifiers = {
+//     absciss,
+//     axisUnit,
+//     oneUnitTex,
+//   };
+//   const question: Question<Identifiers> = {
+//     answer: getAnswer(identifiers),
+//     instruction: getInstruction(identifiers),
+//     keys: getKeys(identifiers),
+//     answerFormat: "tex",
+//     identifiers,
+//     hint: getHint(identifiers),
+//     correction: getCorrection(identifiers),
+//   };
+//   return question;
+// };
+// export const readAbscissOnLine: Exercise<Identifiers> = {
+//   id: "readAbscissOnLine",
+//   connector: "=",
+//   label: "",
+//   isSingleStep: true,
+//   generator: (nb: number) =>
+//     getDistinctQuestions(getReadAbscissOnLineQuestion, nb),
+//   qcmTimer: 60,
+//   freeTimer: 60,
+//   ggbTimer: 60,
+//   getPropositions,
+//   isAnswerValid,
+//   isGGBAnswerValid,
+//   subject: "Mathématiques",
+//   getHint,
+//   getCorrection,
+//   getAnswer,
+//   getGGBAnswer,
+//   getGGBOptions,
+//   getStudentGGBOptions,
+//   rebuildIdentifiers,
+// };

package/lib/exercises/math/percent/percentToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}
+{"version":3,"file":"percentToDecimal.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/percentToDecimal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAuIF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

package/lib/exercises/math/percent/percentToDecimal.js

@@ -4,36 +4,76 @@ exports.percentToDecimal = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const decimal_1 = require("../../../math/numbers/decimals/decimal");
+const integer_1 = require("../../../math/numbers/integer/integer");
 const randint_1 = require("../../../math/utils/random/randint");
+const round_1 = require("../../../math/utils/round");
+const numberParser_1 = require("../../../tree/parsers/numberParser");
 const coinFlip_1 = require("../../../utils/coinFlip");
+const probaFlip_1 = require("../../../utils/probaFlip");
+const getAnswer = ({ nb, isPercentToDecimal }) => {
+    const dec = new decimal_1.Decimal(nb);
+    const tex = dec.toTree().toTex();
+    const percentTex = dec.toPercentNode().toTex();
+    return isPercentToDecimal ? tex : percentTex;
+};
+const getInstruction = ({ isPercentToDecimal, nb, }) => {
+    const dec = new decimal_1.Decimal(nb);
+    const tex = dec.toTree().toTex();
+    const percentTex = dec.toPercentNode().toTex();
+    const instru = isPercentToDecimal ? percentTex : tex;
+    return `Ecrire le nombre suivant ${isPercentToDecimal
+        ? "sous forme de nombre décimal"
+        : "sous forme de pourcentage"} : $${instru}$`;
+};
+const getHint = ({ isPercentToDecimal }) => {
+    return `${isPercentToDecimal
+        ? `Pour écrire $x\\%$ en décimal, rappelle toi que $x\\% = \\frac{x}{100}$.`
+        : `Pour écrire un nombre $x$ en pourcentage, on multiplie $x$ par $100$.`}`;
+};
+const getCorrection = ({ isPercentToDecimal, nb, }) => {
+    const answer = getAnswer({ isPercentToDecimal, nb });
+    const nbPercent = (0, round_1.round)(nb * 100, 10).frenchify();
+    return `${isPercentToDecimal
+        ? `Le symbole $\\%$ signifie simplement "divisé par $100$". 
+
+On a donc $${nbPercent}\\% = \\frac{${nbPercent}}{100} = ${answer}$
+    `
+        : `Pour écrire un nombre sous la forme d'un pourcentage, il suffit de le multiplier par $100$. 
+    
+On a donc $${nb.frenchify()} = ${answer}$.
+
+En effet, on a bien $${answer} = \\frac{${answer.replace("\\%", "")}}{100} = ${nb.frenchify()}$.`}`;
+};
+const getKeys = (identifiers) => {
+    return ["percent"];
+};
 const getPercentToDecimalQuestion = () => {
     const isPercentToDecimal = (0, coinFlip_1.coinFlip)();
-    const nb = decimal_1.DecimalConstructor.random(0, 2);
-    const tex = nb.toTree().toTex();
-    const percentTex = nb.toPercentNode().toTex();
-    const instru = isPercentToDecimal ? percentTex : tex;
-    const answer = isPercentToDecimal ? tex : percentTex;
+    const isNatural = (0, coinFlip_1.coinFlip)();
+    const percentNb = (0, probaFlip_1.probaFlip)(0.3)
+        ? isNatural
+            ? new integer_1.Integer(integer_1.IntegerConstructor.random(1, [0]))
+            : decimal_1.DecimalConstructor.random(0, 10)
+        : (0, coinFlip_1.coinFlip)()
+            ? isNatural
+                ? new integer_1.Integer(integer_1.IntegerConstructor.random(2))
+                : decimal_1.DecimalConstructor.random(10, 100)
+            : isNatural
+                ? new integer_1.Integer(integer_1.IntegerConstructor.random(3))
+                : decimal_1.DecimalConstructor.random(100, 200);
+    const nb = percentNb.times(0.01);
+    const identifiers = {
+        isPercentToDecimal,
+        nb: nb.value,
+    };
     const question = {
-        answer,
-        instruction: `Ecrire le nombre suivant ${isPercentToDecimal
-            ? "sous forme de nombre décimal"
-            : "sous forme de pourcentage"} : $${instru}$`,
-        keys: ["percent"],
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
         answerFormat: "tex",
-        identifiers: { isPercentToDecimal, nb: nb.value },
-        hint: `${isPercentToDecimal
-            ? `Pour écrire $x\\%$ en décimal, rappelle toi que $x\\% = \\frac{x}{100}$.`
-            : `Pour écrire un nombre $x$ en pourcentage, on multiplie $x$ par $100$.`}`,
-        correction: `${isPercentToDecimal
-            ? `Le symbole $\\%$ signifie simplement "divisé par $100$". 
-
-On a donc $${(nb.value * 100).frenchify()}\\% = \\frac{${(nb.value * 100).frenchify()}}{100} = ${answer}$
-      `
-            : `Pour écrire un nombre sous la forme d'un pourcentage, il suffit de le multiplier par $100$. 
-      
-On a donc $${nb.value.frenchify()} = ${answer}$.
-
-En effet, on a bien $${answer} = \\frac{${answer.replace("\\%", "")}}{100} = ${nb.value.frenchify()}$.`}`,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -63,8 +103,11 @@ const isAnswerValid = (ans, { answer, isPercentToDecimal, nb }) => {
         return ans === answer;
     }
     else {
-        const texs = dec.toPercentNode().toAllValidTexs();
-        return texs.includes(ans);
+        const rawAns = ans.replace("\\%", "");
+        const parsed = (0, numberParser_1.numberParser)(rawAns);
+        if (!parsed)
+            return false;
+        return parsed + "\\%" === answer;
     }
 };
 exports.percentToDecimal = {

package/lib/math/numbers/decimals/decimal.d.ts

@@ -18,6 +18,7 @@ export declare class Decimal implements Nombre {
     intPart: number;
     decimalPart: string;
     constructor(value: number | string);
+    times(n: Nombre | number): Decimal;
     equals(n: Nombre): boolean;
     /**
      *

package/lib/math/numbers/decimals/decimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/decimals/decimal.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,UAAyC,CAAC;AACxE,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,MAAM;IAY1E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMpE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAK/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;CAMrD;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,aAAsB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBACR,KAAK,EAAE,MAAM,GAAG,MAAM;IASlC,MAAM,CAAC,CAAC,EAAE,MAAM;IAIhB;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIhC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAkClC,gBAAgB;IA6BhB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAwCtC,cAAc,CAAC,IAAI,EAAE,MAAM;IAS3B,UAAU;IAMV,MAAM;IAIN,aAAa;IAIb,YAAY,CAAC,UAAU,EAAE,MAAM;IAS/B,YAAY,CAAC,UAAU,EAAE,MAAM;CAShC"}
+{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/decimals/decimal.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,UAAyC,CAAC;AACxE,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,GAAE,MAAU,GAAG,MAAM;IAY1E,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMpE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAK/D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;CAMrD;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,aAAsB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBACR,KAAK,EAAE,MAAM,GAAG,MAAM;IAQlC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IASxB,MAAM,CAAC,CAAC,EAAE,MAAM;IAIhB;;;;OAIG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIhC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAkClC,gBAAgB;IA6BhB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAwCtC,cAAc,CAAC,IAAI,EAAE,MAAM;IAS3B,UAAU;IAMV,MAAM;IAIN,aAAa;IAIb,YAAY,CAAC,UAAU,EAAE,MAAM;IAS/B,YAAY,CAAC,UAAU,EAAE,MAAM;CAShC"}

package/lib/math/numbers/decimals/decimal.js

@@ -54,6 +54,16 @@ class Decimal {
         this.decimalPart = decimalPartString || "";
         this.precision = this.decimalPart.length;
     }
+    times(n) {
+        if (typeof n === "number")
+            return new Decimal((0, round_1.round)(this.value * n, 10));
+        throw Error("unimplemnented");
+        // if (n.type === NumberType.Real) {
+        //   throw Error("decimal times real not implemented");
+        // }
+        // if (n.type === NumberType.Rational)
+        //   throw Error("decimal times real not implemented");
+    }
     equals(n) {
         return this.value === n.value;
     }

package/lib/math/numbers/integer/integer.d.ts

@@ -1,4 +1,5 @@
 import { NumberNode } from "../../../tree/nodes/numbers/numberNode";
+import { Decimal } from "../decimals/decimal";
 import { Nombre, NumberType } from "../nombre";
 import { Rational } from "../rationals/rational";
 export declare const integerDigitRanks: string[];
@@ -14,6 +15,7 @@ export declare class Integer implements Nombre {
     constructor(value: number, tex?: string);
     equals(n: Nombre): boolean;
     toTree(): NumberNode;
+    times(n: number | Nombre): Integer | Decimal;
     round(precision: number): Integer;
     divide(nb: Nombre): Nombre;
     multiply(nb: Nombre): Rational | Integer;

package/lib/math/numbers/integer/integer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/integer/integer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,eAAO,MAAM,iBAAiB,UAK7B,CAAC;AACF,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrD,MAAM,CAAC,WAAW,CAAC,GAAG,GAAE,MAAW;IAGnC,MAAM,CAAC,gBAAgB,CACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,EACV,QAAQ,CAAC,EAAE,MAAM,EAAE;CAYtB;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBAEL,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAMvC,MAAM,CAAC,CAAC,EAAE,MAAM;IAGhB,MAAM;IAIN,KAAK,CAAC,SAAS,EAAE,MAAM;IAkCvB,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAc1B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO;IAYxC,QAAQ;IAGR,GAAG,CAAC,EAAE,EAAE,MAAM;CAYf"}
+{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/integer/integer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,eAAO,MAAM,iBAAiB,UAK7B,CAAC;AACF,8BAAsB,kBAAkB;IACtC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrD,MAAM,CAAC,WAAW,CAAC,GAAG,GAAE,MAAW;IAGnC,MAAM,CAAC,gBAAgB,CACrB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,EACV,QAAQ,CAAC,EAAE,MAAM,EAAE;CAYtB;AAED,qBAAa,OAAQ,YAAW,MAAM;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;gBAEL,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAMvC,MAAM,CAAC,CAAC,EAAE,MAAM;IAGhB,MAAM;IAIN,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAMxB,KAAK,CAAC,SAAS,EAAE,MAAM;IAkCvB,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAc1B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO;IAYxC,QAAQ;IAGR,GAAG,CAAC,EAAE,EAAE,MAAM;CAYf"}

package/lib/math/numbers/integer/integer.js

@@ -45,6 +45,15 @@ class Integer {
     toTree() {
         return new numberNode_1.NumberNode(this.value, this.tex);
     }
+    times(n) {
+        if (typeof n === "number")
+            return new Integer(this.value * n);
+        if (n.type === nombre_1.NumberType.Integer)
+            return new Integer(this.value * n.value);
+        if (n.type === nombre_1.NumberType.Decimal)
+            return n.times(n);
+        throw Error("unimplemented");
+    }
     round(precision) {
         const intString = this.value + "";
         if (precision >= intString.length || precision < 1)

package/lib/playground.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,UAAU,YAWtB,CAAC"}
+{"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,UAAU,YAmCtB,CAAC"}

package/lib/playground.js

@@ -1,16 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.playground = void 0;
+const numberToFrenchWord_1 = require("./utils/strings/numberToFrenchWord");
 const playground = () => {
-    // const affine1 = new Affine(4, 5);
-    // const affine2 = new Affine(2, 3);
-    // const tree = affine1.toTree({ toTexOptions: { color: "green" } });
-    // console.log(tree.opts);
-    // console.log(tree.toTex());
-    // const node = new MultiplyNode(
-    //   affine1.toTree({ toTexOptions: { color: "green" } }),
-    //   new (coinFlip() ? SubstractNode : AddNode)(affine2.toTree(), (1).toTree()),
-    // ).toTex();
-    // console.log(node);
+    // for (let i = 0; i < 10000; i++) {
+    //   console.log(numberToFrenchWord(i));
+    // }
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(2));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(21));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(71));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(100));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(120));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(281));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(323));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(900));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(999));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(1000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(1100));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(1323));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(3000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(3242));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(9999));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(10000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(11000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(10001));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(10100));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(10010));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(12345));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(12234));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(100000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(1001000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(1000100));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(1000000));
+    console.log((0, numberToFrenchWord_1.numberToFrenchWord)(9999999));
 };
 exports.playground = playground;

package/lib/utils/strings/frenchNumbers.d.ts

@@ -0,0 +1,6 @@
+export declare const frenchUnits: string[];
+export declare const frenchTeens: string[];
+export declare const frenchTens: string[];
+export declare const frenchTenPowers: string[];
+export declare const tenthThreePowers: string[];
+//# sourceMappingURL=frenchNumbers.d.ts.map

package/lib/utils/strings/frenchNumbers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"frenchNumbers.d.ts","sourceRoot":"","sources":["../../../src/utils/strings/frenchNumbers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,UAWvB,CAAC;AAEF,eAAO,MAAM,WAAW,UAWvB,CAAC;AAEF,eAAO,MAAM,UAAU,UAUtB,CAAC;AAEF,eAAO,MAAM,eAAe,UAU3B,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAmC,CAAC"}

package/lib/utils/strings/frenchNumbers.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tenthThreePowers = exports.frenchTenPowers = exports.frenchTens = exports.frenchTeens = exports.frenchUnits = void 0;
+exports.frenchUnits = [
+    "zéro",
+    "un",
+    "deux",
+    "trois",
+    "quatre",
+    "cinq",
+    "six",
+    "sept",
+    "huit",
+    "neuf",
+];
+exports.frenchTeens = [
+    "dix",
+    "onze",
+    "douze",
+    "treize",
+    "quatorze",
+    "quinze",
+    "seize",
+    "dix-sept",
+    "dix-huit",
+    "dix-neuf",
+];
+exports.frenchTens = [
+    "dix",
+    "vingt",
+    "trente",
+    "quarante",
+    "cinquante",
+    "soixante",
+    "soixante-dix",
+    "quatre-vingts",
+    "quatre-vingt-dix",
+];
+exports.frenchTenPowers = [
+    "dix",
+    "cent",
+    "mille",
+    "dix-mille",
+    "cent-mille",
+    "million",
+    "dix-millions",
+    "cent-millions",
+    "milliard",
+];
+exports.tenthThreePowers = ["mille", "million", "milliard"];

package/lib/utils/strings/numberToFrenchWord.d.ts

@@ -0,0 +1,2 @@
+export declare const numberToFrenchWord: (number: number) => string;
+//# sourceMappingURL=numberToFrenchWord.d.ts.map

package/lib/utils/strings/numberToFrenchWord.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"numberToFrenchWord.d.ts","sourceRoot":"","sources":["../../../src/utils/strings/numberToFrenchWord.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,kBAAkB,WAAY,MAAM,WA0ChD,CAAC"}

package/lib/utils/strings/numberToFrenchWord.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.numberToFrenchWord = void 0;
+const frenchNumbers_1 = require("./frenchNumbers");
+const tensToFrench = (number) => {
+    if (number < 10)
+        return frenchNumbers_1.frenchUnits[number];
+    if (number < 20)
+        return frenchNumbers_1.frenchTeens[number - 10];
+    const tens = Math.floor(number / 10);
+    const ones = number % 10;
+    const units = tens === 7 || tens === 9 ? frenchNumbers_1.frenchTeens : frenchNumbers_1.frenchUnits;
+    let tenString = frenchNumbers_1.frenchTens[tens - 1];
+    if (!ones)
+        return tenString;
+    if (tens === 7 || tens === 9)
+        tenString = frenchNumbers_1.frenchTens[tens - 2];
+    if (tens === 8 || tens === 9)
+        tenString = tenString.replace("s", "");
+    if (ones === 1 && tens !== 8 && tens !== 9)
+        return tenString + "-et-" + units[ones];
+    return tenString + "-" + units[ones];
+};
+const hundredsToFrench = (number) => {
+    if (number === 100)
+        return "cent";
+    const hundreds = Math.floor(number / 100);
+    const tens = number % 100;
+    if (hundreds === 0)
+        return tensToFrench(number);
+    if (tens === 0)
+        return frenchNumbers_1.frenchUnits[hundreds] + "-cent";
+    if (hundreds === 1)
+        return "cent-" + tensToFrench(tens);
+    return frenchNumbers_1.frenchUnits[hundreds] + "-cent-" + tensToFrench(tens);
+};
+const numberToFrenchWord = (number) => {
+    // return hundredsToFrench(number);
+    if (Math.floor(number) !== number)
+        throw Error("decimal writing to french not implemented");
+    const nbStr = number.toString();
+    let toHundreds = [];
+    let j = 0;
+    let currentHundreds = [];
+    const length = nbStr.length;
+    const partsNumber = Math.floor((length - 1) / 3) + 1;
+    for (let i = nbStr.length - 1; i >= 0; i--) {
+        if (j === 3) {
+            toHundreds.push(Number(currentHundreds.reverse().reduce((a, b) => a + b)));
+            currentHundreds = [];
+            j = 0;
+        }
+        j++;
+        currentHundreds.push(nbStr[i]);
+    }
+    toHundreds.push(Number(currentHundreds.reverse().reduce((a, b) => a + b)));
+    // toHundreds.reverse();
+    let res = "";
+    for (let i = toHundreds.length - 1; i > -1; i--) {
+        const tenthPower = i * 3;
+        const hundreds = hundredsToFrench(toHundreds[i]);
+        if (i === 0) {
+            if (res?.length && hundreds !== "zéro")
+                res += "-" + hundreds;
+            if (!res?.length)
+                res += hundreds;
+            continue;
+        }
+        if (hundreds === "zéro")
+            continue;
+        const thousandWord = frenchNumbers_1.tenthThreePowers[i - 1];
+        if (hundreds === "un" && tenthPower === 3) {
+            res += (res ? "-" : "") + "mille";
+        }
+        else {
+            res += (res ? "-" : "") + hundreds + "-" + thousandWord;
+        }
+    }
+    return res;
+};
+exports.numberToFrenchWord = numberToFrenchWord;

package/package.json

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