pimath 0.0.128 → 0.0.130

package/{src → lib}/maths/geometry/vector.ts

@@ -3,7 +3,7 @@
  * @module Vector
  */
 import {Fraction} from "../coefficients/fraction";
-import {Numeric} from "../numeric";
+import {Numeric} from "../numeric.ts";
 import {Point} from "./point";
 
 export class Vector {
@@ -26,7 +26,7 @@ export class Vector {
         return this._x;
     }
 
-    set x(value: Fraction|number|string) {
+    set x(value: Fraction | number | string) {
         this._x = new Fraction(value);
     }
 
@@ -34,7 +34,7 @@ export class Vector {
         return this._y;
     }
 
-    set y(value: Fraction|number|string) {
+    set y(value: Fraction | number | string) {
         this._y = new Fraction(value);
     }
 
@@ -58,6 +58,18 @@ export class Vector {
     // Creation / parsing functions
     // ------------------------------------------
 
+    get isNull(): boolean {
+        return this.x.isZero() && this.y.isZero()
+    }
+
+    static scalarProduct = (v1: Vector, v2: Vector): Fraction => {
+        return v1.x.clone().multiply(v2.x).add(v1.y.clone().multiply(v2.y));
+    };
+
+    static determinant = (v1: Vector, v2: Vector): Fraction => {
+        return v1.x.clone().multiply(v2.y).subtract(v1.y.clone().multiply(v2.x))
+    }
+
     parse = (...values: any): Vector => {
         // TODO: Must be more strict about what is given and limit to two dimensional vectors.p
         // Maybe more than one value was given...
@@ -92,12 +104,12 @@ export class Vector {
                 this._y = new Fraction(values[1])
             }
 
-            if(
+            if (
                 (typeof values[0] === 'object' && !isNaN(values[0].x) && !isNaN(values[0].x)) &&
                 (typeof values[1] === 'object' && !isNaN(values[1].x) && !isNaN(values[1].x))
-            ){
-                this._x = new Fraction(+values[1].x-values[0].x)
-                this._y = new Fraction(+values[1].y-values[0].y)
+            ) {
+                this._x = new Fraction(+values[1].x - values[0].x)
+                this._y = new Fraction(+values[1].y - values[0].y)
             }
         }
 
@@ -122,6 +134,9 @@ export class Vector {
         return this;
     }
 
+    // ------------------------------------------
+    // Mathematical operations
+
     zero = (): Vector => {
         this.reset();
         this._x = new Fraction(null);
@@ -135,18 +150,6 @@ export class Vector {
         return this;
     }
 
-    private _parseString = (value: string): Vector => {
-        // Split comma, semi colon or single space.
-        let components = value.split(/[,;\s]/g);
-
-        // Validate the fraction values.
-        this.x = new Fraction(components[0] || null);
-        this.y = new Fraction(components[1] || null);
-        return this;
-    };
-
-    // ------------------------------------------
-    // Mathematical operations
     // ------------------------------------------
     opposed = (): Vector => {
         this._x.opposed();
@@ -174,14 +177,6 @@ export class Vector {
         return Vector.determinant(this, V)
     }
 
-    static scalarProduct = (v1: Vector, v2: Vector): Fraction => {
-        return v1.x.clone().multiply(v2.x).add(v1.y.clone().multiply(v2.y));
-    };
-
-    static determinant = (v1: Vector, v2: Vector): Fraction => {
-        return v1.x.clone().multiply(v2.y).subtract(v1.y.clone().multiply(v2.x))
-    }
-
     normal = (): Vector => {
         let x = this.x.clone().opposed(), y = this.y.clone();
         this._x = y;
@@ -197,10 +192,6 @@ export class Vector {
         return this.scalarProductWithVector(v).isZero()
     }
 
-    get isNull(): boolean {
-        return this.x.isZero() && this.y.isZero()
-    }
-
     multiplyByScalar = (k: any): Vector => {
         let scalar = new Fraction(k);
         this._x.multiply(scalar);
@@ -211,15 +202,15 @@ export class Vector {
     divideByScalar = (k: any): Vector => {
         return this.multiplyByScalar(new Fraction(k).invert());
     }
-    // ------------------------------------------
-    // Vector functions
-    // ------------------------------------------
 
     simplify = (): Vector => {
         // Multiply by the lcm of denominators.
         return this.multiplyByScalar(Numeric.lcm(this._x.denominator, this._y.denominator))
             .divideByScalar(Numeric.gcd(this._x.numerator, this._y.numerator));
     }
+    // ------------------------------------------
+    // Vector functions
+    // ------------------------------------------
 
     simplifyDirection = (): Vector => {
         let lcm = Numeric.lcm(this.x.denominator, this.y.denominator),
@@ -239,4 +230,14 @@ export class Vector {
 
         return toDegree * Math.acos(scalar / (this.norm * V.norm));
     }
+
+    private _parseString = (value: string): Vector => {
+        // Split comma, semi colon or single space.
+        let components = value.split(/[,;\s]/g);
+
+        // Validate the fraction values.
+        this.x = new Fraction(components[0] || null);
+        this.y = new Fraction(components[1] || null);
+        return this;
+    };
 }

package/{src → lib}/maths/numexp.ts

@@ -6,11 +6,11 @@ export class NumExp {
     private _expression: string
     private _isValid: boolean
 
-    constructor(value: string, uniformize?:boolean) {
+    constructor(value: string, uniformize?: boolean) {
         this._expression = value
         try {
-            this._rpn = new Shutingyard(ShutingyardMode.NUMERIC).parse(value, uniformize || uniformize===undefined).rpn
-        }catch(e){
+            this._rpn = new Shutingyard(ShutingyardMode.NUMERIC).parse(value, uniformize || uniformize === undefined).rpn
+        } catch (e) {
             this._rpn = null
             this._isValid = false
         }
@@ -21,17 +21,17 @@ export class NumExp {
     }
 
     get isValid(): boolean {
-        if(this._isValid===undefined){
+        if (this._isValid === undefined) {
             try {
                 const v = this.evaluate({x: 0})
-            }catch{
+            } catch {
                 this._isValid = false
             }
         }
         return this._isValid
     }
 
-    set isValid(value: boolean){
+    set isValid(value: boolean) {
         this._isValid = value
     }
 
@@ -39,68 +39,10 @@ export class NumExp {
         return this._expression;
     }
 
-    private _extractDecimalPart(value: number): string {
-        let decimal = value.toString()
-
-        if (!decimal.includes('.')) {
-            return ''
-        }
-
-        decimal = decimal.split('.')[1]
-
-        return decimal.substring(0, decimal.length - 2)
-    }
-
-    private _numberCorrection(value: number): number {
-        // Must modify the number if it's like:
-        // a: 3.0000000000000003
-        // b: 3.9999999999999994
-        // remove the last character
-        // check if around n last characters are either 0 or 9
-        // if it is, 'round' the number.
-
-        const epsilon = 0.00000000000001,
-            number_of_digits = 6
-
-        const decimal = this._extractDecimalPart(value)
-        if(decimal===''){return value}
-
-        const n9 = decimal.match(/9+$/g)
-        const n0 = decimal.match(/0+$/g)
-
-        if (n9 && n9[0].length >= number_of_digits) {
-            // New tested values.
-            const mod = this._extractDecimalPart(value + epsilon),
-                mod0 = mod.match(/0+$/g)
-
-            if(mod0 && mod0[0].length>= number_of_digits){
-                // The value can be changed. Remove all zeros!
-                return +((value+epsilon).toString().split(mod0[0])[0])
-            }
-        }
-
-        if (n0 && n0[0].length >= number_of_digits) {
-            // New tested values.
-            const mod = this._extractDecimalPart(value - epsilon),
-                mod9 = mod.match(/9+$/g)
-
-            if(mod9 && mod9[0].length>= number_of_digits){
-                // The value can be changed. Remove all nines!
-                return +(value.toString().split(n0[0])[0])
-            }
-        }
-
-        return value
-    }
-
-    private _addToStack(stack:number[], value: number): void {
-        stack.push(this._numberCorrection(value))
-    }
-
     evaluate(values?: { [Key: string]: number }): number {
         const stack: number[] = []
 
-        if(this._rpn===null){
+        if (this._rpn === null) {
             this._isValid = false
             return 0
         }
@@ -125,51 +67,63 @@ export class NumExp {
                 if (element.token === '*') {
                     const b = stack.pop(),
                         a = stack.pop()
-                    if(a === undefined || b === undefined){this.isValid = false}
+                    if (a === undefined || b === undefined) {
+                        this.isValid = false
+                    }
                     this._addToStack(stack, a * b)
                 } else if (element.token === '/') {
                     const b = stack.pop(),
                         a = stack.pop()
-                    if(a === undefined || b === undefined){this.isValid = false}
+                    if (a === undefined || b === undefined) {
+                        this.isValid = false
+                    }
                     this._addToStack(stack, a / b)
                 } else if (element.token === '+') {
                     const b = stack.pop(),
                         a = stack.pop()
-                    if(a === undefined || b === undefined){this.isValid = false}
+                    if (a === undefined || b === undefined) {
+                        this.isValid = false
+                    }
                     this._addToStack(stack, (+a) + (+b))
                 } else if (element.token === '-') {
                     const b = stack.pop(),
                         a = stack.pop() || 0
-                    if(b === undefined){this.isValid = false}
+                    if (b === undefined) {
+                        this.isValid = false
+                    }
                     this._addToStack(stack, a - b)
                 } else if (element.token === '^') {
                     const b = stack.pop(),
                         a = stack.pop()
-                    if(a === undefined || b === undefined){this.isValid = false}
+                    if (a === undefined || b === undefined) {
+                        this.isValid = false
+                    }
                     this._addToStack(stack, Math.pow(a, b))
                 }
             } else if (element.tokenType === ShutingyardType.FUNCTION) {
                 const a = stack.pop()
-                if(a === undefined){this.isValid = false}
+                if (a === undefined) {
+                    this.isValid = false
+                }
                 if (element.token === 'sin') {
                     this._addToStack(stack, Math.sin(a))
                 } else if (element.token === 'cos') {
                     this._addToStack(stack, Math.cos(a))
                 } else if (element.token === 'tan') {
                     this._addToStack(stack, Math.tan(a))
-                } else if(element.token === 'sqrt') {
+                } else if (element.token === 'sqrt') {
                     this._addToStack(stack, Math.sqrt(a))
-                }else if(element.token ==='nthrt') {
+                } else if (element.token === 'nthrt') {
                     // TODO: support nthrt in num. exp.
                     let b = stack.pop()
-                    if(a%2===0 && b<0){
+                    if (a % 2 === 0 && b < 0) {
                         this._addToStack(stack, NaN)
-                    }else {
+                    } else {
                         this._addToStack(stack, (b < 0 ? -1 : 1) * Math.pow(Math.abs(b), 1 / a))
                     }
-                } else if(element.token === 'ln'){
+                } else if (element.token === 'ln') {
                     this._addToStack(stack, Math.log(a))
-                } else if(element.token === 'log') {
+                } else if (element.token === 'log') {
                     this._addToStack(stack, Math.log10(a))
                 }
             }
@@ -181,4 +135,64 @@ export class NumExp {
             throw `There was a problem parsing: ${this._expression}`
         }
     }
+
+    private _extractDecimalPart(value: number): string {
+        let decimal = value.toString()
+
+        if (!decimal.includes('.')) {
+            return ''
+        }
+
+        decimal = decimal.split('.')[1]
+
+        return decimal.substring(0, decimal.length - 2)
+    }
+
+    private _numberCorrection(value: number): number {
+        // Must modify the number if it's like:
+        // a: 3.0000000000000003
+        // b: 3.9999999999999994
+        // remove the last character
+        // check if around n last characters are either 0 or 9
+        // if it is, 'round' the number.
+
+        const epsilon = 0.00000000000001,
+            number_of_digits = 6
+
+        const decimal = this._extractDecimalPart(value)
+        if (decimal === '') {
+            return value
+        }
+
+        const n9 = decimal.match(/9+$/g)
+        const n0 = decimal.match(/0+$/g)
+
+        if (n9 && n9[0].length >= number_of_digits) {
+            // New tested values.
+            const mod = this._extractDecimalPart(value + epsilon),
+                mod0 = mod.match(/0+$/g)
+
+            if (mod0 && mod0[0].length >= number_of_digits) {
+                // The value can be changed. Remove all zeros!
+                return +((value + epsilon).toString().split(mod0[0])[0])
+            }
+        }
+
+        if (n0 && n0[0].length >= number_of_digits) {
+            // New tested values.
+            const mod = this._extractDecimalPart(value - epsilon),
+                mod9 = mod.match(/9+$/g)
+
+            if (mod9 && mod9[0].length >= number_of_digits) {
+                // The value can be changed. Remove all nines!
+                return +(value.toString().split(n0[0])[0])
+            }
+        }
+
+        return value
+    }
+
+    private _addToStack(stack: number[], value: number): void {
+        stack.push(this._numberCorrection(value))
+    }
 }

package/{src → lib}/maths/randomization/rndHelpers.ts

@@ -1,7 +1,7 @@
 /**
  * Random helpers
  */
-import {Numeric} from "../numeric";
+import {Numeric} from "../numeric.ts";
 
 export class rndHelpers {
 

package/{src → lib}/maths/randomization/rndMonom.ts

@@ -10,19 +10,6 @@ export class rndMonom extends randomCore {
     declare protected _config: randomMonomConfig
     declare protected _defaultConfig: randomMonomConfig
 
-    constructor(userConfig?: randomMonomConfig) {
-        super();
-
-        this._defaultConfig = {
-            letters: 'x',
-            degree: 2,
-            fraction: true,
-            zero: false
-        }
-
-        this._config = this.mergeConfig(userConfig, this._defaultConfig)
-    }
-
     generate = (): Monom => {
         // Create a monom instance
         let M = new Monom()
@@ -54,4 +41,17 @@ export class rndMonom extends randomCore {
 
         return M
     }
+
+    constructor(userConfig?: randomMonomConfig) {
+        super();
+
+        this._defaultConfig = {
+            letters: 'x',
+            degree: 2,
+            fraction: true,
+            zero: false
+        }
+
+        this._config = this.mergeConfig(userConfig, this._defaultConfig)
+    }
 }

package/{src → lib}/maths/randomization/rndPolynom.ts

@@ -12,28 +12,8 @@ export class rndPolynom extends randomCore {
     declare protected _config: randomPolynomConfig
     declare protected _defaultConfig: randomPolynomConfig
 
-    constructor(userConfig?: randomPolynomConfig) {
-        super();
-
-        // Default config for a random polynom
-        this._defaultConfig = {
-            letters: 'x',
-            degree: 2,
-            fraction: false,
-            zero: false,
-            unit: false,
-            factorable: false,
-            allowNullMonom: true,
-            numberOfMonoms: 0,
-            positive: true
-        }
-
-        // Merge config with initialiser
-        this._config = this.mergeConfig(userConfig, this._defaultConfig)
-    }
-
     generate = (): Polynom => {
-        if(this._config.factorable && this._config.degree>1){
+        if (this._config.factorable && this._config.degree > 1) {
             return this.factorable()
         }
 
@@ -60,7 +40,7 @@ export class rndPolynom extends randomCore {
         }
 
         // Make sure the first monom is positive.
-        if(this._config.positive && P.monomByDegree().coefficient.isNegative()){
+        if (this._config.positive && P.monomByDegree().coefficient.isNegative()) {
             P.monomByDegree().coefficient.opposed()
         }
 
@@ -68,12 +48,32 @@ export class rndPolynom extends randomCore {
         if (this._config.numberOfMonoms > 0 && this._config.numberOfMonoms < P.length) {
             // Get the greatest degree monom
             let M = P.monomByDegree().clone()
-            P.monoms = Random.array(P.monoms.slice(1), this._config.numberOfMonoms-1)
+            P.monoms = Random.array(P.monoms.slice(1), this._config.numberOfMonoms - 1)
             P.add(M).reorder().reduce()
         }
         return P
     }
 
+    constructor(userConfig?: randomPolynomConfig) {
+        super();
+
+        // Default config for a random polynom
+        this._defaultConfig = {
+            letters: 'x',
+            degree: 2,
+            fraction: false,
+            zero: false,
+            unit: false,
+            factorable: false,
+            allowNullMonom: true,
+            numberOfMonoms: 0,
+            positive: true
+        }
+
+        // Merge config with initialiser
+        this._config = this.mergeConfig(userConfig, this._defaultConfig)
+    }
+
     factorable = (): Polynom => {
         let P = new Polynom().one()
 
@@ -81,7 +81,7 @@ export class rndPolynom extends randomCore {
         _factorableConfig.degree = 1
         _factorableConfig.factorable = false
 
-        for(let i=0; i<this._config.degree;i++){
+        for (let i = 0; i < this._config.degree; i++) {
             P.multiply(Random.polynom(_factorableConfig))
         }
 

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "pimath",
-  "version": "0.0.128",
+  "version": "0.0.130",
   "description": "A math library for teacher :)",
   "type": "module",
+  "main": "dist/pimath.js",
+  "types": "dist/pimath.d.ts",
+  "files": [
+    "dist",
+    "lib"
+  ],
   "scripts": {
     "test": "mocha -r ts-node/register 'tests/**/*.test.ts'",
     "dev": "vite serve",
-    "build": "tsc && vite build",
+    "build": "tsc --p ./tsconfig-build.json && vite build",
     "preview": "vite preview",
     "docs": "typedoc"
   },
@@ -28,15 +34,8 @@
     "ts-loader": "^9.4.4",
     "ts-node": "^10.9.1",
     "typedoc": "^0.25.1",
-    "typescript": "^5.2.2"
-  },
-  "dependencies": {
-    "vite": "^5.2.10"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/pimath.js",
-      "require": "./dist/pimath.umd.cjs"
-    }
+    "typescript": "^5.2.2",
+    "vite": "^5.2.10",
+    "vite-plugin-dts": "^3.9.0"
   }
 }

package/.eslintrc.js

@@ -1,24 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-    }
-};

package/.idea/$CACHE_FILE$

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths />
-  </component>
-</project>

package/.idea/PI.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/docs" />
-      <excludeFolder url="file://$MODULE_DIR$/esm" />
-      <excludeFolder url="file://$MODULE_DIR$/public" />
-      <excludeFolder url="file://$MODULE_DIR$/dev" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="RegExpAnonymousGroup" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/PI.iml" filepath="$PROJECT_DIR$/.idea/PI.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/php.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
-  <component name="PhpStanOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PsalmOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>