math-exercises 1.1.1 → 1.2.0

package/src/exercises/exercises.js

@@ -1,6 +1,16 @@
 "use strict";
 exports.__esModule = true;
 exports.exercises = void 0;
+var addAndSub_1 = require("./calcul/addAndSub");
+var fractionAndIntegerDivision_1 = require("./calcul/fractions/fractionAndIntegerDivision");
+var fractionAndIntegerProduct_1 = require("./calcul/fractions/fractionAndIntegerProduct");
+var fractionAndIntegerSum_1 = require("./calcul/fractions/fractionAndIntegerSum");
+var fractionsDivision_1 = require("./calcul/fractions/fractionsDivision");
+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 allIdentities_1 = require("./calculLitteral/distributivity/allIdentities");
 var doubleDistributivity_1 = require("./calculLitteral/distributivity/doubleDistributivity");
 var firstIdentity_1 = require("./calculLitteral/distributivity/firstIdentity");
@@ -12,8 +22,16 @@ var equationType2Exercise_1 = require("./calculLitteral/equation/equationType2Ex
 var equationType3Exercise_1 = require("./calculLitteral/equation/equationType3Exercise");
 var equationType4Exercise_1 = require("./calculLitteral/equation/equationType4Exercise");
 var factoType1Exercise_1 = require("./calculLitteral/factorisation/factoType1Exercise");
+var powersDivision_1 = require("./powers/powersDivision");
+var powersOfTenToDecimal_1 = require("./powers/powersOfTenToDecimal");
+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.exercises = [
+    /**
+     * calcul litteral
+     */
     factoType1Exercise_1.factoType1Exercise,
     simpleDistributivity_1.simpleDistributivity,
     doubleDistributivity_1.doubleDistributivity,
@@ -25,5 +43,41 @@ exports.exercises = [
     equationType2Exercise_1.equationType2Exercise,
     equationType3Exercise_1.equationType3Exercise,
     equationType4Exercise_1.equationType4Exercise,
+    /**
+     * square roots
+     */
     simpifySquareRoot_1.simplifySquareRoot,
+    /**
+     * fractions
+     */
+    fractionAndIntegerDivision_1.fractionAndIntegerDivision,
+    fractionAndIntegerProduct_1.fractionAndIntegerProduct,
+    fractionAndIntegerSum_1.fractionAndIntegerSum,
+    fractionsDivision_1.fractionsDivision,
+    fractionsProduct_1.fractionsProduct,
+    fractionsSum_1.fractionsSum,
+    simplifyFraction_1.simplifyFraction,
+    /**
+     * calcul
+     */
+    operationsPriorities_1.operationsPriorities,
+    addAndSub_1.addAndSubExercise,
+    /**
+     * rounding
+     */
+    roundToUnit_1.roundToCentieme,
+    roundToUnit_1.roundToDizieme,
+    roundToUnit_1.roundToMillieme,
+    roundToUnit_1.roundToUnit,
+    /**
+     * puissances
+     */
+    powersDivision_1.powersDivision,
+    powersPower_1.powersPower,
+    powersProduct_1.powersProduct,
+    powersDivision_1.powersOfTenDivision,
+    powersPower_1.powersOfTenPower,
+    powersProduct_1.powersOfTenProduct,
+    scientificToDecimal_1.scientificToDecimal,
+    powersOfTenToDecimal_1.powersOfTenToDecimal,
 ];

package/src/exercises/exercises.ts

@@ -1,3 +1,13 @@
+import { addAndSubExercise } from "./calcul/addAndSub";
+import { fractionAndIntegerDivision } from "./calcul/fractions/fractionAndIntegerDivision";
+import { fractionAndIntegerProduct } from "./calcul/fractions/fractionAndIntegerProduct";
+import { fractionAndIntegerSum } from "./calcul/fractions/fractionAndIntegerSum";
+import { fractionsDivision } from "./calcul/fractions/fractionsDivision";
+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 { allIdentities } from "./calculLitteral/distributivity/allIdentities";
 import { doubleDistributivity } from "./calculLitteral/distributivity/doubleDistributivity";
 import { firstIdentity } from "./calculLitteral/distributivity/firstIdentity";
@@ -9,9 +19,17 @@ import { equationType2Exercise } from "./calculLitteral/equation/equationType2Ex
 import { equationType3Exercise } from "./calculLitteral/equation/equationType3Exercise";
 import { equationType4Exercise } from "./calculLitteral/equation/equationType4Exercise";
 import { factoType1Exercise } from "./calculLitteral/factorisation/factoType1Exercise";
+import { powersDivision, powersOfTenDivision } from "./powers/powersDivision";
+import { powersOfTenToDecimal } from "./powers/powersOfTenToDecimal";
+import { powersOfTenPower, powersPower } from "./powers/powersPower";
+import { powersOfTenProduct, powersProduct } from "./powers/powersProduct";
+import { scientificToDecimal } from "./powers/scientificToDecimal";
 import { simplifySquareRoot } from "./squareRoots/simpifySquareRoot";
 
 export const exercises = [
+  /**
+   * calcul litteral
+   */
   factoType1Exercise,
   simpleDistributivity,
   doubleDistributivity,
@@ -23,5 +41,45 @@ export const exercises = [
   equationType2Exercise,
   equationType3Exercise,
   equationType4Exercise,
+
+  /**
+   * square roots
+   */
   simplifySquareRoot,
+
+  /**
+   * fractions
+   */
+  fractionAndIntegerDivision,
+  fractionAndIntegerProduct,
+  fractionAndIntegerSum,
+  fractionsDivision,
+  fractionsProduct,
+  fractionsSum,
+  simplifyFraction,
+
+  /**
+   * calcul
+   */
+  operationsPriorities,
+  addAndSubExercise,
+
+  /**
+   * rounding
+   */
+  roundToCentieme,
+  roundToDizieme,
+  roundToMillieme,
+  roundToUnit,
+  /**
+   * puissances
+   */
+  powersDivision,
+  powersPower,
+  powersProduct,
+  powersOfTenDivision,
+  powersOfTenPower,
+  powersOfTenProduct,
+  scientificToDecimal,
+  powersOfTenToDecimal,
 ];

package/src/exercises/powers/powersDivision.js

@@ -0,0 +1,46 @@
+"use strict";
+exports.__esModule = true;
+exports.getPowersDivisionQuestion = exports.powersOfTenDivision = exports.powersDivision = void 0;
+var randint_1 = require("../../mathutils/random/randint");
+var power_1 = require("../../numbers/integer/power");
+var latexParse_1 = require("../../tree/latexParser/latexParse");
+var numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+var fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
+var powerNode_1 = require("../../tree/nodes/operators/powerNode");
+var getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+/**
+ * a^b/a^c
+ */
+exports.powersDivision = {
+    id: "powersDivision",
+    connector: "=",
+    instruction: "Calculer :",
+    label: "Dvision de puissances",
+    levels: ["4", "3", "2", "1"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersDivisionQuestion, nb); }
+};
+exports.powersOfTenDivision = {
+    id: "powersOfTenDivision",
+    connector: "=",
+    instruction: "Calculer :",
+    label: "Dvision de puissances de 10",
+    levels: ["4", "3", "2", "1"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(function () { return getPowersDivisionQuestion(true); }, nb); }
+};
+function getPowersDivisionQuestion(useOnlyPowersOfTen) {
+    if (useOnlyPowersOfTen === void 0) { useOnlyPowersOfTen = false; }
+    var a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11);
+    var _a = [1, 2].map(function (el) { return (0, randint_1.randint)(-11, 11); }), b = _a[0], c = _a[1];
+    var statement = new fractionNode_1.FractionNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(c)));
+    var answerTree = new power_1.Power(a, b - c).simplify();
+    var question = {
+        statement: (0, latexParse_1.latexParse)(statement),
+        answer: (0, latexParse_1.latexParse)(answerTree)
+    };
+    return question;
+}
+exports.getPowersDivisionQuestion = getPowersDivisionQuestion;

