BinaryID: fixed < > operator comparison bug. added <= & >= operators. implemented IComparable interface to allow sorting.

ShreyasZare · ShreyasZare · commit dec41140aae3 · 2017-08-20T22:42:41.000+05:30
diff --git a/BitChatCore/Network/BinaryID.cs b/BitChatCore/Network/BinaryID.cs
@@ -1,6 +1,6 @@
 ﻿/*
 Technitium Bit Chat
-Copyright (C) 2015  Shreyas Zare (shreyas@technitium.com)
+Copyright (C) 2017  Shreyas Zare (shreyas@technitium.com)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 namespace BitChatCore.Network
 {
-    public class BinaryID : IWriteStream, IEquatable<BinaryID>
+    public class BinaryID : IWriteStream, IEquatable<BinaryID>, IComparable<BinaryID>
     {
         #region variables
 
@@ -132,6 +132,23 @@ public override int GetHashCode()
                 return BitConverter.ToInt32(_id, 0);
         }
 
+        public int CompareTo(BinaryID other)
+        {
+            if (this._id.Length != other._id.Length)
+                throw new ArgumentException("Operand id length not equal.");
+
+            for (int i = 0; i < this._id.Length; i++)
+            {
+                if (this._id[i] > other._id[i])
+                    return 1;
+
+                if (this._id[i] < other._id[i])
+                    return -1;
+            }
+
+            return 0;
+        }
+
         public override string ToString()
         {
             return BitConverter.ToString(_id).Replace("-", "").ToLower();
@@ -257,16 +274,60 @@ public void WriteTo(Stream s)
             if (b1._id.Length != b2._id.Length)
                 throw new ArgumentException("Operand id length not equal.");
 
+            bool eq = true;
+
             for (int i = 0; i < b1._id.Length; i++)
             {
                 if (b1._id[i] > b2._id[i])
                     return false;
+
+                if (b1._id[i] != b2._id[i])
+                    eq = false;
             }
 
+            if (eq)
+                return false;
+
             return true;
         }
 
         public static bool operator >(BinaryID b1, BinaryID b2)
+        {
+            if (b1._id.Length != b2._id.Length)
+                throw new ArgumentException("Operand id length not equal.");
+
+            bool eq = true;
+
+            for (int i = 0; i < b1._id.Length; i++)
+            {
+                if (b1._id[i] < b2._id[i])
+                    return false;
+
+                if (b1._id[i] != b2._id[i])
+                    eq = false;
+            }
+
+            if (eq)
+                return false;
+
+            return true;
+        }
+
+        public static bool operator <=(BinaryID b1, BinaryID b2)
+        {
+            if (b1._id.Length != b2._id.Length)
+                throw new ArgumentException("Operand id length not equal.");
+
+            for (int i = 0; i < b1._id.Length; i++)
+            {
+                if (b1._id[i] > b2._id[i])
+                    return false;
+            }
+
+            return true;
+        }
+
+        public static bool operator >=(BinaryID b1, BinaryID b2)
         {
             if (b1._id.Length != b2._id.Length)
                 throw new ArgumentException("Operand id length not equal.");
