math-exercises 1.3.63 → 1.3.65

package/lib/math/sets/intervals/intervals.js

@@ -44,14 +44,19 @@ class IntervalConstructor {
                 tex = `]${a};${b}[`;
                 break;
         }
-        //-inf; x[
-        //[x; inf
-        //[a,b]
-        //[ [
-        //] ]
-        //] [
         return new Interval(tex);
     }
+    static differentRandoms(nb) {
+        const res = [];
+        for (let i = 0; i < nb; i++) {
+            let interval;
+            do {
+                interval = this.random();
+            } while (res.some((int) => int.tex === interval.tex));
+            res.push(this.random());
+        }
+        return res;
+    }
 }
 exports.IntervalConstructor = IntervalConstructor;
 var BoundType;
@@ -79,8 +84,8 @@ class Interval {
         switch (`${left}a;b${right}`) {
             case '[a;b]':
                 this.leftBracket = '[';
-                this.leftInequalitySymbol = '\\leq';
-                this.rightInequalitySymbol = '\\leq';
+                this.leftInequalitySymbol = '\\le';
+                this.rightInequalitySymbol = '\\le';
                 this.rightBracket = ']';
                 this.boundType = BoundType.FF;
                 break;
@@ -94,7 +99,7 @@ class Interval {
             case '[a;b[':
                 this.leftBracket = '[';
                 this.rightBracket = '[';
-                this.leftInequalitySymbol = '\\leq';
+                this.leftInequalitySymbol = '\\le';
                 this.rightInequalitySymbol = '<';
                 this.boundType = BoundType.FO;
                 break;
@@ -102,7 +107,7 @@ class Interval {
                 this.leftBracket = ']';
                 this.rightBracket = ']';
                 this.leftInequalitySymbol = '<';
-                this.rightInequalitySymbol = '\\leq';
+                this.rightInequalitySymbol = '\\le';
                 this.boundType = BoundType.OF;
                 break;
             default:
@@ -118,17 +123,68 @@ class Interval {
         this.min = getBound(a);
         this.max = getBound(b);
     }
-    // union(interval: Interval): MathSet {
-    //[a,b] [c,d]
-    //si a=c return a, max(b,d)
-    //si si b = d return min(a,c), b
-    //si a=d return c,b sauf si  OXXO
-    //si b=c return a,d sauf si XOOX
-    //si c > b ou d < a alors union disjointe avec plus petit en 1er
-    //sinon return min(a,c), max(b,d)
-    //res = a
-    // return new MathSet();
-    // }
+    union(interval) {
+        let unionRightBracket = this.max > interval.max
+            ? this.rightBracket
+            : this.max === interval.max
+                ? this.rightBracket === ']' || interval.rightBracket === ']'
+                    ? ']'
+                    : '['
+                : interval.rightBracket;
+        let unionLeftBracket = this.min < interval.min
+            ? this.leftBracket
+            : this.max === interval.max
+                ? this.leftBracket === '[' || interval.leftBracket === '['
+                    ? '['
+                    : ']'
+                : interval.leftBracket;
+        let min = Math.min(this.min, interval.min);
+        let minTex = this.min < interval.min ? this.minTex : interval.minTex;
+        let max = Math.max(this.max, interval.max);
+        let maxTex = this.max > interval.max ? this.maxTex : interval.maxTex;
+        if (this.max < interval.min ||
+            this.min > interval.max ||
+            (this.max === interval.min && this.rightBracket === '[' && interval.leftBracket === ']') ||
+            (this.min === interval.max && this.leftBracket === ']' && interval.rightBracket === '[')) {
+            const firstInterval = this.min < interval.min ? this : interval;
+            const secondInterval = this.min < interval.min ? interval : this;
+            return new mathSet_1.MathSet(`\\left${unionLeftBracket}${firstInterval.minTex};${firstInterval.maxTex}\\right${firstInterval.rightBracket}\\cup\\left${secondInterval.leftBracket}${secondInterval.minTex};${secondInterval.maxTex}\\right${unionRightBracket}`, () => ((0, coinFlip_1.coinFlip)() ? firstInterval.getRandomElement() : secondInterval.getRandomElement()));
+        }
+        else {
+            return new Interval(`${unionLeftBracket}${minTex};${maxTex}${unionRightBracket}`);
+        }
+    }
+    intersection(interval) {
+        const a = this.min;
+        const b = this.max;
+        const c = interval.min;
+        const d = interval.max;
+        //[a,b] n [c,d]
+        const isDisjoint = b < c ||
+            d < a ||
+            (b === c && (this.rightBracket === '[' || interval.leftBracket === ']')) ||
+            (a === d && (interval.rightBracket === '[' || this.leftBracket === ']'));
+        if (isDisjoint) {
+            return new mathSet_1.MathSet('\\emptyset', () => null);
+        }
+        const winningLeftBracket = (brack1, brack2) => (brack1 === ']' || brack2 === ']' ? ']' : '[');
+        const winningRightBracket = (brack1, brack2) => brack1 === '[' || brack2 === '[' ? '[' : ']';
+        let min = Math.max(a, c);
+        let minTex = a >= c ? this.minTex : interval.minTex;
+        let leftBracket = a === c
+            ? winningLeftBracket(this.leftBracket, interval.leftBracket)
+            : a > c
+                ? this.leftBracket
+                : interval.leftBracket;
+        const max = Math.min(b, d);
+        let maxTex = b <= d ? this.maxTex : interval.maxTex;
+        let rightBracket = b === d
+            ? winningRightBracket(this.rightBracket, interval.rightBracket)
+            : b < d
+                ? this.rightBracket
+                : interval.rightBracket;
+        return new Interval(`${leftBracket}${minTex};${maxTex}${rightBracket}`);
+    }
     exclude(nb) {
         const rand = () => {
             let x;
@@ -149,30 +205,30 @@ class Interval {
         };
         return new mathSet_1.MathSet(this.toTex() + `\\ ${set.toTex()}`, rand);
     }
-    toTex() {
-        return this.tex;
-    }
     insideToTex() {
         return this.tex.replaceAll('[', '').replaceAll(']', '');
     }
+    toTex() {
+        return `\\left${this.leftBracket}${this.insideToTex()}\\right${this.rightBracket}`;
+    }
     toInequality() {
         const isLeftClosed = this.boundType === BoundType.FO || this.boundType === BoundType.FF;
         const isRightClosed = this.boundType === BoundType.FF || this.boundType === BoundType.OF;
         if (this.max === Infinity) {
             if (isLeftClosed) {
-                return `x \\geq ${this.min}`;
+                return `x\\ge${this.min}`;
             }
             else
-                return `x > ${this.min}`;
+                return `x>${this.min}`;
         }
         else if (this.min === -Infinity) {
             if (this.boundType === BoundType.OF) {
-                return `x \\leq ${this.max}`;
+                return `x\\le${this.max}`;
             }
             else
-                return `x < ${this.max}`;
+                return `x<${this.max}`;
         }
-        return `${this.min} ${isLeftClosed ? '\\leq' : '<'} x ${isRightClosed ? '\\leq' : '<'} ${this.max}`;
+        return `${this.min}${isLeftClosed ? '\\le x' : '<x'}${isRightClosed ? '\\le' : '<'}${this.max}`;
     }
     getRandomElement(precision = this.type === nombre_1.NumberType.Integer ? 0 : 2) {
         if (this.min === -Infinity || this.max === Infinity)

package/lib/math/sets/mathSet.d.ts

@@ -1,8 +1,9 @@
-import { Nombre } from "../numbers/nombre";
-import { MathSetInterface } from "./mathSetInterface";
+import { Nombre } from '../numbers/nombre';
+import { MathSetInterface } from './mathSetInterface';
 export declare class MathSet implements MathSetInterface {
     tex: string;
-    getRandomElement: () => Nombre;
-    constructor(tex: string, getRandomElement: () => Nombre);
+    toTex: () => string;
+    getRandomElement: () => Nombre | null;
+    constructor(tex: string, getRandomElement: () => Nombre | null);
 }
 //# sourceMappingURL=mathSet.d.ts.map

package/lib/math/sets/mathSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mathSet.d.ts","sourceRoot":"","sources":["../../../src/math/sets/mathSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,OAAQ,YAAW,gBAAgB;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,MAAM,CAAC;gBACnB,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,MAAM;CAIxD"}
+{"version":3,"file":"mathSet.d.ts","sourceRoot":"","sources":["../../../src/math/sets/mathSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,OAAQ,YAAW,gBAAgB;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;gBAC1B,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,MAAM,GAAG,IAAI;CAK/D"}

package/lib/math/sets/mathSet.js

@@ -5,6 +5,7 @@ class MathSet {
     constructor(tex, getRandomElement) {
         this.tex = tex;
         this.getRandomElement = getRandomElement;
+        this.toTex = () => tex;
     }
 }
 exports.MathSet = MathSet;

package/lib/math/sets/mathSetInterface.d.ts

@@ -1,6 +1,7 @@
 import { Nombre } from '../numbers/nombre';
 export interface MathSetInterface {
     tex: string;
-    getRandomElement: () => Nombre;
+    toTex: () => string;
+    getRandomElement: () => Nombre | null;
 }
 //# sourceMappingURL=mathSetInterface.d.ts.map

package/lib/math/sets/mathSetInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mathSetInterface.d.ts","sourceRoot":"","sources":["../../../src/math/sets/mathSetInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,MAAM,CAAC;CAChC"}
+{"version":3,"file":"mathSetInterface.d.ts","sourceRoot":"","sources":["../../../src/math/sets/mathSetInterface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CACvC"}

package/lib/tree/nodes/functions/expNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/expNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAE5D,qBAAa,OAAQ,SAAQ,YAAa,YAAW,IAAI;IACvD,IAAI,EAAE,QAAQ,CAAqB;gBAEvB,KAAK,EAAE,IAAI;IAIvB,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAGf,QAAQ;IAIR,QAAQ,IAAI,IAAI;CAGjB"}
+{"version":3,"file":"expNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/expNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAE5D,qBAAa,OAAQ,SAAQ,YAAa,YAAW,IAAI;IACvD,IAAI,EAAE,QAAQ,CAAqB;gBAEvB,KAAK,EAAE,IAAI;IAIvB,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAMf,QAAQ;IAIR,QAAQ,IAAI,IAAI;CAGjB"}

package/lib/tree/nodes/functions/expNode.js

@@ -13,7 +13,11 @@ class ExpNode extends functionNode_1.FunctionNode {
         return `e^(${this.child.toMathString()})`;
     }
     toTex() {
-        return `e^{${this.child.toTex()}}`;
+        const tex = this.child.toTex();
+        const needBraces = tex.length > 1;
+        if (needBraces)
+            return `e^{${this.child.toTex()}}`;
+        return `e^${tex}`;
     }
     toMathjs() {
         return (0, mathjs_1.exp)(this.child.toMathjs());

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

@@ -14,7 +14,7 @@ class AddNode extends operatorNode_1.OperatorNode {
     }
     toTex() {
         const rightTex = this.rightChild.toTex();
-        return `${this.leftChild.toTex()} ${rightTex[0] === '-' ? '' : '+ '}${rightTex}`;
+        return `${this.leftChild.toTex()}${rightTex[0] === '-' ? '' : '+'}${rightTex}`;
     }
     toMathjs() {
         return (0, mathjs_1.add)(this.leftChild.toMathjs(), this.rightChild.toMathjs());

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

@@ -29,7 +29,8 @@ class DivideNode extends operatorNode_1.OperatorNode {
         }
         if (needBrackets)
             rightTex = `(${rightTex})`;
-        return `${leftTex} \\div ${rightTex}`;
+        const nextIsLetter = rightTex[0].toLowerCase() !== rightTex[0].toUpperCase();
+        return `${leftTex}\\div${nextIsLetter ? ' ' : ''}${rightTex}`;
     }
     toMathjs() {
         return (0, mathjs_1.divide)(this.leftChild.toMathjs(), this.rightChild.toMathjs());

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

@@ -11,7 +11,7 @@ class EqualNode extends operatorNode_1.OperatorNode {
         return `${this.leftChild.toMathString()} = ${this.rightChild.toMathString()}`;
     }
     toTex() {
-        return `${this.leftChild.toTex()} = ${this.rightChild.toTex()}`;
+        return `${this.leftChild.toTex()}=${this.rightChild.toTex()}`;
     }
     toMathjs() {
         return (0, mathjs_1.equal)(this.leftChild.toMathjs(), this.rightChild.toMathjs());

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

@@ -43,7 +43,8 @@ class MultiplyNode extends operatorNode_1.OperatorNode {
             const operatorRightChild = this.rightChild;
             showTimesSign ||= [operatorNode_1.OperatorIds.fraction].includes(operatorRightChild.id);
         }
-        return `${leftTex}${showTimesSign ? '\\times ' : ''}${rightTex}`;
+        const nextIsLetter = rightTex[0].toLowerCase() !== rightTex[0].toUpperCase();
+        return `${leftTex}${showTimesSign ? `\\times${nextIsLetter ? ' ' : ''}` : ''}${rightTex}`;
     }
     toMathjs() {
         return (0, mathjs_1.multiply)(this.leftChild.toMathjs(), this.rightChild.toMathjs());

package/lib/tree/nodes/operators/powerNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,SAAU,SAAQ,YAAa,YAAW,IAAI;gBAC7C,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAI7C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAmBf,QAAQ;CAGT"}
+{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,SAAS,CAAC;AACzC,OAAO,EAAe,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,SAAU,SAAQ,YAAa,YAAW,IAAI;gBAC7C,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI;IAI7C,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,MAAM;IAqBf,QAAQ;CAGT"}

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

@@ -28,7 +28,11 @@ class PowerNode extends operatorNode_1.OperatorNode {
         }
         if (needBrackets)
             leftTex = `(${leftTex})`;
-        return `${leftTex}^{${rightTex}}`;
+        const needBrace = rightTex.length > 1;
+        if (needBrace)
+            return `${leftTex}^{${rightTex}}`;
+        else
+            return `${leftTex}^${rightTex}`;
     }
     toMathjs() {
         return (0, mathjs_1.pow)(this.leftChild.toMathjs(), this.rightChild.toMathjs());

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

@@ -19,7 +19,7 @@ class SubstractNode extends operatorNode_1.OperatorNode {
             rightTex[0] === '-';
         if (needBrackets)
             rightTex = `(${rightTex})`;
-        return `${leftTex} - ${rightTex}`;
+        return `${leftTex}-${rightTex}`;
     }
     toMathjs() {
         return (0, mathjs_1.subtract)(this.leftChild.toMathjs(), this.rightChild.toMathjs());

package/package.json

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