Adds numerical metadata and bumps version

Author: hatesmeetings

pymorton/__init__.py

@@ -45,38 +45,38 @@
 
 
 def __part1by1(n):
-    n &= 0x0000ffff
-    n = (n | (n << 8))  & 0x00FF00FF
-    n = (n | (n << 4))  & 0x0F0F0F0F
-    n = (n | (n << 2))  & 0x33333333
-    n = (n | (n << 1))  & 0x55555555
+    n &= 0x0000ffff                  # base10: 65535,      binary: 1111111111111111,                 len: 16
+    n = (n | (n << 8))  & 0x00FF00FF # base10: 16711935,   binary: 111111110000000011111111,         len: 24
+    n = (n | (n << 4))  & 0x0F0F0F0F # base10: 252645135,  binary: 1111000011110000111100001111,     len: 28
+    n = (n | (n << 2))  & 0x33333333 # base10: 858993459,  binary: 110011001100110011001100110011,   len: 30
+    n = (n | (n << 1))  & 0x55555555 # base10: 1431655765, binary: 1010101010101010101010101010101,  len: 31
     return n
 
 
 def __part1by2(n):
-    n &= 0x000003ff
-    n = (n ^ (n << 16)) & 0xff0000ff
-    n = (n ^ (n << 8))  & 0x0300f00f
-    n = (n ^ (n << 4))  & 0x030c30c3
-    n = (n ^ (n << 2))  & 0x09249249
+    n &= 0x000003ff                  # base10: 1023,       binary: 1111111111,                       len: 10
+    n = (n ^ (n << 16)) & 0xff0000ff # base10: 4278190335, binary: 11111111000000000000000011111111, len: 32
+    n = (n ^ (n << 8))  & 0x0300f00f # base10: 50393103,   binary: 11000000001111000000001111,       len: 26
+    n = (n ^ (n << 4))  & 0x030c30c3 # base10: 51130563,   binary: 11000011000011000011000011,       len: 26
+    n = (n ^ (n << 2))  & 0x09249249 # base10: 153391689,  binary: 1001001001001001001001001001,     len: 28
     return n
 
 
 def __unpart1by1(n):
-    n &= 0x55555555
-    n = (n ^ (n >> 1))  & 0x33333333
-    n = (n ^ (n >> 2))  & 0x0f0f0f0f
-    n = (n ^ (n >> 4))  & 0x00ff00ff
-    n = (n ^ (n >> 8))  & 0x0000ffff
+    n &= 0x55555555                  # base10: 1431655765, binary: 1010101010101010101010101010101,  len: 31
+    n = (n ^ (n >> 1))  & 0x33333333 # base10: 858993459,  binary: 110011001100110011001100110011,   len: 30
+    n = (n ^ (n >> 2))  & 0x0f0f0f0f # base10: 252645135,  binary: 1111000011110000111100001111,     len: 28
+    n = (n ^ (n >> 4))  & 0x00ff00ff # base10: 16711935,   binary: 111111110000000011111111,         len: 24
+    n = (n ^ (n >> 8))  & 0x0000ffff # base10: 65535,      binary: 1111111111111111,                 len: 16
     return n
 
 
 def __unpart1by2(n):
-    n &= 0x09249249
-    n = (n ^ (n >> 2))  & 0x030c30c3
-    n = (n ^ (n >> 4))  & 0x0300f00f
-    n = (n ^ (n >> 8))  & 0xff0000ff
-    n = (n ^ (n >> 16)) & 0x000003ff
+    n &= 0x09249249                  # base10: 153391689,  binary: 1001001001001001001001001001,     len: 28
+    n = (n ^ (n >> 2))  & 0x030c30c3 # base10: 51130563,   binary: 11000011000011000011000011,       len: 26
+    n = (n ^ (n >> 4))  & 0x0300f00f # base10: 50393103,   binary: 11000000001111000000001111,       len: 26
+    n = (n ^ (n >> 8))  & 0xff0000ff # base10: 4278190335, binary: 11111111000000000000000011111111, len: 32
+    n = (n ^ (n >> 16)) & 0x000003ff # base10: 1023,       binary: 1111111111,                       len: 10
     return n
 
 

setup.py

@@ -3,7 +3,7 @@
 def build():
     setup(
             name = 'pymorton',
-            version = '0.2.0',
+            version = '0.2.1',
             author = 'Trevor Prater',
             author_email = 'trevor.prater@gmail.com',
             description = 'A lightweight morton coder with lat/long support.',