Fixed multiply (#16) (#19)

.gitignore

@@ -227,3 +227,4 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+/Steppable.build/

src/multiply/multiplyReport.cpp

@@ -118,29 +118,11 @@ std::string reportMultiply(const std::string& a,
             out += std::to_string(i);
 
     // Add the decimal point.
-    auto biggerNumber = (compare(a, b, 0) == "1") ? a : b;
-    auto smallerNumber = (compare(a, b, 0) == "0") ? a : b;
-    if (scale > 0)
+    auto aDecimals = aDecimal.length(), bDecimals = bDecimal.length();
+    if (aDecimals + bDecimals > 0)
     {
-        auto numberIntegers = out.length() - (aDecimal.length() + bDecimal.length());
-        if (numberIntegers < out.length())
-            out.insert(numberIntegers, 1, '.');
-    }
-    else if (scale == 0)
-    {
-        auto numberIntegers = 0;
-        if ((compare(biggerNumber, "5", 0) == "0" and compare(add(biggerNumber, smallerNumber, 0), "7", 0) != "0") or
-            compare(smallerNumber, "1", 0) == "1")
-            numberIntegers++;
-
-        if (numberIntegers < out.size())
-            out.insert(numberIntegers + 1, 1, '.');
-    }
-    else if (scale < 0)
-    {
-        // auto numberIntegers = -scale;
-        out = "0" + out;
-        out.insert(out.length() + scale - 1, 1, '.');
+        out.insert(out.end() - aDecimals - bDecimals, '.');
+        out = removeTrailingZeros(out);
     }
 
     ss << standardizeNumber(out);

src/power/power.cpp

@@ -47,19 +47,17 @@ namespace steppable::__internals::arithmetic
         {
             if (steps == 2)
                 return "Since the number is 1, the result is 1.";
-            else if (steps == 1)
-                return "1"s + symbols::makeSuperscript(static_cast<std::string>(raiseTo)) + " = 1";
-            else
-                return "1";
+            if (steps == 1)
+                return "1"s + symbols::makeSuperscript(raiseTo) + " = 1";
+            return "1";
         }
-        else if (number == "0")
+        if (number == "0")
         {
             if (steps == 2)
                 return "Since the number is 0, the result is 0.";
-            else if (steps == 1)
-                return "0"s + symbols::makeSuperscript(static_cast<std::string>(raiseTo)) + " = 0";
-            else
-                return "0";
+            if (steps == 1)
+                return "0"s + symbols::makeSuperscript(raiseTo) + " = 0";
+            return "0";
         }
 
         auto numberNoTrailingZeros = removeTrailingZeros(number);

src/power/powerReport.cpp

@@ -55,14 +55,13 @@ std::string reportPower(const std::string_view _number,
     // Here, we attempt to give a quick answer, instead of doing pointless iterations.
     if (numberOrig == "1")
         goto finish;
-    else if (numberOrig == "0")
+    if (numberOrig == "0")
     {
         if (steps == 2)
             return "Since the number is 0, the result is 0.";
-        else if (steps == 1)
+        if (steps == 1)
             return "0"s + makeSuperscript(static_cast<std::string>(raiseTo)) + " = 0";
-        else
-            return "0";
+        return "0";
     }
 
     loop(raiseTo, [&](const auto& i) {

tests/testPower.cpp

@@ -39,4 +39,18 @@ const auto& result = power(number, raiseTo, 0);
 
 _.assertIsEqual(result, "52599132235830049");
 SECTION_END()
+
+SECTION(Power with Decimals)
+const std::string_view &number = "47.5", &raiseTo = "10";
+const auto& result = power(number, raiseTo, 0);
+
+_.assertIsEqual(result, "58470404222497940.0634765625");
+SECTION_END()
+
+SECTION(Power with Decimals)
+const std::string_view &number = "0.5", &raiseTo = "10";
+const auto& result = power(number, raiseTo, 0);
+
+_.assertIsEqual(result, "0.0009765625");
+SECTION_END()
 TEST_END()