package/src/exercises/powers/powersDivision.ts

@@ -0,0 +1,51 @@
+import { randint } from "../../mathutils/random/randint";
+import { Power } from "../../numbers/integer/power";
+import { latexParse } from "../../tree/latexParser/latexParse";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { FractionNode } from "../../tree/nodes/operators/fractionNode";
+import { MultiplyNode } from "../../tree/nodes/operators/multiplyNode";
+import { PowerNode } from "../../tree/nodes/operators/powerNode";
+import { Exercise, Question } from "../exercise";
+import { getDistinctQuestions } from "../utils/getDistinctQuestions";
+
+/**
+ * a^b/a^c
+ */
+
+export const powersDivision: Exercise = {
+  id: "powersDivision",
+  connector: "=",
+  instruction: "Calculer :",
+  label: "Dvision de puissances",
+  levels: ["4", "3", "2", "1"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(getPowersDivisionQuestion, nb),
+};
+export const powersOfTenDivision: Exercise = {
+  id: "powersOfTenDivision",
+  connector: "=",
+  instruction: "Calculer :",
+  label: "Dvision de puissances de 10",
+  levels: ["4", "3", "2", "1"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(() => getPowersDivisionQuestion(true), nb),
+};
+
+export function getPowersDivisionQuestion(useOnlyPowersOfTen: boolean = false): Question {
+  const a = useOnlyPowersOfTen ? 10 : randint(-11, 11);
+  const [b, c] = [1, 2].map((el) => randint(-11, 11));
+
+  const statement = new FractionNode(
+    new PowerNode(new NumberNode(a), new NumberNode(b)),
+    new PowerNode(new NumberNode(a), new NumberNode(c))
+  );
+  const answerTree = new Power(a, b - c).simplify();
+
+  const question: Question = {
+    statement: latexParse(statement),
+    answer: latexParse(answerTree),
+  };
+  return question;
+}

package/src/exercises/powers/powersOfTenToDecimal.js

@@ -0,0 +1,33 @@
+"use strict";
+exports.__esModule = true;
+exports.getPowersOfTenDivisionQuestion = exports.powersOfTenToDecimal = void 0;
+var randint_1 = require("../../mathutils/random/randint");
+var power_1 = require("../../numbers/integer/power");
+var latexParse_1 = require("../../tree/latexParser/latexParse");
+var numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+var powerNode_1 = require("../../tree/nodes/operators/powerNode");
+var getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+/**
+ * 10^(-x) into 0,0...1
+ */
+exports.powersOfTenToDecimal = {
+    id: "powersOfTenToDecimal",
+    connector: "=",
+    instruction: "Donner l'écriture décimale de :",
+    label: "Ecriture décimale d'une puissance de 10",
+    levels: ["5", "4", "3", "2"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersOfTenDivisionQuestion, nb); }
+};
+function getPowersOfTenDivisionQuestion() {
+    var randPower = (0, randint_1.randint)(-6, 8);
+    var statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(randPower));
+    var answerTree = new power_1.Power(10, randPower).toDecimalWriting().toTree();
+    var question = {
+        statement: (0, latexParse_1.latexParse)(statement),
+        answer: (0, latexParse_1.latexParse)(answerTree)
+    };
+    return question;
+}
+exports.getPowersOfTenDivisionQuestion = getPowersOfTenDivisionQuestion;

