math-exercises 1.3.43 → 1.3.46

package/lib/exercises/sequences/geometric/geometricReasonUsage.js

@@ -10,9 +10,9 @@ exports.geometricReasonUsage = {
     connector: '=',
     instruction: '',
     label: "Utiliser la raison d'une suite géométrique",
-    levels: ['1', '0'],
+    levels: ['1reESM', '1reSpé', '1reTech'],
+    sections: ['Suites'],
     isSingleStep: false,
-    section: 'Suites',
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricReasonUsage, nb),
     keys: ['q', 'n', 'u', 'underscore'],
 };

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.js

@@ -10,9 +10,9 @@ exports.geometricRecurrenceFormulaUsage = {
     connector: '=',
     instruction: '',
     label: "Utiliser la formule de récurrence d'une suite géométrique",
-    levels: ['1', '0'],
+    levels: ['1reESM', '1reSpé', '1reTech'],
+    sections: ['Suites'],
     isSingleStep: false,
-    section: 'Suites',
     keys: ['q', 'n', 'u', 'underscore'],
     generator: (nb, options) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricRecurrenceFormulaUsage, nb),
 };

package/lib/exercises/squareRoots/simpifySquareRoot.js

@@ -10,9 +10,9 @@ exports.simplifySquareRoot = {
     connector: '=',
     instruction: 'Simplifier :',
     label: 'Simplification de racines carrées',
-    levels: ['3', '2', '1'],
     isSingleStep: false,
-    section: 'Racines carrées',
+    levels: ['3ème', '2nde', '1reESM'],
+    sections: ['Racines carrées'],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimplifySquareRoot, nb),
     keys: [],
 };

package/lib/exercises/trigonometry/mainRemarkableValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/mainRemarkableValues.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,4BAA4B,EAAE,QAU1C,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAalD"}
+{"version":3,"file":"mainRemarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/mainRemarkableValues.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI9D,eAAO,MAAM,4BAA4B,EAAE,QAU1C,CAAC;AAEF,wBAAgB,uBAAuB,IAAI,QAAQ,CAkDlD"}

package/lib/exercises/trigonometry/mainRemarkableValues.js

@@ -3,27 +3,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMainRemarkableValues = exports.mainRemarkableValuesExercise = void 0;
 const remarkableValue_1 = require("../../math/trigonometry/remarkableValue");
 const coinFlip_1 = require("../../utils/coinFlip");
+const shuffle_1 = require("../../utils/shuffle");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const uuid_1 = require("uuid");
 exports.mainRemarkableValuesExercise = {
     id: 'mainRemarkableValues',
     connector: '=',
     instruction: 'Donner la valeur exacte :',
-    label: 'Valeurs remarquables de cos et sin sur [-\\pi, \\pi]',
-    levels: ['1', '0'],
-    isSingleStep: false,
-    section: 'Trigonométrie',
+    label: 'Valeurs remarquables de $\\cos$ et $\\sin$ sur $[-\\pi, \\pi]$',
+    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    isSingleStep: true,
+    sections: ['Trigonométrie'],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMainRemarkableValues, nb),
     keys: ['pi', 'cos', 'sin'],
 };
 function getMainRemarkableValues() {
     const isCos = (0, coinFlip_1.coinFlip)();
     const remarkableValue = remarkableValue_1.RemarkableValueConstructor.mainInterval();
+    const answer = isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex();
+    const values = [
+        '-1',
+        '-\\frac{\\sqrt 3}{2}',
+        '-\\frac{\\sqrt 2}{2}',
+        '-\\frac{1}{2}',
+        '0',
+        '\\frac{\\sqrt 3}{2}',
+        '\\frac{\\sqrt 2}{2}',
+        '\\frac{1}{2}',
+        '1',
+    ];
+    (0, shuffle_1.shuffle)(values);
+    const getPropositions = (n) => {
+        const props = [
+            {
+                id: (0, uuid_1.v4)(),
+                statement: answer,
+                isRightAnswer: true,
+                format: 'tex',
+            },
+        ];
+        for (let i = 0; i < n - 1; i++) {
+            const statement = values.find((val) => !props.some((el) => el.statement === val));
+            props.push({
+                id: (0, uuid_1.v4)(),
+                statement,
+                isRightAnswer: false,
+                format: 'tex',
+            });
+        }
+        return (0, shuffle_1.shuffle)(props);
+    };
     const question = {
         startStatement: isCos
             ? `\\cos\\left(${remarkableValue.angle.toTex()}\\right)`
             : `\\sin\\left(${remarkableValue.angle.toTex()}\\right)`,
-        answer: isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex(),
+        answer: answer,
         keys: ['pi', 'cos', 'sin'],
+        answerFormat: 'tex',
+        getPropositions,
     };
     return question;
 }

