math-exercises 1.3.44 → 1.3.46

package/lib/exercises/exercise.d.ts

@@ -9,24 +9,24 @@ export interface Question {
     instruction?: string;
     startStatement?: string;
     answer: string;
-    answerFormat?: 'tex' | 'raw';
+    answerFormat: 'tex' | 'raw';
     keys?: string[];
     commands?: string[];
     coords?: number[];
     options?: any;
-    getPropositions?: (n: number) => Proposition[];
+    getPropositions: (n: number) => Proposition[];
 }
 export interface Exercise {
     id: string;
     instruction: string;
     isSingleStep: boolean;
     label: string;
-    sections: Section[];
-    levels: Level[];
+    sections: MathSection[];
+    levels: MathLevel[];
     connector: '=' | '\\iff' | '\\approx';
     keys?: string[];
     generator(nb: number, options?: GeneratorOptions): Question[];
 }
-export type Level = '6ème' | '5ème' | '4ème' | '3ème' | '2nde' | '1reTech' | '1reESM' | '1reSpé' | 'TermSpé' | 'TermTech' | 'MathExp' | 'MathComp';
-export type Section = 'Calcul littéral' | 'Équations' | 'Racines carrées' | 'Fractions' | 'Calculs' | 'Géométrie cartésienne' | 'Vecteurs' | 'Puissances' | 'Suites' | 'Pourcentages' | 'Dérivation' | 'Probabilités' | 'Droites' | 'Géométrie euclidienne' | 'Conversions' | 'Arithmétique' | 'Fonctions affines' | 'Proportionnalité' | 'Logarithme népérien' | 'Exponentielle' | 'Fonctions' | 'Statistiques' | 'Limites' | 'Intégration' | 'Primitives' | 'Équations différentielles' | 'Trigonométrie';
+export type MathLevel = '6ème' | '5ème' | '4ème' | '3ème' | '2nde' | '1reTech' | '1reESM' | '1reSpé' | 'TermSpé' | 'TermTech' | 'MathExp' | 'MathComp';
+export type MathSection = 'Calcul littéral' | 'Équations' | 'Racines carrées' | 'Fractions' | 'Calculs' | 'Géométrie cartésienne' | 'Vecteurs' | 'Puissances' | 'Suites' | 'Pourcentages' | 'Dérivation' | 'Probabilités' | 'Droites' | 'Géométrie euclidienne' | 'Conversions' | 'Arithmétique' | 'Fonctions affines' | 'Proportionnalité' | 'Logarithme népérien' | 'Exponentielle' | 'Fonctions' | 'Statistiques' | 'Limites' | 'Intégration' | 'Primitives' | 'Équations différentielles' | 'Trigonométrie';
 //# sourceMappingURL=exercise.d.ts.map

package/lib/exercises/exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;CAChD;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;CAC/D;AAED,MAAM,MAAM,KAAK,GACb,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,CAAC;AAEf,MAAM,MAAM,OAAO,GACf,iBAAiB,GACjB,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,SAAS,GACT,uBAAuB,GACvB,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,cAAc,GACd,YAAY,GACZ,cAAc,GACd,SAAS,GACT,uBAAuB,GACvB,aAAa,GACb,cAAc,GACd,mBAAmB,GACnB,kBAAkB,GAClB,qBAAqB,GACrB,eAAe,GACf,WAAW,GACX,cAAc,GACd,SAAS,GACT,aAAa,GACb,YAAY,GACZ,2BAA2B,GAC3B,eAAe,CAAC"}
+{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;CAC/C;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACtC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;CAC/D;AAED,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,CAAC;AAEf,MAAM,MAAM,WAAW,GACnB,iBAAiB,GACjB,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,SAAS,GACT,uBAAuB,GACvB,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,cAAc,GACd,YAAY,GACZ,cAAc,GACd,SAAS,GACT,uBAAuB,GACvB,aAAa,GACb,cAAc,GACd,mBAAmB,GACnB,kBAAkB,GAClB,qBAAqB,GACrB,eAAe,GACf,WAAW,GACX,cAAc,GACd,SAAS,GACT,aAAa,GACb,YAAY,GACZ,2BAA2B,GAC3B,eAAe,CAAC"}

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,7 +3,9 @@ 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: '=',
@@ -18,12 +20,47 @@ exports.mainRemarkableValuesExercise = {
 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,7 +3,9 @@ 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: '=',
@@ -18,12 +20,47 @@ exports.remarkableValuesExercise = {
 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,7 +1,7 @@
-import { Exercise, Section } from './exercises/exercise';
+import { Exercise, MathSection } from './exercises/exercise';
 declare const allMathExercises: Exercise[];
 declare const getAllMathExercisesBySection: () => {
-    section: Section;
+    section: MathSection;
     exos: Exercise[];
 }[];
 export { allMathExercises, getAllMathExercisesBySection };

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,gBAAgB,YAAiB,CAAC;AAExC,QAAA,MAAM,4BAA4B;aACT,OAAO;UAAQ,QAAQ,EAAE;GAkBjD,CAAC;AACF,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,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/package.json

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