Refactor grains/square

Check internally for valid squares. Shift on 1, not two -- the first bit is to mark 0 and 1, and shifting it once will turn it into 2.
2019-04-22 01:17:19 +00:00
parent d43303ce4a
commit fb3a4e6b95
1 changed files with 2 additions and 3 deletions
@@ -1,9 +1,8 @@
 #include "grains.h"

 unsigned long long square(int n) {
-  if (!validSquare(n)) return 0;
-  if (n == 1) return 1;
-  return 2llu << (n-2);
+  if (n < 1 || n > 64) return 0;
+  return 1ull << (n-1);
 }

 unsigned long long total() {