Bug Fix: pow(a,1) is incorrect

Author: benlau

bigintegermath.cpp

@@ -11,10 +11,12 @@ BigInteger BigIntegerMath::pow(const BigInteger &base, int exponent)
 {
     BigInteger result;
 
-    if (exponent <= 1) {
+    if (exponent < 1) {
         // It don't support floating point
         result = 1;
         return result;
+    } else if (exponent == 1) {
+        return base;
     }
 
     BigInteger x = base;
@@ -86,6 +88,10 @@ void BigIntegerMath::fraction(double input, BigInteger &numerator, BigInteger &d
         QString integerPart = str.mid(0, matcher.capturedStart());
         denominator = pow(BigInteger(10), decimal.size());
 
+        if (integerPart == "0") {
+            integerPart = "";
+        }
+
         for (int i = 0 ; i < decimal.size() ; i++) {
             integerPart += decimal.at(i);
         }
@@ -100,3 +106,11 @@ void BigIntegerMath::fraction(double input, BigInteger &numerator, BigInteger &d
     }
 
 }
+
+
+QDebug operator<<(QDebug d, const BigInteger &bigInteger)
+{
+    d << QString::fromStdString(bigIntegerToString(bigInteger));
+
+    return d;
+}

bigintegermath.h

@@ -1,6 +1,7 @@
 #ifndef BIGINTEGERMATH_H
 #define BIGINTEGERMATH_H
 
+#include <QtCore>
 #include "BigInteger.hh"
 
 /// Math utility
@@ -16,4 +17,6 @@ class BigIntegerMath
     static void fraction(double decimal, BigInteger& numerator, BigInteger& denominator);
 };
 
+QDebug operator<< (QDebug d, const BigInteger &bigInteger);
+
 #endif // BIGINTEGERMATH_H

bigintegerobject.cpp

@@ -214,10 +214,3 @@ class BigIntegerWrapperRegistrationHelper {
 };
 
 static BigIntegerWrapperRegistrationHelper registerHelper;
-
-QDebug operator<<(QDebug d, const BigInteger &bigInteger)
-{
-    d << QString::fromStdString(bigIntegerToString(bigInteger));
-
-    return d;
-}

bigintegerobject.h

@@ -1,7 +1,6 @@
 #pragma once
 #include <QObject>
 #include <QJSValue>
-#include "BigInteger.hh"
 
 // QML Wrapper Object for BigInteger manipulation
 
@@ -50,5 +49,3 @@ public slots:
     QString pow(const QString& a, int b) const;
 
 };
-
-QDebug operator<< (QDebug d, const BigInteger &bigInteger);

tests/bigintegerunittests/bigintegerunittests.cpp

@@ -78,6 +78,12 @@ void BigIntegerUnitTests::pow()
     result = QString::fromStdString(bigIntegerToString(c));
     QVERIFY(result == "647225717667958234512676373328684966608135637121798638546825574314018838197362232702277832316406382792759851833889013515631314023038087");
 
+    a = 10;
+    b = 1;
+    c = BigIntegerMath::pow(a, b);
+    result = QString::fromStdString(bigIntegerToString(c));
+    QVERIFY(result == "10");
+
 }
 
 void BigIntegerUnitTests::gcd()
@@ -148,4 +154,6 @@ void BigIntegerUnitTests::fraction_data()
     QTest::newRow("") << 1.07 << "107" << "100";
     QTest::newRow("") << -1.07 << "-107" << "100";
     QTest::newRow("") << 0.0 << "0" << "1";
+    QTest::newRow("") << 0.8 << "4" << "5";
+
 }

tests/bigintegerunittests/qml/tst_calculation.qml

@@ -9,6 +9,8 @@ TestCase {
         compare(BigInteger.multiply("3141592653589793238462643383279","3141592653589793238462643383279"), "9869604401089358618834490999872991420714831834895839696791841");
         compare(BigInteger.multiply("134",[ "5", "7"]), "95");
         compare(BigInteger.multiply("134", 0.714285 ), "95");
+        compare(BigInteger.multiply("10", [8,10]), "8");
+        compare(BigInteger.multiply("10", 0.8 ), "8");
     }
 
     function test_divide() {
@@ -50,6 +52,8 @@ TestCase {
 
     function test_fraction() {
         compare(BigInteger.fraction("0.125") , ["1","8"]);
+        compare(BigInteger.fraction("0.8") , ["4","5"]);
+
     }
 
 }