Merge branch 'master' of https://github.com/opensource9ja/panjs

Author: steveoni

.gitignore

@@ -3,5 +3,4 @@ node_modules
 coverage
 .nyc_output
 dist
-danfojs/data
-test.html
+danfojs/data

danfojs/src/core/concat.js

@@ -22,7 +22,7 @@ export class Concat {
 
             df_list = kwargs["df_list"];
         } else {
-            throw new Error("df_list must be an Array of dataFrames");
+            throw new Error("df_list must be an Array of dataFrames/Series");
         }
 
         //check if axis is int and is either 0 or 1
@@ -32,7 +32,8 @@ export class Concat {
 
                 axis = kwargs["axis"];
             } else {
-                throw new Error("Invalid axis: axis must be 0 or 1")
+                axis = 1
+                // throw new Error("Invalid axis: axis must be 0 or 1")
             }
 
         } else {
@@ -198,6 +199,7 @@ export class Concat {
 
 
         }
+        
     }
 }
 

danfojs/src/core/get_dummies.js

@@ -12,7 +12,12 @@ function oneHot(in_data, prefix, prefix_sep){
         prefix_labels = labels.map((x)=>{
             return prefix + prefix_sep + x
         })
+    }else{
+        prefix_labels = labels.map((x)=>{
+            return x
+        })
     }
+   
     let onehot_data = utils.__zeros(in_data.length, labels.length)
 
     for(let i=0; i < in_data.length; i++){
@@ -38,7 +43,7 @@ function get_dummy(kwargs={}){
         utils.__in_object(kwargs,"data", "data not provided")
 
         let prefix = kwargs["prefix"] || null
-        let prefix_sep = kwargs["prefix_sep"] || "_"
+        let prefix_sep = kwargs["prefix_sep"] || ["_"]
         let columns = kwargs["columns"] || null
 
         let is_dataframe = false
@@ -56,8 +61,8 @@ function get_dummy(kwargs={}){
         }
 
         if(!is_dataframe){
-
             let [onehot_data, prefix_labels] = oneHot(in_data, prefix, prefix_sep)
+           
             return new DataFrame(onehot_data,{columns: prefix_labels})
         }
         else{

danfojs/src/core/merge.js

@@ -10,12 +10,18 @@ export class Merge {
         utils.__in_object(kwargs, "left")
         utils.__in_object(kwargs, "right")
         utils.__in_object(kwargs, "on")
-        utils.__in_object(kwargs, "how")
+        // utils.__in_object(kwargs, "how")
+        if(!utils.__key_in_object(kwargs, "how")){
+            this.how = 'inner'
+            kwargs['how'] = 'inner'
+        }else{
+            this.how = kwargs['how']
+        }
 
         this.left = null;
         this.right = null;
         this.on = null;
-        this.how = null;
+        // this.how = null;
 
         let how_keys = ["outer", "inner", "left", "right"]
 

danfojs/src/core/timeseries.js

@@ -300,7 +300,7 @@ export class TimeSeries {
 }
 
 
-export const to_date_time = (kwargs)=>{
+export const to_datetime = (kwargs)=>{
 
     let timeseries = new TimeSeries(kwargs); // parsed to date-time
     timeseries.preprocessed() // generate date-time list

danfojs/src/index.js

@@ -1,11 +1,12 @@
 // export { Series, DataFrame, to_date_time } from './core/index';
 export { Series } from './core/series';
 export { DataFrame } from './core/frame';
-export { to_date_time } from './core/timeseries';
+export { to_datetime } from './core/timeseries';
 export {read_csv} from './io/reader'
 // export {read_json} from './io/reader'
 export {merge} from './core/merge'
 export {concat} from './core/concat'
 export {LabelEncoder, OneHotEncoder} from './preprocessing/encodings' //TODO Create js file to expose functions
-export {RobustScaler, MinMaxScaler, StandardScaler} from './preprocessing/scalers'
-export {date_range} from './core/date_range'
+export {MinMaxScaler, StandardScaler} from './preprocessing/scalers'
+export {date_range} from './core/date_range'
+export {get_dummies} from './core/get_dummies'