Skip to content

Commit b4c8b25

Browse files
committed
fix bug in fillna
1 parent eec59ea commit b4c8b25

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

danfojs/src/core/frame.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,8 +1256,7 @@ export class DataFrame extends Ndframe {
12561256
let row_value = values[i]
12571257
for (let j = 0; j < row_value.length; j++) {
12581258

1259-
let val = row_value[j] == 0 ? 0 : !!row_value[j]
1260-
if (!val) {
1259+
if (isNaN(row_value[j]) && typeof row_value[j] != "string" ) {
12611260
temp_data.push(nan_val)
12621261
} else {
12631262
temp_data.push(row_value[j])
@@ -1266,8 +1265,12 @@ export class DataFrame extends Ndframe {
12661265
}
12671266
data.push(temp_data);
12681267
}
1268+
if (kwargs['inplace']) {
1269+
this.__update_frame_in_place(data, null, null, null, null)
1270+
} else {
1271+
return new DataFrame(data, { columns: columns, index: this.index })
12691272

1270-
return new DataFrame(data, { columns: columns, index: this.index })
1273+
}
12711274

12721275
}
12731276

danfojs/src/plotting/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//perform plotting
2-
// import { newPlot } from 'plotly.js' //comment out when building for Node Version
2+
import { newPlot } from 'plotly.js' //comment out when building for Node Version
33
import { Utils } from "../core/utils"
44
import { Series } from "../core/series"
55

danfojs/tests/core/frame.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,8 +1390,8 @@ describe("DataFrame", function () {
13901390
let df = new DataFrame(data, { columns: column })
13911391

13921392
let df_val = [[-999, 1, 2, 3], [3, 4, -999, 9], [5, 6, 7, 8]]
1393-
1394-
assert.deepEqual(df.fillna({ values: -999 }).values, df_val)
1393+
df.fillna({ values: -999, inplace:true})
1394+
assert.deepEqual(df.values, df_val)
13951395
});
13961396
it("replace all NaN value", function () {
13971397
let data = [[NaN, 1, 2, 3], [3, 4, NaN, 9], [5, 6, 7, 8]]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"table": "^5.4.6"
2424
},
2525
"scripts": {
26-
"test": "nyc mocha --require @babel/register danfojs/tests/core/frame",
26+
"test": "nyc mocha --require @babel/register danfojs/tests/*",
2727
"dev": "npm run lint && babel ./danfojs/src -d dist --no-comments",
2828
"build": "babel ./danfojs/src -d ./dist --no-comments",
2929
"lint": "eslint ./danfojs/src",

0 commit comments

Comments
 (0)