pimath 0.0.36 → 0.0.39

package/src/maths/coefficients/fraction.ts

@@ -51,6 +51,10 @@ export class Fraction {
 
     // Display getter
     get tex(): string {
+        if(this.isInfinity()){
+            return `${this.sign()===1?'+':'-'}\\infty`
+        }
+
         if (this._denominator === 1) {
             return `${this._numerator}`;
         } else if (this._numerator < 0) {

package/src/maths/geometry/line.ts

@@ -195,6 +195,12 @@ export class Line {
                 }else if (values[2] === LinePropriety.Parallel){
                     return this.parseByPointAndVector(values[0], values[1])
                 }
+            }else if (values[0] instanceof Point && values[1] instanceof Line ) {
+                if(values[2]===LinePropriety.Parallel || values[2]===null) {
+                    return this.parseByPointAndLine(values[0], values[1], LinePropriety.Parallel)
+                }else{
+                    return this.parseByPointAndLine(values[0], values[1], LinePropriety.Perpendicular)
+                }
             }
         }
 

package/src/maths/geometry/point.ts

@@ -10,8 +10,8 @@ import {Fraction} from "../coefficients/fraction";
  * Helper class - a way to identify an object {x: number, y: number}
  */
 class PointXY {
-    public x: number
-    public y: number
+    x: number
+    y: number
 }
 
 export class Point {

package/src/maths/shutingyard.ts

@@ -1,6 +1,3 @@
-import {loadHighlighter} from "typedoc/dist/lib/utils/highlighter";
-import exp = require("constants");
-
 export type tokenType = {
     [key: string]: {
         precedence: number,
@@ -9,14 +6,14 @@ export type tokenType = {
     }
 }
 
-export const tokenConstant:{[Key:string]:number} = {
+export const tokenConstant: { [Key: string]: number } = {
     pi: Math.PI,
     e: Math.exp(1)
 }
 
 export enum ShutingyardType {
-    VARIABLE='variable',
-    COEFFICIENT='coefficient',
+    VARIABLE = 'variable',
+    COEFFICIENT = 'coefficient',
     OPERATION = 'operation',
     CONSTANT = 'constant',
     FUNCTION = 'function',
@@ -24,7 +21,7 @@ export enum ShutingyardType {
 }
 
 export enum ShutingyardMode {
-    POLYNOM= 'polynom',
+    POLYNOM = 'polynom',
     SET = 'set',
     NUMERIC = 'numeric'
 }
@@ -32,18 +29,25 @@ export enum ShutingyardMode {
 export type Token = { token: string, tokenType: string }
 
 export class Shutingyard {
-    private _rpn: Token[] = [];
     readonly _mode: ShutingyardMode;
     private _tokenConfig: tokenType;
-    private _tokenConstant: {[Key:string]: number}
-    private _uniformize: boolean;
+    private _tokenConstant: { [Key: string]: number }
     private _tokenKeys: string[]
+    private _uniformize: boolean;
 
-    constructor(mode?: ShutingyardMode ) {
+    constructor(mode?: ShutingyardMode) {
         this._mode = typeof mode === 'undefined' ? ShutingyardMode.POLYNOM : mode;
         this.tokenConfigInitialization()
     }
 
+    private _rpn: Token[] = [];
+
+    // Getter
+    get rpn() {
+        // console.log(this._rpn)
+        return this._rpn;
+    }
+
     /**
      * Determin if the token is a defined operation
      * Defined operations: + - * / ^ sin cos tan
@@ -70,7 +74,7 @@ export class Shutingyard {
                 '-': {precedence: 2, associative: 'left', type: ShutingyardType.OPERATION}
             }
             this._uniformize = false;
-        }else if (this._mode === ShutingyardMode.NUMERIC){
+        } else if (this._mode === ShutingyardMode.NUMERIC) {
             this._tokenConfig = {
                 '^': {precedence: 4, associative: 'right', type: ShutingyardType.OPERATION},
                 '*': {precedence: 3, associative: 'left', type: ShutingyardType.OPERATION},
@@ -99,7 +103,7 @@ export class Shutingyard {
             this._uniformize = true
         }
 
-        this._tokenKeys = Object.keys(this._tokenConfig).sort((a,b)=>b.length-a.length)
+        this._tokenKeys = Object.keys(this._tokenConfig).sort((a, b) => b.length - a.length)
         return this._tokenConfig
     }
 
@@ -126,14 +130,14 @@ export class Shutingyard {
         else if (expr[start] === ',') {
             token = ',';
             tokenType = 'function-argument';
-        } else{
+        } else {
             // Order token keys by token characters length (descending)
             // TODO: this is done each time ! SHould be done once !
             // const keys = Object.keys(this._tokenConfig).sort((a,b)=>b.length-a.length)
 
             // Extract operation and function tokens
-            for(let key of this._tokenKeys){
-                if(expr.substring(start, start+key.length) === key){
+            for (let key of this._tokenKeys) {
+                if (expr.substring(start, start + key.length) === key) {
                     token += key;
                     tokenType = this._tokenConfig[key].type
                     break
@@ -141,27 +145,27 @@ export class Shutingyard {
             }
 
             // Extract constant
-            for(let key in tokenConstant){
-                if(expr.substring(start, start+key.length) === key){
+            for (let key in tokenConstant) {
+                if (expr.substring(start, start + key.length) === key) {
                     token += key;
                     tokenType = ShutingyardType.CONSTANT
                     break
                 }
             }
 
-            if(token===''){
+            if (token === '') {
                 // No function found ! Might be a coefficient !
-                if( expr[start].match(/[0-9]/) ) {
-                    if(this._mode === ShutingyardMode.POLYNOM && false) {
+                if (expr[start].match(/[0-9]/)) {
+                    if (this._mode === ShutingyardMode.POLYNOM && false) {
                         token = expr.substring(start).match(/^([0-9.,/]+)/)[0]
-                    }else{
+                    } else {
                         token = expr.substring(start).match(/^([0-9.,]+)/)[0]
                     }
                     tokenType = ShutingyardType.COEFFICIENT
-                }else if (expr[start].match(/[a-zA-Z]/)) {
+                } else if (expr[start].match(/[a-zA-Z]/)) {
                     token = expr.substring(start).match(/^([a-zA-Z])/)[0]
                     tokenType = ShutingyardType.VARIABLE
-                }else{
+                } else {
                     console.log('Unidentified token', expr[start], expr, start)
                     token = expr[start]
                     tokenType = ShutingyardType.MONOM
@@ -180,7 +184,9 @@ export class Shutingyard {
      */
     Uniformizer(expr: string): string {
         // Determiner if need to be uniformized
-        if(!this._uniformize){return expr}
+        if (!this._uniformize) {
+            return expr
+        }
 
         let expr2;
         // Replace missing multiplication between two parenthese
@@ -220,8 +226,8 @@ export class Shutingyard {
      * @param operators
      */
     parse(expr: string, operators?: string[]): Shutingyard {
-        let outQueue: {token:string, tokenType: string}[] = [],    // Output queue
-            opStack: {token:string, tokenType: string}[] = [],     // Operation queue
+        let outQueue: { token: string, tokenType: string }[] = [],    // Output queue
+            opStack: { token: string, tokenType: string }[] = [],     // Operation queue
             token: string = '',
             tokenPos: number = 0,
             tokenType: string = '',
@@ -287,12 +293,14 @@ export class Shutingyard {
                             outQueue.push((opStack.pop()) || {token: '', tokenType: 'operation'});
 
                             // Get the next operation on top of the Stack.
-                            if(opStack.length===0){break;}
+                            if (opStack.length === 0) {
+                                break;
+                            }
                             opTop = opStack[opStack.length - 1];
                         }
                     }
                     //at the end of iteration push o1 onto the operator stack
-                    opStack.push({token,tokenType});
+                    opStack.push({token, tokenType});
                     break;
                 case 'function-argument':
                     // TODO: check if the opStack exist.
@@ -304,11 +312,11 @@ export class Shutingyard {
                             break;
                         }
 
-                        outQueue.push((opStack.pop()) || {token,tokenType});
+                        outQueue.push((opStack.pop()) || {token, tokenType});
                     }
                     break;
                 case '(':
-                    opStack.push({token,tokenType});
+                    opStack.push({token, tokenType});
                     // Add an empty value if next element is negative.
                     if (expr[tokenPos] === '-') {
                         outQueue.push({token: '0', tokenType: 'coefficient'});
@@ -324,7 +332,7 @@ export class Shutingyard {
                             break;
                         }
 
-                        outQueue.push((opStack.pop()) || {token,tokenType});
+                        outQueue.push((opStack.pop()) || {token, tokenType});
                     }
 
                     //Pop the left parenthesis from the stack, but not onto the output queue.
@@ -349,11 +357,4 @@ export class Shutingyard {
     }
 
 
-    // Getter
-    get rpn() {
-        // console.log(this._rpn)
-        return this._rpn;
-    }
-
-
 }

package/tests/algebra/rationnal.test.ts

@@ -0,0 +1,44 @@
+import {describe} from "mocha";
+import {Rational} from "../../src/maths/algebra/rational";
+import {Polynom} from "../../src/maths/algebra/polynom";
+import {Fraction} from "../../src/maths/coefficients/fraction";
+import {expect} from "chai";
+
+describe('Rational tests', () => {
+    it('should calculate correctly the limits to a value', () => {
+
+        const FR = new Rational(
+            new Polynom('(x+2)'),
+            new Polynom('(x-4)(x+2)')
+        )
+
+        expect(FR.limits(4).tex).to.be.equal("Infinity")
+        expect(FR.limits(4, 'below').tex).to.be.equal("-Infinity")
+        expect(FR.limits(4, 'above').tex).to.be.equal("Infinity")
+        expect(FR.limits(-2).tex).to.be.equal("-\\frac{ 1 }{ 6 }")
+    })
+    it('should calculate the limits to Infinity', ()=>{
+        const FR0 = new Rational(
+            new Polynom('3'),
+            new Polynom('x-5')
+        )
+        const FR2 = new Rational(
+            new Polynom('2x+5'),
+            new Polynom('x-5')
+        )
+
+        const FR3 = new Rational(
+            new Polynom('2x^2+5'),
+            new Polynom('x-5')
+        )
+
+        expect(FR0.limits(Infinity).value).to.be.equal(0)
+        expect(FR0.limits(-Infinity).value).to.be.equal(0)
+
+        expect(FR2.limits(Infinity).value).to.be.equal(2)
+        expect(FR2.limits(-Infinity).value).to.be.equal(2)
+
+        expect(FR3.limits(Infinity).value).to.be.equal(Infinity)
+        expect(FR3.limits(-Infinity).value).to.be.equal(-Infinity)
+    })
+})

package/webpack-production-min.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 module.exports = {
     mode: 'production',
-    entry: './src/main.ts',
+    entry: './src/index.ts',
     devtool: 'source-map',
     module: {
         rules: [

package/webpack-production.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 module.exports = {
     mode: 'production',
-    entry: './src/main.ts',
+    entry: './src/index.ts',
     devtool: 'source-map',
     module: {
         rules: [

package/webpack.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 module.exports = {
     mode: 'development',
-    entry: './src/main.ts',
+    entry: './src/index.ts',
     devtool: 'source-map',
     module: {
         rules: [

package/esm/main.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AACxC,uDAAkD;AAClD,qDAAgD;AAChD,yDAAoD;AACpD,4DAAuD;AACvD,0DAAqD;AACrD,iDAA4C;AAC5C,qDAAgD;AAChD,uDAAkD;AAClD,+DAA0D;AAC1D,uDAAkD;AAClD,2DAAsD;AACtD,+DAAmF;AACnF,oDAA+C;AAC/C,gDAA2C;AAC3C,wDAAmD;AACnD,oDAA+C;AAC/C,kDAA6C;AAE7C,mBAAmB;AACN,QAAA,EAAE,GAAG;IACd,WAAW,EAAE,yBAAW;IACxB,OAAO,EAAE,iBAAO;IAChB,MAAM,EAAE,eAAM;IACd,QAAQ,EAAE,mBAAQ;IAClB,IAAI,EAAE,iBAAO;IACb,KAAK,EAAE,aAAK;IACZ,OAAO,EAAE,iBAAO;IAChB,QAAQ,EAAE,mBAAQ;IAClB,YAAY,EAAE,2BAAY;IAC1B,QAAQ,EAAE,mBAAQ;IAClB,UAAU,EAAE,uBAAU;IACtB,MAAM,EAAE,eAAM;IACd,gBAAgB,EAAE,6BAAgB;IAClC,iBAAiB,EAAE,8BAAiB;IACpC,QAAQ,EAAE;QACN,MAAM,EAAE,eAAM;QACd,KAAK,EAAE,aAAK;QACZ,IAAI,EAAE,WAAI;QACV,QAAQ,EAAE,mBAAQ;QAClB,MAAM,EAAE,eAAM;KACjB;CACJ,CAAC;AACI,MAAO,CAAC,EAAE,GAAG,UAAE,CAAA"}