math-exercises 1.2.7 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Générateurs d'exercices et questions mathématiques en latex",
   "main": "src/index.js",
   "scripts": {

package/src/exercises/calcul/fractions/fractionAndIntegerDivision.ts

@@ -2,9 +2,7 @@ import { randint } from "../../../mathutils/random/randint";
 import { Integer } from "../../../numbers/integer/integer";
 import { RationalConstructor } from "../../../numbers/rationals/rational";
 import { latexParser } from "../../../tree/parsers/latexParser";
-import { AddNode } from "../../../tree/nodes/operators/addNode";
 import { DivideNode } from "../../../tree/nodes/operators/divideNode";
-import { MultiplyNode } from "../../../tree/nodes/operators/multiplyNode";
 import { random } from "../../../utils/random";
 import { Exercise, Question } from "../../exercise";
 import { getDistinctQuestions } from "../../utils/getDistinctQuestions";

package/src/exercises/calcul/rounding/{roundToUnit.js → rounding.js}

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.getRoundQuestions = exports.roundToMillieme = exports.roundToCentieme = exports.roundToDizieme = exports.roundToUnit = void 0;
+exports.getRoundQuestions = exports.allRoundings = exports.roundToMillieme = exports.roundToCentieme = exports.roundToDixieme = exports.roundToUnit = void 0;
 var randint_1 = require("../../../mathutils/random/randint");
 var decimal_1 = require("../../../numbers/decimals/decimal");
 var latexParser_1 = require("../../../tree/parsers/latexParser");
@@ -21,11 +21,11 @@ exports.roundToUnit = {
 /**
  * arrondi à l'unité
  */
-exports.roundToDizieme = {
-    id: "roundToDizieme",
+exports.roundToDixieme = {
+    id: "roundToDixieme",
     connector: "\\approx",
-    instruction: "Arrondir au dizième :",
-    label: "Arrondir au dizième",
+    instruction: "Arrondir au dixième :",
+    label: "Arrondir au dixième",
     levels: ["6", "5"],
     section: "Calculs",
     isSingleStep: true,
@@ -57,11 +57,28 @@ exports.roundToMillieme = {
     isSingleStep: true,
     generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(function () { return getRoundQuestions(3); }, nb); }
 };
+exports.allRoundings = {
+    id: "allRoundings",
+    connector: "\\approx",
+    instruction: "",
+    label: "Arrondir un nombre décimal",
+    levels: ["6", "5"],
+    section: "Calculs",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(function () { return getRoundQuestions((0, randint_1.randint)(0, 4)); }, nb); }
+};
+var instructions = [
+    "Arrondir à l'unité :",
+    "Arrondir au dixième :",
+    "Arrondir au centième :",
+    "Arrondir au millième :",
+];
 function getRoundQuestions(precisionAsked) {
     if (precisionAsked === void 0) { precisionAsked = 0; }
     var precision = (0, randint_1.randint)(precisionAsked + 1, precisionAsked + 5);
     var dec = decimal_1.DecimalConstructor.random(0, 1000, precision);
     var question = {
+        instruction: instructions[precisionAsked],
         startStatement: (0, latexParser_1.latexParser)(dec.toTree()),
         answer: (0, latexParser_1.latexParser)(dec.round(precisionAsked).toTree())
     };

package/src/exercises/calcul/rounding/{roundToUnit.ts → rounding.ts}

@@ -20,11 +20,11 @@ export const roundToUnit: Exercise = {
 /**
  * arrondi à l'unité
  */
-export const roundToDizieme: Exercise = {
-  id: "roundToDizieme",
+export const roundToDixieme: Exercise = {
+  id: "roundToDixieme",
   connector: "\\approx",
-  instruction: "Arrondir au dizième :",
-  label: "Arrondir au dizième",
+  instruction: "Arrondir au dixième :",
+  label: "Arrondir au dixième",
   levels: ["6", "5"],
   section: "Calculs",
   isSingleStep: true,
@@ -57,10 +57,29 @@ export const roundToMillieme: Exercise = {
   generator: (nb: number) => getDistinctQuestions(() => getRoundQuestions(3), nb),
 };
 
+export const allRoundings: Exercise = {
+  id: "allRoundings",
+  connector: "\\approx",
+  instruction: "",
+  label: "Arrondir un nombre décimal",
+  levels: ["6", "5"],
+  section: "Calculs",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(() => getRoundQuestions(randint(0, 4)), nb),
+};
+
+const instructions = [
+  "Arrondir à l'unité :",
+  "Arrondir au dixième :",
+  "Arrondir au centième :",
+  "Arrondir au millième :",
+];
+
 export function getRoundQuestions(precisionAsked: number = 0): Question {
   const precision = randint(precisionAsked + 1, precisionAsked + 5);
   const dec = DecimalConstructor.random(0, 1000, precision);
   const question: Question = {
+    instruction: instructions[precisionAsked],
     startStatement: latexParser(dec.toTree()),
     answer: latexParser(dec.round(precisionAsked).toTree()),
   };

package/src/exercises/exercise.ts

@@ -5,6 +5,7 @@
 // }
 
 export interface Question {
+  instruction?: string;
   startStatement: string;
   answer: string;
 }
@@ -18,8 +19,4 @@ export interface Exercise {
   levels: string[];
   connector: string;
   generator(nb: number): Question[];
-  // questions: Question[];
-  // constructor({ generatorType, questionsNumber }: ExerciseParameters) {
-
-  // }
 }

package/src/exercises/exercises.js

@@ -10,7 +10,7 @@ var fractionsProduct_1 = require("./calcul/fractions/fractionsProduct");
 var fractionsSum_1 = require("./calcul/fractions/fractionsSum");
 var simplifyFraction_1 = require("./calcul/fractions/simplifyFraction");
 var operationsPriorities_1 = require("./calcul/operationsPriorities");
-var roundToUnit_1 = require("./calcul/rounding/roundToUnit");
+var rounding_1 = require("./calcul/rounding/rounding");
 var allIdentities_1 = require("./calculLitteral/distributivity/allIdentities");
 var doubleDistributivity_1 = require("./calculLitteral/distributivity/doubleDistributivity");
 var firstIdentity_1 = require("./calculLitteral/distributivity/firstIdentity");
@@ -28,9 +28,7 @@ var powersPower_1 = require("./powers/powersPower");
 var powersProduct_1 = require("./powers/powersProduct");
 var scientificToDecimal_1 = require("./powers/scientificToDecimal");
 var simpifySquareRoot_1 = require("./squareRoots/simpifySquareRoot");
-exports.data = [
-    {}
-];
+exports.data = [{}];
 exports.exercises = [
     /**
      * calcul litteral
@@ -68,10 +66,11 @@ exports.exercises = [
     /**
      * rounding
      */
-    roundToUnit_1.roundToCentieme,
-    roundToUnit_1.roundToDizieme,
-    roundToUnit_1.roundToMillieme,
-    roundToUnit_1.roundToUnit,
+    rounding_1.roundToCentieme,
+    rounding_1.roundToDixieme,
+    rounding_1.roundToMillieme,
+    rounding_1.roundToUnit,
+    rounding_1.allRoundings,
     /**
      * puissances
      */

package/src/exercises/exercises.ts

@@ -7,7 +7,13 @@ import { fractionsProduct } from "./calcul/fractions/fractionsProduct";
 import { fractionsSum } from "./calcul/fractions/fractionsSum";
 import { simplifyFraction } from "./calcul/fractions/simplifyFraction";
 import { operationsPriorities } from "./calcul/operationsPriorities";
-import { roundToCentieme, roundToDizieme, roundToMillieme, roundToUnit } from "./calcul/rounding/roundToUnit";
+import {
+  allRoundings,
+  roundToCentieme,
+  roundToDixieme,
+  roundToMillieme,
+  roundToUnit,
+} from "./calcul/rounding/rounding";
 import { allIdentities } from "./calculLitteral/distributivity/allIdentities";
 import { doubleDistributivity } from "./calculLitteral/distributivity/doubleDistributivity";
 import { firstIdentity } from "./calculLitteral/distributivity/firstIdentity";
@@ -26,11 +32,7 @@ import { powersOfTenProduct, powersProduct } from "./powers/powersProduct";
 import { scientificToDecimal } from "./powers/scientificToDecimal";
 import { simplifySquareRoot } from "./squareRoots/simpifySquareRoot";
 
-export const data = [
-  {
-    
-  }
-]
+export const data = [{}];
 
 export const exercises = [
   /**
@@ -74,9 +76,10 @@ export const exercises = [
    * rounding
    */
   roundToCentieme,
-  roundToDizieme,
+  roundToDixieme,
   roundToMillieme,
   roundToUnit,
+  allRoundings,
   /**
    * puissances
    */

package/src/index.js

@@ -3,8 +3,3 @@ exports.__esModule = true;
 exports.exercises = void 0;
 var exercises_1 = require("./exercises/exercises");
 exports.exercises = exercises_1.exercises;
-var polynomial_1 = require("./polynomials/polynomial");
-// exercises.forEach((exo) => {
-//   console.log(exo.instruction, exo.generator(10));
-// });
-var pol = new polynomial_1.Polynomial([2, 3, 1, 4]);

package/src/index.ts

@@ -10,5 +10,4 @@ import { derivateParser } from "./tree/parsers/derivateParser";
 //   console.log(exo.instruction, exo.generator(10));
 // });
 
-const pol = new Polynomial([2, 3, 1, 4]);
 export { exercises };

package/src/numbers/decimals/decimal.js

@@ -38,7 +38,7 @@ var Decimal = /** @class */ (function () {
     }
     /**
      *
-     * @param precision 0 = unité, 1 = dizieme, ... , -1 : dizaine
+     * @param precision 0 = unité, 1 = dixieme, ... , -1 : dizaine
      * @returns
      */
     Decimal.prototype.round = function (precision) {

package/src/numbers/decimals/decimal.ts

@@ -41,7 +41,7 @@ export class Decimal implements Nombre {
 
   /**
    *
-   * @param precision 0 = unité, 1 = dizieme, ... , -1 : dizaine
+   * @param precision 0 = unité, 1 = dixieme, ... , -1 : dizaine
    * @returns
    */
   round(precision: number): Nombre {

package/src/exercises/calculLitteral/reduction.ts

@@ -1,27 +0,0 @@
-// import { Interval } from "../../sets/intervals/intervals";
-// import { Exercise, Question } from "../exercise";
-// import { getDistinctQuestions } from "../utils/getDistinctQuestions";
-
-// export const reduction: Exercise = {
-//   id: "reduction",
-//   connector: "=",
-//   instruction: "Réduire :",
-//   label: "Réduire une expression polynomiale",
-//   levels: ["3", "2"],
-//   isSingleStep: false,
-//   section: "Calcul Littéral",
-//   generator: (nb: number) => getDistinctQuestions(getReductionQuestion, nb),
-// };
-
-// export function getReductionQuestion(): Question {
-//   const interval = new Interval("[[1; 10]]").difference(new DiscreteSet([new Integer(0)]));
-//   const affine = AffineConstructor.random(interval, interval);
-
-//   const statementTree = new PowerNode(affine.toTree(), new NumberNode(2));
-//   const answerTree = affine.multiply(affine).toTree();
-
-//   return {
-//     statement: latexParse(statementTree),
-//     answer: latexParse(answerTree),
-//   };
-// }