Skip to content

Correctly type parse numbers wrapped in strings #370

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

Merged
texodus merged 2 commits into from
Jan 8, 2019
Merged

Correctly type parse numbers wrapped in strings #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
451ba6d
replace JS Math module with std::min
sc1f Jan 2, 2019
5f9ba17
Fix issue #368: correctly parse numbers wrapped in strings
sc1f Jan 7, 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
22 changes: 22 additions & 0 deletions packages/perspective/test/js/constructors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ var data_7 = {
z: [true, false, true, false]
};

var int_in_string = [{a: "1"}, {a: "2"}, {a: "12345"}];

var float_in_string = [{a: "1.5"}, {a: "2.5"}, {a: "12345.56789"}];

var meta_3 = {
w: "float",
x: "integer",
Expand Down Expand Up @@ -467,6 +471,24 @@ module.exports = perspective => {
table.delete();
});

it("Infers ints wrapped in strings", async function() {
var table = perspective.table(int_in_string);
var view = table.view();
let result = await view.schema();
expect(result).toEqual({a: "integer"});
view.delete();
table.delete();
});

it("Infers floats wrapped in strings", async function() {
var table = perspective.table(float_in_string);
var view = table.view();
let result = await view.schema();
expect(result).toEqual({a: "float"});
view.delete();
table.delete();
});

it("Infers correct type for empty string columns", async function() {
var table = perspective.table([{x: "", y: 1}, {x: "", y: 2}, {x: "", y: 3}, {x: "", y: 4}]);
var view = table.view();
Expand Down
20 changes: 12 additions & 8 deletions src/cpp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,9 +935,7 @@ column_names(val data, std::int32_t format) {
if (format == 0) {
std::int32_t max_check = 50;
val data_names = Object.call<val>("keys", data[0]);
std::int32_t check_index = val::global("Math")
.call<val>("min", val(max_check), val(data["length"]))
.as<std::int32_t>();
std::int32_t check_index = std::min(max_check, data["length"].as<std::int32_t>());

for (auto ix = 0; ix < check_index; ix++) {
val next = Object.call<val>("keys", data[ix]);
Expand Down Expand Up @@ -970,9 +968,19 @@ infer_type(val x, val date_validator) {
std::string jstype = x.typeOf().as<std::string>();
t_dtype t = t_dtype::DTYPE_STR;

// Unwrap numbers inside strings
val x_number = val::global("Number").call<val>("call", val::object(), x);
bool number_in_string = (jstype == "string")
&& (x["length"].as<std::int32_t>() != 0)
&& (!val::global("isNaN")
.call<bool>("call", val::object(), x_number));

if (x.isNull()) {
t = t_dtype::DTYPE_NONE;
} else if (jstype == "number") {
} else if (jstype == "number" || number_in_string) {
if (number_in_string) {
x = x_number;
}
double x_float64 = x.as<double>();
if ((std::fmod(x_float64, 1.0) == 0.0) && (x_float64 < 10000.0) && (x_float64 != 0.0)) {
t = t_dtype::DTYPE_INT32;
Expand Down Expand Up @@ -1003,10 +1011,6 @@ infer_type(val x, val date_validator) {
t = t_dtype::DTYPE_STR;
}
}
} else if (!val::global("isNaN").call<bool>("call", val::object(),
val::global("Number").call<val>("call", val::object(), x))) {
PSP_COMPLAIN_AND_ABORT("BADLANDS");
t = t_dtype::DTYPE_FLOAT64;
}

return t;
Expand Down