added preprocessor method for potts, and implemented dihedral for the c++ stuff

5 files changed, 88 insertions, 5 deletions

diff --git a/lib/dihedral.h b/lib/dihedral.h
index c95b23a..f67c930 100644
--- a/lib/dihedral.h
+++ b/lib/dihedral.h
@@ -19,3 +19,81 @@ q_t *dihedral_gen_transformations(q_t q);
 R_t *dihedral_gen_involutions(q_t q);
 
 R_t factorial(q_t);
+
+#ifdef __cplusplus
+
+template <class T, q_t q>
+struct dihedral2_t { bool is_reflection; T x; };
+
+template <class T, q_t q>
+void init(dihedral2_t<T, q> *ptr) {
+  ptr->is_reflection = false;
+  ptr->x = (T)0;
+}
+
+template <class T, q_t q>
+dihedral2_t<T, q> copy(dihedral2_t<T, q> r) {
+  return r;
+}
+
+template <class T, q_t q>
+void free_spin(dihedral2_t<T, q> r) {
+  // do nothing!
+}
+
+template <q_t q>
+potts_t<q> act(dihedral2_t<q_t, q> r, potts_t<q> s) {
+  potts_t<q> s2;
+  if (r.is_reflection) {
+    s2.x = ((q + r.x) - s.x) % q;
+  } else {
+    s2.x = (r.x + s.x) % q;
+  }
+
+  return s2;
+}
+
+template <q_t q>
+dihedral2_t<q_t,q> act(dihedral2_t<q_t,q> r1, dihedral2_t<q_t,q> r2) {
+  dihedral2_t<q_t,q> r3;
+
+  if (r1.is_reflection) {
+    r3.is_reflection = !(r2.is_reflection);
+    r3.x = ((q + r1.x) - r2.x) % q;
+  } else {
+    r3.is_reflection = r2.is_reflection;
+    r3.x = (r1.x + r2.x) % q;
+  }
+
+  return r3;
+}
+
+template <q_t q>
+potts_t<q> act_inverse(dihedral2_t<q_t,q> r, potts_t<q> s) {
+  potts_t<q> s2;
+  if (r.is_reflection) {
+    s2.x = ((r.x + q) - s.x) % q;
+  } else {
+    s2.x = ((s.x + q) - r.x) % q;
+  }
+
+  return s2;
+}
+
+template <q_t q>
+dihedral2_t<q_t, q> act_inverse(dihedral2_t<q_t,q> r1, dihedral2_t<q_t,q> r2) {
+  dihedral2_t<q_t,q> r3;
+
+  if (r1.is_reflection) {
+    r3.is_reflection = !(r2.is_reflection);
+    r3.x = ((r1.x + q) - r2.x) % q;
+  } else {
+    r3.is_reflection = r2.is_reflection;
+    r3.x = ((r2.x + q) - r1.x) % q;
+  }
+
+  return r3;
+}
+
+#endif
+
diff --git a/lib/ising.h b/lib/ising.h
index d956d88..ec392bf 100644
--- a/lib/ising.h
+++ b/lib/ising.h
@@ -93,3 +93,7 @@ void write_magnetization(int M, FILE *outfile) {
   fwrite(&M, sizeof(int), 1, outfile);
 }
 
+#define N_STATES 2
+const ising_t states[2] = {(bool)0, (bool)1};
+q_t state_to_ind(ising_t state) { return (q_t)state.x; }
+
diff --git a/lib/potts.h b/lib/potts.h
index e411ddb..732a76f 100644
--- a/lib/potts.h
+++ b/lib/potts.h
@@ -96,3 +96,8 @@ void write_magnetization(typename potts_t<q>::M_t M, FILE *outfile) {
   fwrite(&M, sizeof(int), q, outfile);
 }
 
+// knock yourself out
+const potts_t<POTTSQ> states[256] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
+template <q_t q>
+q_t state_to_ind(potts_t<q> state) { return (q_t)state.x; }
+
diff --git a/src/wolff_ising.cpp b/src/wolff_ising.cpp
index f614707..7492ebf 100644
--- a/src/wolff_ising.cpp
+++ b/src/wolff_ising.cpp
@@ -8,9 +8,6 @@
 #include <z2.h>
 #include <ising.h>
 
-#define N_STATES 2
-const ising_t states[N_STATES] = {false, true};
-q_t state_to_ind(ising_t state) { return (q_t)state.x; }
 #include <finite_states.h>
 
 // include wolff.h
diff --git a/src/wolff_potts.cpp b/src/wolff_potts.cpp
index 6b6f602..f8f1523 100644
--- a/src/wolff_potts.cpp
+++ b/src/wolff_potts.cpp
@@ -10,9 +10,8 @@
 #include <potts.h>
 #include <colors.h>
 
+// hack to speed things up considerably
 #define N_STATES POTTSQ
-const potts_t<POTTSQ> states[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-q_t state_to_ind(potts_t<POTTSQ> state) { return (q_t)state.x; }
 #include <finite_states.h>
 
 // include wolff.h