package/src/exercises/powers/powersOfTenToDecimal.ts

@@ -0,0 +1,37 @@
+import { randint } from "../../mathutils/random/randint";
+import { Power } from "../../numbers/integer/power";
+import { latexParse } from "../../tree/latexParser/latexParse";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { FractionNode } from "../../tree/nodes/operators/fractionNode";
+import { MultiplyNode } from "../../tree/nodes/operators/multiplyNode";
+import { PowerNode } from "../../tree/nodes/operators/powerNode";
+import { Exercise, Question } from "../exercise";
+import { getDistinctQuestions } from "../utils/getDistinctQuestions";
+
+/**
+ * 10^(-x) into 0,0...1
+ */
+
+export const powersOfTenToDecimal: Exercise = {
+  id: "powersOfTenToDecimal",
+  connector: "=",
+  instruction: "Donner l'écriture décimale de :",
+  label: "Ecriture décimale d'une puissance de 10",
+  levels: ["5", "4", "3", "2"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(getPowersOfTenDivisionQuestion, nb),
+};
+
+export function getPowersOfTenDivisionQuestion(): Question {
+  const randPower = randint(-6, 8);
+
+  const statement = new PowerNode(new NumberNode(10), new NumberNode(randPower));
+  const answerTree = new Power(10, randPower).toDecimalWriting().toTree();
+
+  const question: Question = {
+    statement: latexParse(statement),
+    answer: latexParse(answerTree),
+  };
+  return question;
+}

package/src/exercises/powers/powersPower.js

@@ -0,0 +1,45 @@
+"use strict";
+exports.__esModule = true;
+exports.getPowersPowerQuestion = exports.powersPower = exports.powersOfTenPower = void 0;
+var randint_1 = require("../../mathutils/random/randint");
+var power_1 = require("../../numbers/integer/power");
+var latexParse_1 = require("../../tree/latexParser/latexParse");
+var numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+var powerNode_1 = require("../../tree/nodes/operators/powerNode");
+var getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+/**
+ * (a^b)^c
+ */
+exports.powersOfTenPower = {
+    id: "powersOfTenPower",
+    connector: "=",
+    instruction: "Calculer :",
+    label: "Puissance de 10 d'une puissance",
+    levels: ["4", "3", "2", "1"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(function () { return getPowersPowerQuestion(true); }, nb); }
+};
+exports.powersPower = {
+    id: "powersPower",
+    connector: "=",
+    instruction: "Calculer :",
+    label: "Puissance d'une puissance",
+    levels: ["4", "3", "2", "1"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersPowerQuestion, nb); }
+};
+function getPowersPowerQuestion(useOnlyPowersOfTen) {
+    if (useOnlyPowersOfTen === void 0) { useOnlyPowersOfTen = false; }
+    var a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11);
+    var _a = [1, 2].map(function (el) { return (0, randint_1.randint)(-11, 11); }), b = _a[0], c = _a[1];
+    var statement = new powerNode_1.PowerNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c));
+    var answerTree = new power_1.Power(a, b * c).simplify();
+    var question = {
+        statement: (0, latexParse_1.latexParse)(statement),
+        answer: (0, latexParse_1.latexParse)(answerTree)
+    };
+    return question;
+}
+exports.getPowersPowerQuestion = getPowersPowerQuestion;