package/lib/exercises/trigonometry/remarkableValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD,eAAO,MAAM,wBAAwB,EAAE,QAUtC,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAW9C"}
+{"version":3,"file":"remarkableValues.d.ts","sourceRoot":"","sources":["../../../src/exercises/trigonometry/remarkableValues.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI9D,eAAO,MAAM,wBAAwB,EAAE,QAUtC,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,CAiD9C"}

package/lib/exercises/trigonometry/remarkableValues.js

@@ -3,27 +3,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRemarkableValues = exports.remarkableValuesExercise = void 0;
 const remarkableValue_1 = require("../../math/trigonometry/remarkableValue");
 const coinFlip_1 = require("../../utils/coinFlip");
+const shuffle_1 = require("../../utils/shuffle");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const uuid_1 = require("uuid");
 exports.remarkableValuesExercise = {
     id: 'remarkableValues',
     connector: '=',
     instruction: 'Donner la valeur exacte :',
-    label: 'Valeurs remarquables de cos et sin',
-    levels: ['1', '0'],
-    isSingleStep: false,
-    section: 'Trigonométrie',
+    label: 'Valeurs remarquables de $\\cos$ et $\\sin$',
+    levels: ['1reSpé', 'TermSpé', 'MathComp'],
+    isSingleStep: true,
+    sections: ['Trigonométrie'],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getRemarkableValues, nb),
     keys: ['pi', 'cos', 'sin'],
 };
 function getRemarkableValues() {
     const isCos = (0, coinFlip_1.coinFlip)();
     const remarkableValue = remarkableValue_1.RemarkableValueConstructor.simplifiable();
+    const answer = isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex();
+    const values = [
+        '-1',
+        '-\\frac{\\sqrt 3}{2}',
+        '-\\frac{\\sqrt 2}{2}',
+        '-\\frac{1}{2}',
+        '0',
+        '\\frac{\\sqrt 3}{2}',
+        '\\frac{\\sqrt 2}{2}',
+        '\\frac{1}{2}',
+        '1',
+    ];
+    (0, shuffle_1.shuffle)(values);
+    const getPropositions = (n) => {
+        const props = [
+            {
+                id: (0, uuid_1.v4)(),
+                statement: answer,
+                isRightAnswer: true,
+                format: 'tex',
+            },
+        ];
+        for (let i = 0; i < n - 1; i++) {
+            const statement = values.find((val) => !props.some((el) => el.statement === val));
+            props.push({
+                id: (0, uuid_1.v4)(),
+                statement,
+                isRightAnswer: false,
+                format: 'tex',
+            });
+        }
+        return props;
+    };
     const question = {
         startStatement: isCos
             ? `\\cos\\left(${remarkableValue.angle.toTex()}\\right)`
             : `\\sin\\left(${remarkableValue.angle.toTex()}\\right)`,
-        answer: isCos ? remarkableValue.cos.toTex() : remarkableValue.sin.toTex(),
+        answer: answer,
         keys: ['pi', 'cos', 'sin'],
+        answerFormat: 'tex',
+        getPropositions,
     };
     return question;
 }

package/lib/index.d.ts

@@ -1,3 +1,8 @@
-declare const allMathExercises: import("./exercises/exercise").Exercise[];
-export { allMathExercises };
+import { Exercise, MathSection } from './exercises/exercise';
+declare const allMathExercises: Exercise[];
+declare const getAllMathExercisesBySection: () => {
+    section: MathSection;
+    exos: Exercise[];
+}[];
+export { allMathExercises, getAllMathExercisesBySection };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,gBAAgB,2CAAiB,CAAC;AAQxC,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAG7D,QAAA,MAAM,gBAAgB,YAAiB,CAAC;AAExC,QAAA,MAAM,4BAA4B;aACT,WAAW;UAAQ,QAAQ,EAAE;GAkBrD,CAAC;AACF,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,CAAC"}

package/lib/index.js

@@ -1,6 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allMathExercises = void 0;
+exports.getAllMathExercisesBySection = exports.allMathExercises = void 0;
 const exercises_1 = require("./exercises/exercises");
 const allMathExercises = [...exercises_1.exercises];
 exports.allMathExercises = allMathExercises;
+const getAllMathExercisesBySection = () => {
+    const data = [];
+    allMathExercises.forEach((exo) => {
+        const sectionsData = data.filter((el) => exo.sections.includes(el.section));
+        if (!sectionsData.length) {
+            exo.sections.forEach((section) => data.push({
+                section,
+                exos: [exo],
+            }));
+        }
+        else {
+            sectionsData.forEach((sectionData) => {
+                var _a;
+                (_a = data.find((d) => d.section === sectionData.section)) === null || _a === void 0 ? void 0 : _a.exos.push(exo);
+            });
+        }
+    });
+    return data;
+};
+exports.getAllMathExercisesBySection = getAllMathExercisesBySection;

package/lib/server.js

@@ -17,22 +17,25 @@ const runServer = () => {
     });
     app.get('/exo', (req, res) => {
         const exoId = req.query.exoId;
-        const exo = allExercises.find((exo) => exo.id == exoId);
+        const exoIndex = allExercises.findIndex((exo) => exo.id == exoId);
+        const exo = allExercises[exoIndex];
         if (!exo)
             res.send('Exo not found');
         const questions = exo === null || exo === void 0 ? void 0 : exo.generator(10);
         res.json({
             exercise: exo,
             questions,
+            nextId: allExercises[(exoIndex + 1) % allExercises.length].id,
+            prevId: allExercises[(exoIndex - 1 + allExercises.length) % allExercises.length].id,
         });
     });
     app.get('/qcmExo', (req, res) => {
         const exoId = req.query.exoId;
-        const exo = allExercises.find((exo) => exo.id == exoId);
+        const exoIndex = allExercises.findIndex((exo) => exo.id == exoId);
+        const exo = allExercises[exoIndex];
         if (!exo)
             res.send('Exo not found');
         const questions = exo === null || exo === void 0 ? void 0 : exo.generator(10);
-        console.log(questions);
         const populatedQuestions = questions === null || questions === void 0 ? void 0 : questions.map((q) => {
             var _a;
             return Object.assign(Object.assign({}, q), { propositions: (_a = q.getPropositions) === null || _a === void 0 ? void 0 : _a.call(q, 4) });
@@ -40,6 +43,8 @@ const runServer = () => {
         res.json({
             exercise: exo,
             questions: populatedQuestions,
+            nextId: allExercises[(exoIndex + 1) % allExercises.length].id,
+            prevId: allExercises[(exoIndex - 1 + allExercises.length) % allExercises.length].id,
         });
     });
     app.listen('5000', () => {

package/package.json

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