@datagrok/peptides 1.3.9 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,12 +1,11 @@
1
1
  import * as ui from 'datagrok-api/ui';
2
- import * as grok from 'datagrok-api/grok';
3
2
  import * as DG from 'datagrok-api/dg';
4
3
 
5
4
  import * as type from '../utils/types';
5
+ import * as C from '../utils/constants';
6
6
  import {PeptidesModel} from '../model';
7
7
 
8
8
  import $ from 'cash-dom';
9
- import wu from 'wu';
10
9
 
11
10
  //TODO: show sliderInput values
12
11
  export function getSettingsDialog(model: PeptidesModel): DG.Dialog {
@@ -27,36 +26,41 @@ export function getSettingsDialog(model: PeptidesModel): DG.Dialog {
27
26
  });
28
27
  maxMutations.addPostfix((settings.maxMutations ?? 1).toString());
29
28
  const minActivityDelta = ui.sliderInput('Min activity delta', settings.minActivityDelta ?? 0, 0, 100, () => {
30
- const val = Math.round(minActivityDelta.value!);
31
- result.minActivityDelta = val;
29
+ const val = minActivityDelta.value!.toFixed(3);
30
+ result.minActivityDelta = parseFloat(val);
32
31
  $(minActivityDelta.root).find('label.ui-input-description').remove();
33
- minActivityDelta.addPostfix(val.toString());
32
+ minActivityDelta.addPostfix(val);
34
33
  });
35
34
  minActivityDelta.addPostfix((settings.minActivityDelta ?? 0).toString());
36
35
  accordion.addPane('Mutation Cliffs', () => ui.inputs([maxMutations, minActivityDelta]), true);
37
36
 
38
37
  const inputsRows: HTMLElement[] = [];
