math-exercises 1.3.8 → 1.3.9

package/lib/exercises/calculLitteral/factorisation/factoIdRmq.d.ts

@@ -0,0 +1,7 @@
+/**
+ *  type (ax+b)(cx+d) ± (ax+b)(ex+f)
+ */
+import { Exercise, Question } from '../../../exercises/exercise';
+export declare const factoType1Exercise: Exercise;
+export declare function getFactoType1Question(): Question;
+//# sourceMappingURL=factoIdRmq.d.ts.map

package/lib/exercises/calculLitteral/factorisation/factoIdRmq.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"factoIdRmq.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS9D,eAAO,MAAM,kBAAkB,EAAE,QAShC,CAAC;AAEF,wBAAgB,qBAAqB,IAAI,QAAQ,CA4BhD"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq.js

@@ -0,0 +1,38 @@
+"use strict";
+/**
+ *  type (ax+b)(cx+d) ± (ax+b)(ex+f)
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFactoType1Question = exports.factoType1Exercise = void 0;
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../math/polynomials/affine");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
+const random_1 = require("../../../utils/random");
+const shuffle_1 = require("../../../utils/shuffle");
+exports.factoType1Exercise = {
+    id: 'factoIdRmq1',
+    connector: '=',
+    instruction: 'Factoriser :',
+    isSingleStep: false,
+    label: 'Factorisation du type $(ax+b)(cx+d) \\pm (ax+b)(ex+f)$',
+    levels: ['3', '2'],
+    section: 'Calcul littéral',
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactoType1Question, nb),
+};
+function getFactoType1Question() {
+    const affines = affine_1.AffineConstructor.differentRandoms(3);
+    const permut = [(0, shuffle_1.shuffle)([affines[0], affines[1]]), (0, shuffle_1.shuffle)([affines[0], affines[2]])];
+    const operation = (0, random_1.random)(['add', 'substract']);
+    const statementTree = operation === 'add'
+        ? new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(permut[0][0].toTree(), permut[0][1].toTree()), new multiplyNode_1.MultiplyNode(permut[1][0].toTree(), permut[1][1].toTree()))
+        : new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(permut[0][0].toTree(), permut[0][1].toTree()), new multiplyNode_1.MultiplyNode(permut[1][0].toTree(), permut[1][1].toTree()));
+    const answerTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].add(operation === 'add' ? affines[2] : affines[2].opposite()).toTree());
+    const question = {
+        startStatement: statementTree.toTex(),
+        answer: answerTree.toTex(),
+    };
+    return question;
+}
+exports.getFactoType1Question = getFactoType1Question;

package/lib/exercises/exercise.d.ts

@@ -1,3 +1,4 @@
+export type GeneratorOptions = {};
 export interface Question {
     instruction?: string;
     startStatement?: string;
@@ -11,6 +12,6 @@ export interface Exercise {
     section: string;
     levels: string[];
     connector: string;
-    generator(nb: number): Question[];
+    generator(nb: number, options: GeneratorOptions): Question[];
 }
 //# 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,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;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,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CACnC"}
+{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;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,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,QAAQ,EAAE,CAAC;CAC9D"}

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

@@ -1 +1 @@
-{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,SAAS,iCAoErB,CAAC"}
+{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAyCA,eAAO,MAAM,SAAS,iCA6ErB,CAAC"}

package/lib/exercises/exercises.js

@@ -29,6 +29,11 @@ const powersOfTenToDecimal_1 = require("./powers/powersOfTenToDecimal");
 const powersPower_1 = require("./powers/powersPower");
 const powersProduct_1 = require("./powers/powersProduct");
 const scientificToDecimal_1 = require("./powers/scientificToDecimal");
+const geometricExplicitFormulaUsage_1 = require("./sequences/geometric/geometricExplicitFormulaUsage");
+const geometricFindExplicitFormula_1 = require("./sequences/geometric/geometricFindExplicitFormula");
+const geometricFindReason_1 = require("./sequences/geometric/geometricFindReason");
+const geometricReasonUsage_1 = require("./sequences/geometric/geometricReasonUsage");
+const geometricRecurrenceFormulaUsage_1 = require("./sequences/geometric/geometricRecurrenceFormulaUsage");
 const simpifySquareRoot_1 = require("./squareRoots/simpifySquareRoot");
 exports.exercises = [
     /**
@@ -91,4 +96,12 @@ exports.exercises = [
     powersProduct_1.powersOfTenProduct,
     scientificToDecimal_1.scientificToDecimal,
     powersOfTenToDecimal_1.powersOfTenToDecimal,
+    /**
+     * suites
+     */
+    geometricExplicitFormulaUsage_1.geometricExplicitFormulaUsage,
+    geometricFindReason_1.geometricFindReason,
+    geometricFindExplicitFormula_1.geometricFindExplicitFormula,
+    geometricReasonUsage_1.geometricReasonUsage,
+    geometricRecurrenceFormulaUsage_1.geometricRecurrenceFormulaUsage,
 ];

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