package/src/exercises/powers/powersPower.ts

@@ -0,0 +1,55 @@
+import { randint } from "../../mathutils/random/randint";
+import { Integer } from "../../numbers/integer/integer";
+import { Power } from "../../numbers/integer/power";
+import { DiscreteSet } from "../../sets/discreteSet";
+import { Interval } from "../../sets/intervals/intervals";
+import { latexParse } from "../../tree/latexParser/latexParse";
+import { Node } from "../../tree/nodes/node";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { AddNode } from "../../tree/nodes/operators/addNode";
+import { DivideNode } from "../../tree/nodes/operators/divideNode";
+import { MultiplyNode } from "../../tree/nodes/operators/multiplyNode";
+import { PowerNode } from "../../tree/nodes/operators/powerNode";
+import { coin } from "../../utils/coin";
+import { Exercise, Question } from "../exercise";
+import { getDistinctQuestions } from "../utils/getDistinctQuestions";
+
+/**
+ * (a^b)^c
+ */
+
+export const powersOfTenPower: Exercise = {
+  id: "powersOfTenPower",
+  connector: "=",
+  instruction: "Calculer :",
+  label: "Puissance de 10 d'une puissance",
+  levels: ["4", "3", "2", "1"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(() => getPowersPowerQuestion(true), nb),
+};
+
+export const powersPower: Exercise = {
+  id: "powersPower",
+  connector: "=",
+  instruction: "Calculer :",
+  label: "Puissance d'une puissance",
+  levels: ["4", "3", "2", "1"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(getPowersPowerQuestion, nb),
+};
+
+export function getPowersPowerQuestion(useOnlyPowersOfTen: boolean = false): Question {
+  const a = useOnlyPowersOfTen ? 10 : randint(-11, 11);
+  const [b, c] = [1, 2].map((el) => randint(-11, 11));
+
+  const statement = new PowerNode(new PowerNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c));
+  let answerTree = new Power(a, b * c).simplify();
+
+  const question: Question = {
+    statement: latexParse(statement),
+    answer: latexParse(answerTree),
+  };
+  return question;
+}

package/src/exercises/powers/powersProduct.js

@@ -0,0 +1,46 @@
+"use strict";
+exports.__esModule = true;
+exports.getPowersProductQuestion = exports.powersProduct = exports.powersOfTenProduct = void 0;
+var randint_1 = require("../../mathutils/random/randint");
+var power_1 = require("../../numbers/integer/power");
+var latexParse_1 = require("../../tree/latexParser/latexParse");
+var numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+var multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
+var powerNode_1 = require("../../tree/nodes/operators/powerNode");
+var getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+/**
+ * a^b*a^c
+ */
+exports.powersOfTenProduct = {
+    id: "powersOfTenProduct",
+    connector: "=",
+    instruction: "Calculer :",
+    label: "Multiplication de puissances de 10",
+    levels: ["4", "3", "2", "1"],
+    section: "Calculs",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(function () { return getPowersProductQuestion(true); }, nb); }
+};
+exports.powersProduct = {
+    id: "powersProduct",
+    connector: "=",
+    instruction: "Calculer :",
+    label: "Multiplication de puissances",
+    levels: ["4", "3", "2", "1"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersProductQuestion, nb); }
+};
+function getPowersProductQuestion(useOnlyPowersOfTen) {
+    if (useOnlyPowersOfTen === void 0) { useOnlyPowersOfTen = false; }
+    var a = useOnlyPowersOfTen ? 10 : (0, randint_1.randint)(-11, 11);
+    var _a = [1, 2].map(function (el) { return (0, randint_1.randint)(-11, 11); }), b = _a[0], c = _a[1];
+    var statement = new multiplyNode_1.MultiplyNode(new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new powerNode_1.PowerNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(c)));
+    var answerTree = new power_1.Power(a, b + c).simplify();
+    var question = {
+        statement: (0, latexParse_1.latexParse)(statement),
+        answer: (0, latexParse_1.latexParse)(answerTree)
+    };
+    return question;
+}
+exports.getPowersProductQuestion = getPowersProductQuestion;

