Skip to content

Commit 1bed8ee

Browse files
risenWrisenW
committed
Update dropNa axis order
1 parent df89bf9 commit 1bed8ee

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎src/danfojs-base/core/frame.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ export default class DataFrame extends NDframe implements DataFrameInterface {
12461246

12471247
const newIndex: Array<number | string> = [];
12481248

1249-
if (axis == 0) {
1249+
if (axis == 1) {
12501250
const newData = [];
12511251

12521252
const dfValues = this.values as ArrayType2D;

‎src/danfojs-browser/tests/core/frame.test.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ describe("DataFrame", function () {
15271527

15281528

15291529
describe("dropNa", function () {
1530-
it("drop NaNs along axis 1", function () {
1530+
it("drop NaNs along axis 0", function () {
15311531
const data = [ [ 0, 2, 4 ],
15321532
[ 360, 180, 360 ],
15331533
[ NaN, 180, 360 ] ];
@@ -1536,56 +1536,56 @@ describe("DataFrame", function () {
15361536
const df_val = [ [ 2, 4 ],
15371537
[ 180, 360 ],
15381538
[ 180, 360 ] ];
1539-
assert.deepEqual(df.dropNa(1).values, df_val);
1539+
assert.deepEqual(df.dropNa(0).values, df_val);
15401540

15411541
});
1542-
it("drop NaNs along axis 0", function () {
1542+
it("drop NaNs along axis 1", function () {
15431543
const data = [ [ 0, 2, 4 ],
15441544
[ 360, 180, 360 ],
15451545
[ NaN, 180, 360 ] ];
15461546
const column = [ "A", "B", "C" ];
15471547
const df = new dfd.DataFrame(data, { columns: column });
15481548
const df_val = [ [ 0, 2, 4 ],
15491549
[ 360, 180, 360 ] ];
1550-
assert.deepEqual(df.dropNa(0).values, df_val);
1550+
assert.deepEqual(df.dropNa(1).values, df_val);
15511551

15521552
});
1553-
it("drop NaNs along axis 0", function () {
1553+
it("drop NaNs along axis 1", function () {
15541554
const data = [ [ NaN, 1, 2, 3 ], [ 3, 4, NaN, 9 ], [ 5, 6, 7, 8 ] ];
15551555
const column = [ "A", "B", "C", "D" ];
15561556
const df = new dfd.DataFrame(data, { columns: column });
15571557
const df_val = [ [ 5, 6, 7, 8 ] ];
1558-
assert.deepEqual(df.dropNa(0).values, df_val);
1558+
assert.deepEqual(df.dropNa(1).values, df_val);
15591559

15601560
});
1561-
it("drop inplace at axis 1, inplace false ", function () {
1561+
it("drop inplace at axis 0, inplace false ", function () {
15621562
const data = [ [ NaN, 1, 2, 3 ], [ 3, 4, NaN, 9 ], [ 5, 6, 7, 8 ] ];
15631563
const column = [ "A", "B", "C", "D" ];
15641564
const df = new dfd.DataFrame(data, { columns: column });
15651565

15661566
const df_val = [ [ 1, 3 ], [ 4, 9 ], [ 6, 8 ] ];
15671567

1568-
assert.deepEqual(df.dropNa(1).values, df_val);
1568+
assert.deepEqual(df.dropNa(0).values, df_val);
15691569

15701570
});
1571-
it("drop inplace at axis 1, inplace true ", function () {
1571+
it("drop inplace at axis 0, inplace true ", function () {
15721572
const data = [ [ NaN, 1, 2, 3 ], [ 3, 4, NaN, 9 ], [ 5, 6, 7, 8 ] ];
15731573
const column = [ "A", "B", "C", "D" ];
15741574
const df = new dfd.DataFrame(data, { columns: column });
15751575

15761576
const df_val = [ [ 1, 3 ], [ 4, 9 ], [ 6, 8 ] ];
1577-
df.dropNa(1, { inplace: true });
1577+
df.dropNa(0, { inplace: true });
15781578
assert.deepEqual(df.values, df_val);
15791579

15801580
});
1581-
it("drop inplace at axis 0 at inplace true", function () {
1581+
it("drop inplace at axis 1 at inplace true", function () {
15821582
const data = [ [ NaN, 1, 2, 3 ], [ 3, 4, NaN, 9 ], [ 5, 6, 7, 8 ] ];
15831583
const column = [ "A", "B", "C", "D" ];
15841584
const df = new dfd.DataFrame(data, { columns: column });
15851585

15861586
const df_val = [ [ 5, 6, 7, 8 ] ];
15871587

1588-
df.dropNa(0, { inplace: true });
1588+
df.dropNa(1, { inplace: true });
15891589
assert.deepEqual(df.values, df_val);
15901590

15911591
});
@@ -1597,7 +1597,7 @@ describe("DataFrame", function () {
15971597

15981598
let df_val = [ [ 5, 6, 7, 8 ] ];
15991599

1600-
df.dropNa(0, { inplace: true });
1600+
df.dropNa(1, { inplace: true });
16011601
assert.deepEqual(df.values, df_val);
16021602

16031603
});

‎src/danfojs-node/test/core/frame.test.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ describe("DataFrame", function () {
15521552

15531553

15541554
describe("dropNa", function () {
1555-
it("drop NaNs along axis 1", function () {
1555+
it("drop NaNs along axis 0", function () {
15561556
const data = [[0, 2, 4],
15571557
[360, 180, 360],
15581558
[NaN, 180, 360]]
@@ -1561,56 +1561,56 @@ describe("DataFrame", function () {
15611561
const df_val = [[2, 4],
15621562
[180, 360],
15631563
[180, 360]]
1564-
assert.deepEqual((df.dropNa(1) as DataFrame).values, df_val);
1564+
assert.deepEqual((df.dropNa(0) as DataFrame).values, df_val);
15651565

15661566
});
1567-
it("drop NaNs along axis 0", function () {
1567+
it("drop NaNs along axis 1", function () {
15681568
const data = [[0, 2, 4],
15691569
[360, 180, 360],
15701570
[NaN, 180, 360]]
15711571
const column = ["A", "B", "C"];
15721572
const df = new DataFrame(data, { columns: column });
15731573
const df_val = [[0, 2, 4],
15741574
[360, 180, 360]]
1575-
assert.deepEqual((df.dropNa(0) as DataFrame).values, df_val);
1575+
assert.deepEqual((df.dropNa(1) as DataFrame).values, df_val);
15761576

15771577
});
1578-
it("drop NaNs along axis 0", function () {
1578+
it("drop NaNs along axis 1", function () {
15791579
const data = [[NaN, 1, 2, 3], [3, 4, NaN, 9], [5, 6, 7, 8]];
15801580
const column = ["A", "B", "C", "D"];
15811581
const df = new DataFrame(data, { columns: column });
15821582
const df_val = [[5, 6, 7, 8]];
1583-
assert.deepEqual((df.dropNa(0) as DataFrame).values, df_val);
1583+
assert.deepEqual((df.dropNa(1) as DataFrame).values, df_val);
15841584

15851585
});
1586-
it("drop inplace at axis 1, inplace false ", function () {
1586+
it("drop inplace at axis 0, inplace false ", function () {
15871587
const data = [[NaN, 1, 2, 3], [3, 4, NaN, 9], [5, 6, 7, 8]];
15881588
const column = ["A", "B", "C", "D"];
15891589
const df = new DataFrame(data, { columns: column });
15901590

15911591
const df_val = [[1, 3], [4, 9], [6, 8]];
15921592

1593-
assert.deepEqual((df.dropNa(1) as DataFrame).values, df_val);
1593+
assert.deepEqual((df.dropNa(0) as DataFrame).values, df_val);
15941594

15951595
});
1596-
it("drop inplace at axis 1, inplace true ", function () {
1596+
it("drop inplace at axis 0, inplace true ", function () {
15971597
const data = [[NaN, 1, 2, 3], [3, 4, NaN, 9], [5, 6, 7, 8]];
15981598
const column = ["A", "B", "C", "D"];
15991599
const df = new DataFrame(data, { columns: column });
16001600

16011601
const df_val = [[1, 3], [4, 9], [6, 8]];
1602-
df.dropNa(1, { inplace: true });
1602+
df.dropNa(0, { inplace: true });
16031603
assert.deepEqual(df.values, df_val);
16041604

16051605
});
1606-
it("drop inplace at axis 0 at inplace true", function () {
1606+
it("drop inplace at axis 1 at inplace true", function () {
16071607
const data = [[NaN, 1, 2, 3], [3, 4, NaN, 9], [5, 6, 7, 8]];
16081608
const column = ["A", "B", "C", "D"];
16091609
const df = new DataFrame(data, { columns: column });
16101610

16111611
const df_val = [[5, 6, 7, 8]];
16121612

1613-
df.dropNa(0, { inplace: true });
1613+
df.dropNa(1, { inplace: true });
16141614
assert.deepEqual(df.values, df_val);
16151615

16161616
});
@@ -1621,7 +1621,7 @@ describe("DataFrame", function () {
16211621

16221622
let df_val = [[5, 6, 7, 8]];
16231623

1624-
df.dropNa(0, { inplace: true });
1624+
df.dropNa(1, { inplace: true });
16251625
assert.deepEqual(df.values, df_val);
16261626

16271627
});

0 commit comments

Comments
 (0)