pimath 0.0.121 → 0.0.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pimath",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "description": "A math library for teacher :)",
   "scripts": {
     "test": "mocha -r ts-node/register 'tests/**/*.test.ts'",
@@ -17,9 +17,9 @@
   "devDependencies": {
     "@types/chai": "*",
     "@types/mocha": "*",
-    "@types/node": "^20.4.2",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@types/node": "^20.4.4",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
     "chai": "*",
     "mocha": "*",
     "eslint": "^8.45.0",
@@ -27,7 +27,7 @@
     "ts-node": "^10.9.1",
     "typedoc": "^0.24.8",
     "typescript": "^5.1.6",
-    "webpack": "^5.88.1",
+    "webpack": "^5.88.2",
     "webpack-bundle-analyzer": "^4.9.0",
     "webpack-cli": "^5.1.4"
   }

package/src/index.ts

@@ -39,4 +39,4 @@ export const PiMath = {
     }
 };
 
-(<any>window).PiMath = PiMath
+(<any>window).Pi = PiMath

package/src/maths/algebra/study.ts

@@ -91,6 +91,7 @@ export interface StudyConfig {
     derivative?: boolean,
     domain?: boolean,
     name?: string,
+    variable?: string,
     signs?: boolean,
     variations?: boolean
 }
@@ -125,6 +126,7 @@ export class Study {
 
         this._config = {
             name :'f',
+            variable: 'x',
             domain :true,
             asymptotes :true,
             signs :true,
@@ -136,9 +138,11 @@ export class Study {
             if (typeof config === 'string') {
                 const d = config.split(',')
                 this._config = {}
-                let n = d.filter(x=>x.includes('(x)'))
+                let n = d.filter(x=>x.includes('(') && x.includes(')'))
+
                 if(n.length===1){
-                    this._config.name = n[0].split('(x)')[0]
+                    this._config.name = n[0].split('(')[0]
+                    this._config.variable = n[0].split('(')[1].split(')')[0]
                 }
                 this._config.domain = d.includes('d')
                 this._config.asymptotes = d.includes('a')
@@ -150,18 +154,16 @@ export class Study {
             }
         }
 
-        this._name = this._config?.name ?? 'f'
-
         this.makeStudy()
         return this
     }
 
     get name(): string {
-        return this._name;
+        return this._config.name;
     }
 
     set name(value: string) {
-        this._name = value;
+        this._config.name = value;
     }
 
     get config(): StudyConfig {
@@ -468,14 +470,14 @@ export class Study {
 
     private _makeTexFromTableOfSigns = (tos: ITableOfSigns): string => {
         let factors = tos.factors.map(x => `\\(${x.tex}\\)/1`),
-            factorsFx = `\\(${this._name}(x)\\)/1.2`,
+            factorsFx = `\\(${this._config.name}(${this._config.variable})\\)/1.2`,
             zeroes = tos.zeroes
 
         // Add the last lines "label"
         if (tos.type === TABLE_OF_SIGNS.GROWS) {
-            factorsFx = `\\(${this._name}'(x)\\)/1.2,\\(f(x)\\)/2`
+            factorsFx = `\\(${this._config.name}'(${this._config.variable})\\)/1.2,\\(f(x${this._config.variable})\\)/2`
         } else if (tos.type === TABLE_OF_SIGNS.VARIATIONS) {
-            factorsFx = `\\(${this._name}''(x)\\)/1.2,\\(f(x)\\)/2`
+            factorsFx = `\\(${this._config.name}''(${this._config.variable})\\)/1.2,\\(f(${this._config.variable})\\)/2`
         }
 
         // Create the tikzPicture header

package/tests/numexp.test.ts

@@ -61,4 +61,16 @@ describe('Numerical expression', () => { // the tests container
         expect(p.evaluate({x: 16})).to.be.equal(2)
         expect(p.evaluate({x: -16})).to.be.NaN
     })
+
+    it('should work with constant', function () {
+
+        let k = new NumExp('2pi*x')
+        expect(k.evaluate({x: 1})).to.be.equal(6.283186)
+    });
+
+    it('should work with constant but without variables', function () {
+
+        let k = new NumExp('2pi')
+        expect(k.evaluate()).to.be.equal(6.283186)
+    });
 });