@@ -12,7 +12,7 @@ exports.geometricExplicitFormulaUsage = {
     id: 'geometricExplicitFormulaUsage',
     connector: '=',
     instruction: '',
-    label: "Utiliser la formule explicite d'une suite géométrique",
+    label: "Utiliser la formule générale d'une suite géométrique",
     levels: ['1', '0'],
     isSingleStep: false,
     section: 'Suites',

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

@@ -12,7 +12,7 @@ exports.geometricFindExplicitFormula = {
     id: 'geometricFindExplicitFormula',
     connector: '=',
     instruction: '',
-    label: "Déterminer la formule explicite d'une suite géométrique",
+    label: "Déterminer la formule générale d'une suite géométrique",
     levels: ['1', '0'],
     isSingleStep: false,
     section: 'Suites',

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.d.ts

@@ -1,4 +1,8 @@
-import { Exercise, Question } from '../../../exercises/exercise';
+import { Exercise, GeneratorOptions, Question } from '../../../exercises/exercise';
+interface GeometricRecurrenceFormulaUsageOptions extends GeneratorOptions {
+    test: boolean;
+}
 export declare const geometricRecurrenceFormulaUsage: Exercise;
-export declare function getGeometricRecurrenceFormulaUsage(): Question;
+export declare function getGeometricRecurrenceFormulaUsage(options: GeometricRecurrenceFormulaUsageOptions): Question;
+export {};
 //# sourceMappingURL=geometricRecurrenceFormulaUsage.d.ts.map

package/lib/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAS9D,eAAO,MAAM,+BAA+B,EAAE,QAS7C,CAAC;AAEF,wBAAgB,kCAAkC,IAAI,QAAQ,CAY7D"}
+{"version":3,"file":"geometricRecurrenceFormulaUsage.d.ts","sourceRoot":"","sources":["../../../../src/exercises/sequences/geometric/geometricRecurrenceFormulaUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIhF,UAAU,sCAAuC,SAAQ,gBAAgB;IACvE,IAAI,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,+BAA+B,EAAE,QAU7C,CAAC;AAEF,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,sCAAsC,GAAG,QAAQ,CAY5G"}

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

@@ -11,9 +11,9 @@ exports.geometricRecurrenceFormulaUsage = {
     levels: ['1', '0'],
     isSingleStep: false,
     section: 'Suites',
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricRecurrenceFormulaUsage, nb),
+    generator: (nb, options) => (0, getDistinctQuestions_1.getDistinctQuestions)(getGeometricRecurrenceFormulaUsage, nb),
 };
-function getGeometricRecurrenceFormulaUsage() {
+function getGeometricRecurrenceFormulaUsage(options) {
     const firstRank = (0, randint_1.randint)(1, 20);
     const firstValue = (0, randint_1.randint)(1, 10);
     const reason = (0, randint_1.randint)(2, 10);

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,QAAA,MAAM,YAAY,2CAAiB,CAAC;AAcpC,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,YAAY,2CAAiB,CAAC;AAMpC,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/lib/index.js

@@ -2,21 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.allExercises = void 0;
 const exercises_1 = require("./exercises/exercises");
-const geometricExplicitFormulaUsage_1 = require("./exercises/sequences/geometric/geometricExplicitFormulaUsage");
-const geometricFindExplicitFormula_1 = require("./exercises/sequences/geometric/geometricFindExplicitFormula");
-const geometricFindReason_1 = require("./exercises/sequences/geometric/geometricFindReason");
-const geometricReasonUsage_1 = require("./exercises/sequences/geometric/geometricReasonUsage");
-const geometricRecurrenceFormulaUsage_1 = require("./exercises/sequences/geometric/geometricRecurrenceFormulaUsage");
 const allExercises = [...exercises_1.exercises];
 exports.allExercises = allExercises;
-const exos = [
-    geometricExplicitFormulaUsage_1.geometricExplicitFormulaUsage,
-    geometricFindExplicitFormula_1.geometricFindExplicitFormula,
-    geometricFindReason_1.geometricFindReason,
-    geometricReasonUsage_1.geometricReasonUsage,
-    geometricRecurrenceFormulaUsage_1.geometricRecurrenceFormulaUsage,
-];
-exos.forEach((exo) => {
-    console.log(exo);
-    console.log(exo.generator(10));
-});

package/package.json

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