class CColorAmount

fix operators

Author: hihiben

src/amount.h

@@ -55,11 +55,16 @@ class CColorAmount : public colorAmount_t
     bool operator>(const CColorAmount& rhs) const
     {
         CColorAmount lhs = (*this);
-        for (CColorAmount::const_iterator itr(rhs.begin()); itr != rhs.end(); itr++) {
-            CColorAmount::const_iterator itl = lhs.find(itr->first);
-            if (itl == lhs.end())
-                return false;
-            else if (itl->second <= itr->second)
+        CColorAmount::const_iterator itl(lhs.begin());
+        CColorAmount::const_iterator itr(rhs.begin());
+        for (; itr != rhs.end() ; itl++, itr++) {
+            while (itl.first != itr.first) {
+                if (itl == lhs.end())
+                    return false;
+                else
+                    itl++;
+            }
+            if (itl->second <= itr->second)
                 return false;
         }
 
@@ -69,11 +74,16 @@ class CColorAmount : public colorAmount_t
     bool operator>=(const CColorAmount& rhs) const
     {
         CColorAmount lhs = (*this);
-        for (CColorAmount::const_iterator itr(rhs.begin()); itr != rhs.end(); itr++) {
-            CColorAmount::const_iterator itl = lhs.find(itr->first);
-            if (itl == lhs.end())
-                return false;
-            else if (itl->second < itr->second)
+        CColorAmount::const_iterator itl(lhs.begin());
+        CColorAmount::const_iterator itr(rhs.begin());
+        for (; itr != rhs.end() ; itl++, itr++) {
+            while (itl.first != itr.first) {
+                if (itl == lhs.end())
+                    return false;
+                else
+                    itl++;
+            }
+            if (itl->second < itr->second)
                 return false;
         }
 
@@ -83,30 +93,13 @@ class CColorAmount : public colorAmount_t
     bool operator<(const CColorAmount& rhs) const
     {
         CColorAmount lhs = (*this);
-        for (CColorAmount::const_iterator itl(lhs.begin()); itl != lhs.end(); itl++) {
-            CColorAmount::const_iterator itr = rhs.find(itl->first);
-            if (itr == rhs.end())
-                return false;
-            else if (itl->second >= itr->second)
-                return false;
-        }
-
-        return true;
+        return !(lhs >= rhs);
     }
 
     bool operator<=(const CColorAmount& rhs) const
     {
         CColorAmount lhs = (*this);
-
-        for (CColorAmount::const_iterator itl(lhs.begin()); itl != lhs.end(); itl++) {
-            CColorAmount::const_iterator itr = rhs.find(itl->first);
-            if (itr == rhs.end())
-                return false;
-            else if (itl->second > itr->second)
-                return false;
-        }
-
-        return true;
+        return !(lhs > rhs);
     }
 
     bool operator==(const CColorAmount& rhs) const