Split ring definitions into separate file

Makefile

 default: groupConnectivity.so clean_obj
 
-groupConnectivity.so: groupConnectivity.pyx group-connectivity.h setup.py compileTimeOptions.h parmap.py
+groupConnectivity.so: groupConnectivity.pyx group-connectivity.h setup.py compileTimeOptions.h rings.h parmap.py
 	python setup.py build_ext
 	cp build/lib*/groupConnectivity.so .
 

group-connectivity.h

 #ifndef __GROUP_CONNECTIVITY_H__
 #define __GROUP_CONNECTIVITY_H__
 
+#include <vector>
 #include "compileTimeOptions.h"
+#include "rings.h"
 
-namespace Ring {
-
-#define MakeRing(Name, Size, Plus, Negate, Multiply, One) \
-template < typename T_ > struct Name { \
-  typedef T_ T; \
-  enum { size = Size }; \
-  static T plus(T a, T b) { return Plus; } \
-  static T negate(T a) { return Negate; } \
-  static T multiply(T a, T b) { return Multiply; } \
-  static const T one = One; \
-  static const T zero = 0; \
-}
-
-MakeRing(Z5, 5, (a + b) % 5, (5 - a) % 5, (a * b) % 5, 1);
-MakeRing(Z4, 4, (a + b) & 3, (4 - a) & 3, (a * b) & 3, 1);
-MakeRing(Z2_2, 4, a^b, a, a&b, 3);
-
-}
-
-#include <vector>
 
 typedef int EdgeId;
 typedef int DirectedEdgeId;

rings.h

+#ifndef __RINGS_H__
+#define __RINGS_H__
+
+namespace Ring {
+
+#define MakeRing(Name, Size, Plus, Negate, Multiply, One) \
+template < typename T_ > struct Name { \
+  typedef T_ T; \
+  enum { size = Size }; \
+  static T plus(T a, T b) { return Plus; } \
+  static T negate(T a) { return Negate; } \
+  static T multiply(T a, T b) { return Multiply; } \
+  static const T one = One; \
+  static const T zero = 0; \
+}
+
+MakeRing(Z5, 5, (a + b) % 5, (5 - a) % 5, (a * b) % 5, 1);
+MakeRing(Z4, 4, (a + b) & 3, (4 - a) & 3, (a * b) & 3, 1);
+MakeRing(Z2_2, 4, a^b, a, a&b, 3);
+
+}
+
+#endif
+