Fix dtype check bug

Author: risenW

danfojs-browser/src/core/utils.js

@@ -213,7 +213,7 @@ export class Utils {
   //infer types from an array of array
   __get_t(arr_val) {
     if (this.__is_1D_array(arr_val)) {
-      const dtypes = [];
+      let dtypes = [];
       let int_tracker = [];
       let float_tracker = [];
       let string_tracker = [];
@@ -228,6 +228,10 @@ export class Utils {
         }
       });
 
+      if (arr.length == 0){
+        dtypes.push("string");
+      }
+
       if (arr.length < config.get_dtype_test_lim) {
         lim = arr.length - 1;
       } else {
@@ -260,7 +264,7 @@ export class Utils {
         }
 
         if (count == lim) {
-          //if atleast one string appears return string dtype
+        //if atleast one string appears return string dtype
           const even = (element) => element == true;
           if (string_tracker.some(even)) {
             dtypes.push("string");
@@ -278,13 +282,9 @@ export class Utils {
 
       return dtypes;
     } else {
-      const dtypes = [];
+      let dtypes = [];
       let lim;
-      if (arr_val[0].length < config.get_dtype_test_lim) {
-        lim = arr_val[0].length - 1;
-      } else {
-        lim = config.get_dtype_test_lim - 1;
-      }
+
       arr_val.forEach((ele) => {
         let int_tracker = [];
         let float_tracker = [];
@@ -296,11 +296,18 @@ export class Utils {
         ele.map((val) => {
           if (!(isNaN(val) && typeof val != "string")) {
             arr.push(val);
-          } else {
-            arr.push("NaN"); //set NaN to string and return dtype ""string". The caller should explicitly convert the dtype
           }
         });
 
+        if (arr.length == 0){
+          dtypes.push("string");
+        }
+
+        if (arr.length < config.get_dtype_test_lim) {
+          lim = arr.length - 1;
+        } else {
+          lim = config.get_dtype_test_lim - 1;
+        }
         arr.forEach((ele, indx) => {
           let count = indx;
           if (typeof ele == "boolean") {
@@ -328,7 +335,7 @@ export class Utils {
           }
 
           if (count == lim) {
-            //if atleast one string appears return string dtype
+          //if atleast one string appears return string dtype
             const even = (element) => element == true;
             if (string_tracker.some(even)) {
               dtypes.push("string");
@@ -349,6 +356,7 @@ export class Utils {
     }
   }
 
+
   __unique(data) {
     let unique = new Set();
 

danfojs-browser/tests/core/utils.js

@@ -96,6 +96,13 @@ describe("Utils Functions", function () {
       let result = [ 'boolean', 'string', 'string' ];
       assert.deepEqual(utils.__get_t(data), result);
     });
+    it("Returns correct dtype if NaN present in data", function () {
+      let data = [
+        [ 18.7, 17.4, 18, NaN, 19.3 ],
+        [ 20, NaN, 19, 18, 20 ] ];
+      let result = [ 'float32', 'int32' ];
+      assert.deepEqual(utils.__get_t(data), result);
+    });
   });
 
   describe("__map_int_to_bool", function () {

danfojs-node/src/core/utils.js

@@ -213,7 +213,7 @@ export class Utils {
   //infer types from an array of array
   __get_t(arr_val) {
     if (this.__is_1D_array(arr_val)) {
-      const dtypes = [];
+      let dtypes = [];
       let int_tracker = [];
       let float_tracker = [];
       let string_tracker = [];
@@ -228,6 +228,10 @@ export class Utils {
         }
       });
 
+      if (arr.length == 0){
+        dtypes.push("string");
+      }
+
       if (arr.length < config.get_dtype_test_lim) {
         lim = arr.length - 1;
       } else {
@@ -278,13 +282,9 @@ export class Utils {
 
       return dtypes;
     } else {
-      const dtypes = [];
+      let dtypes = [];
       let lim;
-      if (arr_val[0].length < config.get_dtype_test_lim) {
-        lim = arr_val[0].length - 1;
-      } else {
-        lim = config.get_dtype_test_lim - 1;
-      }
+
       arr_val.forEach((ele) => {
         let int_tracker = [];
         let float_tracker = [];
@@ -296,11 +296,18 @@ export class Utils {
         ele.map((val) => {
           if (!(isNaN(val) && typeof val != "string")) {
             arr.push(val);
-          } else {
-            arr.push("NaN"); //set NaN to string and return dtype ""string". The caller should explicitly convert the dtype
           }
         });
 
+        if (arr.length == 0){
+          dtypes.push("string");
+        }
+
+        if (arr.length < config.get_dtype_test_lim) {
+          lim = arr.length - 1;
+        } else {
+          lim = config.get_dtype_test_lim - 1;
+        }
         arr.forEach((ele, indx) => {
           let count = indx;
           if (typeof ele == "boolean") {

danfojs-node/tests/core/utils.js

@@ -70,7 +70,13 @@ describe("Utils Functions", function () {
       let result = [ 'float32' ];
       assert.deepEqual(utils.__get_t(data), result);
     });
-
+    it("Returns correct dtype if NaN present in data", function () {
+      let data = [
+        [18.7, 17.4, 18, NaN, 19.3],
+        [ 20, NaN, 19, 18, 20 ]];
+      let result = [ 'float32', 'int32' ];
+      assert.deepEqual(utils.__get_t(data), result);
+    });
     it("Returns the data type present in an 2D array", function () {
       let data = [ [ 'Alice', 'Boy', 'Girl', "39" ], [ 2, 5, 30, 89 ], [ 3.1, 6.1, 40.1, 78.2 ] ];
       let result = [ 'string', 'int32', 'float32' ];
@@ -91,7 +97,7 @@ describe("Utils Functions", function () {
       let result = [ 'boolean', 'string', 'int32' ];
       assert.deepEqual(utils.__get_t(data), result);
     });
-    it("Returns string type if values are NaN", function () {
+    it("Returns string type if values are all NaN", function () {
       let data = [ [ true, false, true ], [ "boy", "girl", "boy" ], [ NaN, undefined, NaN ] ];
       let result = [ 'boolean', 'string', 'string' ];
       assert.deepEqual(utils.__get_t(data), result);