math-exercises 1.3.3 → 1.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/exercises/calcul/addAndSub.js +11 -12
- package/lib/exercises/calcul/fractions/fractionAndIntegerDivision.js +15 -15
- package/lib/exercises/calcul/fractions/fractionAndIntegerProduct.js +15 -14
- package/lib/exercises/calcul/fractions/fractionAndIntegerSum.js +13 -13
- package/lib/exercises/calcul/fractions/fractionsDivision.js +12 -12
- package/lib/exercises/calcul/fractions/fractionsProduct.js +11 -12
- package/lib/exercises/calcul/fractions/fractionsSum.js +11 -12
- package/lib/exercises/calcul/fractions/simplifyFraction.js +10 -11
- package/lib/exercises/calcul/operations/operationsPriorities.js +98 -0
- package/lib/exercises/calcul/operations/operationsPrioritiesWithoutRelative.js +111 -0
- package/lib/exercises/calcul/rounding/rounding.js +36 -37
- package/lib/exercises/calculLitteral/distributivity/allIdentities.js +8 -8
- package/lib/exercises/calculLitteral/distributivity/doubleDistributivity.js +15 -16
- package/lib/exercises/calculLitteral/distributivity/firstIdentity.js +10 -11
- package/lib/exercises/calculLitteral/distributivity/secondIdentity.js +17 -18
- package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.js +16 -17
- package/lib/exercises/calculLitteral/distributivity/thirdIdentity.js +15 -16
- package/lib/exercises/calculLitteral/equation/equationType1Exercise.js +15 -16
- package/lib/exercises/calculLitteral/equation/equationType2Exercise.js +19 -20
- package/lib/exercises/calculLitteral/equation/equationType3Exercise.js +19 -20
- package/lib/exercises/calculLitteral/equation/equationType4Exercise.js +20 -21
- package/lib/exercises/calculLitteral/factorisation/factoType1Exercise.js +20 -21
- package/lib/exercises/exercises.js +11 -1
- package/lib/exercises/geometry/cartesian/midpoint.js +29 -0
- package/lib/exercises/geometry/vectors/scalarProductViaCoords.js +28 -0
- package/lib/exercises/geometry/vectors/scalarProductViaNorms.js +27 -0
- package/lib/exercises/powers/powersDivision.js +23 -24
- package/lib/exercises/powers/powersOfTenToDecimal.js +13 -14
- package/lib/exercises/powers/powersPower.js +19 -20
- package/lib/exercises/powers/powersProduct.js +22 -23
- package/lib/exercises/powers/scientificToDecimal.js +17 -18
- package/lib/exercises/sequences/geometric/geometricExplicitFormulaUsage.js +24 -0
- package/lib/exercises/sequences/geometric/geometricFindReason.js +23 -0
- package/lib/exercises/squareRoots/simpifySquareRoot.js +9 -10
- package/lib/exercises/trigonometry/mainRemarkableValues.js +28 -0
- package/lib/exercises/trigonometry/remarkableValues.js +28 -0
- package/lib/exercises/utils/getDistinctQuestions.js +1 -1
- package/lib/geometry/point.js +26 -0
- package/lib/geometry/vector.js +31 -0
- package/lib/index.js +1 -0
- package/lib/math/geometry/point.js +27 -0
- package/lib/math/geometry/vector.js +31 -0
- package/lib/math/numbers/decimals/decimal.js +140 -0
- package/lib/math/numbers/epsilon.js +10 -0
- package/lib/math/numbers/integer/integer.js +68 -0
- package/lib/math/numbers/integer/power.js +52 -0
- package/lib/math/numbers/nombre.js +10 -0
- package/lib/math/numbers/rationals/rational.js +113 -0
- package/lib/math/numbers/reals/real.js +16 -0
- package/lib/math/numbers/reals/squareRoot.js +63 -0
- package/lib/math/polynomials/affine.js +42 -0
- package/lib/math/polynomials/polynomial.js +125 -0
- package/lib/math/sequences/arithmeticSequence.js +1 -0
- package/lib/math/sequences/geometricSequence.js +8 -0
- package/lib/math/sequences/sequence.js +18 -0
- package/lib/math/sets/discreteSet.js +28 -0
- package/lib/math/sets/emptySet.js +6 -0
- package/lib/math/sets/intervals/intervals.js +104 -0
- package/lib/math/sets/mathSet.js +10 -0
- package/lib/math/sets/mathSetInterface.js +2 -0
- package/lib/math/trigonometry/remarkableValue.js +29 -0
- package/lib/math/trigonometry/remarkableValues.js +51 -0
- package/lib/math/utils/arithmetic/coprimesOf.js +13 -0
- package/lib/math/utils/arithmetic/dividersOf.js +12 -0
- package/lib/math/utils/arithmetic/gcd.js +7 -0
- package/lib/math/utils/arithmetic/isSquare.js +7 -0
- package/lib/math/utils/arithmetic/lcd.js +12 -0
- package/lib/math/utils/arithmetic/nonCoprimesOf.js +13 -0
- package/lib/math/utils/arithmetic/nonDividersOf.js +14 -0
- package/lib/math/utils/arithmetic/primeFactors.js +22 -0
- package/lib/math/utils/decimals/decimalPartLengthOf.js +14 -0
- package/lib/math/utils/random/randTupleInt.js +30 -0
- package/lib/math/utils/random/randint.js +18 -0
- package/lib/math/utils/round.js +8 -0
- package/lib/mathutils/random/randTupleInt.js +30 -0
- package/lib/sets/intervals/intervals.js +14 -18
- package/lib/tree/nodes/functions/cosNode.js +21 -0
- package/lib/tree/nodes/functions/functionNode.js +2 -0
- package/lib/tree/nodes/functions/oppositeNode.js +16 -3
- package/lib/tree/nodes/functions/sinNode.js +1 -0
- package/lib/tree/nodes/functions/sqrtNode.js +6 -3
- package/lib/tree/nodes/node.js +4 -3
- package/lib/tree/nodes/numbers/constantNode.js +18 -0
- package/lib/tree/nodes/numbers/numberNode.js +7 -3
- package/lib/tree/nodes/numbers/piNode.js +5 -0
- package/lib/tree/nodes/operators/addNode.js +7 -3
- package/lib/tree/nodes/operators/divideNode.js +20 -3
- package/lib/tree/nodes/operators/equalNode.js +6 -3
- package/lib/tree/nodes/operators/fractionNode.js +6 -3
- package/lib/tree/nodes/operators/multiplyNode.js +33 -3
- package/lib/tree/nodes/operators/operatorNode.js +5 -5
- package/lib/tree/nodes/operators/powerNode.js +23 -3
- package/lib/tree/nodes/operators/substractNode.js +14 -3
- package/lib/tree/nodes/variables/variableNode.js +9 -6
- package/lib/tree/parsers/derivateParser.js +61 -59
- package/lib/tree/parsers/latexParser.js +109 -116
- package/lib/tree/parsers/simplify.js +52 -0
- package/lib/trigonometry/remarkableValue.js +29 -0
- package/lib/trigonometry/remarkableValues.js +51 -0
- package/lib/utils/arrayEqual.js +13 -0
- package/lib/utils/coinFlip.js +7 -0
- package/package.json +2 -2
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getAddAndSubQuestions = exports.addAndSubExercise = void 0;
|
|
4
|
-
const randint_1 = require("
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const addNode_1 = require("../../tree/nodes/operators/addNode");
|
|
4
|
+
const randint_1 = require("src/math/utils/random/randint");
|
|
5
|
+
const numberNode_1 = require("src/tree/nodes/numbers/numberNode");
|
|
6
|
+
const addNode_1 = require("src/tree/nodes/operators/addNode");
|
|
8
7
|
const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
|
|
9
8
|
/**
|
|
10
9
|
* a±b±c±d
|
|
11
10
|
*/
|
|
12
11
|
exports.addAndSubExercise = {
|
|
13
|
-
id:
|
|
14
|
-
connector:
|
|
15
|
-
instruction:
|
|
16
|
-
label:
|
|
17
|
-
levels: [
|
|
18
|
-
section:
|
|
12
|
+
id: 'addAndSub',
|
|
13
|
+
connector: '=',
|
|
14
|
+
instruction: 'Calculer :',
|
|
15
|
+
label: 'Additions et soustractions',
|
|
16
|
+
levels: ['6', '5'],
|
|
17
|
+
section: 'Calculs',
|
|
19
18
|
isSingleStep: true,
|
|
20
19
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAddAndSubQuestions, nb),
|
|
21
20
|
};
|
|
@@ -30,9 +29,9 @@ function getAddAndSubQuestions() {
|
|
|
30
29
|
for (let i = 2; i < allNumbersNodes.length; i++) {
|
|
31
30
|
statementTree = new addNode_1.AddNode(statementTree, allNumbersNodes[i]);
|
|
32
31
|
}
|
|
33
|
-
const answer = numbers.reduce((a, b) => a + b) +
|
|
32
|
+
const answer = numbers.reduce((a, b) => a + b) + '';
|
|
34
33
|
const question = {
|
|
35
|
-
startStatement:
|
|
34
|
+
startStatement: statementTree.toTex(),
|
|
36
35
|
answer: answer,
|
|
37
36
|
};
|
|
38
37
|
return question;
|
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFractionAndIntegerDivision = exports.fractionAndIntegerDivision = void 0;
|
|
4
|
-
const
|
|
5
|
-
const integer_1 = require("
|
|
6
|
-
const rational_1 = require("
|
|
7
|
-
const
|
|
8
|
-
const divideNode_1 = require("
|
|
9
|
-
const
|
|
10
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const integer_1 = require("src/math/numbers/integer/integer");
|
|
6
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
7
|
+
const randint_1 = require("src/math/utils/random/randint");
|
|
8
|
+
const divideNode_1 = require("src/tree/nodes/operators/divideNode");
|
|
9
|
+
const coinFlip_1 = require("src/utils/coinFlip");
|
|
11
10
|
exports.fractionAndIntegerDivision = {
|
|
12
|
-
id:
|
|
13
|
-
connector:
|
|
14
|
-
instruction:
|
|
11
|
+
id: 'fractionAndIntegerDivision',
|
|
12
|
+
connector: '=',
|
|
13
|
+
instruction: 'Calculer la forme irréductible :',
|
|
15
14
|
label: "Division d'un entier et d'une fraction",
|
|
16
|
-
levels: [
|
|
15
|
+
levels: ['4', '3', '2', '1'],
|
|
17
16
|
isSingleStep: false,
|
|
18
|
-
section:
|
|
17
|
+
section: 'Fractions',
|
|
19
18
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerDivision, nb),
|
|
20
19
|
};
|
|
21
20
|
function getFractionAndIntegerDivision() {
|
|
22
21
|
const rational = rational_1.RationalConstructor.randomIrreductible();
|
|
23
22
|
const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]));
|
|
24
|
-
const integerFirst = (0,
|
|
23
|
+
const integerFirst = (0, coinFlip_1.coinFlip)();
|
|
25
24
|
const statementTree = integerFirst
|
|
26
25
|
? new divideNode_1.DivideNode(integer.toTree(), rational.toTree())
|
|
27
26
|
: new divideNode_1.DivideNode(rational.toTree(), integer.toTree());
|
|
28
27
|
const answerTree = integerFirst ? integer.divide(rational).toTree() : rational.divide(integer).toTree();
|
|
29
28
|
const question = {
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
instruction: '',
|
|
30
|
+
startStatement: statementTree.toTex(),
|
|
31
|
+
answer: answerTree.toTex(),
|
|
32
32
|
};
|
|
33
33
|
return question;
|
|
34
34
|
}
|
|
@@ -1,30 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFractionAndIntegerProduct = exports.fractionAndIntegerProduct = void 0;
|
|
4
|
-
const
|
|
5
|
-
const integer_1 = require("
|
|
6
|
-
const rational_1 = require("
|
|
7
|
-
const
|
|
8
|
-
const multiplyNode_1 = require("
|
|
9
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const integer_1 = require("src/math/numbers/integer/integer");
|
|
6
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
7
|
+
const randint_1 = require("src/math/utils/random/randint");
|
|
8
|
+
const multiplyNode_1 = require("src/tree/nodes/operators/multiplyNode");
|
|
10
9
|
exports.fractionAndIntegerProduct = {
|
|
11
|
-
id:
|
|
12
|
-
connector:
|
|
13
|
-
instruction:
|
|
10
|
+
id: 'fractionAndIntegerProduct',
|
|
11
|
+
connector: '=',
|
|
12
|
+
instruction: 'Calculer la forme irréductible :',
|
|
14
13
|
label: "Produit d'un entier et d'une fraction",
|
|
15
|
-
levels: [
|
|
14
|
+
levels: ['4', '3', '2', '1'],
|
|
16
15
|
isSingleStep: false,
|
|
17
|
-
section:
|
|
16
|
+
section: 'Fractions',
|
|
18
17
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerProduct, nb),
|
|
19
18
|
};
|
|
20
19
|
function getFractionAndIntegerProduct() {
|
|
21
20
|
const rational = rational_1.RationalConstructor.randomIrreductible();
|
|
22
21
|
const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]));
|
|
23
|
-
const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), integer.toTree())
|
|
22
|
+
const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), integer.toTree());
|
|
23
|
+
statementTree.shuffle();
|
|
24
24
|
const answerTree = rational.multiply(integer).toTree();
|
|
25
25
|
const question = {
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
instruction: '',
|
|
27
|
+
startStatement: statementTree.toTex(),
|
|
28
|
+
answer: answerTree.toTex(),
|
|
28
29
|
};
|
|
29
30
|
return question;
|
|
30
31
|
}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFractionAndIntegerSum = exports.fractionAndIntegerSum = void 0;
|
|
4
|
-
const
|
|
5
|
-
const integer_1 = require("
|
|
6
|
-
const rational_1 = require("
|
|
7
|
-
const
|
|
8
|
-
const addNode_1 = require("
|
|
9
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const integer_1 = require("src/math/numbers/integer/integer");
|
|
6
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
7
|
+
const randint_1 = require("src/math/utils/random/randint");
|
|
8
|
+
const addNode_1 = require("src/tree/nodes/operators/addNode");
|
|
10
9
|
exports.fractionAndIntegerSum = {
|
|
11
|
-
id:
|
|
12
|
-
connector:
|
|
13
|
-
instruction:
|
|
10
|
+
id: 'fractionAndIntegerSum',
|
|
11
|
+
connector: '=',
|
|
12
|
+
instruction: 'Calculer la forme irréductible :',
|
|
14
13
|
label: "Somme d'un entier et d'une fraction",
|
|
15
|
-
levels: [
|
|
14
|
+
levels: ['4', '3', '2', '1'],
|
|
16
15
|
isSingleStep: false,
|
|
17
|
-
section:
|
|
16
|
+
section: 'Fractions',
|
|
18
17
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionAndIntegerSum, nb),
|
|
19
18
|
};
|
|
20
19
|
function getFractionAndIntegerSum() {
|
|
@@ -24,8 +23,9 @@ function getFractionAndIntegerSum() {
|
|
|
24
23
|
statementTree.shuffle();
|
|
25
24
|
const answerTree = rational.add(integer).toTree();
|
|
26
25
|
const question = {
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
instruction: '',
|
|
27
|
+
startStatement: statementTree.toTex(),
|
|
28
|
+
answer: answerTree.toTex(),
|
|
29
29
|
};
|
|
30
30
|
return question;
|
|
31
31
|
}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFractionsDivision = exports.fractionsDivision = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const divideNode_1 = require("
|
|
7
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
6
|
+
const divideNode_1 = require("src/tree/nodes/operators/divideNode");
|
|
8
7
|
exports.fractionsDivision = {
|
|
9
|
-
id:
|
|
10
|
-
connector:
|
|
11
|
-
instruction:
|
|
12
|
-
label:
|
|
13
|
-
levels: [
|
|
14
|
-
section:
|
|
8
|
+
id: 'fractionsDivision',
|
|
9
|
+
connector: '=',
|
|
10
|
+
instruction: 'Calculer la forme irréductible :',
|
|
11
|
+
label: 'Divisions de fractions',
|
|
12
|
+
levels: ['4', '3', '2', '1'],
|
|
13
|
+
section: 'Fractions',
|
|
15
14
|
isSingleStep: false,
|
|
16
15
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsDivision, nb),
|
|
17
16
|
};
|
|
@@ -21,8 +20,9 @@ function getFractionsDivision() {
|
|
|
21
20
|
const statementTree = new divideNode_1.DivideNode(rational.toTree(), rational2.toTree());
|
|
22
21
|
const answerTree = rational.divide(rational2).toTree();
|
|
23
22
|
const question = {
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
instruction: '',
|
|
24
|
+
startStatement: statementTree.toTex(),
|
|
25
|
+
answer: answerTree.toTex(),
|
|
26
26
|
};
|
|
27
27
|
return question;
|
|
28
28
|
}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFractionsProduct = exports.fractionsProduct = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const multiplyNode_1 = require("
|
|
7
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
6
|
+
const multiplyNode_1 = require("src/tree/nodes/operators/multiplyNode");
|
|
8
7
|
exports.fractionsProduct = {
|
|
9
|
-
id:
|
|
10
|
-
connector:
|
|
11
|
-
instruction:
|
|
12
|
-
label:
|
|
13
|
-
levels: [
|
|
14
|
-
section:
|
|
8
|
+
id: 'fractionsProduct',
|
|
9
|
+
connector: '=',
|
|
10
|
+
instruction: 'Calculer la forme irréductible :',
|
|
11
|
+
label: 'Produits de fractions',
|
|
12
|
+
levels: ['4', '3', '2', '1'],
|
|
13
|
+
section: 'Fractions',
|
|
15
14
|
isSingleStep: false,
|
|
16
15
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsProduct, nb),
|
|
17
16
|
};
|
|
@@ -21,8 +20,8 @@ function getFractionsProduct() {
|
|
|
21
20
|
const statementTree = new multiplyNode_1.MultiplyNode(rational.toTree(), rational2.toTree());
|
|
22
21
|
const answerTree = rational.multiply(rational2).toTree();
|
|
23
22
|
const question = {
|
|
24
|
-
startStatement:
|
|
25
|
-
answer:
|
|
23
|
+
startStatement: statementTree.toTex(),
|
|
24
|
+
answer: answerTree.toTex(),
|
|
26
25
|
};
|
|
27
26
|
return question;
|
|
28
27
|
}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFractionsSum = exports.fractionsSum = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const addNode_1 = require("
|
|
7
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
6
|
+
const addNode_1 = require("src/tree/nodes/operators/addNode");
|
|
8
7
|
exports.fractionsSum = {
|
|
9
|
-
id:
|
|
10
|
-
connector:
|
|
11
|
-
instruction:
|
|
12
|
-
label:
|
|
13
|
-
levels: [
|
|
14
|
-
section:
|
|
8
|
+
id: 'fractionsSum',
|
|
9
|
+
connector: '=',
|
|
10
|
+
instruction: 'Calculer la forme irréductible :',
|
|
11
|
+
label: 'Sommes de fractions',
|
|
12
|
+
levels: ['4', '3', '2', '1'],
|
|
13
|
+
section: 'Fractions',
|
|
15
14
|
isSingleStep: false,
|
|
16
15
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFractionsSum, nb),
|
|
17
16
|
};
|
|
@@ -21,8 +20,8 @@ function getFractionsSum() {
|
|
|
21
20
|
const statementTree = new addNode_1.AddNode(rational.toTree(), rational2.toTree());
|
|
22
21
|
const answerTree = rational.add(rational2).toTree();
|
|
23
22
|
const question = {
|
|
24
|
-
startStatement:
|
|
25
|
-
answer:
|
|
23
|
+
startStatement: statementTree.toTex(),
|
|
24
|
+
answer: answerTree.toTex(),
|
|
26
25
|
};
|
|
27
26
|
return question;
|
|
28
27
|
}
|
|
@@ -1,24 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getSimplifyFraction = exports.simplifyFraction = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
|
|
4
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
5
|
+
const rational_1 = require("src/math/numbers/rationals/rational");
|
|
7
6
|
exports.simplifyFraction = {
|
|
8
|
-
id:
|
|
9
|
-
connector:
|
|
10
|
-
instruction:
|
|
11
|
-
label:
|
|
12
|
-
levels: [
|
|
7
|
+
id: 'simplifyFrac',
|
|
8
|
+
connector: '=',
|
|
9
|
+
instruction: 'Simplifier :',
|
|
10
|
+
label: 'Simplification de fractions',
|
|
11
|
+
levels: ['4', '3', '2'],
|
|
13
12
|
isSingleStep: false,
|
|
14
|
-
section:
|
|
13
|
+
section: 'Fractions',
|
|
15
14
|
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimplifyFraction, nb),
|
|
16
15
|
};
|
|
17
16
|
function getSimplifyFraction() {
|
|
18
17
|
const rational = rational_1.RationalConstructor.randomSimplifiable(10);
|
|
19
18
|
const question = {
|
|
20
|
-
startStatement:
|
|
21
|
-
answer:
|
|
19
|
+
startStatement: rational.toTree().toTex(),
|
|
20
|
+
answer: rational.simplify().toTree().toTex(),
|
|
22
21
|
};
|
|
23
22
|
return question;
|
|
24
23
|
}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* a*b ±c±d
|
|
4
|
+
* a/b ±c±d
|
|
5
|
+
* a*b*c ± d
|
|
6
|
+
* a*b±c*d
|
|
7
|
+
* a/b ± c*d
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.getPriorityQuestions = exports.operationsPriorities = void 0;
|
|
11
|
+
const getDistinctQuestions_1 = require("src/exercises/utils/getDistinctQuestions");
|
|
12
|
+
const randint_1 = require("src/math/utils/random/randint");
|
|
13
|
+
const numberNode_1 = require("src/tree/nodes/numbers/numberNode");
|
|
14
|
+
const addNode_1 = require("src/tree/nodes/operators/addNode");
|
|
15
|
+
const divideNode_1 = require("src/tree/nodes/operators/divideNode");
|
|
16
|
+
const multiplyNode_1 = require("src/tree/nodes/operators/multiplyNode");
|
|
17
|
+
const coinFlip_1 = require("src/utils/coinFlip");
|
|
18
|
+
exports.operationsPriorities = {
|
|
19
|
+
id: 'operationsPriorities',
|
|
20
|
+
connector: '=',
|
|
21
|
+
instruction: 'Calculer :',
|
|
22
|
+
label: 'Priorités opératoires',
|
|
23
|
+
levels: ['6', '5', '4'],
|
|
24
|
+
section: 'Calculs',
|
|
25
|
+
isSingleStep: true,
|
|
26
|
+
generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPriorityQuestions, nb),
|
|
27
|
+
};
|
|
28
|
+
function getPriorityQuestions() {
|
|
29
|
+
const type = (0, randint_1.randint)(1, 6);
|
|
30
|
+
let startStatement = '';
|
|
31
|
+
let answer = '';
|
|
32
|
+
let a, b, c, d;
|
|
33
|
+
let statement;
|
|
34
|
+
switch (type) {
|
|
35
|
+
case 1: // a*b ±c±d
|
|
36
|
+
[c, d] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(-10, 11, [0]));
|
|
37
|
+
[a, b] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11));
|
|
38
|
+
statement = (0, coinFlip_1.coinFlip)()
|
|
39
|
+
? //a*b first ou last
|
|
40
|
+
new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new addNode_1.AddNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)))
|
|
41
|
+
: //a*b middle
|
|
42
|
+
new addNode_1.AddNode(new addNode_1.AddNode(new numberNode_1.NumberNode(c), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b))), new numberNode_1.NumberNode(d));
|
|
43
|
+
statement.shuffle();
|
|
44
|
+
startStatement = statement.toTex();
|
|
45
|
+
answer = (a * b + c + d).toString();
|
|
46
|
+
break;
|
|
47
|
+
case 2: // a/b ±c±d
|
|
48
|
+
[b, c, d] = [1, 2, 3].map((el) => (0, randint_1.randint)(-10, 11, [0]));
|
|
49
|
+
a = b * (0, randint_1.randint)(0, 11);
|
|
50
|
+
statement = (0, coinFlip_1.coinFlip)()
|
|
51
|
+
? //a/b first ou last
|
|
52
|
+
new addNode_1.AddNode(new divideNode_1.DivideNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new addNode_1.AddNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)))
|
|
53
|
+
: //a/b middle
|
|
54
|
+
new addNode_1.AddNode(new addNode_1.AddNode(new numberNode_1.NumberNode(c), new divideNode_1.DivideNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b))), new numberNode_1.NumberNode(d));
|
|
55
|
+
statement.shuffle();
|
|
56
|
+
startStatement = statement.toTex();
|
|
57
|
+
answer = (a / b + c + d).toString();
|
|
58
|
+
break;
|
|
59
|
+
case 3: // a*b ± c*d
|
|
60
|
+
[a, b, c, d] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(-10, 11));
|
|
61
|
+
statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)));
|
|
62
|
+
startStatement = statement.toTex();
|
|
63
|
+
answer = (a * b + c * d).toString();
|
|
64
|
+
break;
|
|
65
|
+
case 4: // a*b ± c/d
|
|
66
|
+
[a, b] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11));
|
|
67
|
+
d = (0, randint_1.randint)(-10, 11, [0]);
|
|
68
|
+
c = d * (0, randint_1.randint)(0, 11);
|
|
69
|
+
statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new divideNode_1.DivideNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)));
|
|
70
|
+
statement.shuffle();
|
|
71
|
+
startStatement = statement.toTex();
|
|
72
|
+
answer = (a * b + c / d).toString();
|
|
73
|
+
break;
|
|
74
|
+
case 5: // a/b ± c/d
|
|
75
|
+
[b, d] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11, [0]));
|
|
76
|
+
a = b * (0, randint_1.randint)(0, 11);
|
|
77
|
+
c = d * (0, randint_1.randint)(0, 11);
|
|
78
|
+
statement = new addNode_1.AddNode(new divideNode_1.DivideNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new divideNode_1.DivideNode(new numberNode_1.NumberNode(c), new numberNode_1.NumberNode(d)));
|
|
79
|
+
startStatement = statement.toTex();
|
|
80
|
+
answer = (a / b + c / d).toString();
|
|
81
|
+
break;
|
|
82
|
+
case 5: // a*b*c ± d
|
|
83
|
+
[b, d] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11, [0]));
|
|
84
|
+
a = b * (0, randint_1.randint)(0, 11);
|
|
85
|
+
c = d * (0, randint_1.randint)(0, 11);
|
|
86
|
+
statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c)), new numberNode_1.NumberNode(d));
|
|
87
|
+
statement.shuffle();
|
|
88
|
+
startStatement = statement.toTex();
|
|
89
|
+
answer = (a * b * c + d).toString();
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
const question = {
|
|
93
|
+
startStatement,
|
|
94
|
+
answer,
|
|
95
|
+
};
|
|
96
|
+
return question;
|
|
97
|
+
}
|
|
98
|
+
exports.getPriorityQuestions = getPriorityQuestions;
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// import { randint } from "../../mathutils/random/randint";
|
|
3
|
+
// import { latexParser } from "../../tree/parsers/latexParser";
|
|
4
|
+
// import { Node } from "../../tree/nodes/node";
|
|
5
|
+
// import { NumberNode } from "../../tree/nodes/numbers/numberNode";
|
|
6
|
+
// import { AddNode } from "../../tree/nodes/operators/addNode";
|
|
7
|
+
// import { DivideNode } from "../../tree/nodes/operators/divideNode";
|
|
8
|
+
// import { MultiplyNode } from "../../tree/nodes/operators/multiplyNode";
|
|
9
|
+
// import { coinFlip } from "../../utils/coinFlip";
|
|
10
|
+
// import { Exercise, Question } from "../exercise";
|
|
11
|
+
// import { getDistinctQuestions } from "../utils/getDistinctQuestions";
|
|
12
|
+
// /**
|
|
13
|
+
// * a*b ±c±d
|
|
14
|
+
// * a/b ±c±d
|
|
15
|
+
// * a*b*c ± d
|
|
16
|
+
// * a*b±c*d
|
|
17
|
+
// * a/b ± c*d
|
|
18
|
+
// */
|
|
19
|
+
// export const operationsPriorities: Exercise = {
|
|
20
|
+
// id: "operationsPrioritiesWithoutRelative",
|
|
21
|
+
// connector: "=",
|
|
22
|
+
// instruction: "Calculer :",
|
|
23
|
+
// label: "Priorités opératoires (sans relatif)",
|
|
24
|
+
// levels: ["6", "5", "4"],
|
|
25
|
+
// section: "Calculs",
|
|
26
|
+
// isSingleStep: true,
|
|
27
|
+
// generator: (nb: number) => getDistinctQuestions(getPriorityQuestionsWithoutRelatif, nb),
|
|
28
|
+
// };
|
|
29
|
+
// export function getPriorityQuestionsWithoutRelatif(): Question {
|
|
30
|
+
// const type = randint(1, 6);
|
|
31
|
+
// let statement: Node;
|
|
32
|
+
// let answer: string = "";
|
|
33
|
+
// let a, b, c, d: number;
|
|
34
|
+
// switch (type) {
|
|
35
|
+
// case 1: // a*b ±c±d
|
|
36
|
+
// [c, d] = [1, 2, 3, 4].map((el) => randint(-10, 11, [0]));
|
|
37
|
+
// [a, b] = [1, 2].map((el) => randint(-10, 11));
|
|
38
|
+
// statement = coinFlip()
|
|
39
|
+
// ? //a*b first ou last
|
|
40
|
+
// new AddNode(
|
|
41
|
+
// new MultiplyNode(new NumberNode(a), new NumberNode(b)),
|
|
42
|
+
// new AddNode(new NumberNode(c), new NumberNode(d))
|
|
43
|
+
// ).shuffle()
|
|
44
|
+
// : //a*b middle
|
|
45
|
+
// new AddNode(
|
|
46
|
+
// new AddNode(new NumberNode(c), new MultiplyNode(new NumberNode(a), new NumberNode(b))),
|
|
47
|
+
// new NumberNode(d)
|
|
48
|
+
// );
|
|
49
|
+
// answer = (a * b + c + d).toString();
|
|
50
|
+
// break;
|
|
51
|
+
// case 2: // a/b ±c±d
|
|
52
|
+
// [b, c, d] = [1, 2, 3].map((el) => randint(-10, 11, [0]));
|
|
53
|
+
// a = b * randint(0, 11);
|
|
54
|
+
// statement = coinFlip()
|
|
55
|
+
// ? //a/b first ou last
|
|
56
|
+
// new AddNode(
|
|
57
|
+
// new DivideNode(new NumberNode(a), new NumberNode(b)),
|
|
58
|
+
// new AddNode(new NumberNode(c), new NumberNode(d))
|
|
59
|
+
// ).shuffle()
|
|
60
|
+
// : //a/b middle
|
|
61
|
+
// new AddNode(
|
|
62
|
+
// new AddNode(new NumberNode(c), new DivideNode(new NumberNode(a), new NumberNode(b))),
|
|
63
|
+
// new NumberNode(d)
|
|
64
|
+
// );
|
|
65
|
+
// answer = (a / b + c + d).toString();
|
|
66
|
+
// break;
|
|
67
|
+
// case 3: // a*b ± c*d
|
|
68
|
+
// [a, b, c, d] = [1, 2, 3, 4].map((el) => randint(-10, 11));
|
|
69
|
+
// statement = new AddNode(
|
|
70
|
+
// new MultiplyNode(new NumberNode(a), new NumberNode(b)),
|
|
71
|
+
// new MultiplyNode(new NumberNode(c), new NumberNode(d))
|
|
72
|
+
// );
|
|
73
|
+
// answer = (a * b + c * d).toString();
|
|
74
|
+
// break;
|
|
75
|
+
// case 4: // a*b ± c/d
|
|
76
|
+
// [a, b] = [1, 2].map((el) => randint(-10, 11));
|
|
77
|
+
// d = randint(-10, 11, [0]);
|
|
78
|
+
// c = d * randint(0, 11);
|
|
79
|
+
// statement = new AddNode(
|
|
80
|
+
// new MultiplyNode(new NumberNode(a), new NumberNode(b)),
|
|
81
|
+
// new DivideNode(new NumberNode(c), new NumberNode(d))
|
|
82
|
+
// ).shuffle();
|
|
83
|
+
// answer = (a * b + c / d).toString();
|
|
84
|
+
// break;
|
|
85
|
+
// case 5: // a/b ± c/d
|
|
86
|
+
// [b, d] = [1, 2].map((el) => randint(-10, 11, [0]));
|
|
87
|
+
// a = b * randint(0, 11);
|
|
88
|
+
// c = d * randint(0, 11);
|
|
89
|
+
// statement = new AddNode(
|
|
90
|
+
// new DivideNode(new NumberNode(a), new NumberNode(b)),
|
|
91
|
+
// new DivideNode(new NumberNode(c), new NumberNode(d))
|
|
92
|
+
// );
|
|
93
|
+
// answer = (a / b + c / d).toString();
|
|
94
|
+
// break;
|
|
95
|
+
// case 5: // a*b*c ± d
|
|
96
|
+
// [b, d] = [1, 2].map((el) => randint(-10, 11, [0]));
|
|
97
|
+
// a = b * randint(0, 11);
|
|
98
|
+
// c = d * randint(0, 11);
|
|
99
|
+
// statement = new AddNode(
|
|
100
|
+
// new MultiplyNode(new MultiplyNode(new NumberNode(a), new NumberNode(b)), new NumberNode(c)),
|
|
101
|
+
// new NumberNode(d)
|
|
102
|
+
// ).shuffle();
|
|
103
|
+
// answer = (a * b * c + d).toString();
|
|
104
|
+
// break;
|
|
105
|
+
// }
|
|
106
|
+
// const question: Question = {
|
|
107
|
+
// startStatement: latexParser(statement!),
|
|
108
|
+
// answer: answer,
|
|
109
|
+
// };
|
|
110
|
+
// return question;
|
|
111
|
+
// }
|