Thanks to visit codestin.com
Credit goes to github.com

Skip to content

do better generation of strings for uncertain measurements #249

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
phlptp merged 5 commits into from
Nov 23, 2022
Merged

do better generation of strings for uncertain measurements #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
540caae
do better generation of strings for uncertain measurements
phlptp Nov 22, 2022
124d0c8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2022
230693b
use fractional uncertainty in to_string for uncertain measurements
phlptp Nov 22, 2022
5a3fbdb
Merge branch 'uncertain_string' of https://github.com/LLNL/units into…
phlptp Nov 22, 2022
d9293f5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2022
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
19 changes: 19 additions & 0 deletions test/test_uncertain_measurements.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,25 @@ TEST(uncertainStrings, to_string)
auto str = to_string(um1);
EXPECT_EQ(str, "10+/-0.4 m");
}

TEST(uncertainStrings, to_stringReduce)
{
uncertain_measurement um1(10.897, 0.4, m);
auto str = to_string(um1);
EXPECT_EQ(str, "10.9+/-0.4 m");

uncertain_measurement um2(10.848, 0.04, m);
str = to_string(um2);
EXPECT_EQ(str, "10.85+/-0.04 m");

uncertain_measurement um3(10.848e-7, 0.041e-7, m);
str = to_string(um3);
EXPECT_EQ(str, "1.085e-06+/-4.1e-09 m");

uncertain_measurement um4(335.0, 100.0, m);
str = to_string(um4);
EXPECT_EQ(str, "3.4e+02+/-1e+02 m");
}
#endif

TEST(uncertainOps, fractional_uncertainty)
Expand Down
11 changes: 8 additions & 3 deletions units/units.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,13 +1697,18 @@ std::string to_string(const measurement& measure, std::uint32_t match_flags)
std::string
to_string(const uncertain_measurement& measure, std::uint32_t match_flags)
{
// TODO(PT) this should really follow more appropriate rules for digits of
// precision
// compute the correct number of digits to display for uncertain precision
auto digits = static_cast<std::streamsize>(
ceil(-log10(measure.fractional_uncertainty()))) +
1;
digits = (digits < 2) ? 2 : digits;
std::stringstream ss;
ss.precision(6);
ss.precision(digits);
ss << measure.value_f();
ss << "+/-";
ss.precision(2);
ss << measure.uncertainty_f() << ' ';
ss.precision(digits);
ss << to_string(measure.units(), match_flags);
return ss.str();
}
Expand Down