Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read numpy nans/datetimes #741

Merged
merged 10 commits into from
Sep 25, 2019
+677 −116
Merged

Read numpy nans/datetimes #741

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
73d7e61
promote float32 and float64 columns, correctly parse numpy.nan and nu…
sc1f Sep 23, 2019
6df43da
further clean datetime parsing in python
sc1f Sep 24, 2019
498fa4f
enable py tests for implicit index updates on explicitly indexed tables
sc1f Sep 24, 2019
76abb06
move all timestamp generation to date_validator.py, remove helper in cpp
sc1f Sep 24, 2019
b8fa0d6
remove unnecessary promotion from int64
sc1f Sep 24, 2019
ea94340
allow filter with numpy datetimes, comprehensively test numpy and pan…
sc1f Sep 25, 2019
04475d2
tighten up promotion logic to allow updates of similar coercible type…
sc1f Sep 25, 2019
730fd67
cleanup
sc1f Sep 25, 2019
7ab02ec
remove conditional pandas import
sc1f Sep 25, 2019
159af03
remove py::str construction, move to accessor
sc1f Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unnecessary promotion from int64
@sc1f
sc1f committed Sep 24, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit b8fa0d6e3f15390ffba93a41d74d12757ae30ddc
5 changes: 2 additions & 3 deletions python/perspective/perspective/src/fill.cpp
View file
Original file line number Diff line number Diff line change
@@ -267,9 +267,8 @@ _fill_col_int64(t_data_accessor accessor, t_data_table& tbl, std::shared_ptr<t_c
}

double fval = item.cast<double>();
bool is_numpy_nan = py::hasattr(item, "real") && py::str(item.attr("real")).cast<std::string>() == "nan";
if (isnan(fval) || is_numpy_nan) {
WARN("Promoting to string");
if (isnan(fval)) {
WARN("Promoting " + name + " to string from int64");
tbl.promote_column(name, DTYPE_STR, i, false);
col = tbl.get_column(name);
_fill_col_string(