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

Author: risenW

danfojs/src/core/concat.js

@@ -1,6 +1,7 @@
 import { DataFrame } from './frame'
 // import { Series } from "../../src/core/series";
 import { Utils } from "./utils"
+import { Series } from './series'
 
 const utils = new Utils()
 
@@ -89,9 +90,19 @@ export class Concat {
                     let val = values[index]
                     if (typeof data[index] === "undefined") {
 
-                        data[index] = val;
+                        if(Array.isArray(val)){
+                            data[index] = val
+                        }else{
+                            data[index] = [val];
+                        }
+                        
                     } else {
-                        data[index].push(...val);
+                        if(Array.isArray(val)){
+                            data[index].push(...val);
+                        }else{
+                            data[index].push(val);
+                        }
+                        
                     }
                 }
 
@@ -147,7 +158,6 @@ export class Concat {
                         not_exist.push(col_name);
                     }
                 }
-
                 if (not_exist.length > 0) {
                     for (let i = 0; i < value.length; i++) {
                         let row_value = value[i]
@@ -161,7 +171,12 @@ export class Concat {
                                 new_arr[j] = NaN
                             } else {
                                 let index = df_columns.indexOf(col_name)
-                                new_arr[j] = row_value[index]
+                                if(Array.isArray(row_value)){
+                                    new_arr[j] = row_value[index]
+                                }else{
+                                    new_arr[j] = row_value;
+                                }
+                                
                             }
 
                         }
@@ -172,9 +187,16 @@ export class Concat {
                 }
 
             }
+            
+            if(Array.isArray(data[0])){
+                let df = new DataFrame(data, { columns: columns });
+                return df;
+            }else{
+                let sf = new Series(data)
+                return sf
+            }
 
-            let df = new DataFrame(data, { columns: columns });
-            return df;
+            
 
         }
 

danfojs/src/core/groupby.js

@@ -306,6 +306,18 @@ export class GroupBy {
         return df
     }
 
+    max(){
+        let value = this.arithemetic("max()")
+        let df = this.to_DataFrame(this.key_col, this.group_col_name,value,"max")
+        return df
+    }
+
+    min(){
+        let value = this.arithemetic("min()")
+        let df = this.to_DataFrame(this.key_col, this.group_col_name,value,"min")
+        return df
+    }
+
     /**
      * returns dataframe of a group
      * @param {*} key [Array] 
@@ -366,7 +378,7 @@ export class GroupBy {
                     let k_data = key_val[key_2]
                     let kk = []
                     kk[0] = isNaN(parseInt(key_1)) ? key_1 : parseInt(key_1)
-                    kk[1] = isNaN(parseInt(key_2)) ? key_1 : parseInt(key_2)
+                    kk[1] = isNaN(parseInt(key_2)) ? key_2 : parseInt(key_2)
                     kk.push(...k_data)
                     df_data.push(kk)
 
@@ -396,7 +408,7 @@ export class GroupBy {
             }
             let column = [...key_col]
             let group_col = col.slice().map((x,i)=>{
-                if(ops.length >1){
+                if(Array.isArray(ops)){
                     return `${x}_${ops[i]}`
                 }
                 return `${x}_${ops}`

danfojs/tests/core/concat.js

@@ -1,6 +1,7 @@
 import { assert } from "chai"
 import { DataFrame } from '../../src/core/frame'
 import {concat} from '../../src/core/concat'
+import { Series } from "../../src/core/series";
 
 
 
@@ -48,4 +49,89 @@ describe("Concatenate", function () {
             NaN, NaN, NaN]]
         assert.deepEqual(new_df.values, data_values);
     });
+
+    it("concatenate dataframe and series along 0 axis",function(){
+
+        let data1 = [1,2,3,4]
+        let data2 = [3,4,5,6]
+
+        let data = [[1, 2, 3], [4, 5, 6], [20, 30, 40], [39, 89, 78]]
+        let cols = ["A", "B", "C"]
+        let df = new DataFrame(data, { columns: cols })
+
+        let s1 = new Series(data1)
+        let s2 = new Series(data2)
+        let rslt = [
+            [ 1, 2, 3, NaN ],
+            [ 4, 5, 6, NaN ],
+            [ 20, 30, 40, NaN ],
+            [ 39, 89, 78, NaN ],
+            [ NaN, NaN, NaN, 1 ],
+            [ NaN, NaN, NaN, 2 ],
+            [ NaN, NaN, NaN, 3 ],
+            [ NaN, NaN, NaN, 4 ]
+          ]
+           
+
+        let con = concat({ "df_list": [df,s1], "axis": 0 })
+
+        assert.deepEqual(con.values, rslt)
+
+    })
+
+    it("concatenate dataframe and series along axis 1",function(){
+
+        let data = [[1, 2, 3], [4, 5, 6], [20, 30, 40], [39, 89, 78]]
+        let cols = ["A", "B", "C"]
+        let df = new DataFrame(data, { columns: cols })
+
+        let data1 = [1,2,3,4]
+        let s1 = new Series(data1)
+        let rslt = [
+            [ 1, 2, 3, 1 ],
+            [ 4, 5, 6, 2 ],
+            [ 20, 30, 40, 3 ],
+            [ 39, 89, 78, 4 ]
+          ]
+           
+
+        let con = concat({ "df_list": [df,s1], "axis": 1 })
+
+        assert.deepEqual(con.values, rslt)
+
+    })
+    it("concatenate series along axis 1",function(){
+
+        let data1 = [1,2,3,4]
+        let data2 = [3,4,5,6]
+
+        let s1 = new Series(data1)
+        let s2 = new Series(data2)
+        let rslt = [ [ 1, 3 ], [ 2, 4 ], [ 3, 5 ], [ 4, 6 ] ]
+           
+
+        let con = concat({ "df_list": [s1,s2], "axis": 1 })
+
+        assert.deepEqual(con.values, rslt)
+
+    })
+    it("concatenate series along axis 0",function(){
+
+        let data1 = [1,2,3,4]
+        let data2 = [3,4,5,6]
+
+        let s1 = new Series(data1)
+        let s2 = new Series(data2)
+        let rslt = [
+            1, 2, 3, 4,
+            3, 4, 5, 6
+          ]
+           
+        let con = concat({ "df_list": [s1,s2], "axis": 0 })
+
+        assert.deepEqual(con.values, rslt)
+
+    })
+
+
 });