package/src/exercises/powers/powersProduct.ts

@@ -0,0 +1,51 @@
+import { randint } from "../../mathutils/random/randint";
+import { Power } from "../../numbers/integer/power";
+import { latexParse } from "../../tree/latexParser/latexParse";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { MultiplyNode } from "../../tree/nodes/operators/multiplyNode";
+import { PowerNode } from "../../tree/nodes/operators/powerNode";
+import { Exercise, Question } from "../exercise";
+import { getDistinctQuestions } from "../utils/getDistinctQuestions";
+
+/**
+ * a^b*a^c
+ */
+
+export const powersOfTenProduct: Exercise = {
+  id: "powersOfTenProduct",
+  connector: "=",
+  instruction: "Calculer :",
+  label: "Multiplication de puissances de 10",
+  levels: ["4", "3", "2", "1"],
+  section: "Calculs",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(() => getPowersProductQuestion(true), nb),
+};
+
+export const powersProduct: Exercise = {
+  id: "powersProduct",
+  connector: "=",
+  instruction: "Calculer :",
+  label: "Multiplication de puissances",
+  levels: ["4", "3", "2", "1"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(getPowersProductQuestion, nb),
+};
+
+export function getPowersProductQuestion(useOnlyPowersOfTen: boolean = false): Question {
+  const a = useOnlyPowersOfTen ? 10 : randint(-11, 11);
+  const [b, c] = [1, 2].map((el) => randint(-11, 11));
+
+  const statement = new MultiplyNode(
+    new PowerNode(new NumberNode(a), new NumberNode(b)),
+    new PowerNode(new NumberNode(a), new NumberNode(c))
+  );
+  const answerTree = new Power(a, b + c).simplify();
+
+  const question: Question = {
+    statement: latexParse(statement),
+    answer: latexParse(answerTree),
+  };
+  return question;
+}

package/src/exercises/powers/scientificToDecimal.js

@@ -0,0 +1,38 @@
+"use strict";
+exports.__esModule = true;
+exports.getScientificToDecimalQuestion = exports.scientificToDecimal = void 0;
+var randint_1 = require("../../mathutils/random/randint");
+var decimal_1 = require("../../numbers/decimals/decimal");
+var integer_1 = require("../../numbers/integer/integer");
+var latexParse_1 = require("../../tree/latexParser/latexParse");
+var numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+var multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
+var powerNode_1 = require("../../tree/nodes/operators/powerNode");
+var getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+/**
+ * a*10^x vers décimal
+ *  */
+exports.scientificToDecimal = {
+    id: "scientificToDecimal",
+    connector: "=",
+    instruction: "Donner l'écriture décimale de :",
+    label: "Ecriture décimale de $a\\times 10^x",
+    levels: ["5", "4", "3", "2"],
+    section: "Puissances",
+    isSingleStep: true,
+    generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getScientificToDecimalQuestion, nb); }
+};
+function getScientificToDecimalQuestion() {
+    var randPower = (0, randint_1.randint)(-6, 8);
+    var int = integer_1.IntegerConstructor.random((0, randint_1.randint)(1, 4));
+    var fracPart = decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(0, 4));
+    var randDecimal = decimal_1.DecimalConstructor.fromParts(int + "", fracPart);
+    var statement = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(randDecimal.value), new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(randPower)));
+    var answerTree = randDecimal.multiplyByPowerOfTen(randPower).toTree();
+    var question = {
+        statement: (0, latexParse_1.latexParse)(statement),
+        answer: (0, latexParse_1.latexParse)(answerTree)
+    };
+    return question;
+}
+exports.getScientificToDecimalQuestion = getScientificToDecimalQuestion;

