summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2018-10-19 13:23:23 -0400
committerJaron Kent-Dobias <jaron@kent-dobias.com>2018-10-19 13:23:23 -0400
commit3b8e7ea25f0c23ca596c1c4e3e4f71d12c5fc065 (patch)
tree0400d589c68aaf38381591072e8faad09d3779f8
parent864e288c5cb51ae94ac09db8597714c605344c3d (diff)
downloadc++-3b8e7ea25f0c23ca596c1c4e3e4f71d12c5fc065.tar.gz
c++-3b8e7ea25f0c23ca596c1c4e3e4f71d12c5fc065.tar.bz2
c++-3b8e7ea25f0c23ca596c1c4e3e4f71d12c5fc065.zip
added more examples and cleaned up the model headers
-rw-r--r--doc/examples.rst10
-rw-r--r--doc/index.rst5
-rw-r--r--examples/CMakeLists.txt12
-rw-r--r--examples/clock.cpp98
-rw-r--r--examples/continuous_gaussian.cpp112
-rw-r--r--examples/discrete_gaussian.cpp117
-rw-r--r--examples/ising_standalone.cpp4
-rw-r--r--examples/potts.cpp110
-rw-r--r--lib/include/wolff/models/dihedral.hpp4
-rw-r--r--lib/include/wolff/models/dihedral_inf.hpp4
-rw-r--r--lib/include/wolff/models/height.hpp14
-rw-r--r--lib/include/wolff/models/potts.hpp17
-rw-r--r--lib/include/wolff/models/symmetric.hpp4
13 files changed, 506 insertions, 5 deletions
diff --git a/doc/examples.rst b/doc/examples.rst
new file mode 100644
index 0000000..71b70ce
--- /dev/null
+++ b/doc/examples.rst
@@ -0,0 +1,10 @@
+
+********
+Examples
+********
+
+Several examples are included in the directory :file:`examples/`. The simplist, standalone example of measuring the average cluster size of an Ising model is provided in full below, demonstrating how to define a model, measurement, couplings, and initialize the algorithm.
+
+.. literalinclude:: ../examples/ising_standalone.cpp
+ :language: cpp
+
diff --git a/doc/index.rst b/doc/index.rst
index 4e58e46..98f1e76 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,10 +1,11 @@
-Wolff Libraries
-+++++++++++++++
+Wolff Library
++++++++++++++
.. toctree ::
:maxdepth: 2
+ examples
models
system
measurement
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c64bb06..634c600 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -3,11 +3,21 @@ add_executable(ising ising.cpp)
add_executable(ising_animation ising_animation.cpp)
add_executable(ising_standalone ising_standalone.cpp)
add_executable(xy On.cpp)
+add_executable(potts_3 potts.cpp)
+add_executable(clock_5 clock.cpp)
+add_executable(discrete_gaussian discrete_gaussian.cpp)
+add_executable(continuous_gaussian continuous_gaussian.cpp)
-add_compile_definitions(xy WOLFF_N=2)
+target_compile_definitions(xy PUBLIC WOLFF_N=2)
+target_compile_definitions(potts_3 PUBLIC WOLFF_POTTSQ=3)
+target_compile_definitions(clock_5 PUBLIC WOLFF_POTTSQ=5)
target_link_libraries(ising wolff)
target_link_libraries(ising_animation wolff GL GLU glut)
target_link_libraries(ising_standalone wolff)
target_link_libraries(xy wolff)
+target_link_libraries(potts_3 wolff)
+target_link_libraries(clock_5 wolff)
+target_link_libraries(discrete_gaussian wolff)
+target_link_libraries(continuous_gaussian wolff)
diff --git a/examples/clock.cpp b/examples/clock.cpp
new file mode 100644
index 0000000..4b0ffb8
--- /dev/null
+++ b/examples/clock.cpp
@@ -0,0 +1,98 @@
+
+#include <getopt.h>
+#include <iostream>
+#include <chrono>
+
+#include "simple_measurement.hpp"
+
+#include <wolff/models/potts.hpp>
+#include <wolff/models/dihedral.hpp>
+#include <wolff/finite_states.hpp>
+
+#include <wolff.hpp>
+
+using namespace wolff;
+
+int main(int argc, char *argv[]) {
+
+ // set defaults
+ N_t N = (N_t)1e4;
+ D_t D = 2;
+ L_t L = 128;
+ double T = 2.26918531421;
+ vector_t<2, double> H;
+ H.fill(0.0);
+ q_t Hi = 0;
+
+ int opt;
+
+ // take command line arguments
+ while ((opt = getopt(argc, argv, "N:D:L:T:H:")) != -1) {
+ switch (opt) {
+ case 'N': // number of steps
+ N = (N_t)atof(optarg);
+ break;
+ case 'D': // dimension
+ D = atoi(optarg);
+ break;
+ case 'L': // linear size
+ L = atoi(optarg);
+ break;
+ case 'T': // temperature
+ T = atof(optarg);
+ break;
+ case 'H': // external field
+ H[Hi] = atof(optarg);
+ Hi++;
+ break;
+ default:
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ // define the spin-spin coupling
+ std::function <double(const potts_t<WOLFF_POTTSQ>&, const potts_t<WOLFF_POTTSQ>&)> Z = [] (const potts_t<WOLFF_POTTSQ>& s1, const potts_t<WOLFF_POTTSQ>& s2) -> double {
+ return cos(2 * M_PI * (double)(s1.x + WOLFF_POTTSQ - s2.x) / (double)WOLFF_POTTSQ);
+ };
+
+ // define the spin-field coupling
+ std::function <double(const potts_t<WOLFF_POTTSQ>&)> B = [=] (const potts_t<WOLFF_POTTSQ>& s) -> double {
+ return H[0] * cos(2 * M_PI * (double)s.x / (double)WOLFF_POTTSQ) + H[1] * sin(2 * M_PI * (double)s.x / (double)WOLFF_POTTSQ);
+ };
+
+ // initialize the lattice
+ graph G(D, L);
+
+ // initialize the system
+ system<dihedral_t<WOLFF_POTTSQ>, potts_t<WOLFF_POTTSQ>> S(G, T, Z, B);
+
+ // initialize the random number generator
+ auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+ std::mt19937 rng{seed};
+
+ // define function that generates self-inverse rotations
+ std::function <dihedral_t<WOLFF_POTTSQ>(std::mt19937&, const system<dihedral_t<WOLFF_POTTSQ>, potts_t<WOLFF_POTTSQ>>&, v_t)> gen_r = [] (std::mt19937& r, const system<dihedral_t<WOLFF_POTTSQ>, potts_t<WOLFF_POTTSQ>>& S, v_t i0) -> dihedral_t<WOLFF_POTTSQ> {
+ dihedral_t<WOLFF_POTTSQ> rot;
+ rot.is_reflection = true;
+ std::uniform_int_distribution<q_t> dist(0, WOLFF_POTTSQ - 2);
+ q_t x = dist(r);
+ rot.x = (2 * S.s[i0].x + x + 1) % WOLFF_POTTSQ;
+
+ return rot;
+ };
+
+ // initailze the measurement object
+ simple_measurement A(S);
+
+ // run wolff N times
+ S.run_wolff(N, gen_r, A, rng);
+
+ // print the result of our measurements
+ std::cout << "Wolff complete!\nThe average energy per site was " << A.avgE() / S.nv
+ << ".\nThe average magnetization per site was " << A.avgM() / S.nv
+ << ".\nThe average cluster size per site was " << A.avgC() / S.nv << ".\n";
+
+ // exit
+ return 0;
+}
+
diff --git a/examples/continuous_gaussian.cpp b/examples/continuous_gaussian.cpp
new file mode 100644
index 0000000..ef08247
--- /dev/null
+++ b/examples/continuous_gaussian.cpp
@@ -0,0 +1,112 @@
+
+#include <getopt.h>
+#include <iostream>
+#include <chrono>
+
+#include "simple_measurement.hpp"
+
+#include <wolff/models/height.hpp>
+#include <wolff/models/dihedral_inf.hpp>
+
+#include <wolff.hpp>
+
+int main(int argc, char *argv[]) {
+
+ // set defaults
+ N_t N = (N_t)1e4;
+ D_t D = 2;
+ L_t L = 128;
+ double T = 0.8;
+ double H = 0.0;
+
+ int opt;
+
+ // take command line arguments
+ while ((opt = getopt(argc, argv, "N:D:L:T:H:")) != -1) {
+ switch (opt) {
+ case 'N': // number of steps
+ N = (N_t)atof(optarg);
+ break;
+ case 'D': // dimension
+ D = atoi(optarg);
+ break;
+ case 'L': // linear size
+ L = atoi(optarg);
+ break;
+ case 'T': // temperature
+ T = atof(optarg);
+ break;
+ case 'H': // external field
+ H = atof(optarg);
+ break;
+ default:
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ // define the spin-spin coupling
+ std::function <double(const height_t<double>&, const height_t<double>&)> Z = [] (const height_t<double>& s1, const height_t<double>& s2) -> double {
+ return - pow(s1.x - s2.x, 2);
+ };
+
+ // define the spin-field coupling
+ std::function <double(const height_t<double>&)> B = [&] (const height_t<double>& s) -> double {
+ return - H * pow(s.x, 2);
+ };
+
+ // initialize the lattice
+ graph G(D, L);
+
+ // initialize the system
+ system<dihedral_inf_t<double>, height_t<double>> S(G, T, Z, B);
+
+ bool odd_run = false;
+
+ std::function <dihedral_inf_t<double>(std::mt19937&, const system<dihedral_inf_t<double>, height_t<double>>&, v_t)> gen_R_IH = [&](std::mt19937& r, const system<dihedral_inf_t<double>, height_t<double>>& S, v_t i0) -> dihedral_inf_t<double> {
+ dihedral_inf_t<double> rot;
+ rot.is_reflection = true;
+
+ if (odd_run) {
+ std::uniform_int_distribution<v_t> dist(0, S.nv - 2);
+ v_t j = i0;
+
+ //while (S.s[j].x == S.s[i0].x) {
+ v_t tmp = dist(r);
+
+ if (tmp < i0) {
+ j = tmp;
+ } else {
+ j = tmp + 1;
+ }
+ //}
+
+ rot.x = 2 * S.s[j].x;
+ } else {
+ std::normal_distribution<double> dist(0.0,1.0);
+ rot.x = 2 * S.s[i0].x + dist(r);
+ }
+
+ odd_run = !odd_run;
+
+ return rot;
+ };
+
+ // initailze the measurement object
+ simple_measurement A(S);
+
+ // initialize the random number generator
+ auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+ std::mt19937 rng{seed};
+
+ // run wolff N times
+ S.run_wolff(N, gen_R_IH, A, rng);
+
+ // print the result of our measurements
+ std::cout << "Wolff complete!\nThe average energy per site was " << A.avgE() / S.nv
+ << ".\nThe average magnetization per site was " << A.avgM() / S.nv
+ << ".\nThe average cluster size per site was " << A.avgC() / S.nv << ".\n";
+
+ // exit
+ return 0;
+}
+
diff --git a/examples/discrete_gaussian.cpp b/examples/discrete_gaussian.cpp
new file mode 100644
index 0000000..75ea0f9
--- /dev/null
+++ b/examples/discrete_gaussian.cpp
@@ -0,0 +1,117 @@
+
+#include <getopt.h>
+#include <iostream>
+#include <chrono>
+
+#include "simple_measurement.hpp"
+
+#include <wolff/models/height.hpp>
+#include <wolff/models/dihedral_inf.hpp>
+
+#include <wolff.hpp>
+
+int main(int argc, char *argv[]) {
+
+ // set defaults
+ N_t N = (N_t)1e4;
+ D_t D = 2;
+ L_t L = 128;
+ double T = 0.8;
+ double H = 0.0;
+
+ int opt;
+
+ // take command line arguments
+ while ((opt = getopt(argc, argv, "N:D:L:T:H:")) != -1) {
+ switch (opt) {
+ case 'N': // number of steps
+ N = (N_t)atof(optarg);
+ break;
+ case 'D': // dimension
+ D = atoi(optarg);
+ break;
+ case 'L': // linear size
+ L = atoi(optarg);
+ break;
+ case 'T': // temperature
+ T = atof(optarg);
+ break;
+ case 'H': // external field
+ H = atof(optarg);
+ break;
+ default:
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ // define the spin-spin coupling
+ std::function <double(const height_t<int64_t>&, const height_t<int64_t>&)> Z = [] (const height_t<int64_t>& s1, const height_t<int64_t>& s2) -> double {
+ return - pow(s1.x - s2.x, 2);
+ };
+
+ // define the spin-field coupling
+ std::function <double(const height_t<int64_t>&)> B = [&] (const height_t<int64_t>& s) -> double {
+ return - H * pow(s.x, 2);
+ };
+
+ // initialize the lattice
+ graph G(D, L);
+
+ // initialize the system
+ system<dihedral_inf_t<int64_t>, height_t<int64_t>> S(G, T, Z, B);
+
+ bool odd_run = false;
+
+ std::function <dihedral_inf_t<int64_t>(std::mt19937&, const system<dihedral_inf_t<int64_t>, height_t<int64_t>>&, v_t)> gen_R_IH = [&](std::mt19937& r, const system<dihedral_inf_t<int64_t>, height_t<int64_t>>& S, v_t i0) -> dihedral_inf_t<int64_t> {
+ dihedral_inf_t<int64_t> rot;
+ rot.is_reflection = true;
+
+ if (odd_run) {
+ std::uniform_int_distribution<v_t> dist(0, S.nv - 2);
+ v_t j = i0;
+
+ //while (S.s[j].x == S.s[i0].x) {
+ v_t tmp = dist(r);
+
+ if (tmp < i0) {
+ j = tmp;
+ } else {
+ j = tmp + 1;
+ }
+ //}
+
+ rot.x = 2 * S.s[j].x;
+ } else {
+ std::uniform_int_distribution<int> dist(0, 1);
+ int j = dist(r);
+ if (j) {
+ rot.x = 2 * S.s[i0].x + 1;
+ } else {
+ rot.x = 2 * S.s[i0].x - 1;
+ }
+ }
+
+ odd_run = !odd_run;
+
+ return rot;
+ };
+
+ // initailze the measurement object
+ simple_measurement A(S);
+
+ // initialize the random number generator
+ auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+ std::mt19937 rng{seed};
+
+ // run wolff N times
+ S.run_wolff(N, gen_R_IH, A, rng);
+
+ // print the result of our measurements
+ std::cout << "Wolff complete!\nThe average energy per site was " << A.avgE() / S.nv
+ << ".\nThe average magnetization per site was " << A.avgM() / S.nv
+ << ".\nThe average cluster size per site was " << A.avgC() / S.nv << ".\n";
+
+ // exit
+ return 0;
+}
+
diff --git a/examples/ising_standalone.cpp b/examples/ising_standalone.cpp
index c958777..62b4089 100644
--- a/examples/ising_standalone.cpp
+++ b/examples/ising_standalone.cpp
@@ -23,8 +23,10 @@ class ising_t {
};
class measure_clusters : public measurement<ising_t, ising_t> {
- public:
+ private:
v_t C;
+
+ public:
double Ctotal;
measure_clusters() {
diff --git a/examples/potts.cpp b/examples/potts.cpp
new file mode 100644
index 0000000..84494e2
--- /dev/null
+++ b/examples/potts.cpp
@@ -0,0 +1,110 @@
+
+#include <getopt.h>
+#include <iostream>
+#include <chrono>
+
+#include "simple_measurement.hpp"
+
+#include <wolff/models/potts.hpp>
+#include <wolff/models/symmetric.hpp>
+#include <wolff/finite_states.hpp>
+
+#include <wolff.hpp>
+
+using namespace wolff;
+
+int main(int argc, char *argv[]) {
+
+ // set defaults
+ N_t N = (N_t)1e4;
+ D_t D = 2;
+ L_t L = 128;
+ double T = 2.26918531421;
+ vector_t<WOLFF_POTTSQ, double> H;
+ H.fill(0.0);
+ q_t Hi = 0;
+
+ int opt;
+
+ // take command line arguments
+ while ((opt = getopt(argc, argv, "N:D:L:T:H:")) != -1) {
+ switch (opt) {
+ case 'N': // number of steps
+ N = (N_t)atof(optarg);
+ break;
+ case 'D': // dimension
+ D = atoi(optarg);
+ break;
+ case 'L': // linear size
+ L = atoi(optarg);
+ break;
+ case 'T': // temperature
+ T = atof(optarg);
+ break;
+ case 'H': // external field
+ H[Hi] = atof(optarg);
+ Hi++;
+ break;
+ default:
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ // define the spin-spin coupling
+ std::function <double(const potts_t<WOLFF_POTTSQ>&, const potts_t<WOLFF_POTTSQ>&)> Z = [] (const potts_t<WOLFF_POTTSQ>& s1, const potts_t<WOLFF_POTTSQ>& s2) -> double {
+ if (s1.x == s2.x) {
+ return 1.0;
+ } else {
+ return 0.0;
+ }
+ };
+
+ // define the spin-field coupling
+ std::function <double(const potts_t<WOLFF_POTTSQ>&)> B = [=] (const potts_t<WOLFF_POTTSQ>& s) -> double {
+ return H[s.x];
+ };
+
+ // initialize the lattice
+ graph G(D, L);
+
+ // initialize the system
+ system<symmetric_t<WOLFF_POTTSQ>, potts_t<WOLFF_POTTSQ>> S(G, T, Z, B);
+
+ // initialize the random number generator
+ auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+ std::mt19937 rng{seed};
+
+ // define function that generates self-inverse rotations
+ std::function <symmetric_t<WOLFF_POTTSQ>(std::mt19937&, const system<symmetric_t<WOLFF_POTTSQ>, potts_t<WOLFF_POTTSQ>>&, v_t)> gen_r = [] (std::mt19937& r, const system<symmetric_t<WOLFF_POTTSQ>, potts_t<WOLFF_POTTSQ>>& S, v_t i0) -> symmetric_t<WOLFF_POTTSQ> {
+ symmetric_t<WOLFF_POTTSQ> rot;
+
+ std::uniform_int_distribution<q_t> dist(0, WOLFF_POTTSQ - 2);
+ q_t j = dist(r);
+ q_t swap_v;
+ if (j < S.s[i0].x) {
+ swap_v = j;
+ } else {
+ swap_v = j + 1;
+ }
+
+ rot[S.s[i0].x] = swap_v;
+ rot[swap_v] = S.s[i0].x;
+
+ return rot;
+ };
+
+ // initailze the measurement object
+ simple_measurement A(S);
+
+ // run wolff N times
+ S.run_wolff(N, gen_r, A, rng);
+
+ // print the result of our measurements
+ std::cout << "Wolff complete!\nThe average energy per site was " << A.avgE() / S.nv
+ << ".\nThe average magnetization per site was " << A.avgM() / S.nv
+ << ".\nThe average cluster size per site was " << A.avgC() / S.nv << ".\n";
+
+ // exit
+ return 0;
+}
+
diff --git a/lib/include/wolff/models/dihedral.hpp b/lib/include/wolff/models/dihedral.hpp
index cbc5687..50272e3 100644
--- a/lib/include/wolff/models/dihedral.hpp
+++ b/lib/include/wolff/models/dihedral.hpp
@@ -4,6 +4,8 @@
#include <wolff/types.h>
#include "potts.hpp"
+namespace wolff {
+
template <q_t q>
class dihedral_t {
public:
@@ -46,3 +48,5 @@ class dihedral_t {
}
};
+}
+
diff --git a/lib/include/wolff/models/dihedral_inf.hpp b/lib/include/wolff/models/dihedral_inf.hpp
index bded387..b88e91b 100644
--- a/lib/include/wolff/models/dihedral_inf.hpp
+++ b/lib/include/wolff/models/dihedral_inf.hpp
@@ -3,6 +3,8 @@
#include <cmath>
#include "height.hpp"
+namespace wolff {
+
template <class T>
class dihedral_inf_t {
public:
@@ -45,3 +47,5 @@ class dihedral_inf_t {
}
};
+}
+
diff --git a/lib/include/wolff/models/height.hpp b/lib/include/wolff/models/height.hpp
index bd0ceb6..9d7e87c 100644
--- a/lib/include/wolff/models/height.hpp
+++ b/lib/include/wolff/models/height.hpp
@@ -4,6 +4,8 @@
#include <cmath>
#include <wolff/types.h>
+namespace wolff {
+
template <class T>
struct height_t {
T x;
@@ -28,6 +30,16 @@ struct height_t {
};
template <class T>
+inline typename height_t<T>::M_t operator*(v_t a, height_t<T> h) {
+ return h * a;
+}
+
+template <class T>
+inline typename height_t<T>::F_t operator*(double a, height_t<T> h) {
+ return h * a;
+}
+
+template <class T>
inline T& operator+=(T& M, const height_t<T> &h) {
M += h.x;
@@ -41,3 +53,5 @@ inline T& operator-=(T& M, const height_t<T> &h) {
return M;
}
+}
+
diff --git a/lib/include/wolff/models/potts.hpp b/lib/include/wolff/models/potts.hpp
index 10b440e..ce419ce 100644
--- a/lib/include/wolff/models/potts.hpp
+++ b/lib/include/wolff/models/potts.hpp
@@ -6,6 +6,8 @@
#include "../types.h"
#include "vector.hpp"
+namespace wolff {
+
template <q_t q>
class potts_t {
public:
@@ -44,7 +46,20 @@ class potts_t {
}
};
-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>
+inline typename potts_t<q>::M_t operator*(v_t a, const potts_t<q>& s) {
+ return s * a;
+}
+
+template<q_t q>
+inline typename potts_t<q>::F_t operator*(double a, const potts_t<q>& s) {
+ return s * a;
+}
+
+#define WOLFF_FINITE_STATES_N WOLFF_POTTSQ
+const potts_t<WOLFF_POTTSQ> finite_states_possible[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 finite_states_enum(const potts_t<q>& state) { return (q_t)state.x; }
+}
+
diff --git a/lib/include/wolff/models/symmetric.hpp b/lib/include/wolff/models/symmetric.hpp
index 7bcc9a6..71431c5 100644
--- a/lib/include/wolff/models/symmetric.hpp
+++ b/lib/include/wolff/models/symmetric.hpp
@@ -6,6 +6,8 @@
#include "../types.h"
#include "potts.hpp"
+namespace wolff {
+
template <q_t q>
class symmetric_t : public std::array<q_t, q> {
public:
@@ -49,3 +51,5 @@ class symmetric_t : public std::array<q_t, q> {
}
};
+}
+