pimath 0.0.17 → 0.0.21

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

@@ -1 +1 @@
-{"version":3,"file":"rndMonom.js","sourceRoot":"","sources":["../../../src/maths/random/rndMonom.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAExC,mCAA+B;AAC/B,4CAAuC;AAKnC,MAAa,QAAS,SAAQ,uBAAU;IAIpC,YAAY,UAA8B;QACtC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG;YAClB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,KAAK;SACd,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,GAAG,GAAU,EAAE;QAEnB,IAAI,CAAC,GAAG,IAAI,aAAK,EAAE,CAAA;QAGnB,CAAC,CAAC,WAAW,GAAG,cAAM,CAAC,QAAQ,CAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAGF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAEjC,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;gBAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACrB;YACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,CAAC,GAAG,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrD,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;aAC7C;SACJ;aAAM;YACH,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;SACzD;QAED,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;CACJ;AA3CD,4BA2CC"}
+{"version":3,"file":"rndMonom.js","sourceRoot":"","sources":["../../../src/maths/random/rndMonom.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAExC,mCAA+B;AAC/B,4CAAuC;AAKnC,MAAa,QAAS,SAAQ,uBAAU;IAIpC,YAAY,UAA8B;QACtC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG;YAClB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,KAAK;SACd,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACpE,CAAC;IAED,QAAQ,GAAG,GAAU,EAAE;QAEnB,IAAI,CAAC,GAAG,IAAI,aAAK,EAAE,CAAA;QAGnB,CAAC,CAAC,WAAW,GAAG,cAAM,CAAC,QAAQ,CAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAGF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAEjC,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;gBAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACrB;YACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,CAAC,GAAG,cAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrD,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;aAC7C;SACJ;aAAM;YACH,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;SACzD;QAED,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;CACJ;AA5CD,4BA4CC"}

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

@@ -2,6 +2,7 @@ export declare type randomCoefficientConfig = {
     negative?: boolean;
     reduced?: boolean;
     zero?: boolean;
+    natural?: boolean;
 };
 export declare type randomMonomConfig = {
     letters?: string;

package/package.json

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

package/src/maths/algebra/equation.ts

@@ -37,8 +37,8 @@ export class Equation {
                 this.parse(equations[0]);
             }
         } else if (equations.length === 2) {
-            this.left = equations[0].isPolynom ? equations[0].clone() : new Polynom(equations[0]);
-            this.right = equations[1].isPolynom ? equations[1].clone() : new Polynom(equations[1]);
+            this.left = (equations[0] instanceof Polynom) ? equations[0].clone() : new Polynom(equations[0]);
+            this.right = (equations[1] instanceof Polynom) ? equations[1].clone() : new Polynom(equations[1]);
         } else {
             // Return default empty equation
             return this;
@@ -101,6 +101,11 @@ export class Equation {
         return `${this._left.tex}${this.signAsTex}${this._right.tex}`;
     }
 
+    get display(): string {
+        return `${this._left.display}${this.signAsTex}${this._right.display}`;
+    }
+
+
     get raw(): string {
         return `${this._left.raw}${this.signAsTex}${this._right.raw}`;
     }

package/src/maths/algebra/monom.ts

@@ -33,10 +33,6 @@ export class Monom {
     // ------------------------------------------
     // Getter and setter
     // ------------------------------------------
-    get isMonom() {
-        return true;
-    }
-
     /**
      * Get the coefficient as fraction
      */
@@ -311,10 +307,10 @@ export class Monom {
 
         let stack: Monom[] = [], m, pow, letter, q1, q2
 
-        if(rpn.length===0){
+        if (rpn.length === 0) {
             this.zero()
             return this
-        }else if(rpn.length===1){
+        } else if (rpn.length === 1) {
             const element = rpn[0]
 
             this.one()
@@ -324,9 +320,8 @@ export class Monom {
                 this.setLetter(element.token, 1)
             }
             return this
-        }else{
+        } else {
             // Reset the monom
-            this.one()
             for (const element of rpn) {
                 if (element.tokenType === 'coefficient') {
                     let M = new Monom().one()
@@ -343,16 +338,15 @@ export class Monom {
                             q2 = (stack.pop()) || new Monom().zero()
                             q1 = (stack.pop()) || new Monom().zero()
 
-                            if(q1.isZero() && q2.isZero()){
-                                this.opposed()
-                                break
-                            }
                             stack.push(q1.subtract(q2))
+
                             break;
                         case '*':
                             // Get the last element in the stack
-                            m = (stack.pop()) || new Monom().one()
-                            this.multiply(m)
+                            q2 = (stack.pop()) || new Monom().one()
+                            q1 = (stack.pop()) || new Monom().one()
+
+                            stack.push(q1.multiply(q2))
                             break
                         case '^':
                             // get the two last elements in the stack
@@ -361,16 +355,20 @@ export class Monom {
 
                             letter = m.variables[0]
 
-                            if(letter!==undefined) {
+                            if (letter !== undefined) {
                                 m.setLetter(letter, pow)
                             }
-                            this.multiply(m.clone())
+
+                            stack.push(m)
+                            // this.multiply(m.clone())
                             break
                     }
                 }
             }
         }
 
+        this.one()
+        this.multiply(stack[0])
         return this
     }
     /**
@@ -388,6 +386,14 @@ export class Monom {
         return F;
     };
 
+    makeSame = (M: Monom):Monom => {
+        // Copy the literal parts.
+        for (let k in M._literal) {
+            this.setLetter(k, M._literal[k].clone());
+        }
+        return this
+    }
+
     /**
      * Create a zero value monom
      */
@@ -439,6 +445,9 @@ export class Monom {
     add = (...M: Monom[]): Monom => {
         for (let m of M) {
             if (this.isSameAs(m)) {
+                if(this.isZero()){
+                    this.makeSame(m)
+                }
                 this._coefficient.add(m.coefficient);
             } else {
                 console.log('Add: Is not similar: ', m.display);
@@ -454,7 +463,10 @@ export class Monom {
     subtract = (...M: Monom[]): Monom => {
         for (let m of M) {
             if (this.isSameAs(m)) {
-                this._coefficient.add(m.coefficient.clone().opposed());
+                if(this.isZero()){
+                    this.makeSame(m)
+                }
+                this._coefficient.add(m.clone().coefficient.opposed());
             } else {
                 console.log('Subtract: Is not similar: ', m.display);
             }
@@ -571,14 +583,17 @@ export class Monom {
                     M2: string[] = M.variables,
                     K: string[] = M1.concat(M2.filter((item) => M1.indexOf(item) < 0));
 
-                for (let key of K) {
-                    // The setLetter is not available in one of the monom
-                    if (this._literal[key] === undefined || M.literal[key] === undefined) {
-                        return false;
-                    }
-                    // The setLetter does not have the isSame power in each monoms.
-                    if (!this._literal[key].isEqual(M.literal[key])) {
-                        return false;
+                // To compare, both must be different than zero.
+                if (!this.isZero() && !M.isZero()) {
+                    for (let key of K) {
+                        // The setLetter is not available in one of the monom
+                        if (this._literal[key] === undefined || M.literal[key] === undefined) {
+                            return false;
+                        }
+                        // The setLetter does not have the isSame power in each monoms.
+                        if (!this._literal[key].isEqual(M.literal[key])) {
+                            return false;
+                        }
                     }
                 }
 

package/src/maths/algebra/polynom.ts

@@ -34,11 +34,6 @@ export class Polynom {
         return this;
     }
 
-    get isPolynom() {
-        return true;
-    };
-
-
     // ------------------------------------------
     // Getter and setter
     // ------------------------------------------
@@ -365,9 +360,9 @@ export class Polynom {
     add = (...values: any[]): Polynom => {
 
         for (let value of values) {
-            if (value.isPolynom) {
+            if (value instanceof Polynom) {
                 this._monoms = this._monoms.concat(value.monoms);
-            } else if (value.isMonom) {
+            } else if (value instanceof Monom) {
                 this._monoms.push(value.clone());
             } else if (Number.isSafeInteger(value)) {
                 this._monoms.push(new Monom(value.toString()));
@@ -382,9 +377,9 @@ export class Polynom {
     subtract = (...values: any[]): Polynom => {
 
         for (let value of values) {
-            if (value.isPolynom) {
+            if (value instanceof Polynom) {
                 this._monoms = this._monoms.concat(value.clone().opposed().monoms);
-            } else if (value.isMonom) {
+            } else if (value instanceof Monom) {
                 this._monoms.push(value.clone().opposed());
             } else if (Number.isSafeInteger(value)) {
                 this._monoms.push(new Monom(value.toString()).opposed());
@@ -753,7 +748,7 @@ export class Polynom {
      * @param P
      */
     replaceBy = (letter: string, P: Polynom): Polynom => {
-        let pow: number;
+        let pow: Fraction;
         const resultPolynom: Polynom = new Polynom().zero();
 
         for (const m of this.monoms) {
@@ -762,10 +757,11 @@ export class Polynom {
             } else {
                 // We have found a setLetter.
                 // Get the power and reset it.
-                pow = +m.literal[letter];
+                pow = m.literal[letter].clone();
                 delete m.literal[letter];
 
-                resultPolynom.add(P.clone().pow(pow).multiply(m));
+                // TODO: replaceBy works only with positive and natural pow
+                resultPolynom.add(P.clone().pow(Math.abs(pow.numerator)).multiply(m));
             }
         }
 
@@ -1100,7 +1096,7 @@ export class Polynom {
         // Reduce the polynom.
         const M = this.clone().reduce();
         for (const m of M._monoms) {
-            if (m.degree(letter) === degree) {
+            if (m.degree(letter).isEqual(degree)) {
                 return m.clone();
             }
         }

package/src/maths/geometry/circle.ts

@@ -1,47 +1,159 @@
 import {Point} from "./point";
-import {Fraction} from "../coefficients/fraction";
-import {Equation} from "../algebra/equation";
-import {Polynom} from "../algebra/polynom";
+import {Fraction} from "../coefficients";
+import {Equation, Monom, Polynom} from "../algebra";
+import {Line} from "./line";
+import {Vector} from "./vector";
 
 
 export class Circle {
     private _center: Point;
     private _radius: Fraction;
+    private _squareRadius: Fraction;
+    private _cartesian: Equation;
     private _exists: boolean;
+
     constructor(...values: any) {
         this._exists = false
 
-        if(values!==undefined){this.parse(...values)}
+        if (values !== undefined) {
+            this.parse(...values)
+        }
     }
 
-    private parse(...values: any) {
-        if(values.length===2){
-            this._center = new Point(values[0])
-            this._radius = new Fraction(values[1])
+
+    get center(): Point {
+        return this._center;
+    }
+
+    get radius(): { tex: string, display: string } {
+        if (this._squareRadius.isSquare()) {
+            return {
+                tex: this._squareRadius.clone().sqrt().tex,
+                display: this._squareRadius.clone().sqrt().display,
+            }
+        } else {
+            return {
+                tex: `\\sqrt{${this._squareRadius.tex}}`,
+                display: `sqrt(${this._squareRadius.display})`
+            }
         }
+        return this._squareRadius
     }
 
     get tex(): string {
         let cx, cy
-        if(this._center.x.isZero()){
+        if (this._center.x.isZero()) {
             cx = 'x^2'
-        }else{
-            cx = `\\left(x-${this._center.x.tex}\\right)^2`
+        } else {
+            cx = `\\left(x${this._center.x.isNegative() ? '+' : '-'}${this._center.x.clone().abs().tex}\\right)^2`
         }
-        if(this._center.y.isZero()){
+        if (this._center.y.isZero()) {
             cy = 'y^2'
-        }else{
-            cy = `\\left(y-${this._center.y.tex}\\right)^2`
+        } else {
+            cy = `\\left(y${this._center.y.isNegative() ? '+' : '-'}${this._center.y.clone().abs().tex}\\right)^2`
+        }
+        return `${cx}+${cy}=${this._squareRadius.tex}`
+    }
+
+    get developed(): string {
+        return this._cartesian.tex
+    }
+
+
+    // TODO: reformat code for better display.
+    get display(): string {
+        return this._cartesian.display
+    }
+
+    get cartesian(): Equation {
+        return this._cartesian
+    }
+
+    private parse(...values: any) {
+        if (values.length === 1 && typeof values[0] === 'string') {
+            this.checkCircle(new Equation(values[0]))
+        } else if (values.length >= 2) {
+            this._center = new Point(values[0])
+
+            if (values[1] instanceof Point) {
+                // Go through this point
+                this._squareRadius = new Vector(this._center, values[1]).normSquare
+            } else {
+                if (values[2] === true) {
+                    this._squareRadius = new Fraction(values[1])
+                } else {
+                    this._radius = new Fraction(values[1])
+                    this._squareRadius = this._radius.clone().pow(2)
+                }
+            }
+            this._cartesian = (new Equation(
+                new Polynom(`(x-(${this._center.x.display}))^2+(y-(${this._center.y.display}))^2`),
+                new Polynom(`${this._squareRadius.display}`)
+            )).moveLeft()
         }
-        return `${cx}+${cy}=${this._radius.pow(2).tex}`
     }
 
-    get developed():string {
-        let equ = new Equation(
-            new Polynom(`(x-(${this._center.x.display}))^2+(y-(${this._center.y.display}))^2`),
-            new Polynom(`${this._radius.pow(2).display}`)
-        )
 
-        return equ.moveLeft().tex;
+    checkCircle = (P: Equation): boolean => {
+        if (P.degree('x').value === 2 && P.degree('y').value === 2) {
+            // Both must be of degree 2.
+            let x2 = P.left.monomByDegree(2, 'x'),
+                y2 = P.left.monomByDegree(2, 'y'),
+                x1: Monom, y1: Monom, c: Monom
+
+            // Both square monoms must have the same coefficient.
+            if (x2.coefficient.isEqual(y2.coefficient)) {
+                P.divide(x2.coefficient)
+
+                x1 = P.left.monomByDegree(1, 'x')
+                y1 = P.left.monomByDegree(1, 'y')
+
+                c = P.left.monomByDegree(0)
+
+                this._center = new Point(
+                    x1.coefficient.clone().divide(2).opposed(),
+                    y1.coefficient.clone().divide(2).opposed()
+                )
+
+                this._squareRadius = c.coefficient.clone().opposed()
+                    .add(this._center.x.clone().pow(2))
+                    .add(this._center.y.clone().pow(2))
+
+            }
+        }
+
+        return false
+    }
+
+    /**
+     * Get the relative position between circle and line. It corresponds to the number of intersection.
+     * @param {Line} L
+     * @returns {number}
+     */
+    relativePosition = (L: Line): number => {
+        let distance = L.distanceTo(this.center),
+            radius = Math.sqrt(this._squareRadius.value)
+
+        if (distance.value - radius > 0.0000000001) {
+            return 0 // external
+        } else if (Math.abs(distance.value - radius) < 0.0000000001) {
+            return 1 // tangent
+        } else {
+            return 2 // external
+        }
+    }
+
+    lineIntersection = (L: Line): Point[] => {
+        let P1: Point, P2: Point
+
+        const equ = this._cartesian.clone(),
+            yLine = L.equation.clone().isolate('y')
+
+        if (yLine instanceof Equation) {
+            equ.replaceBy('y', yLine.right)
+            equ.solve()
+        }
+
+        return []
     }
 }