@datagrok/eda 1.3.1 → 1.3.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@datagrok/eda",
   "friendlyName": "EDA",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Exploratory Data Analysis Tools",
   "dependencies": {
     "@datagrok-libraries/math": "^1.2.4",
-    "@datagrok-libraries/ml": "^6.8.0",
+    "@datagrok-libraries/ml": "^6.8.1",
     "@datagrok-libraries/tutorials": "^1.4.2",
     "@datagrok-libraries/utils": "^4.4.0",
     "@keckelt/tsne": "^1.0.2",

package/src/package.ts

@@ -194,7 +194,7 @@ export async function reduceDimensionality(): Promise<void> {
 export function GetMCLEditor(call: DG.FuncCall): void {
   try {
     const funcEditor = new MCLEditor();
-    ui.dialog('Markov clustering')
+    const dialog = ui.dialog('Markov clustering')
       .add(funcEditor.getEditor())
       .onOK(async () => {
         const params = funcEditor.params;
@@ -205,6 +205,7 @@ export function GetMCLEditor(call: DG.FuncCall): void {
           useWebGPU: params.useWebGPU, inflate: params.inflateFactor, minClusterSize: params.minClusterSize,
         }).call(true);
       }).show();
+    dialog.history(() => ({editorSettings: funcEditor.getStringInput()}), (x: any) => funcEditor.applyStringInput(x['editorSettings']));
   } catch (err: any) {
     const errMsg = err instanceof Error ? err.message : err.toString();
     const errStack = err instanceof Error ? err.stack : undefined;

package/src/pls/pls-tools.ts

@@ -7,7 +7,7 @@ import * as DG from 'datagrok-api/dg';
 import {PLS_ANALYSIS, ERROR_MSG, TITLE, HINT, LINK, COMPONENTS, INT, TIMEOUT,
   RESULT_NAMES, WASM_OUTPUT_IDX, RADIUS, LINE_WIDTH, COLOR, X_COORD, Y_COORD,
   DEMO_INTRO_MD, DEMO_RESULTS_MD, DEMO_RESULTS} from './pls-constants';
-import {checkWasmDimensionReducerInputs, checkColumnType, checkMissingVals} from '../utils';
+import {checkWasmDimensionReducerInputs, checkColumnType, checkMissingVals, describeElements} from '../utils';
 import {_partialLeastSquareRegressionInWebWorker} from '../../wasm/EDAAPI';
 import {carsDataframe} from '../data-generators';
 
@@ -168,8 +168,6 @@ async function performMVA(input: PlsInput, analysisType: PLS_ANALYSIS): Promise<
     help: LINK.MODEL,
   }));
 
-  console.log(input.names?.name);
-
   if ((input.names !== undefined) && (input.names !== null))
     predictVsReferScatter.setOptions({labelColumnNames: [input.names?.name]});
 
@@ -275,18 +273,14 @@ async function performMVA(input: PlsInput, analysisType: PLS_ANALYSIS): Promise<
   }));
 
   // emphasize viewers in the demo case
-  if (analysisType === PLS_ANALYSIS.DEMO) {
-    const pages = [predictVsReferScatter, scoresScatter, loadingsScatter, regrCoeffsBar, explVarsBar]
-      .map((viewer, idx) => {
-        return {
-          text: DEMO_RESULTS[idx].text,
-          showNextTo: viewer.root,
-        };
-      });
-
-    const wizard = ui.hints.addTextHint({title: TITLE.EXPLORE, pages: pages});
-    wizard.helpUrl = LINK.MVA;
+  if (analysisType === PLS_ANALYSIS.DEMO) {    
     grok.shell.windows.help.showHelp(ui.markdown(DEMO_RESULTS_MD));
+
+    describeElements(
+      [predictVsReferScatter, scoresScatter, loadingsScatter, regrCoeffsBar, explVarsBar].map((v) => v.root),
+      DEMO_RESULTS.map((info) => `<b>${info.caption}</b>\n\n${info.text}`),
+      ['left', 'left', 'right', 'right', 'left'],
+    );
   }
 } // performMVA
 
@@ -400,8 +394,6 @@ export async function runMVA(analysisType: PLS_ANALYSIS): Promise<void> {
     .addButton(TITLE.RUN, async () => {
       dlg.close();
 
-      console.log(names);
-
       await performMVA({
         table: table,
         features: DG.DataFrame.fromColumns(features).columns,

package/src/utils.ts

@@ -27,7 +27,7 @@ const UNSUPPORTED_COLUMN_TYPE_MES = 'unsupported column type: ';
 const INCORRECT_MIN_DIST_MES = 'min distance must be positive.';
 const INCORRECT_SPREAD_MES = 'spread must be positive.';
 const INCORRECT_EPOCH_MES = 'number of epoch must be at least 1.';
-const INCORRECT_NEIBORS_MES = 'number of neibors must be at least 2 and not greater than samples count.';
+const INCORRECT_NEIBORS_MES = 'number of neighbors must be at least 2 and not greater than samples count.';
 const INCORRECT_ITERATIONS_MES = 'number of iterations must be at least 1.';
 const INCORRECT_LEARNING_RATE_MES = 'learning rate must be positive.';
 const INCORRECT_PERPLEXITY_MES = 'perplexity must be at least 2 and not greater than samples count.';
@@ -244,7 +244,7 @@ function scaleDf(df: DG.DataFrame): DG.DataFrame {
   return df;
 }
 
-/** Return standartized dataframe */
+/** Return standardized dataframe */
 export function centerScaleDataFrame(df: DG.DataFrame, toCenter: boolean, toScale: boolean): DG.DataFrame {
   if (toCenter) {
     if (toScale)
@@ -270,3 +270,49 @@ export function extractNonConstantColsDf(features: DG.ColumnList): DG.DataFrame
 
   return DG.DataFrame.fromColumns(cols);
 }
+
+/** Describe viewers and return the Done button */
+export function describeElements(roots: HTMLElement[], description: string[], position: string[]): HTMLButtonElement {
+  if (roots.length !== description.length)
+    throw new Error('Non-equal size of viewer roots and descriptions');
+
+  let idx = 0;
+  let closeIcn: HTMLElement;
+  let msg: HTMLDivElement;
+  let popup: HTMLDivElement;
+
+  const nextBtn = ui.button('next', () => {
+    popup.remove();
+    ++idx;
+    step();
+  }, 'Go to the next viewer');
+
+  const prevBtn = ui.button('prev', () => {
+    idx -= 1;    
+    popup.remove();
+    step();
+  }, 'Go to the previous viewer');
+
+  const doneBtn = ui.button('done', () => popup.remove(), 'Go to the next step');
+
+  const btnsDiv = ui.divH([prevBtn, nextBtn, doneBtn]);
+ btnsDiv.style.marginLeft = 'auto';
+ btnsDiv.style.marginRight = '0px';
+
+  const step = () => {
+    if (idx < roots.length) {
+      msg = ui.divV([ui.markdown(description[idx]), btnsDiv]);
+      popup = ui.hints.addHint(roots[idx], msg, position[idx] as ui.hints.POSITION);
+      doneBtn.hidden = (idx < roots.length - 1);
+      nextBtn.hidden = (idx === roots.length - 1);
+      prevBtn.hidden = (idx < 1);
+      
+      closeIcn = popup.querySelector('i') as HTMLElement;
+      closeIcn.onclick = () => doneBtn.click();
+    }
+  };
+
+  step();
+
+  return doneBtn;
+}