package/src/exercises/powers/scientificToDecimal.ts

@@ -0,0 +1,44 @@
+import { randint } from "../../mathutils/random/randint";
+import { DecimalConstructor } from "../../numbers/decimals/decimal";
+import { IntegerConstructor } from "../../numbers/integer/integer";
+import { Power } from "../../numbers/integer/power";
+import { latexParse } from "../../tree/latexParser/latexParse";
+import { NumberNode } from "../../tree/nodes/numbers/numberNode";
+import { FractionNode } from "../../tree/nodes/operators/fractionNode";
+import { MultiplyNode } from "../../tree/nodes/operators/multiplyNode";
+import { PowerNode } from "../../tree/nodes/operators/powerNode";
+import { Exercise, Question } from "../exercise";
+import { getDistinctQuestions } from "../utils/getDistinctQuestions";
+
+/**
+ * a*10^x vers décimal
+ *  */
+
+export const scientificToDecimal: Exercise = {
+  id: "scientificToDecimal",
+  connector: "=",
+  instruction: "Donner l'écriture décimale de :",
+  label: "Ecriture décimale de $a\\times 10^x",
+  levels: ["5", "4", "3", "2"],
+  section: "Puissances",
+  isSingleStep: true,
+  generator: (nb: number) => getDistinctQuestions(getScientificToDecimalQuestion, nb),
+};
+
+export function getScientificToDecimalQuestion(): Question {
+  const randPower = randint(-6, 8);
+  const int = IntegerConstructor.random(randint(1, 4));
+  const fracPart = DecimalConstructor.randomFracPart(randint(0, 4));
+  const randDecimal = DecimalConstructor.fromParts(int + "", fracPart);
+  const statement = new MultiplyNode(
+    new NumberNode(randDecimal.value),
+    new PowerNode(new NumberNode(10), new NumberNode(randPower))
+  );
+  const answerTree = randDecimal.multiplyByPowerOfTen(randPower).toTree();
+
+  const question: Question = {
+    statement: latexParse(statement),
+    answer: latexParse(answerTree),
+  };
+  return question;
+}

package/src/exercises/squareRoots/simpifySquareRoot.js

@@ -10,6 +10,7 @@ exports.simplifySquareRoot = {
     instruction: "Simplifier :",
     label: "Simplification de racines carrées",
     levels: ["3", "2", "1"],
+    isSingleStep: false,
     section: "Racines carrées",
     generator: function (nb) { return (0, getDistinctQuestions_1.getDistinctQuestions)(getSimplifySquareRoot, nb); }
 };

package/src/exercises/squareRoots/simpifySquareRoot.ts

@@ -9,6 +9,7 @@ export const simplifySquareRoot: Exercise = {
   instruction: "Simplifier :",
   label: "Simplification de racines carrées",
   levels: ["3", "2", "1"],
+  isSingleStep: false,
   section: "Racines carrées",
   generator: (nb: number) => getDistinctQuestions(getSimplifySquareRoot, nb),
 };

package/src/index.js

@@ -3,3 +3,8 @@ exports.__esModule = true;
 exports.exercises = void 0;
 var exercises_1 = require("./exercises/exercises");
 exports.exercises = exercises_1.exercises;
+var scientificToDecimal_1 = require("./exercises/powers/scientificToDecimal");
+// exercises.forEach((exo) => {
+//   console.log(exo.instruction, exo.generator(10));
+// });
+console.log(scientificToDecimal_1.scientificToDecimal);

package/src/index.ts

@@ -1,19 +1,8 @@
-import { allIdentities } from "./exercises/calculLitteral/distributivity/allIdentities";
-import { doubleDistributivity } from "./exercises/calculLitteral/distributivity/doubleDistributivity";
-import { simpleDistributivity } from "./exercises/calculLitteral/distributivity/simpleDistributivity";
-import { equationType1Exercise } from "./exercises/calculLitteral/equation/equationType1Exercise";
-import { equationType2Exercise } from "./exercises/calculLitteral/equation/equationType2Exercise";
-import { equationType3Exercise } from "./exercises/calculLitteral/equation/equationType3Exercise";
-import { equationType4Exercise } from "./exercises/calculLitteral/equation/equationType4Exercise";
-import { factoType1Exercise } from "./exercises/calculLitteral/factorisation/factoType1Exercise";
 import { exercises } from "./exercises/exercises";
-import { simplifySquareRoot } from "./exercises/squareRoots/simpifySquareRoot";
-import { randint } from "./mathutils/random/randint";
-import { Rational } from "./numbers/rationals/rational";
-import { SquareRoot } from "./numbers/reals/squareRoot";
-import { Affine } from "./polynomials/affine";
-import { Polynomial } from "./polynomials/polynomial";
-import { latexParse } from "./tree/latexParser/latexParse";
-import { VariableNode } from "./tree/nodes/variables/variableNode";
+import { scientificToDecimal } from "./exercises/powers/scientificToDecimal";
 
+console.log(scientificToDecimal.generator(10));
+// exercises.forEach((exo) => {
+//   console.log(exo.instruction, exo.generator(10));
+// });
 export { exercises };