Skip to content

Commit

Permalink
chore!: update dependencies and remove default export
Browse files Browse the repository at this point in the history
  • Loading branch information
lpatiny committed May 16, 2024
1 parent 720c147 commit db9724e
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 24 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
extends: cheminfo
parserOptions:
sourceType: module
env:
jest: true
20 changes: 20 additions & 0 deletions .github/workflows/documentationjs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Deploy documentation.js on GitHub pages

on:
release:
types: [published]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build documentation
uses: zakodium/documentationjs-action@v1
- name: Deploy to GitHub pages
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
BRANCH: gh-pages
FOLDER: docs
CLEAN: true
12 changes: 12 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Node.js CI

on:
push:
branches:
- main
pull_request:

jobs:
nodejs:
# Documentation: https://github.com/zakodium/workflows#nodejs-ci
uses: zakodium/workflows/.github/workflows/nodejs.yml@nodejs-v1
16 changes: 16 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Release

on:
push:
branches:
- main

jobs:
release:
# Documentation: https://github.com/zakodium/workflows#release
uses: zakodium/workflows/.github/workflows/release.yml@release-v1
with:
npm: true
secrets:
github-token: ${{ secrets.BOT_TOKEN }}
npm-token: ${{ secrets.NPM_BOT_TOKEN }}
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"arrowParens": "always",
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all"
}
7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

File renamed without changes.
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"compile": "rollup -c",
"eslint": "eslint src",
"eslint-fix": "npm run eslint -- --fix",
"prepublishOnly": "npm run compile",
"prepack": "npm run compile",
"prettier": "prettier --check src",
"prettier-write": "prettier --write src",
"test": "npm run test-coverage && npm run eslint",
"test-only": "jest",
"test-coverage": "jest --coverage"
Expand All @@ -32,16 +34,15 @@
"testEnvironment": "node"
},
"devDependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
"eslint": "^5.16.0",
"eslint-config-cheminfo": "^1.20.1",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-jest": "^22.5.1",
"jest": "^24.7.1",
"rollup": "^1.10.1"
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
"@types/jest": "^29.5.12",
"eslint": "^8.57.0",
"eslint-config-cheminfo": "^9.2.0",
"jest": "^29.7.0",
"rollup": "^4.17.2"
},
"dependencies": {
"ml-regression-base": "^2.0.1",
"ml-regression-simple-linear": "^2.0.2"
"ml-regression-base": "^4.0.0",
"ml-regression-simple-linear": "^3.0.0"
}
}
File renamed without changes.
6 changes: 3 additions & 3 deletions src/__tests__/test.js → src/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import PowerRegression from '..';
import { PowerRegression } from '..';

describe('Power regression', () => {
it('basic test', () => {
Expand Down Expand Up @@ -28,8 +28,8 @@ describe('Power regression', () => {
const x2 = [20, 30];
const y2 = result.predict(x2);

expect(y2[0]).toBeCloseTo(expected.A * Math.pow(x2[0], expected.B), 10e-4);
expect(y2[1]).toBeCloseTo(expected.A * Math.pow(x2[1], expected.B), 10e-4);
expect(y2[0]).toBeCloseTo(expected.A * x2[0] ** expected.B, 10e-4);
expect(y2[1]).toBeCloseTo(expected.A * x2[1] ** expected.B, 10e-4);

const score = result.score(x, y);
expect(score.r2).toBeCloseTo(0.999, 1e-2);
Expand Down
9 changes: 5 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import BaseRegression, {
import {
BaseRegression,
checkArrayLength,
maybeToPrecision
} from 'ml-regression-base';
import SimpleLinearRegression from 'ml-regression-simple-linear';
import { SimpleLinearRegression } from 'ml-regression-simple-linear';

export default class PowerRegression extends BaseRegression {
export class PowerRegression extends BaseRegression {
constructor(x, y) {
super();
if (x === true) {
Expand All @@ -18,7 +19,7 @@ export default class PowerRegression extends BaseRegression {
}

_predict(newInputs) {
return this.A * Math.pow(newInputs, this.B);
return this.A * newInputs ** this.B;
}

toJSON() {
Expand Down

0 comments on commit db9724e

Please sign in to comment.