Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 9.0.0 #113

Merged
merged 6 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ node_modules/
*.css
*.log
/dist/
/yarn.lock
!yarn.lock
# yarn
.pnp.*
.yarn/*
Expand Down
46 changes: 39 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "tourdino",
"description": "Calculate and visualize similarity measures.",
"homepage": "https://phovea.caleydo.org",
"version": "8.0.0",
"version": "9.0.0",
"author": {
"name": "The Caleydo Team",
"email": "contact@caleydo.org",
Expand All @@ -23,8 +23,41 @@
"type": "git",
"url": "git@github.com:Caleydo/tourdino.git"
},
"main": "dist/index.js",
"types": "dist/index.d.ts",
"main": "src/index.ts",
"types": "src/index.ts",
"exports": {
".": {
"types": [
"./dist/index.d.ts",
"./src/index.ts"
],
"import": [
"./dist/index.js",
"./src/index.ts"
],
"default": [
"./dist/index.js",
"./src/index.ts"
]
},
"./phovea_registry": [
"./dist/phovea_registry.js",
"./src/phovea_registry.ts"
],
"./dist/phovea_registry": [
"./dist/phovea_registry.js",
"./src/phovea_registry.ts"
],
"./src/scss/*": [
"./dist/scss/*",
"./src/scss/*"
],
"./dist/scss/*": [
"./dist/scss/*",
"./src/scss/*"
],
"./package.json": "./package.json"
},
"files": [
"src",
"dist"
Expand All @@ -48,7 +81,6 @@
"docs": "visyn_scripts docs",
"lint:fix": "visyn_scripts lint --fix",
"lint": "visyn_scripts lint",
"prepack": "npm run build",
"start": "visyn_scripts start --env workspace_mode=single",
"storybook:build": "NODE_OPTIONS=--max_old_space_size=4096 build-storybook",
"storybook": "NODE_OPTIONS=--max_old_space_size=4096 start-storybook -p 6006",
Expand All @@ -62,16 +94,16 @@
"worker-loader": "^2.0.0"
},
"dependencies": {
"d3.parsets": "git+ssh://git@github.com/jasondavies/d3-parsets#v1.2.4",
"d3.parsets": "git+ssh://git@github.com/jasondavies/d3-parsets#e758679787f009b760d42a41189102bf216f39ab",
"jstat": "^1.9.4",
"lodash": "~4.17.20",
"tdp_core": "^20.1.0",
"tdp_core": "^23.0.2",
"vega": "~5.20.0",
"vega-embed": "6.19.1",
"vega-functions": "5.12.0",
"vega-lite": "5.1.1",
"vega-parser": "6.1.3",
"visyn_scripts": "^4.1.0",
"visyn_scripts": "^7.0.1",
"xxhashjs": "^0.2.2"
},
"resolutions": {
Expand Down
6 changes: 5 additions & 1 deletion src/app/TouringPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ export class TouringPanel {

private active: boolean;

constructor(private readonly _desc: IPanelTabExtensionDesc, private readonly tab: PanelTab, private readonly provider: LocalDataProvider) {
constructor(
private readonly _desc: IPanelTabExtensionDesc,
private readonly tab: PanelTab,
private readonly provider: LocalDataProvider,
) {
this.node = tab.node;
this.node.classList.add('touring');
this.node.innerHTML = touringTemplate;
Expand Down
4 changes: 2 additions & 2 deletions src/base/BaseUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* arr1: eleents only in arr1
* arr2: eleents only in arr2
*/
static intersection(arr1: any[], arr2: any[]) {

Check warning on line 11 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type

Check warning on line 11 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type
const intersection = [];
const filtered2 = arr2.slice(0); // Slice is fastest (internally optimized) method on blink browsers (e.g. chrome) to copy an array
const filtered1 = arr1.filter((itemA) => {
Expand All @@ -32,7 +32,7 @@
* @param arr2 Second array
* @returns An array containing two same length arrays with no null/missing values
*/
static removeMissingValues(arr1: any[], arr2: any[]) {

Check warning on line 35 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type

Check warning on line 35 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type
const filtered1 = [];
const filtered2 = [];
arr1.forEach((item, index) => {
Expand All @@ -49,7 +49,7 @@
return (n * (n - 1)) / 2;
}

static isMissingValue(v: any): boolean {

Check warning on line 52 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type
if (
v == null ||
v === undefined ||
Expand Down Expand Up @@ -83,7 +83,7 @@
* @param scoreVal score value for the current measure
* @param pVal p-value calculated for the current measure
*/
static measureResultObj(scoreVal: number, pVal: number, setSizeA: number, setSizeB: number, addData?: any): IMeasureResult {

Check warning on line 86 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type
if (addData !== undefined) {
return {
scoreValue: scoreVal,
Expand Down Expand Up @@ -117,8 +117,8 @@
* See: https://stackoverflow.com/a/1527820/2549748
*/
private static getRandomInt(min, max) {
min = Math.ceil(min);

Check warning on line 120 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Assignment to function parameter 'min'
max = Math.floor(max);

Check warning on line 121 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Assignment to function parameter 'max'
return Math.floor(Math.random() * (max - min + 1)) + min;
}

Expand All @@ -137,13 +137,13 @@

while (integers.length !== n) {
// skipped if n = max+1 --> all integers between 0 and max
integers.splice(getRandomInt(0, integers.length), 1); // definetly one hit per iteration
integers.splice(BaseUtils.getRandomInt(0, integers.length), 1); // definetly one hit per iteration
}
return integers;
}
const integers = [];
while (integers.length < n) {
const integer = getRandomInt(0, max);
const integer = BaseUtils.getRandomInt(0, max);
if (integers.indexOf(integer) === -1) {
// not every iteration might add an element
integers.push(integer);
Expand All @@ -156,7 +156,7 @@
* Shuffles array in place. From: https://stackoverflow.com/a/6274381/2549748
* @param {Array} arr An array containing the items.
*/
static shuffle(arr: any[]): any[] {

Check warning on line 159 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type

Check warning on line 159 in src/base/BaseUtils.ts

View workflow job for this annotation

GitHub Actions / build / build-node

Unexpected any. Specify a different type
let index;
let rndIndex;
let helper;
Expand Down
1 change: 1 addition & 0 deletions src/phovea_registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import reg from './phovea';
* build a registry by registering all phovea modules
*/
// other modules
import 'tdp_core/dist/phovea_registry';

// self
PluginRegistry.getInstance().register('tourdino', reg);
5 changes: 4 additions & 1 deletion src/tasks/RankingAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ export class RankingAdapter {
return indices;
}

constructor(protected readonly provider: LocalDataProvider, private rankingIndex = 0) {}
constructor(
protected readonly provider: LocalDataProvider,
private rankingIndex = 0,
) {}

public getProvider(): LocalDataProvider {
return this.provider;
Expand Down
Loading