[groupby.js][s]: obtain groupby column dtype to fix #183

Author: steveoni

danfojs-node/src/core/groupby.js

@@ -12,13 +12,14 @@ const utils = new Utils;
  * @param {column_name} Array of all column name in the dataframe.
  */
 export class GroupBy {
-  constructor(col_dict, key_col, data, column_name) {
+  constructor(col_dict, key_col, data, column_name, col_dtype) {
 
     this.key_col = key_col;
     this.col_dict = col_dict;
     this.data = data;
     this.column_name = column_name;
     this.data_tensors = {}; //store the tensor version of the groupby data
+    this.col_dtype = col_dtype;
 
   }
 
@@ -150,7 +151,8 @@ export class GroupBy {
       null,
       this.key_col,
       null,
-      col_names
+      col_names,
+      this.col_dtype
     );
 
     gp.group_col = group_col;
@@ -367,8 +369,8 @@ export class GroupBy {
 
                 if (typeof key_data[j] === "undefined" ){
                   key_data[j] = [];
-                  key_data[j][0] = isNaN(parseInt(key_1)) ? key_1 : parseInt(key_1);
-                  key_data[j][1] = isNaN(parseInt(key_2)) ? key_2 : parseInt(key_2);
+                  key_data[j][0] = this.col_dtype[0] === "string" ? key_1 : parseInt(key_1);
+                  key_data[j][1] = this.col_dtype[1] === "string" ? key_2 : parseInt(key_2);
                   key_data[j].push(col_data[j]);
                 } else {
                   key_data[j].push(col_data[j]);
@@ -378,8 +380,8 @@ export class GroupBy {
             df_data.push(...key_data);
 
           } else {
-            key_data[0] = isNaN(parseInt(key_1)) ? key_1 : parseInt(key_1);
-            key_data[1] = isNaN(parseInt(key_2)) ? key_2 : parseInt(key_2);
+            key_data[0] = this.col_dtype[0] === "string" ? key_1 : parseInt(key_1);
+            key_data[1] = this.col_dtype[1] === "string" ? key_2 : parseInt(key_2);
             key_data.push(...k_data);
             df_data.push(key_data);
           }
@@ -413,19 +415,17 @@ export class GroupBy {
 
               if (typeof key_data[j] === "undefined" ){
                 key_data[j] = [];
-                key_data[j][0] = isNaN(parseInt(key_1)) ? key_1 : parseInt(key_1);
+                key_data[j][0] = this.col_dtype[0] === "string" ? key_1 : parseInt(key_1);
                 key_data[j].push(col_data[j]);
               } else {
                 key_data[j].push(col_data[j]);
-                // console.log("key_data", key_data);
               }
             }
-            // df_data.push(...key_data);
           }
           df_data.push(...key_data);
 
         } else {
-          key_data[0] = isNaN(parseInt(key_1)) ? key_1 : parseInt(key_1);
+          key_data[0] = this.col_dtype[0] === "string" ? key_1 : parseInt(key_1);
           key_data.push(...key_val);
           df_data.push(key_data);
         }