39
38
  for (const col of model.df.columns.numerical) {
40
- const isIncluded = ui.boolInput('', typeof (settings.columns ?? {})[col.name] !== 'undefined',
39
+ const colName = col.name;
40
+ if (colName == settings.activityColumnName || colName == C.COLUMNS_NAMES.ACTIVITY_SCALED)
41
+ continue;
42
+
43
+ const isIncludedInput = ui.boolInput('', typeof (settings.columns ?? {})[colName] !== 'undefined',
41
44
  () => {
42
- if (isIncluded)
43
- result.columns![col.name] = aggregation.stringValue;
45
+ if (isIncludedInput.value)
46
+ result.columns![colName] = aggregationInput.stringValue;
44
47
  else
45
- delete result.columns![col.name];
48
+ delete result.columns![colName];
46
49
  }) as DG.InputBase<boolean>;
47
- const aggregation = ui.choiceInput('Aggregation', (settings.columns ?? {})[col.name] ?? 'avg', Object.values(DG.STATS),
48
- () => {
49
- if (isIncluded)
50
- result.columns![col.name] = aggregation.stringValue;
50
+ const aggregationInput = ui.choiceInput('Aggregation', (settings.columns ?? {})[colName] ?? 'avg',
51
+ Object.values(DG.STATS), () => {
52
+ if (isIncludedInput.value)
53
+ result.columns![colName] = aggregationInput.stringValue;
51
54
  else
52
55
  delete result.columns![col.name];
53
56
  }) as DG.InputBase<string>;
54
- $(aggregation.root).find('label').css('width', 'auto');
55
- const inputsRow = ui.inputsRow(col.name, [isIncluded, aggregation]);
57
+ $(aggregationInput.root).find('label').css('width', 'auto');
58
+ const inputsRow = ui.inputsRow(col.name, [isIncludedInput, aggregationInput]);
56
59
  $(inputsRow).find('div.ui-div').css('display', 'inline-flex');
57
60
  inputsRows.push(inputsRow);
58
61
  }
59
- accordion.addPane('Columns to include', () => ui.divV(inputsRows), false);
62
+ if (inputsRows.length != 0)
63
+ accordion.addPane('Columns to include', () => ui.divV(inputsRows), false);
60
64
 
61
65
  const dialog = ui.dialog('Peptides settings').add(accordion);
62
66
  dialog.root.style.width = '400px';
@@ -1,4 +1,4 @@
1
- <html><head><meta charset="utf-8"/><title>Peptides Test Report. Datagrok version datagrok/datagrok:latest SHA=62cc009524f3. Commit 0949dc07.</title><style type="text/css">html,
1
+ <html><head><meta charset="utf-8"/><title>Peptides Test Report. Datagrok version datagrok/datagrok:bleeding-edge SHA=4775b69ad08a. Commit 1bc1a2b4.</title><style type="text/css">html,
2
2
  body {
3
3
  font-family: Arial, Helvetica, sans-serif;
4
4
  font-size: 1rem;
@@ -229,12 +229,7 @@ header {
229
229
  font-size: 1rem;
230
230
  padding: 0 0.5rem;
231
231
  }
232
- </style></head><body><div id="jesthtml-content"><header><h1 id="title">Peptides Test Report. Datagrok version datagrok/datagrok:latest SHA=62cc009524f3. Commit 0949dc07.</h1></header><div id="metadata-container"><div id="timestamp">Started: 2022-11-11 14:09:20</div><div id="summary"><div id="suite-summary"><div class="summary-total">Suites (1)</div><div class="summary-passed summary-empty">0 passed</div><div class="summary-failed">1 failed</div><div class="summary-pending summary-empty">0 pending</div></div><div id="test-summary"><div class="summary-total">Tests (1)</div><div class="summary-passed summary-empty">0 passed</div><div class="summary-failed">1 failed</div><div class="summary-pending summary-empty">0 pending</div></div></div></div><div id="suite-1" class="suite-container"><div class="suite-info"><div class="suite-path">/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts</div><div class="suite-time warn">96.038s</div></div><div class="suite-tests"><div class="test-result failed"><div class="test-info"><div class="test-suitename"> </div><div class="test-title">TEST</div><div class="test-status">failed</div><div class="test-duration">82.695s</div></div><div class="failureMessages"> <pre class="failureMsg">Error: Test result : Failed : 329 : Peptides.Core.Start analysis: сomplex : Error: For column 'macromolecule' of alphabet 'UN' tag '.alphabetSize' is mandatory.
233
-
234
- at /home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:68:20
235
- at Generator.next (&lt;anonymous&gt;)
236
- at fulfilled (/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:31:58)
237
- at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre></div></div></div><div class="suite-consolelog"><div class="suite-consolelog-header">Console Log</div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at Object.&lt;anonymous&gt; (/home/runner/work/public/public/packages/Peptides/src/__jest__/test-node.ts:62:11)
232
+ </style></head><body><div id="jesthtml-content"><header><h1 id="title">Peptides Test Report. Datagrok version datagrok/datagrok:bleeding-edge SHA=4775b69ad08a. Commit 1bc1a2b4.</h1></header><div id="metadata-container"><div id="timestamp">Started: 2022-12-22 14:26:33</div><div id="summary"><div id="suite-summary"><div class="summary-total">Suites (1)</div><div class="summary-passed">1 passed</div><div class="summary-failed summary-empty">0 failed</div><div class="summary-pending summary-empty">0 pending</div></div><div id="test-summary"><div class="summary-total">Tests (1)</div><div class="summary-passed">1 passed</div><div class="summary-failed summary-empty">0 failed</div><div class="summary-pending summary-empty">0 pending</div></div></div></div><div id="suite-1" class="suite-container"><div class="suite-info"><div class="suite-path">/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts</div><div class="suite-time warn">65.742s</div></div><div class="suite-tests"><div class="test-result passed"><div class="test-info"><div class="test-suitename"> </div><div class="test-title">TEST</div><div class="test-status">passed</div><div class="test-duration">56.156s</div></div></div></div><div class="suite-consolelog"><div class="suite-consolelog-header">Console Log</div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at Object.&lt;anonymous&gt; (/home/runner/work/public/public/packages/Peptides/src/__jest__/test-node.ts:62:11)
238
233
  at Generator.next (&lt;anonymous&gt;)
239
234
  at fulfilled (/home/runner/work/public/public/packages/Peptides/src/__jest__/test-node.ts:28:58)
240
235
  at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre><pre class="suite-consolelog-item-message">Using web root: http://localhost:8080</pre></div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at /home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:40:11
@@ -244,33 +239,39 @@ header {
244
239
  at Object.&lt;anonymous&gt;.__awaiter (/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:30:12)
245
240
  at Object.&lt;anonymous&gt; (/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:38:23)
246
241
  at Promise.then.completed (/home/runner/work/public/public/packages/Peptides/node_modules/jest-circus/build/utils.js:391:28)
247
- at new Promise (&lt;anonymous&gt;)</pre><pre class="suite-consolelog-item-message">Testing Peptides package</pre></div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at /home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:66:11
242
+ at new Promise (&lt;anonymous&gt;)</pre><pre class="suite-consolelog-item-message">Testing Peptides package</pre></div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at /home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:71:11
248
243
  at Generator.next (&lt;anonymous&gt;)
249
244
  at fulfilled (/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:31:58)
250
- at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre><pre class="suite-consolelog-item-message">Test result : Success : 4295 : Peptides.Core.Start analysis: simple : OK
251
- Test result : Success : 7421 : Peptides.Core.Save and load project : OK
252
- Test result : Success : 0 : Peptides.Peptide space.test_table.is_not_empty : OK
253
- Test result : Success : 2686 : Peptides.Peptide space.PeptideSimilaritySpaceWidget.is_drawing : OK
245
+ at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre><pre class="suite-consolelog-item-message">Test result : Success : 1783 : Peptides.Core.Start analysis: simple : OK
246
+ Test result : Success : 1047 : Peptides.Core.Start analysis: сomplex : OK
247
+ Test result : Success : 3669 : Peptides.Core.Save and load project : OK
248
+ Test result : Success : 1 : Peptides.Peptide space.test_table.is_not_empty : OK
249
+ Test result : Success : 2129 : Peptides.Peptide space.PeptideSimilaritySpaceWidget.is_drawing : OK
254
250
  Test result : Success : 2 : Peptides.Peptide space.test_deminsionality_reducer : OK
255
251
  Test result : Success : 0 : Peptides.Peptide space.test_peptide_similarity_space_viewer : OK
256
- Test result : Success : 2238 : Peptides.Peptide space.peptide_space.DimensinalityReducer.UMAP.Levenshtein.is_numeric : OK
257
- Test result : Success : 2625 : Peptides.Peptide space.peptide_space.DimensinalityReducer.UMAP.Jaro-Winkler.is_numeric : OK
258
- Test result : Success : 3350 : Peptides.Peptide space.peptide_space.DimensinalityReducer.t-SNE.Levenshtein.is_numeric : OK
259
- Test result : Success : 3819 : Peptides.Peptide space.peptide_space.DimensinalityReducer.t-SNE.Jaro-Winkler.is_numeric : OK
260
- Test result : Success : 208 : Peptides.Peptide space.peptide_space.DimensinalityReducer.SPE.Levenshtein.is_numeric : OK
261
- Test result : Success : 594 : Peptides.Peptide space.peptide_space.DimensinalityReducer.SPE.Jaro-Winkler.is_numeric : OK
262
- Test result : Success : 171 : Peptides.Peptide space.peptide_space.DimensinalityReducer.pSPE.Levenshtein.is_numeric : OK
263
- Test result : Success : 556 : Peptides.Peptide space.peptide_space.DimensinalityReducer.pSPE.Jaro-Winkler.is_numeric : OK
264
- Test result : Success : 8614 : Peptides.Peptide space.peptide_space.DimensinalityReducer.OriginalSPE.Levenshtein.is_numeric : OK
265
- Test result : Success : 9838 : Peptides.Peptide space.peptide_space.DimensinalityReducer.OriginalSPE.Jaro-Winkler.is_numeric : OK
266
- Test result : Success : 2113 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.UMAP.Levenshtein.is_proper : OK
267
- Test result : Success : 2618 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.UMAP.Jaro-Winkler.is_proper : OK
268
- Test result : Success : 3392 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.t-SNE.Levenshtein.is_proper : OK
269
- Test result : Success : 3850 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.t-SNE.Jaro-Winkler.is_proper : OK
270
- Test result : Success : 232 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.SPE.Levenshtein.is_proper : OK
271
- Test result : Success : 818 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.SPE.Jaro-Winkler.is_proper : OK
272
- Test result : Success : 193 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.pSPE.Levenshtein.is_proper : OK
273
- Test result : Success : 587 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.pSPE.Jaro-Winkler.is_proper : OK
274
- Test result : Success : 8223 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.OriginalSPE.Levenshtein.is_proper : OK
275
- Test result : Success : 9416 : Peptides.Peptide space.peptide_space.PeptideSimilaritySpaceViewer.OriginalSPE.Jaro-Winkler.is_proper : OK
252
+ Test result : Success : 0 : Peptides.Algorithms.MutationCliffs : OK
253
+ Test result : Success : 2002 : Peptides.Algorithms.peptide_space.DimensinalityReducer.UMAP.Levenshtein.is_numeric : OK
254
+ Test result : Success : 2342 : Peptides.Algorithms.peptide_space.DimensinalityReducer.UMAP.Jaro-Winkler.is_numeric : OK
255
+ Test result : Success : 2307 : Peptides.Algorithms.peptide_space.DimensinalityReducer.t-SNE.Levenshtein.is_numeric : OK
256
+ Test result : Success : 2655 : Peptides.Algorithms.peptide_space.DimensinalityReducer.t-SNE.Jaro-Winkler.is_numeric : OK
257
+ Test result : Success : 150 : Peptides.Algorithms.peptide_space.DimensinalityReducer.SPE.Levenshtein.is_numeric : OK
258
+ Test result : Success : 445 : Peptides.Algorithms.peptide_space.DimensinalityReducer.SPE.Jaro-Winkler.is_numeric : OK
259
+ Test result : Success : 131 : Peptides.Algorithms.peptide_space.DimensinalityReducer.pSPE.Levenshtein.is_numeric : OK
260
+ Test result : Success : 419 : Peptides.Algorithms.peptide_space.DimensinalityReducer.pSPE.Jaro-Winkler.is_numeric : OK
261
+ Test result : Success : 5686 : Peptides.Algorithms.peptide_space.DimensinalityReducer.OriginalSPE.Levenshtein.is_numeric : OK
262
+ Test result : Success : 5437 : Peptides.Algorithms.peptide_space.DimensinalityReducer.OriginalSPE.Jaro-Winkler.is_numeric : OK
263
+ Test result : Success : 1712 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.UMAP.Levenshtein.is_proper : OK
264
+ Test result : Success : 2131 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.UMAP.Jaro-Winkler.is_proper : OK
265
+ Test result : Success : 2631 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.t-SNE.Levenshtein.is_proper : OK
266
+ Test result : Success : 3008 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.t-SNE.Jaro-Winkler.is_proper : OK
267
+ Test result : Success : 343 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.SPE.Levenshtein.is_proper : OK
268
+ Test result : Success : 471 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.SPE.Jaro-Winkler.is_proper : OK
269
+ Test result : Success : 162 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.pSPE.Levenshtein.is_proper : OK
270
+ Test result : Success : 497 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.pSPE.Jaro-Winkler.is_proper : OK
271
+ Test result : Success : 5454 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.OriginalSPE.Levenshtein.is_proper : OK
272
+ Test result : Success : 6105 : Peptides.Algorithms.peptide_space.PeptideSimilaritySpaceViewer.OriginalSPE.Jaro-Winkler.is_proper : OK
273
+ </pre></div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at /home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:73:11
274
+ at Generator.next (&lt;anonymous&gt;)
275
+ at fulfilled (/home/runner/work/public/public/packages/Peptides/src/__jest__/remote.test.ts:31:58)
276
+ at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre><pre class="suite-consolelog-item-message">Test result : Skipped : 0 : Peptides.Algorithms.MutationCliffs - Benchmark 5k : Benchmark
276
277
  </pre></div></div></div></div></body></html>
package/tsconfig.json CHANGED
@@ -4,9 +4,9 @@
4
4
 
5
5
  /* Basic Options */
6
6
  // "incremental": true, /* Enable incremental compilation */
7
- "target": "es2018", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
8
- "module": "es2020", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
9
- "lib": ["es2020", "dom", "ES2021.String"], /* Specify library files to be included in the compilation. */
7
+ "target": "ES6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
8
+ "module": "ES2022", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
9
+ "lib": ["ES2022", "dom"], /* Specify library files to be included in the compilation. */
10
10
  // "allowJs": true, /* Allow javascript files to be compiled. */
11
11
  // "checkJs": true, /* Report errors in .js files. */
12
12
  // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */