math-exercises 1.3.66 → 1.3.67

package/lib/math/numbers/rationals/rational.js

@@ -7,6 +7,7 @@ const lcd_1 = require("../../../math/utils/arithmetic/lcd");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const coinFlip_1 = require("../../../utils/coinFlip");
 const random_1 = require("../../../utils/random");
 const shuffle_1 = require("../../../utils/shuffle");
 const integer_1 = require("../integer/integer");
@@ -34,6 +35,15 @@ class RationalConstructor {
         const [num, denum] = (0, shuffle_1.shuffle)([a, b]);
         return new Rational(num, denum);
     }
+    static randomIrreductibleWithSign(max = 11) {
+        const sign = (0, coinFlip_1.coinFlip)() ? 1 : -1;
+        const a = (0, randint_1.randint)(2, max);
+        const b = (0, random_1.random)([...(0, coprimesOf_1.coprimesOf)(a), 1]);
+        if (b === 1)
+            return new Rational(sign * b, a);
+        const [num, denum] = (0, shuffle_1.shuffle)([a, b]);
+        return new Rational(sign * num, denum);
+    }
 }
 exports.RationalConstructor = RationalConstructor;
 class Rational {

package/lib/math/polynomials/polynomial.d.ts

@@ -1,8 +1,9 @@
 import { Node } from '../../tree/nodes/node';
-export declare function createRandomPolynomialWithOrder(order: number, variable?: string): Polynomial;
 export declare abstract class PolynomialConstructor {
     static randomWithOrder(order: number, variable?: string): Polynomial;
     static random(maxOrder: number, variable?: string): Polynomial;
+    static randomWithLength(maxOrder: number, length: number, variable?: string): Polynomial;
+    static randomWithLengthAndSameSigns(maxOrder: number, length: number, variable?: string): Polynomial;
 }
 export declare class Polynomial {
     degree: number;

package/lib/math/polynomials/polynomial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polynomial.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/polynomial.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAU7C,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY,GAAG,UAAU,CAYjG;AAED,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAa5D,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;CAavD;AAED,qBAAa,UAAU;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;OAIG;gBACS,YAAY,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAY;IAS1D,MAAM,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAG9B,QAAQ,IAAI,MAAM,EAAE;IA8BpB,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAc9B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU;IAM7B,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAkBnC,QAAQ,IAAI,UAAU;IAOtB,QAAQ,IAAI,UAAU;IAQtB,SAAS,IAAI,UAAU;IAMvB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAM5B,QAAQ,CAAC,EAAE,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM;IAiB7C,MAAM,IAAI,IAAI;IAmCd,KAAK,IAAI,MAAM;IAkBf,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"polynomial.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/polynomial.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAW7C,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAa5D,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IActD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAmBhF,MAAM,CAAC,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;CAmB7F;AAED,qBAAa,UAAU;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;OAIG;gBACS,YAAY,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAY;IAS1D,MAAM,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAG9B,QAAQ,IAAI,MAAM,EAAE;IA8BpB,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAc9B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU;IAM7B,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAkBnC,QAAQ,IAAI,UAAU;IAOtB,QAAQ,IAAI,UAAU;IAQtB,SAAS,IAAI,UAAU;IAMvB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAM5B,QAAQ,CAAC,EAAE,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM;IAiB7C,MAAM,IAAI,IAAI;IAmCd,KAAK,IAAI,MAAM;IAkBf,QAAQ,IAAI,MAAM;CAGnB"}

package/lib/math/polynomials/polynomial.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Polynomial = exports.PolynomialConstructor = exports.createRandomPolynomialWithOrder = void 0;
+exports.Polynomial = exports.PolynomialConstructor = void 0;
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
@@ -8,18 +8,7 @@ const oppositeNode_1 = require("../../tree/nodes/functions/oppositeNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
 const randint_1 = require("../../math/utils/random/randint");
-function createRandomPolynomialWithOrder(order, variable = 'x') {
-    if (order < 0) {
-        throw Error('Order must be a non-negative integer');
-    }
-    const coefficients = [];
-    for (let i = 0; i <= order - 1; i++) {
-        coefficients.push((0, randint_1.randint)(-9, 10));
-    }
-    coefficients.push((0, randint_1.randint)(-9, 10, [0]));
-    return new Polynomial(coefficients, variable);
-}
-exports.createRandomPolynomialWithOrder = createRandomPolynomialWithOrder;
+const coinFlip_1 = require("../../utils/coinFlip");
 class PolynomialConstructor {
     static randomWithOrder(order, variable = 'x') {
         if (order < 0) {
@@ -44,6 +33,45 @@ class PolynomialConstructor {
         coefficients.push((0, randint_1.randint)(-9, 10, [0]));
         return new Polynomial(coefficients, variable);
     }
+    static randomWithLength(maxOrder, length, variable = 'x') {
+        if (maxOrder < 0) {
+            throw Error('Order must be a non-negative integer');
+        }
+        const order = (0, randint_1.randint)(1, maxOrder + 1);
+        const coefficients = [];
+        const otherTermDegrees = [];
+        for (let i = 0; i < length - 1; i++) {
+            otherTermDegrees.push((0, randint_1.randint)(0, order));
+        }
+        for (let i = 0; i <= order - 1; i++) {
+            if (otherTermDegrees.includes(i))
+                coefficients.push((0, randint_1.randint)(-9, 10, [0]));
+            else
+                coefficients.push(0);
+        }
+        coefficients.push((0, randint_1.randint)(-9, 10, [0]));
+        return new Polynomial(coefficients, variable);
+    }
+    static randomWithLengthAndSameSigns(maxOrder, length, variable = 'x') {
+        if (maxOrder < 0) {
+            throw Error('Order must be a non-negative integer');
+        }
+        const order = (0, randint_1.randint)(1, maxOrder + 1);
+        const coefficients = [];
+        const otherTermDegrees = [];
+        const sign = (0, coinFlip_1.coinFlip)() ? 1 : -1;
+        for (let i = 0; i < length - 1; i++) {
+            otherTermDegrees.push((0, randint_1.randint)(0, order));
+        }
+        for (let i = 0; i <= order - 1; i++) {
+            if (otherTermDegrees.includes(i))
+                coefficients.push(sign * (0, randint_1.randint)(0, 10, [0]));
+            else
+                coefficients.push(0);
+        }
+        coefficients.push(sign * (0, randint_1.randint)(0, 10, [0]));
+        return new Polynomial(coefficients, variable);
+    }
 }
 exports.PolynomialConstructor = PolynomialConstructor;
 class Polynomial {

package/lib/math/sequences/geometricSequence.d.ts

@@ -1,4 +1,14 @@
+import { MultiplyNode } from '../../tree/nodes/operators/multiplyNode';
+import { Nombre, NumberType } from '../numbers/nombre';
 export declare abstract class GeometricSequenceConstructor {
-    static random(): void;
+    static random(reasonType?: NumberType): GeometricSequence;
+    static randomWithLimit(reasonType?: NumberType): GeometricSequence;
+}
+export declare class GeometricSequence {
+    firstTerm: Nombre;
+    reason: Nombre;
+    constructor(firstTerm: Nombre, reason: Nombre);
+    getLimit(): string | null;
+    toTree(): MultiplyNode;
 }
 //# sourceMappingURL=geometricSequence.d.ts.map

package/lib/math/sequences/geometricSequence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometricSequence.d.ts","sourceRoot":"","sources":["../../../src/math/sequences/geometricSequence.ts"],"names":[],"mappings":"AAEA,8BAAsB,4BAA4B;IAC9C,MAAM,CAAC,MAAM;CAGhB"}
+{"version":3,"file":"geometricSequence.d.ts","sourceRoot":"","sources":["../../../src/math/sequences/geometricSequence.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAOvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIvD,8BAAsB,4BAA4B;IAChD,MAAM,CAAC,MAAM,CAAC,UAAU,GAAE,UAA+B;IAkBzD,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,UAAU;CAmB/C;AAED,qBAAa,iBAAiB;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;gBAEH,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAK7C,QAAQ;IAMR,MAAM;CAGP"}

package/lib/math/sequences/geometricSequence.js

@@ -1,8 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeometricSequenceConstructor = void 0;
+exports.GeometricSequence = exports.GeometricSequenceConstructor = void 0;
+const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../tree/nodes/operators/powerNode");
+const variableNode_1 = require("../../tree/nodes/variables/variableNode");
+const coinFlip_1 = require("../../utils/coinFlip");
+const random_1 = require("../../utils/random");
+const decimal_1 = require("../numbers/decimals/decimal");
+const integer_1 = require("../numbers/integer/integer");
+const nombre_1 = require("../numbers/nombre");
+const rational_1 = require("../numbers/rationals/rational");
+const randint_1 = require("../utils/random/randint");
 class GeometricSequenceConstructor {
-    static random() {
+    static random(reasonType = nombre_1.NumberType.Integer) {
+        let reason;
+        const type = reasonType ?? (0, random_1.random)([nombre_1.NumberType.Decimal, nombre_1.NumberType.Integer, nombre_1.NumberType.Rational]);
+        switch (type) {
+            case nombre_1.NumberType.Decimal:
+                reason = decimal_1.DecimalConstructor.random(-9, 10);
+                break;
+            case nombre_1.NumberType.Integer:
+                reason = new integer_1.Integer((0, randint_1.randint)(-9, 10, [0, 1]));
+                break;
+            case nombre_1.NumberType.Rational:
+                reason = rational_1.RationalConstructor.randomIrreductible();
+                break;
+            case nombre_1.NumberType.Real:
+                throw Error('real geometric reason not supported yet');
+        }
+        return new GeometricSequence(new integer_1.Integer((0, randint_1.randint)(-9, 10, [0, 1])), reason);
+    }
+    static randomWithLimit(reasonType) {
+        let reason;
+        const type = reasonType ?? (0, random_1.random)([nombre_1.NumberType.Decimal, nombre_1.NumberType.Integer, nombre_1.NumberType.Rational]);
+        switch (type) {
+            case nombre_1.NumberType.Decimal:
+                reason = (0, coinFlip_1.coinFlip)() ? decimal_1.DecimalConstructor.random(-1, 1) : decimal_1.DecimalConstructor.random(1, 10);
+                break;
+            case nombre_1.NumberType.Integer:
+                reason = new integer_1.Integer((0, randint_1.randint)(2, 10, [0, 1]));
+                break;
+            case nombre_1.NumberType.Rational:
+                reason = rational_1.RationalConstructor.randomIrreductible();
+                break;
+            case nombre_1.NumberType.Real:
+                throw Error('real geometric reason not supported yet');
+        }
+        return new GeometricSequence(new integer_1.Integer((0, randint_1.randint)(-9, 10, [0, 1])), reason);
     }
 }
 exports.GeometricSequenceConstructor = GeometricSequenceConstructor;
+class GeometricSequence {
+    constructor(firstTerm, reason) {
+        this.firstTerm = firstTerm;
+        this.reason = reason;
+    }
+    getLimit() {
+        if (this.reason.value < -1)
+            return null;
+        if (this.reason.value === 1 || this.reason.value === -1)
+            return this.firstTerm + '';
+        if (this.reason.value > 1)
+            return this.firstTerm.value > 0 ? '+\\infty' : '-\\infty';
+        return '0';
+    }
+    toTree() {
+        return new multiplyNode_1.MultiplyNode(this.firstTerm.toTree(), new powerNode_1.PowerNode(this.reason.toTree(), new variableNode_1.VariableNode('n')));
+    }
+}
+exports.GeometricSequence = GeometricSequence;

package/lib/tree/nodes/operators/multiplyNode.js

@@ -41,7 +41,7 @@ class MultiplyNode extends operatorNode_1.OperatorNode {
         let showTimesSign = !isNaN(+rightTex[0]) || this.rightChild.type === node_1.NodeType.number;
         if (this.rightChild.type === node_1.NodeType.operator) {
             const operatorRightChild = this.rightChild;
-            showTimesSign ||= [operatorNode_1.OperatorIds.fraction].includes(operatorRightChild.id);
+            showTimesSign ||= [operatorNode_1.OperatorIds.fraction, operatorNode_1.OperatorIds.power].includes(operatorRightChild.id);
         }
         const nextIsLetter = rightTex[0].toLowerCase() !== rightTex[0].toUpperCase();
         return `${leftTex}${showTimesSign ? `\\times${nextIsLetter ? ' ' : ''}` : ''}${rightTex}`;

package/lib/tree/nodes/operators/powerNode.js

@@ -27,7 +27,7 @@ class PowerNode extends operatorNode_1.OperatorNode {
             ].includes(childOperator.id);
         }
         if (needBrackets)
-            leftTex = `(${leftTex})`;
+            leftTex = `\\left(${leftTex}\\right)`;
         const needBrace = rightTex.length > 1;
         if (needBrace)
             return `${leftTex}^{${rightTex}}`;

package/package.json

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