zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-16 04:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use floats for remaining time math

Browse Source
This commit is contained in:
Seth Parker
2020-11-16 10:54:05 -05:00
parent c3ff1fbd91
commit e01c2950f2
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/indicators/block_progress_bar.hpp
View File

@@ -200,7 +200,9 @@ private:
if (saved_start_time) { if (saved_start_time) {
auto eta = std::chrono::nanoseconds( auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed.count() * max_progress / progress_) : 0); progress_ > 0 ? static_cast<long long>(float(elapsed.count()) *
max_progress / progress_)
: 0);
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta); auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
details::write_duration(os, remaining); details::write_duration(os, remaining);
} else { } else {

4
include/indicators/progress_bar.hpp
View File

@@ -255,8 +255,8 @@ private:
if (saved_start_time) { if (saved_start_time) {
auto eta = std::chrono::nanoseconds( auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed_.count() * progress_ > 0 ? static_cast<long long>(float(elapsed_.count()) *
(max_progress / progress_)) max_progress / progress_)
: 0); : 0);
auto remaining = eta > elapsed_ ? (eta - elapsed_) : (elapsed_ - eta); auto remaining = eta > elapsed_ ? (eta - elapsed_) : (elapsed_ - eta);
details::write_duration(os, remaining); details::write_duration(os, remaining);

4
include/indicators/progress_spinner.hpp
View File

@@ -195,7 +195,9 @@ public:
else else
os << " ["; os << " [";
auto eta = std::chrono::nanoseconds( auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed.count() * max_progress / progress_) : 0); progress_ > 0 ? static_cast<long long>(float(elapsed.count()) *
max_progress / progress_)
: 0);
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta); auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
details::write_duration(os, remaining); details::write_duration(os, remaining);
os << "]"; os << "]";

12
single_include/indicators/indicators.hpp
View File

@@ -1788,8 +1788,8 @@ private:
if (saved_start_time) { if (saved_start_time) {
auto eta = std::chrono::nanoseconds( auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed_.count() * progress_ > 0 ? static_cast<long long>(float(elapsed_.count()) *
(max_progress / progress_)) max_progress / progress_)
: 0); : 0);
auto remaining = eta > elapsed_ ? (eta - elapsed_) : (elapsed_ - eta); auto remaining = eta > elapsed_ ? (eta - elapsed_) : (elapsed_ - eta);
details::write_duration(os, remaining); details::write_duration(os, remaining);
@@ -2089,8 +2089,8 @@ private:
if (saved_start_time) { if (saved_start_time) {
auto eta = std::chrono::nanoseconds( auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed.count() * progress_ > 0 ? static_cast<long long>(float(elapsed.count()) *
(max_progress / progress_)) max_progress / progress_)
: 0); : 0);
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta); auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
details::write_duration(os, remaining); details::write_duration(os, remaining);
@@ -2798,8 +2798,8 @@ public:
else else
os << " ["; os << " [";
auto eta = std::chrono::nanoseconds( auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed.count() * progress_ > 0 ? static_cast<long long>(float(elapsed.count()) *
(max_progress / progress_)) max_progress / progress_)
: 0); : 0);
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta); auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
details::write_duration(os, remaining); details::write_duration(os, remaining);