fix comparison bug with leading zeros

Limeoats · Apr 29, 2017 · e4bd192 · e4bd192
1 parent 375e0d1
commit e4bd192
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/bin/BigNumber/include/bignumber.h b/bin/BigNumber/include/bignumber.h
@@ -93,6 +93,8 @@ class BigNumber {
      * @return The BigNumber after negation
      */
     BigNumber negate();
+
+    BigNumber trimLeadingZeros();
 
     //@{
     /**

diff --git a/bin/BigNumber/lib/libBigNumber.a b/bin/BigNumber/lib/libBigNumber.a
diff --git a/main.cpp b/main.cpp
@@ -110,6 +110,7 @@ int main() {
     assert(BigNumber("-5") >= BigNumber("-10"));
     assert(BigNumber("0") >= BigNumber("0"));
     assert(BigNumber("32") >= BigNumber("-32"));
+    assert(BigNumber("2") >= BigNumber("0001"));
 
     //Less than or equal to
     assert(BigNumber("5") <= BigNumber("10"));

diff --git a/src/bignumber.cpp b/src/bignumber.cpp
@@ -344,6 +344,14 @@ BigNumber BigNumber::negate() {
     return *this;
 }
 
+BigNumber BigNumber::trimLeadingZeros() {
+    BigNumber b = *this;
+    if (b._numberString.find_first_not_of('0') != std::string::npos) {
+        b.setString(b._numberString.erase(0, b._numberString.find_first_not_of('0')));
+    }
+    return b;
+}
+
 bool BigNumber::equals(const BigNumber &other) {
     return this->_numberString == other._numberString;
 }
@@ -461,21 +469,24 @@ bool operator>(BigNumber b1, const BigNumber &b2) {
             return !(b1.isNegative() && !b2.isNegative());
         }
     }
-    if (b1 == b2) {
+    b1 = b1.trimLeadingZeros();
+    auto c = BigNumber(b2);
+    c = c.trimLeadingZeros();
+    if (b1 == c) {
         return false;
     }
-    if (b1._numberString.size() > b2._numberString.size()) {
+    if (b1._numberString.size() > c._numberString.size()) {
         return true;
     }
-    else if (b2._numberString.size() > b1._numberString.size()) {
+    else if (c._numberString.size() > b1._numberString.size()) {
         return false;
     }
     else {
         for (unsigned int i = 0; i < b1._numberString.size(); ++i) {
-            if (b1[i] == static_cast<unsigned int>(b2._numberString[i] - '0')) {
+            if (b1[i] == static_cast<unsigned int>(c._numberString[i] - '0')) {
                 continue;
             }
-            return b1[i] > static_cast<unsigned int>(b2._numberString[i] - '0');
+            return b1[i] > static_cast<unsigned int>(c._numberString[i] - '0');
         }
     }
     return false;

diff --git a/src/bignumber.h b/src/bignumber.h
@@ -93,6 +93,8 @@ class BigNumber {
      * @return The BigNumber after negation
      */
     BigNumber negate();
+
+    BigNumber trimLeadingZeros();
 
     //@{
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,8 @@ class BigNumber { @@
          * @return The BigNumber after negation
          */
         BigNumber negate();
+        BigNumber trimLeadingZeros();
         //@{
         /**
@@ Expand Down @@