Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ZCG-coder committed Jun 30, 2024
2 parents 69ac88a + a6c4796 commit 1ddbb46
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/log/log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ namespace steppable::__internals::arithmetic
// /-\ +--------------------------------------------+
// / ! \ | WARNING: DO NOT CALL THIS METHOD DIRECTLY! |
// /-----\ +--------------------------------------------+
// TODO: Improve accuracy.
// 4 3 2
// (x - 1)(137x + 1762x + 3762x + 1762x + 137)
// ln(x) = ------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/power/powerReport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ std::string reportPower(const std::string_view _number,
ss << number;
}

if (steps == 1)
if (steps >= 1)
ss << numberOrig << makeSuperscript(static_cast<std::string>(raiseTo)) << " = " << number;
else if (steps == 0)
ss << number;
Expand Down
4 changes: 2 additions & 2 deletions src/root/root.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ namespace steppable::__internals::arithmetic
auto radicand = add(y, newAvg, 0);
auto test = power(radicand, base, 0);

if (compare(newAvg, "0", 0) == "2")
return numUtils::roundDown(numUtils::roundOff(radicand, 1));
if (compare(newAvg, "0", 0) == "2" or compare(test, number, 0) == "2")
return roundDown(numUtils::roundOff(radicand, 1));
if (compare(test, number, 0) == "1")
x = radicand;
else if (compare(test, number, 0) == "0")
Expand Down
2 changes: 0 additions & 2 deletions tests/testHyp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ SECTION(Test inverse hyperbolic sine)
_.assertIsEqual(asinh("0.5", 4), "0.4812");
SECTION_END()

// TODO: FIX THESE
// - Incorrect return values.
SECTION(Test inverse hyperbolic cosine)
_.assertIsEqual(acosh("1.25", 4), "0.6931");
SECTION_END()
Expand Down

0 comments on commit 1ddbb46

Please sign in to comment.