Merge branch 'master' of https://github.com/opensource9ja/danfojs into fix/dtype-check

Author: risenW

danfojs-browser/lib/bundle.js

@@ -171,35 +171,120 @@ class Utils {
     }
   }
 
+  __checker(arr_val) {
+    let dtypes = [];
+    let lim;
+    let int_tracker = [];
+    let float_tracker = [];
+    let string_tracker = [];
+    let bool_tracker = [];
+
+    if (arr_val.length == 0) {
+      dtypes.push("string");
+    }
+
+    if (arr_val.length < config.get_dtype_test_lim) {
+      lim = arr_val.length - 1;
+    } else {
+      lim = config.get_dtype_test_lim - 1;
+    }
+
+    arr_val.forEach((ele, indx) => {
+      let count = indx;
+
+      if (typeof ele == "boolean") {
+        float_tracker.push(false);
+        int_tracker.push(false);
+        string_tracker.push(false);
+        bool_tracker.push(true);
+      } else if (isNaN(ele) && typeof ele != "string") {
+        float_tracker.push(true);
+        int_tracker.push(false);
+        string_tracker.push(false);
+        bool_tracker.push(false);
+      } else if (!isNaN(Number(ele))) {
+        if (ele.toString().includes(".")) {
+          float_tracker.push(true);
+          int_tracker.push(false);
+          string_tracker.push(false);
+          bool_tracker.push(false);
+        } else {
+          float_tracker.push(false);
+          int_tracker.push(true);
+          string_tracker.push(false);
+          bool_tracker.push(false);
+        }
+      } else {
+        float_tracker.push(false);
+        int_tracker.push(false);
+        string_tracker.push(true);
+        bool_tracker.push(false);
+      }
+
+      if (count == lim) {
+        const even = element => element == true;
+
+        if (string_tracker.some(even)) {
+          dtypes = "string";
+        } else if (float_tracker.some(even)) {
+          dtypes = "float32";
+        } else if (int_tracker.some(even)) {
+          dtypes = "int32";
+        } else if (bool_tracker.some(even)) {
+          dtypes = "boolean";
+        } else {
+          dtypes = "undefined";
+        }
+      }
+    });
+    return dtypes;
+  }
+
   __get_t(arr_val) {
+    const self = this;
+
     if (this.__is_1D_array(arr_val)) {
-      const dtypes = [];
+      return [this.__checker(arr_val)];
+    } else {
+      const dtypes = arr_val.map(arr => {
+        return self.__checker(arr);
+      });
+      return dtypes;
+    }
+  }
+
+  __get_tt(arr_val) {
+    if (this.__is_1D_array(arr_val)) {
+      let dtypes = [];
       let int_tracker = [];
       let float_tracker = [];
       let string_tracker = [];
       let bool_tracker = [];
       let lim;
-      let arr = [];
-      arr_val.map(val => {
-        if (!(isNaN(val) && typeof val != "string")) {
-          arr.push(val);
-        }
-      });
 
-      if (arr.length < config.get_dtype_test_lim) {
-        lim = arr.length - 1;
+      if (arr_val.length == 0) {
+        dtypes.push("string");
+      }
+
+      if (arr_val.length < config.get_dtype_test_lim) {
+        lim = arr_val.length - 1;
       } else {
         lim = config.get_dtype_test_lim - 1;
       }
 
-      arr.forEach((ele, indx) => {
+      arr_val.forEach((ele, indx) => {
         let count = indx;
 
         if (typeof ele == "boolean") {
           float_tracker.push(false);
           int_tracker.push(false);
           string_tracker.push(false);
           bool_tracker.push(true);
+        } else if (isNaN(ele) && typeof ele != "string") {
+          float_tracker.push(true);
+          int_tracker.push(false);
+          string_tracker.push(false);
+          bool_tracker.push(false);
         } else if (!isNaN(Number(ele))) {
           if (ele.toString().includes(".")) {
             float_tracker.push(true);
@@ -237,28 +322,24 @@ 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 => {
+      arr_val.forEach(arr => {
         let int_tracker = [];
         let float_tracker = [];
         let string_tracker = [];
         let bool_tracker = [];
-        let arr = [];
-        ele.map(val => {
-          if (!(isNaN(val) && typeof val != "string")) {
-            arr.push(val);
-          } else {
-            arr.push("NaN");
-          }
-        });
+
+        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;
 
@@ -279,6 +360,11 @@ class Utils {
               string_tracker.push(false);
               bool_tracker.push(false);
             }
+          } else if (isNaN(ele) && typeof ele != "string") {
+            float_tracker.push(true);
+            int_tracker.push(false);
+            string_tracker.push(false);
+            bool_tracker.push(false);
           } else {
             float_tracker.push(false);
             int_tracker.push(false);