pimath 0.0.124 → 0.0.125

package/esm/maths/randomization/random.d.ts

@@ -9,7 +9,7 @@ export declare namespace Random {
     function polynom(config?: randomPolynomConfig): Polynom;
     function monom(config?: randomMonomConfig): Monom;
     function fraction(config?: randomCoefficientConfig): Fraction;
-    function number(from: number, to: number): number;
+    function number(from: number, to: number, exclude?: number[]): number;
     function numberSym(max: number, allowZero?: boolean): number;
     function prime(max: number): number;
     function bool(percent?: number): boolean;

package/esm/maths/randomization/random.js

@@ -36,8 +36,8 @@ var Random;
         return (new rndFraction_1.rndFraction(config)).generate();
     }
     Random.fraction = fraction;
-    function number(from, to) {
-        return rndHelpers_1.rndHelpers.randomInt(from, to);
+    function number(from, to, exclude) {
+        return rndHelpers_1.rndHelpers.randomInt(from, to, exclude);
     }
     Random.number = number;
     function numberSym(max, allowZero) {

package/esm/maths/randomization/random.js.map

@@ -1 +1 @@
-{"version":3,"file":"random.js","sourceRoot":"","sources":["../../../src/maths/randomization/random.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,yCAAoC;AACpC,6CAAwC;AAQxC,+CAA0C;AAK1C,uDAAkD;AAElD,yDAAoD;AAEpD,6CAA0B;AAE1B,IAAiB,MAAM,CAmDtB;AAnDD,WAAiB,MAAM;IACnB,SAAgB,OAAO,CAAC,MAA4B;QAChD,OAAO,CAAC,IAAI,uBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC9C,CAAC;IAFe,cAAO,UAEtB,CAAA;IAED,SAAgB,KAAK,CAAC,MAA0B;QAC5C,OAAO,CAAC,IAAI,mBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC5C,CAAC;IAFe,YAAK,QAEpB,CAAA;IAED,SAAgB,QAAQ,CAAC,MAAgC;QACrD,OAAO,CAAC,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC/C,CAAC;IAFe,eAAQ,WAEvB,CAAA;IAED,SAAgB,MAAM,CAAC,IAAY,EAAE,EAAU;QAC3C,OAAO,uBAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACzC,CAAC;IAFe,aAAM,SAErB,CAAA;IAED,SAAgB,SAAS,CAAC,GAAW,EAAE,SAAmB;QACtD,OAAO,uBAAU,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAClD,CAAC;IAFe,gBAAS,YAExB,CAAA;IAED,SAAgB,KAAK,CAAC,GAAW;QAC7B,OAAO,uBAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACtC,CAAC;IAFe,YAAK,QAEpB,CAAA;IAED,SAAgB,IAAI,CAAC,OAAgB;QACjC,OAAO,uBAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC;IAFe,WAAI,OAEnB,CAAA;IAED,SAAgB,KAAK,CAAC,GAAU,EAAE,MAAe;QAC7C,OAAO,uBAAU,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;IAFe,YAAK,QAEpB,CAAA;IAED,SAAgB,IAAI,CAAC,GAAU;QAC3B,OAAO,uBAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACrC,CAAC;IAFe,WAAI,OAEnB,CAAA;IAED,SAAgB,OAAO,CAAC,GAAU;QAC9B,OAAO,uBAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IACvC,CAAC;IAFe,cAAO,UAEtB,CAAA;IAED,IAAiB,QAAQ,CASxB;IATD,WAAiB,QAAQ;QACrB,SAAgB,IAAI,CAAC,MAAiC;YAClD,OAAO,CAAC,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnD,CAAC;QAFe,aAAI,OAEnB,CAAA;QAED,SAAgB,KAAK,CAAC,MAAkC;YACpD,OAAO,CAAC,IAAI,mCAAgB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACpD,CAAC;QAFe,cAAK,QAEpB,CAAA;IAEL,CAAC,EATgB,QAAQ,GAAR,eAAQ,KAAR,eAAQ,QASxB;AACL,CAAC,EAnDgB,MAAM,sBAAN,MAAM,QAmDtB"}
+{"version":3,"file":"random.js","sourceRoot":"","sources":["../../../src/maths/randomization/random.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,yCAAoC;AACpC,6CAAwC;AAQxC,+CAA0C;AAK1C,uDAAkD;AAElD,yDAAoD;AAEpD,6CAA0B;AAE1B,IAAiB,MAAM,CAmDtB;AAnDD,WAAiB,MAAM;IACnB,SAAgB,OAAO,CAAC,MAA4B;QAChD,OAAO,CAAC,IAAI,uBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC9C,CAAC;IAFe,cAAO,UAEtB,CAAA;IAED,SAAgB,KAAK,CAAC,MAA0B;QAC5C,OAAO,CAAC,IAAI,mBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC5C,CAAC;IAFe,YAAK,QAEpB,CAAA;IAED,SAAgB,QAAQ,CAAC,MAAgC;QACrD,OAAO,CAAC,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC/C,CAAC;IAFe,eAAQ,WAEvB,CAAA;IAED,SAAgB,MAAM,CAAC,IAAY,EAAE,EAAU,EAAE,OAAkB;QAC/D,OAAO,uBAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAFe,aAAM,SAErB,CAAA;IAED,SAAgB,SAAS,CAAC,GAAW,EAAE,SAAmB;QACtD,OAAO,uBAAU,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAClD,CAAC;IAFe,gBAAS,YAExB,CAAA;IAED,SAAgB,KAAK,CAAC,GAAW;QAC7B,OAAO,uBAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACtC,CAAC;IAFe,YAAK,QAEpB,CAAA;IAED,SAAgB,IAAI,CAAC,OAAgB;QACjC,OAAO,uBAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC;IAFe,WAAI,OAEnB,CAAA;IAED,SAAgB,KAAK,CAAC,GAAU,EAAE,MAAe;QAC7C,OAAO,uBAAU,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;IAFe,YAAK,QAEpB,CAAA;IAED,SAAgB,IAAI,CAAC,GAAU;QAC3B,OAAO,uBAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IACrC,CAAC;IAFe,WAAI,OAEnB,CAAA;IAED,SAAgB,OAAO,CAAC,GAAU;QAC9B,OAAO,uBAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IACvC,CAAC;IAFe,cAAO,UAEtB,CAAA;IAED,IAAiB,QAAQ,CASxB;IATD,WAAiB,QAAQ;QACrB,SAAgB,IAAI,CAAC,MAAiC;YAClD,OAAO,CAAC,IAAI,iCAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnD,CAAC;QAFe,aAAI,OAEnB,CAAA;QAED,SAAgB,KAAK,CAAC,MAAkC;YACpD,OAAO,CAAC,IAAI,mCAAgB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACpD,CAAC;QAFe,cAAK,QAEpB,CAAA;IAEL,CAAC,EATgB,QAAQ,GAAR,eAAQ,KAAR,eAAQ,QASxB;AACL,CAAC,EAnDgB,MAAM,sBAAN,MAAM,QAmDtB"}

package/esm/maths/randomization/rndHelpers.d.ts

@@ -9,7 +9,7 @@ export declare class rndHelpers {
      * @param a (number) : From this value to the second value. If the second is ommited, this value is the max value.
      * @param b (number) : To this value. If this is ommited.
      */
-    static randomInt(a: number, b?: number): number;
+    static randomInt(a: number, b?: number, exclude?: number[]): number;
     /**
      * Random integer between -max and max value.
      * @param max (number) : determine the limits.

package/esm/maths/randomization/rndHelpers.js

@@ -18,11 +18,32 @@ class rndHelpers {
      * @param a (number) : From this value to the second value. If the second is ommited, this value is the max value.
      * @param b (number) : To this value. If this is ommited.
      */
-    static randomInt(a, b) {
+    static randomInt(a, b, exclude) {
         if (b === undefined) {
-            return this.randomInt(0, a);
+            if (a >= 0) {
+                return this.randomInt(0, a);
+            }
+            else {
+                return this.randomInt(a, 0);
+            }
         }
-        return Math.floor(Math.random() * (b - a + 1) + a);
+        // Same start and end values
+        if (a === b) {
+            return a;
+        }
+        // No exclusion
+        if (exclude === undefined) {
+            return Math.floor(Math.random() * (b - a + 1) + a);
+        }
+        // With exclusion
+        if (Math.abs(b - a) <= exclude.length) {
+            throw new Error('The number of excluded values is too high.');
+        }
+        let r = this.randomInt(a, b);
+        while (exclude.includes(r)) {
+            r = this.randomInt(a, b);
+        }
+        return r;
     }
     /**
      * Random integer between -max and max value.
@@ -59,7 +80,7 @@ class rndHelpers {
         if (arr.length === 0) {
             return '';
         }
-        return this.randomArray(arr, 1)[0];
+        return arr[this.randomInt(0, arr.length - 1)];
     }
     static shuffleArray(arr) {
         // The Fisher-Yates algorithm

package/esm/maths/randomization/rndHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"rndHelpers.js","sourceRoot":"","sources":["../../../src/maths/randomization/rndHelpers.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,wCAAmC;AAEnC,MAAa,UAAU;IAEnB;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,UAAe,GAAG;QAChC,OAAO,IAAI,CAAC,MAAM,EAAE,GAAC,OAAO,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,CAAQ,EAAE,CAAS;QAChC,IAAG,CAAC,KAAG,SAAS,EAAC;YAAC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;SAAC;QAE9C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,GAAU,EAAE,IAAa;QACzC,IAAG,IAAI,KAAG,KAAK,EAAC;YACZ,OAAO,IAAI,CAAC,UAAU,EAAE,CAAA,CAAC,CAAA,IAAI,CAAC,SAAS,CAAC,CAAC,EAAC,GAAG,CAAC,CAAA,CAAC,CAAA,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAC,GAAG,CAAC,CAAC;SACzE;aAAI;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACpC;IACL,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAW;QAC1B,IAAI,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;QAC7B,IAAG,GAAG,KAAG,SAAS,EAAC;YACf,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,GAAC,GAAG,CAAC,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAU,EAAE,MAAc;QACzC,IAAG,MAAM,KAAG,SAAS,EAAC;YAAC,MAAM,GAAG,CAAC,CAAA;SAAC;QAElC,uBAAuB;QACvB,IAAG,GAAG,CAAC,MAAM,IAAE,CAAC,EAAC;YAAC,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SAAC;QAE5C,uDAAuD;QACvD,OAAO,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAU;QACxB,IAAG,GAAG,CAAC,MAAM,KAAG,CAAC,EAAC;YAAC,OAAO,EAAE,CAAA;SAAC;QAC7B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,GAAU;QAC1B,6BAA6B;QAC7B,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACrC,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC7B,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;SAC1B;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;CAEJ;AAtED,gCAsEC"}
+{"version":3,"file":"rndHelpers.js","sourceRoot":"","sources":["../../../src/maths/randomization/rndHelpers.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pimath",
-  "version": "0.0.124",
+  "version": "0.0.125",
   "description": "A math library for teacher :)",
   "scripts": {
     "test": "mocha -r ts-node/register 'tests/**/*.test.ts'",

package/src/maths/randomization/random.ts

@@ -32,8 +32,8 @@ export namespace Random {
         return (new rndFraction(config)).generate()
     }
 
-    export function number(from: number, to: number): number {
-        return rndHelpers.randomInt(from, to)
+    export function number(from: number, to: number, exclude?: number[]): number {
+        return rndHelpers.randomInt(from, to, exclude)
     }
 
     export function numberSym(max: number, allowZero?: boolean): number {

package/src/maths/randomization/rndHelpers.ts

@@ -9,8 +9,8 @@ export class rndHelpers {
      * Random boolean with a percent ratio
      * @param percent
      */
-    static randomBool(percent:number=0.5):boolean{
-        return Math.random()<percent;
+    static randomBool(percent: number = 0.5): boolean {
+        return Math.random() < percent;
     }
 
     /**
@@ -18,10 +18,35 @@ export class rndHelpers {
      * @param a (number) : From this value to the second value. If the second is ommited, this value is the max value.
      * @param b (number) : To this value. If this is ommited.
      */
-    static randomInt(a:number, b?:number):number{
-        if(b===undefined){return this.randomInt(0,a);}
+    static randomInt(a: number, b?: number, exclude?: number[]): number {
+        if (b === undefined) {
+            if (a >= 0) {
+                return this.randomInt(0, a);
+            } else {
+                return this.randomInt(a, 0);
+            }
+        }
+
+        // Same start and end values
+        if (a === b) {
+            return a
+        }
 
-        return Math.floor(Math.random() * (b - a + 1) + a);
+        // No exclusion
+        if (exclude === undefined) {
+            return Math.floor(Math.random() * (b - a + 1) + a);
+        }
+
+        // With exclusion
+        if (Math.abs(b - a) <= exclude.length) {
+            throw new Error('The number of excluded values is too high.')
+        }
+
+        let r = this.randomInt(a, b)
+        while (exclude.includes(r)) {
+            r = this.randomInt(a, b)
+        }
+        return r
     }
 
     /**
@@ -29,35 +54,41 @@ export class rndHelpers {
      * @param max (number) : determine the limits.
      * @param zero (bool) : determine if zero is allowed or not.
      */
-    static randomIntSym(max:number, zero?:boolean):number{
-        if(zero===false){
-            return this.randomBool()?this.randomInt(1,max):-this.randomInt(1,max);
-        }else{
+    static randomIntSym(max: number, zero?: boolean): number {
+        if (zero === false) {
+            return this.randomBool() ? this.randomInt(1, max) : -this.randomInt(1, max);
+        } else {
             return this.randomInt(-max, max);
         }
     }
 
     static randomPrime(max: number): number {
         let primes = Numeric.primes()
-        if(max!==undefined){
-            primes = primes.filter(x=>x<max)
+        if (max !== undefined) {
+            primes = primes.filter(x => x < max)
         }
         return this.randomItem(primes)
     }
 
-    static randomArray(arr: any[], number?:number):any[]{
-        if(number===undefined){number = 1}
+    static randomArray(arr: any[], number?: number): any[] {
+        if (number === undefined) {
+            number = 1
+        }
 
         // Return a clone array
-        if(arr.length<=0){return Object.values(arr)}
+        if (arr.length <= 0) {
+            return Object.values(arr)
+        }
 
         // Randomize the array and return the n first elements.
-        return rndHelpers.shuffleArray(arr).slice(0,number);
+        return rndHelpers.shuffleArray(arr).slice(0, number);
     }
 
-    static randomItem(arr: any[]): any{
-        if(arr.length===0){return ''}
-        return this.randomArray(arr, 1)[0]
+    static randomItem(arr: any[]): any {
+        if (arr.length === 0) {
+            return ''
+        }
+        return arr[this.randomInt(0, arr.length - 1)]
     }
 
     static shuffleArray(arr: any[]): any[] {

package/tests/geometry/circle.test.ts

@@ -4,14 +4,16 @@ import {Circle} from "../../src/maths/geometry/circle";
 import {Line} from "../../src/maths/geometry/line";
 import {Point} from "../../src/maths/geometry/point";
 import {Fraction} from "../../src/maths/coefficients/fraction";
+import {Random} from "../../src/maths/randomization/random";
+import {Numeric} from "../../src/maths/numeric";
 
 describe('Circle', function () {
     it('should calculate the intersection of a circle and a line', function () {
         let C = new Circle(
-            new Point(8, 6),
-            20,
-            true
-        ),
+                new Point(8, 6),
+                20,
+                true
+            ),
             LT = new Line('2x+y-32=0'),
             LS = new Line('3x-y-8=0'),
             IPT = C.lineIntersection(LT),
@@ -28,7 +30,7 @@ describe('Circle', function () {
         expect(IPS[1].y.value).to.be.equal(10)
     });
 
-    it('should calculate tangents', function(){
+    it('should calculate tangents', function () {
 
         // Through one point on the circle
         const C = new Circle(
@@ -37,18 +39,18 @@ describe('Circle', function () {
             true
         ), P = new Point(-5, 7);
 
-        expect(C.tangents(P).map(x=>x.tex.canonical)).to.have.all.members(['3x-4y+43=0'])
+        expect(C.tangents(P).map(x => x.tex.canonical)).to.have.all.members(['3x-4y+43=0'])
 
         // With a slope
         const D = new Circle('x^2+y^2+10x=2y-6'),
             slope = new Fraction(-2, 1)
 
-        expect(D.tangents(slope).map(x=>x.tex.canonical)).to.have.all.members(['2x+y-1=0', '2x+y+19=0'])
+        expect(D.tangents(slope).map(x => x.tex.canonical)).to.have.all.members(['2x+y-1=0', '2x+y+19=0'])
 
         const E = new Circle('(x-2)^2+(y-1)^2=5'),
             P2 = new Point(6, -2)
 
-        expect(E.tangents(P2).map(x=>x.tex.canonical)).to.have.all.members(['2x+y-10=0','2x+11y+10=0'])
+        expect(E.tangents(P2).map(x => x.tex.canonical)).to.have.all.members(['2x+y-10=0', '2x+11y+10=0'])
 
         let P3 = new Point(2, 2)
         expect(E.tangents(P3)).to.be.empty
@@ -58,10 +60,10 @@ describe('Circle', function () {
         const C = new Circle('(x-3)^2+(y+4)^2=16'),
             pts = C.getPointsOnCircle()
 
-        expect(pts.map(x=>x.x.display + ',' + x.y.display)).to.have.all.members([ '3,0', '3,-8', '7,-4', '-1,-4' ])
+        expect(pts.map(x => x.x.display + ',' + x.y.display)).to.have.all.members(['3,0', '3,-8', '7,-4', '-1,-4'])
     });
 
-    it('should calculate the circle from center and radius', function(){
+    it('should calculate the circle from center and radius', function () {
         let circle = new Circle("x^2+6x+y^2-8y+12=0")
 
         console.log(circle.tex)
@@ -81,4 +83,117 @@ describe('Circle', function () {
         let L = new Line(A, B)
         console.log(L.tex.canonical)
     });
+
+    it('temp tests', () => {
+        for (let i = 0; i < 30; i++) {
+            let A = Random.Geometry.point({axis: false}),
+                B = Random.Geometry.point({axis: false})
+
+            if (Random.bool()) {
+                B.x = new Fraction().zero()
+            } else {
+                B.y = new Fraction().zero()
+            }
+
+            const c1 = new Circle(A, Random.number(1, 10)),
+                c2 = new Circle(B, Random.number(1, 10))
+
+            console.log(`(exercice ${i + 1}): déterminer la forme \\textbf{centre-rayon} des équations cartésiennes suivantes. En déduire le centre et le rayon du cercle.
+    \\begin{enumerate}[label=\\Alph*]
+    \\item \\( (\\Gamma_1): ${c1.developed}\\) \\iftoggle{master}{\\(${c1.tex}\\)}{}
+    \\item \\( (\\Gamma_2): ${c2.developed}\\) \\iftoggle{master}{\\(${c2.tex}\\)}{}
+    \\end{enumerate}
+    \\vfill
+    ${i % 2 === 1 ? '\\newpage' : ''}
+    `)
+        }
+    })
+
+    it('temp tests 2', () => {
+        const q = `(I): Soit \\(\\Gamma_1\\) et \\(\\Gamma_2\\) deux cercles. Déterminer leur position relative à l'aide des informations ci-dessous.
+
+\\[(\\Gamma_1): @G1 \\qquad (\\Gamma_2): @G2 \\]
+\\[\\trou{@R1} \\]
+
+\\vspace{3cm}
+(II): Soit \\((\\Gamma_3):  @G3\\) un cercle. Déterminer l'équation cartésienne, sous sa forme centre-sommet, des cercles \\(\\Gamma_4\\) de rayon \\(@RAYON\\) qui sont tangents à \\(\\Gamma_3\\) en sachant que les deux centres ont la même @AXE.\\\\
+Préciser la position relative entre \\(\\Gamma_3\\) et \\(\\Gamma_4\\)
+\\[ \\trou{@R2a} \\]
+\\[ \\trou{@R2b} \\]
+`
+
+        for (let i = 0; i < 30; i++) {
+            let A = Random.Geometry.point({axis: false}),
+                triplet = Random.item(Numeric.pythagoricianTripletsWithTarget(
+                    Random.item([5, 13, 17, 25, 29, 37, 41])
+                ).filter(tr => {
+                    // remove all items with zero values.
+                    return tr.every(x => x !== 0)
+                })),
+                B = new Point(
+                    A.x.value + triplet[0],
+                    A.y.value + triplet[1]
+                ),
+                delta = Random.number(2, triplet[2] - 1),
+                positionRelative = ['extérieure', 'intérieure', 'sécante', 'disjointe'][i % 4],
+                // positionRelative = Random.item(['extérieure', 'intérieure', 'sécante', 'disjointe']),
+                c1: Circle, c2: Circle
+
+            if (positionRelative === 'extérieure') {
+                c1 = new Circle(A, triplet[2] - delta)
+                c2 = new Circle(B, delta)
+            } else if (positionRelative === 'intérieure') {
+                c1 = new Circle(A, triplet[2] + delta)
+                c2 = new Circle(B, delta)
+            } else if (positionRelative === 'sécante') {
+                c1 = new Circle(A, triplet[2] + delta - Random.number(1, delta - 1))
+                c2 = new Circle(B, delta)
+            } else if (positionRelative === 'disjointe') {
+                c1 = new Circle(A, triplet[2] + delta + 1)
+                c2 = new Circle(B, delta)
+            }
+
+            const R1 = `\\delta(O_1;O_2)=${A.distanceTo(B).value}\\qquad r_1=${c1.radius.value} \\qquad ${c2.radius.value} \\qquad \\implies \\text{${positionRelative}} `
+
+
+            let C = Random.Geometry.point({axis: false}),
+                r1 = Random.number(2, 10),
+                c3 = new Circle(C, r1),
+                // Get a random number from 2 to 10 that is not equal to r1
+                r2 = Random.number(2, 10, [r1]),
+                axis = Random.item(['abscisse', 'ordonnée']),
+                centers: Point[] = []
+
+            const c3x = c3.center.x.value,
+                c3y = c3.center.y.value
+            if (axis === 'abscisse') {
+
+                centers = [
+                    new Point(c3x, c3y - (r1 + r2)),
+                    new Point(c3x, c3y - (r2 - r1)),
+                    new Point(c3x, c3y - (r1 - r2)),
+                    new Point(c3x, c3y + (r1 + r2))
+                ]
+            } else {
+                centers = [
+                    new Point(c3x - (r1 + r2), c3y),
+                    new Point(c3x - (r2 - r1), c3y),
+                    new Point(c3x - (r1 - r2), c3y),
+                    new Point(c3x + (r1 + r2), c3y)
+                ]
+            }
+
+            console.log(`(exercice ${i + 1}): ` + q
+                    .replaceAll('@G1', c1.tex)
+                    .replaceAll('@R1', R1)
+                    .replaceAll('@G2', c2.tex)
+                    .replaceAll('@G3', c3.developed)
+                    .replaceAll('@RAYON', r2.toString())
+                    .replaceAll('@AXE', axis)
+                    .replaceAll('@R2a', centers.slice(0, 2).map(x => new Circle(x, r2).tex).join(' \\qquad '))
+                    .replaceAll('@R2b', centers.slice(2, 4).map(x => new Circle(x, r2).tex).join(' \\qquad '))
+                + '\\vfill' + (i % 2 === 1 ? '\\newpage' : '')
+            )
+        }
+    })
 });

package/tests/numexp.test.ts

@@ -31,7 +31,7 @@ describe('Numerical expression', () => { // the tests container
         expect(exprInvalid.isValid).to.be.false
     });
 
-    it('souldd detect invalid expression withouth crahsing', function() {
+    it('souldd detect invalid expression withouth crahsing', function () {
         const exprPourrie = new NumExp('3xsi'),
             exprOk = new NumExp('3xsin(x)')
 
@@ -52,7 +52,7 @@ describe('Numerical expression', () => { // the tests container
         expect(expr2.evaluate({x: 2})).to.be.equal(1)
     });
 
-    it('should calculate sqrt from exp', function(){
+    it('should calculate sqrt from exp', function () {
         let k = new NumExp('nthrt(x,3)')
         expect(k.evaluate({x: -8})).to.be.equal(-2)
         expect(k.evaluate({x: 27})).to.be.equal(3)
@@ -78,4 +78,12 @@ describe('Numerical expression', () => { // the tests container
         let k = new NumExp('ln(3)')
         expect(+k.evaluate().toFixed(6)).to.be.equal(1.098612)
     });
+
+    it('should parse with sqrt and root', () => {
+        const expr1 = new NumExp('sqrt(9)');
+        expect(expr1.evaluate()).to.be.equal(3);
+        
+        const expr2 = new NumExp('nthrt(8,3)');
+        expect(expr2.evaluate()).to.be.equal(2);
+    })
 });