Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 25, 2023
1 parent 74eab30 commit e3bb44e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docs/user-guide/defined_units.rst
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ Some special units that were not otherwise characterized in namespace `units::pr
- rootHertz - square root of Hertz, this is a special handling unit that triggers some specific behavior to handle it.
- rootMeter - square root of meter, this is a special handling unit that triggers some specific behavior to handle it.
- degreeAPI - API scale for measuring liquid density typically petroleum based products
- degreeBaumeLight - scale for measuring liquid density for liquids lighter than water
- degreeBaumeLight - scale for measuring liquid density for liquids lighter than water
- debreeBaumeHeavy - scale for measuring liquid density for liquids heavier than water


Expand Down
47 changes: 24 additions & 23 deletions test/test_equation_units.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -600,35 +600,36 @@ TEST(otherEqUnits, unknownEQ)
EXPECT_EQ(convert(1.927, eq20 * precise::W, eq20 * precise::W), 1.927);
}


TEST(otherEqUnits, APIgravity)
{
auto apiG=precise::special::degreeAPI;
//gasoline
EXPECT_NEAR(convert(56.98,apiG,precise::g / precise::mL),0.7508,0.0001);
EXPECT_NEAR(convert(0.750743, precise::g / precise::mL,apiG),56.98,0.001);
//kerosene
EXPECT_NEAR(convert(50.9,apiG,precise::g / precise::mL),0.775768,0.0001);
EXPECT_NEAR(convert(0.775768,precise::g / precise::mL,apiG),50.9,0.001);
auto apiG = precise::special::degreeAPI;
// gasoline
EXPECT_NEAR(convert(56.98, apiG, precise::g / precise::mL), 0.7508, 0.0001);
EXPECT_NEAR(
convert(0.750743, precise::g / precise::mL, apiG), 56.98, 0.001);
// kerosene
EXPECT_NEAR(
convert(50.9, apiG, precise::g / precise::mL), 0.775768, 0.0001);
EXPECT_NEAR(convert(0.775768, precise::g / precise::mL, apiG), 50.9, 0.001);
}

TEST(otherEqUnits, degreeBaume)
{
auto degBL=precise::special::degreeBaumeLight;
EXPECT_NEAR(convert(10,degBL,precise::g / precise::mL),1.0000,0.0001);
EXPECT_NEAR(convert(1.0000, precise::g / precise::mL,degBL),10.0,0.001);
EXPECT_NEAR(convert(26.075, degBL,precise::g / precise::mL),0.897,0.001);
EXPECT_NEAR(convert(0.897, precise::g / precise::mL,degBL),26.075,0.001);
EXPECT_NEAR(convert(43.91, degBL,precise::g / precise::mL),0.805,0.001);
EXPECT_NEAR(convert(0.805, precise::g / precise::mL,degBL),43.91,0.01);
auto degBH=precise::special::degreeBaumeHeavy;
EXPECT_NEAR(convert(0,degBH,precise::g / precise::mL),1.0000,0.0001);
EXPECT_NEAR(convert(1.0000, precise::g / precise::mL,degBH),0.0,0.001);
EXPECT_NEAR(convert(15.0, degBH,precise::g / precise::mL),1.115,0.001);
EXPECT_NEAR(convert(1.115, precise::g / precise::mL,degBH),14.955,0.001);
EXPECT_NEAR(convert(69.0, degBH,precise::g / precise::mL),1.908,0.001);
EXPECT_NEAR(convert(1.908, precise::g / precise::mL,degBH),69.0,0.005);
auto degBL = precise::special::degreeBaumeLight;
EXPECT_NEAR(convert(10, degBL, precise::g / precise::mL), 1.0000, 0.0001);
EXPECT_NEAR(convert(1.0000, precise::g / precise::mL, degBL), 10.0, 0.001);
EXPECT_NEAR(convert(26.075, degBL, precise::g / precise::mL), 0.897, 0.001);
EXPECT_NEAR(convert(0.897, precise::g / precise::mL, degBL), 26.075, 0.001);
EXPECT_NEAR(convert(43.91, degBL, precise::g / precise::mL), 0.805, 0.001);
EXPECT_NEAR(convert(0.805, precise::g / precise::mL, degBL), 43.91, 0.01);

auto degBH = precise::special::degreeBaumeHeavy;
EXPECT_NEAR(convert(0, degBH, precise::g / precise::mL), 1.0000, 0.0001);
EXPECT_NEAR(convert(1.0000, precise::g / precise::mL, degBH), 0.0, 0.001);
EXPECT_NEAR(convert(15.0, degBH, precise::g / precise::mL), 1.115, 0.001);
EXPECT_NEAR(convert(1.115, precise::g / precise::mL, degBH), 14.955, 0.001);
EXPECT_NEAR(convert(69.0, degBH, precise::g / precise::mL), 1.908, 0.001);
EXPECT_NEAR(convert(1.908, precise::g / precise::mL, degBH), 69.0, 0.005);
}

#ifndef UNITS_HEADER_ONLY
Expand Down

0 comments on commit e3bb44e

Please sign in to comment.