@datagrok/eda 1.2.5 → 1.2.7

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@datagrok/eda",
     "friendlyName": "EDA",
-    "version": "1.2.5",
+    "version": "1.2.7",
     "description": "Exploratory Data Analysis Tools",
     "dependencies": {
-        "@datagrok-libraries/math": "^1.2.0",
+        "@datagrok-libraries/math": "^1.2.3",
         "@datagrok-libraries/ml": "^6.7.0",
         "@datagrok-libraries/tutorials": "^1.4.2",
         "@datagrok-libraries/utils": "^4.3.0",

package/src/missing-values-imputation/ui-constants.ts

@@ -26,7 +26,7 @@ export const COPY_SUFFIX = 'copy';
 
 /** UI titles */
 export enum TITLE {
-  KNN_IMPUTER = 'KNN Imputation',
+  KNN_IMPUTER = 'k-NN Imputation',
   TABLE = 'Table',
   IN_PLACE = 'In-place',
   COLUMNS = 'Impute',
@@ -44,12 +44,12 @@ export enum TITLE {
 };
 
 /** Help links */
-export const KNN_IMPUTER = '/help/explore/missing-values-imputation';
+export const KNN_IMPUTER = '/help/explore/missing-values-imputation#the-k-nn-method';
 
 /** Tooltips */
 export enum HINT {
   TARGET = 'Columns with missing values that must be filled',
-  FEATURES = "Columns with features to be used for determining the 'nearest' elements in the KNN method",
+  FEATURES = "Columns with features to be used for determining the 'nearest' elements in the k-NN method",
   IN_PLACE = 'Defines whether to use in-place imputation or add a new column without missing values',
   METRIC = 'Type of metric between the feature values',
   WEIGHT = 'Weight',
@@ -61,6 +61,7 @@ export enum HINT {
   FILL_VALUE = 'Fill value',
   IMPUTATION_SETTINGS = 'Simple imputation settings',
   KEEP_EMPTY = 'Defines whether to keep empty missing values failed to be imputed OR fill them using simple imputation',
+  RUN = 'Run imputation using the k-NN method',
 };
 
 export const MAX_INPUT_NAME_LENGTH = 15;

package/src/missing-values-imputation/ui.ts

@@ -275,7 +275,7 @@ export async function runKNNImputer(df?: DG.DataFrame): Promise<void> {
         grok.shell.error(`${ERROR_MSG.KNN_FAILS}: ${ERROR_MSG.CORE_ISSUE}`);
       reject(err);
     }
-  });
+  }, undefined, HINT.RUN);
 
   dlg.add(targetColInput)
     .add(featuresInput)

package/src/pls/pls-constants.ts

@@ -36,6 +36,7 @@ export enum TITLE {
   EXPLORE = 'Explore',
   FEATURES = 'Feature names',
   BROWSE = 'Browse',
+  ANALYSIS = 'Features Analysis',
 }
 
 /** Tooltips */

package/src/pls/pls-tools.ts

@@ -139,15 +139,18 @@ async function performMVA(input: PlsInput, analysisType: PLS_ANALYSIS): Promise<
     grok.shell.tableView(input.table.name);
 
   // 0.1 Buffer table
-  const buffer = DG.DataFrame.fromColumns([
+  const loadingsRegrCoefsTable = DG.DataFrame.fromColumns([
     DG.Column.fromStrings(TITLE.FEATURE, featuresNames),
     result.regressionCoefficients,
   ]);
 
+  loadingsRegrCoefsTable.name = `${input.table.name}(${TITLE.ANALYSIS})`;
+  grok.shell.addTable(loadingsRegrCoefsTable);
+
   // 0.2. Add X-Loadings
   result.xLoadings.forEach((col, idx) => {
-    col.name = buffer.columns.getUnusedName(`${TITLE.XLOADING}${idx + 1}`);
-    buffer.columns.add(col);
+    col.name = loadingsRegrCoefsTable.columns.getUnusedName(`${TITLE.XLOADING}${idx + 1}`);
+    loadingsRegrCoefsTable.columns.add(col);
   });
 
   // 1. Predicted vs Reference scatter plot
@@ -165,12 +168,15 @@ 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({labelFormColumnNames: [input.names?.name]});
 
   // 2. Regression Coefficients Bar Chart
   result.regressionCoefficients.name = TITLE.REGR_COEFS;
-  const regrCoeffsBar = view.addViewer(DG.Viewer.barChart(buffer, {
+  const regrCoeffsBar = view.addViewer(DG.Viewer.barChart(loadingsRegrCoefsTable, {
+    table: loadingsRegrCoefsTable.name,
     title: TITLE.REGR_COEFS,
     splitColumnName: TITLE.FEATURE,
     valueColumnName: result.regressionCoefficients.name,
@@ -182,7 +188,8 @@ async function performMVA(input: PlsInput, analysisType: PLS_ANALYSIS): Promise<
 
   // 3. Loadings Scatter Plot
   result.xLoadings.forEach((col, idx) => col.name = `${TITLE.XLOADING}${idx + 1}`);
-  const loadingsScatter = view.addViewer(DG.Viewer.scatterPlot(buffer, {
+  const loadingsScatter = view.addViewer(DG.Viewer.scatterPlot(loadingsRegrCoefsTable, {
+    table: loadingsRegrCoefsTable.name,
     title: TITLE.LOADINGS,
     xColumnName: `${TITLE.XLOADING}1`,
     yColumnName: `${TITLE.XLOADING}${result.xLoadings.length > 1 ? '2' : '1'}`,
@@ -249,10 +256,14 @@ async function performMVA(input: PlsInput, analysisType: PLS_ANALYSIS): Promise<
     DG.Column.fromFloat32Array(input.predict.name, yExplVars),
   ]);
 
+  explVarsDF.name = `${input.table.name}(${TITLE.EXPL_VAR})`;
+  grok.shell.addTable(explVarsDF);
+
   xExplVars.forEach((arr, idx) => explVarsDF.columns.add(DG.Column.fromFloat32Array(featuresNames[idx], arr)));
 
   // 5.3) bar chart
   const explVarsBar = view.addViewer(DG.Viewer.barChart(explVarsDF, {
+    table: explVarsDF.name,
     title: TITLE.EXPL_VAR,
     splitColumnName: TITLE.COMPONENTS,
     valueColumnName: input.predict.name,
@@ -377,7 +388,7 @@ export async function runMVA(analysisType: PLS_ANALYSIS): Promise<void> {
   const namesInputs = ui.input.column(TITLE.NAMES, {
     table: table,
     value: names,
-    onValueChanged: () => names = predictInput.value ?? undefined,
+    onValueChanged: (value) => names = value ?? undefined,
     filter: (col: DG.Column) => col.type === DG.COLUMN_TYPE.STRING},
   );
   namesInputs.setTooltip(HINT.NAMES);
@@ -388,6 +399,8 @@ 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/global.d.ts

@@ -1,13 +0,0 @@
-import * as grokNamespace from 'datagrok-api/grok';
-import * as uiNamespace from 'datagrok-api/ui';
-import * as DGNamespace from 'datagrok-api/dg';
-import * as rxjsNamespace from 'rxjs';
-import $Namespace from 'cash-dom';
-
-declare global {
-    const grok: typeof grokNamespace;
-    const ui: typeof uiNamespace;
-    const DG: typeof DGNamespace;
-    const rjxs: typeof rxjsNamespace;
-    const $: typeof $Namespace;
-}