organicmaps/fast_double_parser
13
Fork 0
mirror of https://github.com/lemire/fast_double_parser.git synced 2025-04-03 20:04:57 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Tweaks for VS

Browse source
This commit is contained in:
Daniel Lemire 2020-06-03 10:58:42 -07:00
parent 1ab5b1d19a
commit 553d74bd66
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
benchmarks/benchmark.cpp
View file

@ -87,7 +87,7 @@ double findmax_doubleconversion(std::vector<std::string> s) {
separator);
int processed_characters_count;
for (std::string st : s) {
x = converter.StringToDouble(st.data(), st.size(),
x = converter.StringToDouble(st.data(), int(st.size()),
&processed_characters_count);
if (processed_characters_count == 0) {
throw std::runtime_error("bug in findmax_doubleconversion");
@ -124,7 +124,7 @@ void validate(std::vector<std::string> s) {
int processed_characters_count;
for (std::string st : s) {
xref = strtod(st.data(), NULL);
x = converter.StringToDouble(st.data(), st.size(),
x = converter.StringToDouble(st.data(), int(st.size()),
&processed_characters_count);
if (xref != x) {
std::cerr << "double conversion disagrees" << std::endl;
@ -192,7 +192,7 @@ void process(std::vector<std::string> lines, size_t volume) {
t2 = std::chrono::high_resolution_clock::now();
if (ts == 0)
printf("bug\n");
dif = std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count();
dif = double(std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count());
if (i > 0)
printf("fast_double_parser %.2f MB/s\n", volumeMB * 1000000000 / dif);
t1 = std::chrono::high_resolution_clock::now();
@ -200,7 +200,7 @@ void process(std::vector<std::string> lines, size_t volume) {
t2 = std::chrono::high_resolution_clock::now();
if (ts == 0)
printf("bug\n");
dif = std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count();
dif = double(std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count());
if (i > 0)
printf("strtod %.2f MB/s\n", volumeMB * 1000000000 / dif);
t1 = std::chrono::high_resolution_clock::now();
@ -208,7 +208,7 @@ void process(std::vector<std::string> lines, size_t volume) {
t2 = std::chrono::high_resolution_clock::now();
if (ts == 0)
printf("bug\n");
dif = std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count();
dif = double(std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count());
if (i > 0)
printf("abslfromch %.2f MB/s\n", volumeMB * 1000000000 / dif);
t1 = std::chrono::high_resolution_clock::now();
@ -216,7 +216,7 @@ void process(std::vector<std::string> lines, size_t volume) {
t2 = std::chrono::high_resolution_clock::now();
if (ts == 0)
printf("bug\n");
dif = std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count();
dif = double(std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count());
if (i > 0)
printf("absl %.2f MB/s\n", volumeMB * 1000000000 / dif);
t1 = std::chrono::high_resolution_clock::now();
@ -224,7 +224,7 @@ void process(std::vector<std::string> lines, size_t volume) {
t2 = std::chrono::high_resolution_clock::now();
if (ts == 0)
printf("bug\n");
dif = std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count();
dif = double(std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count());
if (i > 0)
printf("double-conv %.2f MB/s\n", volumeMB * 1000000000 / dif);
printf("\n\n");

6
include/fast_double_parser.h
View file

@ -1176,7 +1176,7 @@ really_inline double compute_float_64(int64_t power, uint64_t i, bool negative,
///////
uint64_t upperbit = upper >> 63;
uint64_t mantissa = upper >> (upperbit + 9);
lz += 1 ^ upperbit;
lz += int(1 ^ upperbit);
// Here we have mantissa < (1<<54).
// We have to round to even. The "to even" part
@ -1346,7 +1346,7 @@ really_inline bool parse_number_base(const char *p, double *outDouble) {
exponent = first_after_period - p;
}
int digit_count =
p - start_digits - 1; // used later to guard against overflows
int(p - start_digits - 1); // used later to guard against overflows
int64_t exp_number = 0; // exponential part
if (('e' == *p) || ('E' == *p)) {
++p;
@ -1395,7 +1395,7 @@ really_inline bool parse_number_base(const char *p, double *outDouble) {
start++;
}
// we over-decrement by one when there is a decimal separator
digit_count -= (start - start_digits);
digit_count -= int(start - start_digits);
if (digit_count >= 19) {
// Chances are good that we had an overflow!
// We start anew.

12
tests/stats.cpp
View file

@ -99,7 +99,7 @@ size_t compute_float_64_stats(int64_t power, uint64_t i) {
///////
uint64_t upperbit = upper >> 63;
uint64_t mantissa = upper >> (upperbit + 9);
lz += 1 ^ upperbit;
lz += int(1 ^ upperbit);
// Here we have mantissa < (1<<54).
// We have to round to even. The "to even" part
@ -135,7 +135,7 @@ size_t compute_float_64_stats(int64_t power, uint64_t i) {
}
// parse the number at p
int parse_number_stats(const char *p) {
size_t parse_number_stats(const char *p) {
bool found_minus = (*p == '-');
bool negative = false;
if (found_minus) {
@ -196,7 +196,7 @@ int parse_number_stats(const char *p) {
exponent = first_after_period - p;
}
int digit_count =
p - start_digits - 1; // used later to guard against overflows
int(p - start_digits - 1); // used later to guard against overflows
int64_t exp_number = 0; // exponential part
if (('e' == *p) || ('E' == *p)) {
++p;
@ -245,7 +245,7 @@ int parse_number_stats(const char *p) {
start++;
}
// we over-decrement by one when there is a '.'
digit_count -= (start - start_digits);
digit_count -= int(start - start_digits);
if (digit_count >= 19) {
// Chances are good that we had an overflow!
// We start anew.
@ -299,7 +299,7 @@ void random_floats(bool ininterval) {
std::string s(64, '\0');
auto written = std::snprintf(&s[0], s.size(), "%.*e", DBL_DIG + 1, d);
s.resize(written);
int state = parse_number_stats(s.data());
size_t state = parse_number_stats(s.data());
counters[state] += 1;
}
size_t count = howmany;
@ -333,7 +333,7 @@ void fileload(char *filename) {
std::string line;
size_t count = 0;
while (getline(inputfile, line)) {
int state = parse_number_stats(line.data());
size_t state = parse_number_stats(line.data());
counters[state] += 1;
count++;
}