Skip to content

Commit 4d73772

Browse files
committed
update groupby method
* first * last * size
1 parent 51674c3 commit 4d73772

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

src/danfojs-base/aggregators/groupby.ts

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,9 @@ export default class Groupby {
400400
let colDict: { [key: string ]: DataFrame | Series } = {}
401401
for(const [key, values] of Object.entries(this.colDict)) {
402402
let valDataframe = new DataFrame(values)
403-
valDataframe.print()
404403
colDict[key] = callable(valDataframe)
405404
}
405+
console.log(colDict)
406406
return this.concatGroups(colDict)
407407
}
408408

@@ -414,8 +414,6 @@ export default class Groupby {
414414
copyDf = values.copy()
415415
}
416416
else {
417-
values.print()
418-
console.log(values.values)
419417
copyDf = new DataFrame([values.values], {columns: ['applyops']})
420418
}
421419
let len = copyDf.shape[0]
@@ -424,8 +422,8 @@ export default class Groupby {
424422
let keyValue = this.keyToValue[key][key1]
425423
let dfValue = Array(len).fill(keyValue)
426424
copyDf.addColumn(keyName, dfValue, {inplace: true})
427-
data.push(copyDf)
428425
}
426+
data.push(copyDf)
429427
}
430428
return concat({dfList: data, axis:0}) as DataFrame
431429
}
@@ -439,9 +437,21 @@ export default class Groupby {
439437
return this.colDict
440438
}
441439

442-
ngroup(nth: number) {
443-
const values = Object.values(this.colDict)
444-
const nvalue = values[nth]
445-
return new DataFrame(nvalue)
440+
first(): DataFrame{
441+
return this.apply((x)=>{
442+
return x.head(1)
443+
})
444+
}
445+
446+
last(): DataFrame {
447+
return this.apply((x)=>{
448+
return x.tail(1)
449+
})
450+
}
451+
452+
size(): DataFrame {
453+
return this.apply((x)=>{
454+
return new Series([x.shape[0]])
455+
})
446456
}
447457
}

0 commit comments

Comments
 (0)