math-exercises 1.3.40 → 1.3.41

package/lib/exercises/calcul/arithmetics/primeNumbers.js

@@ -77,7 +77,7 @@ function getPrimeNumbers() {
         return (0, shuffle_1.shuffle)(res);
     };
     const question = {
-        startStatement: `${prod} = ?`,
+        startStatement: `${prod}`,
         answer,
         keys: [],
         getPropositions,

package/lib/exercises/calcul/proportionality/proportionalityTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM3E,eAAO,MAAM,oBAAoB,EAAE,QAUlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAoElD"}
+{"version":3,"file":"proportionalityTable.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calcul/proportionality/proportionalityTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAM3E,eAAO,MAAM,oBAAoB,EAAE,QAUlC,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAsElD"}

package/lib/exercises/calcul/proportionality/proportionalityTable.js

@@ -9,12 +9,12 @@ exports.proportionalityTable = {
     id: 'proportionalityTable',
     connector: '=',
     instruction: '',
-    label: 'Calculs de fréquences marginales et conditionnelles',
-    levels: ['1', '0'],
+    label: 'Calcul dans un tableau de proportionnalité',
+    levels: ['5', '4', '3'],
     isSingleStep: false,
-    section: 'Probabilités',
+    section: 'Proportionnalité',
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getProportionalityTable, nb),
-    keys: ['f', 'cap', 'underscore'],
+    keys: [],
 };
 function getProportionalityTable() {
     const fact = (0, randint_1.randint)(2, 10);
@@ -65,12 +65,14 @@ function getProportionalityTable() {
     const question = {
         instruction: `On considère le tableau de proportionnalité suivant : 
 
-| |A|B|
-|-|-|-|
-|C|${x1}|${x3}|
-|D|${x2}|${x4}|`,
+| | |
+|-|-|
+|${x1}|${x3}|
+|${x2}|${x4}|
+
+Déterminer le nombre manquant.`,
         answer: answer + '',
-        keys: ['f', 'cap', 'underscore'],
+        keys: [],
         getPropositions,
     };
     return question;

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.js

@@ -10,7 +10,7 @@ exports.equationSimpleSquare = {
     id: 'equationSimpleSquare',
     connector: '=',
     instruction: '',
-    label: 'Résoudre une équation du second degré du type x² = a',
+    label: 'Résoudre une équation du second degré du type $x^2 = a$',
     levels: ['2', '1'],
     section: 'Équations',
     isSingleStep: false,

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.d.ts

@@ -0,0 +1,4 @@
+import { Exercise, Question } from '../../../exercises/exercise';
+export declare const evaluateExpression: Exercise;
+export declare function getEvaluateExpression(): Question;
+//# sourceMappingURL=evaluateExpression.d.ts.map

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAQ3E,eAAO,MAAM,kBAAkB,EAAE,QAUhC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CAiDhD"}

package/lib/exercises/calculLitteral/simplifying/evaluateExpression.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEvaluateExpression = exports.evaluateExpression = void 0;
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const polynomial_1 = require("../../../math/polynomials/polynomial");
+const randint_1 = require("../../../math/utils/random/randint");
+const coinFlip_1 = require("../../../utils/coinFlip");
+const shuffle_1 = require("../../../utils/shuffle");
+const uuid_1 = require("uuid");
+exports.evaluateExpression = {
+    id: 'evaluateExpression',
+    connector: '=',
+    instruction: '',
+    label: 'Evaluer une expression',
+    levels: ['4', '3', '2'],
+    section: 'Calcul littéral',
+    isSingleStep: true,
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEvaluateExpression, nb),
+    keys: ['x'],
+};
+function getEvaluateExpression() {
+    const rand = (0, coinFlip_1.coinFlip)();
+    const polynome1 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-5, 6, [0])]);
+    const polynome2 = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-9, 10), (0, randint_1.randint)(-4, 5, [0])]);
+    const xValue = (0, randint_1.randint)(-9, 10);
+    const statement = rand
+        ? `Calculer $${polynome1.toTree().toTex()}$ pour $x = ${xValue}$`
+        : `Calculer $${polynome2.toTree().toTex()}$ pour $x = ${xValue}$`;
+    const answer = rand ? polynome1.calculate(xValue) : polynome2.calculate(xValue);
+    const getPropositions = (n) => {
+        const res = [];
+        res.push({
+            id: (0, uuid_1.v4)() + '',
+            statement: answer + '',
+            isRightAnswer: true,
+        });
+        for (let i = 0; i < n - 1; i++) {
+            let isDuplicate;
+            let proposition;
+            do {
+                const wrongAnswer = answer + (0, randint_1.randint)(-10, 11, [0]);
+                proposition = {
+                    id: (0, uuid_1.v4)() + '',
+                    statement: wrongAnswer + '',
+                    isRightAnswer: false,
+                };
+                isDuplicate = res.some((p) => p.statement === proposition.statement);
+            } while (isDuplicate);
+            res.push(proposition);
+        }
+        return (0, shuffle_1.shuffle)(res);
+    };
+    const question = {
+        instruction: statement,
+        answer: answer + '',
+        keys: ['x'],
+        getPropositions,
+    };
+    return question;
+}
+exports.getEvaluateExpression = getEvaluateExpression;

package/lib/exercises/calculLitteral/simplifying/reduceExpression.js

@@ -13,7 +13,7 @@ exports.reduceExpression = {
     instruction: "Réduire l'expression suivante :",
     isSingleStep: false,
     label: 'Réduire une expression',
-    levels: ['3', '2'],
+    levels: ['4', '3', '2'],
     section: 'Calcul littéral',
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getReduceExpression, nb),
     keys: ['x'],

package/lib/exercises/exercises.js

@@ -100,7 +100,7 @@ const circleCircumference_1 = require("./geometry/euclidean/circleCircumference"
 const triangleArea_1 = require("./geometry/euclidean/triangleArea");
 const distanceBetweenTwoPoints_1 = require("./geometry/cartesian/distanceBetweenTwoPoints");
 const reduceExpression_1 = require("./calculLitteral/simplifying/reduceExpression");
-const evaluateExpression_1 = require("./calculLitteral/equation/evaluateExpression");
+const evaluateExpression_1 = require("./calculLitteral/simplifying/evaluateExpression");
 const proportionalityTable_1 = require("./calcul/proportionality/proportionalityTable");
 exports.exercises = [
     /**

package/lib/exercises/geometry/cartesian/distanceBetweenTwoPoints.js

@@ -90,7 +90,7 @@ function getDistanceBetweenTwoPoints() {
         return (0, shuffle_1.shuffle)(res);
     };
     const question = {
-        instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Calculer la distance AB.`,
+        instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Calculer la distance $AB$.`,
         startStatement: 'AB',
         answer,
         keys: [],

package/package.json

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